March 2011 - openSUSE Commits - openSUSE Mailing Lists

commit timezone for openSUSE:11.4
by root＠hilbert.suse.de 25 Mar '11

25 Mar '11

Hello community, here is the log from the commit of package timezone for openSUSE:11.4 checked in at Fri Mar 25 10:22:19 CET 2011. -------- --- old-versions/11.4/UPDATES/all/timezone/timezone-java.changes 2011-03-12 11:10:10.000000000 +0100 +++ 11.4/timezone/timezone-java.changes 2011-03-14 21:44:04.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Mar 14 21:40:14 CET 2011 - dmueller(a)suse.de + +- update to 2011d: + * Pacific/Apia: Move DST from April 3rd to April 2nd + * Europe/Istanbul: Move DST from March 27th to 28th + * America/Cuba: DST starts on March 20th + +------------------------------------------------------------------- timezone.changes: same change calling whatdependson for 11.4-i586 Old: ---- tzcode2011c.tar.gz tzdata2011c.tar.gz New: ---- tzcode2011d.tar.gz tzdata2011d.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ timezone-java.spec ++++++ --- /var/tmp/diff_new_pack.PG3a38/_old 2011-03-25 10:21:59.000000000 +0100 +++ /var/tmp/diff_new_pack.PG3a38/_new 2011-03-25 10:21:59.000000000 +0100 @@ -25,7 +25,7 @@ Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2011c +Version: 2011d Release: 0.<RELEASE2> Source: tzdata%{version}.tar.gz Source1: tzcode%version.tar.gz ++++++ timezone.spec ++++++ --- /var/tmp/diff_new_pack.PG3a38/_old 2011-03-25 10:21:59.000000000 +0100 +++ /var/tmp/diff_new_pack.PG3a38/_new 2011-03-25 10:21:59.000000000 +0100 @@ -25,7 +25,7 @@ Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2011c +Version: 2011d Release: 0.<RELEASE2> Source: tzdata%{version}.tar.gz Source1: tzcode%version.tar.gz ++++++ tzcode2011c.tar.gz -> tzcode2011d.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zic.c new/zic.c --- old/zic.c 2010-12-16 18:24:13.000000000 +0100 +++ new/zic.c 2011-03-09 20:41:27.000000000 +0100 @@ -3,7 +3,7 @@ ** 2006-07-17 by Arthur David Olson. */ -static char elsieid[] = "@(#)zic.c 8.24"; +static char elsieid[] = "@(#)zic.c 8.25"; #include "private.h" #include "locale.h" @@ -1639,10 +1639,11 @@ mrudst = types[i]; else mrustd = types[i]; for (i = 0; i < typecnt; ++i) - if (writetype[i]) + if (writetype[i]) { if (isdsts[i]) hidst = i; else histd = i; + } if (hidst >= 0 && mrudst >= 0 && hidst != mrudst && gmtoffs[hidst] != gmtoffs[mrudst]) { isdsts[mrudst] = -1; ++++++ tzdata2011c.tar.gz -> tzdata2011d.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/australasia new/australasia --- old/australasia 2011-01-12 17:03:44.000000000 +0100 +++ new/australasia 2011-03-09 20:38:29.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)australasia 8.22 +# @(#)australasia 8.23 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -509,11 +509,31 @@ # to 01:00am and First Sunday April 2011 (03/04/11) - adjust clocks # backwards from 1:00am to 12:00am" +# From Raymond Hughes (2011-03-07) +# I believe this will be posted shortly on the website +# <a href="http://www.mcil.gov.ws"> +# www.mcil.gov.ws +# </a> +# +# PUBLIC NOTICE ON DAYLIGHT SAVING TIME +# +# Pursuant to the Daylight Saving Act 2009 and Cabinets decision, +# businesses and the general public are hereby advised that daylight +# saving time is on the first Saturday of April 2011 (02/04/11). +# +# The public is therefore advised that when the standard time strikes +# the hour of four oclock (4.00am or 0400 Hours) on the 2nd April 2011, +# then all instruments used to measure standard time are to be +# adjusted/changed to three oclock (3:00am or 0300Hrs). +# +# Margaret Fruean ACTING CHIEF EXECUTIVE OFFICER MINISTRY OF COMMERCE, +# INDUSTRY AND LABOUR 28th February 2011 + Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time -11:00 - WST 2010 Sep 26 - -11:00 1:00 WSDT 2011 Apr 3 1:00 + -11:00 1:00 WSDT 2011 Apr 2 4:00 -11:00 - WST # Solomon Is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etcetera new/etcetera --- old/etcetera 2010-12-16 18:24:20.000000000 +0100 +++ new/etcetera 2011-03-09 20:27:36.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)etcetera 8.2 +# @(#)etcetera 8.3 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -36,8 +36,7 @@ # (i.e. west of Greenwich) even though many people would expect it to # mean 4 hours ahead of UTC (i.e. east of Greenwich). # -# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation -# (which is not yet supported by the tz code) allows for +# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for # TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to # ISO 8601 you can use TZ='<-0400>+4'. Thus the commonly-expected # offset is kept within the angle bracket (and is used for display) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/europe new/europe --- old/europe 2010-12-16 18:24:20.000000000 +0100 +++ new/europe 2011-03-11 04:03:39.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)europe 8.27 +# @(#)europe 8.28 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -2483,25 +2483,18 @@ # (on a non-government server though) describing dates between 2002 and 2006: # http://www.alomaliye.com/bkk_2002_3769.htm -# From Sue Williams (2008-08-11): -# I spotted this news article about a potential change in Turkey. -# -# <a href="http://www.hurriyet.com.tr/english/domestic/9626174.asp?scr=1"> -# http://www.hurriyet.com.tr/english/domestic/9626174.asp?scr=1 +# From Gökdeniz Karadağ (2011-03-10): +# +# According to the articles linked below, Turkey will change into summer +# time zone (GMT+3) on March 28, 2011 at 3:00 a.m. instead of March 27. +# This change is due to a nationwide exam on 27th. +# +# <a href="http://www.worldbulletin.net/?aType=haber&ArticleID=70872"> +# http://www.worldbulletin.net/?aType=haber&ArticleID=70872 # </a> - -# From Sue Williams (2008-08-20): -# This article says that around the end of March 2011, Turkey wants to -# adjust the clocks forward by 1/2 hour and stay that way permanently. -# The article indicates that this is a change in timezone offset in addition -# to stopping observance of DST. -# This proposal has not yet been approved. -# -# Read more here... -# -# Turkey to abandon daylight saving time in 2011 -# <a href="http://www.turkishdailynews.com.tr/article.php?enewsid=112989"> -# http://www.turkishdailynews.com.tr/article.php?enewsid=112989 +# Turkish: +# <a href="http://www.hurriyet.com.tr/ekonomi/17230464.asp?gid=373"> +# http://www.hurriyet.com.tr/ekonomi/17230464.asp?gid=373 # </a> # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -2569,6 +2562,8 @@ 2:00 Turkey EE%sT 1978 Oct 15 3:00 Turkey TR%sT 1985 Apr 20 # Turkey Time 2:00 Turkey EE%sT 2007 + 2:00 EU EE%sT 2011 Mar 27 1:00u + 2:00 - EET 2011 Mar 28 1:00u 2:00 EU EE%sT Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/northamerica new/northamerica --- old/northamerica 2011-02-09 20:00:33.000000000 +0100 +++ new/northamerica 2011-03-09 20:45:23.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)northamerica 8.41 +# @(#)northamerica 8.42 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -2606,6 +2606,21 @@ # the time was announced as "diez cinco"--the same time as here, indicating # that has indeed switched to DST. Assume second Sunday from 2009 forward. +# From Steffen Thorsen (2011-03-08): +# Granma announced that Cuba is going to start DST on 2011-03-20 00:00:00 +# this year. Nothing about the end date known so far (if that has +# changed at all). +# +# Source: +# <a href="http://granma.co.cu/2011/03/08/nacional/artic01.html"> +# http://granma.co.cu/2011/03/08/nacional/artic01.html +# </a> +# +# Our info: +# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html"> +# http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html +# </a> + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Cuba 1928 only - Jun 10 0:00 1:00 D Rule Cuba 1928 only - Oct 10 0:00 0 S @@ -2639,7 +2654,9 @@ Rule Cuba 2006 max - Oct lastSun 0:00s 0 S Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D -Rule Cuba 2009 max - Mar Sun>=8 0:00s 1:00 D +Rule Cuba 2009 2010 - Mar Sun>=8 0:00s 1:00 D +Rule Cuba 2011 only - Mar Sun>=15 0:00s 1:00 D +Rule Cuba 2012 max - Mar Sun>=8 0:00s 1:00 D # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Havana -5:29:28 - LMT 1890 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit timezone for openSUSE:11.3
by root＠hilbert.suse.de 25 Mar '11

25 Mar '11

Hello community, here is the log from the commit of package timezone for openSUSE:11.3 checked in at Fri Mar 25 10:21:35 CET 2011. -------- --- old-versions/11.3/UPDATES/all/timezone/timezone-java.changes 2011-03-08 04:00:29.000000000 +0100 +++ 11.3/timezone/timezone-java.changes 2011-03-14 21:44:04.000000000 +0100 @@ -2 +2 @@ -Tue Mar 8 03:00:38 UTC 2011 - crrodriguez(a)opensuse.org +Mon Mar 14 21:40:14 CET 2011 - dmueller(a)suse.de @@ -4 +4,39 @@ -- Update to 2011c, updates for Chile and Australia. +- update to 2011d: + * Pacific/Apia: Move DST from April 3rd to April 2nd + * Europe/Istanbul: Move DST from March 27th to 28th + * America/Cuba: DST starts on March 20th + +------------------------------------------------------------------- +Sat Mar 12 11:09:35 CET 2011 - dmueller(a)suse.de + +- update to 2011c: + * northamerica Replace Juneau with Juneau, Sitka, and Metlakatla. + * southamerica Delay end of DST in 2011 until first Sunday in April. + +------------------------------------------------------------------- +Wed Feb 16 00:48:03 CET 2011 - dmueller(a)suse.de + +- update to 2011b: + * updates for australasia and northamerica + +------------------------------------------------------------------- +Tue Nov 2 11:57:20 CET 2010 - dmueller(a)suse.de + +- update to 2010o: + * fix Pacific/Apia and Austalasia/Fiji + +------------------------------------------------------------------- +Tue Oct 5 15:42:21 CEST 2010 - dmueller(a)suse.de + +- update to 2010m: + * fix historic data of Antarctica/Vostok + +------------------------------------------------------------------- +Tue Sep 21 16:18:24 CEST 2010 - dmueller(a)suse.de + +- change execlp into execl + +------------------------------------------------------------------- +Wed Aug 25 11:59:01 CEST 2010 - ro(a)suse.de + +- add missing sentinel to tzcode-link.diff @@ -26,0 +65,5 @@ + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh(a)medozas.de + +- use %_smp_mflags timezone.changes: same change calling whatdependson for 11.3-i586 Old: ---- _service _service:download_url:tzcode2011c.tar.gz _service:download_url:tzdata2011c.tar.gz New: ---- tzcode2011d.tar.gz tzdata2011d.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ timezone-java.spec ++++++ --- /var/tmp/diff_new_pack.q8Bd7j/_old 2011-03-25 10:21:21.000000000 +0100 +++ /var/tmp/diff_new_pack.q8Bd7j/_new 2011-03-25 10:21:21.000000000 +0100 @@ -25,10 +25,10 @@ Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2011c +Version: 2011d Release: 0.<RELEASE2> Source: tzdata%{version}.tar.gz -Source1: tzcode%{version}.tar.gz +Source1: tzcode%version.tar.gz # COMMON-END # COMMON-END Url: http://www.gnu.org/software/libc/libc.html ++++++ timezone.spec ++++++ --- /var/tmp/diff_new_pack.q8Bd7j/_old 2011-03-25 10:21:21.000000000 +0100 +++ /var/tmp/diff_new_pack.q8Bd7j/_new 2011-03-25 10:21:21.000000000 +0100 @@ -25,10 +25,10 @@ Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2011c +Version: 2011d Release: 0.<RELEASE2> Source: tzdata%{version}.tar.gz -Source1: tzcode%{version}.tar.gz +Source1: tzcode%version.tar.gz # COMMON-END Patch0: tzdata-china.diff Patch1: tzcode-zic.diff @@ -60,8 +60,8 @@ AREA=%{AREA} ZONE=%{ZONE} export AREA LANG LC_ALL ZONE -make %{?jobs:-j%jobs} TZDIR=%{_prefix}/share/zoneinfo CFLAGS="$RPM_OPT_FLAGS -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"'" AWK=awk -make %{?jobs:-j%jobs} TZDIR=zoneinfo AWK=awk zones +make %{?_smp_mflags} TZDIR=%{_prefix}/share/zoneinfo CFLAGS="$RPM_OPT_FLAGS -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"'" AWK=awk +make %{?_smp_mflags} TZDIR=zoneinfo AWK=awk zones # Generate posixrules ./zic -y ./yearistype -d zoneinfo -p %{AREA}/%{ZONE} ++++++ tzcode-link.diff ++++++ --- /var/tmp/diff_new_pack.q8Bd7j/_old 2011-03-25 10:21:22.000000000 +0100 +++ /var/tmp/diff_new_pack.q8Bd7j/_new 2011-03-25 10:21:22.000000000 +0100 @@ -10,7 +10,7 @@ +const char * const toname; +{ + if (!fork()) { -+ execlp("cp", "cp", fromname, toname, (char*) NULL); ++ execl("/bin/cp", "cp", fromname, toname, (char*) NULL); + _exit(1); + } + int s; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit timezone for openSUSE:11.2
by root＠hilbert.suse.de 25 Mar '11

25 Mar '11

Hello community, here is the log from the commit of package timezone for openSUSE:11.2 checked in at Fri Mar 25 10:20:53 CET 2011. -------- --- old-versions/11.2/UPDATES/all/timezone/timezone-java.changes 2011-03-08 04:04:55.000000000 +0100 +++ 11.2/timezone/timezone-java.changes 2011-03-14 21:44:04.000000000 +0100 @@ -2 +2 @@ -Tue Mar 8 03:05:22 UTC 2011 - crrodriguez(a)opensuse.org +Mon Mar 14 21:40:14 CET 2011 - dmueller(a)suse.de @@ -4 +4,39 @@ -- Update to 2011c, updates for Chile and Australia. +- update to 2011d: + * Pacific/Apia: Move DST from April 3rd to April 2nd + * Europe/Istanbul: Move DST from March 27th to 28th + * America/Cuba: DST starts on March 20th + +------------------------------------------------------------------- +Sat Mar 12 11:09:35 CET 2011 - dmueller(a)suse.de + +- update to 2011c: + * northamerica Replace Juneau with Juneau, Sitka, and Metlakatla. + * southamerica Delay end of DST in 2011 until first Sunday in April. + +------------------------------------------------------------------- +Wed Feb 16 00:48:03 CET 2011 - dmueller(a)suse.de + +- update to 2011b: + * updates for australasia and northamerica + +------------------------------------------------------------------- +Tue Nov 2 11:57:20 CET 2010 - dmueller(a)suse.de + +- update to 2010o: + * fix Pacific/Apia and Austalasia/Fiji + +------------------------------------------------------------------- +Tue Oct 5 15:42:21 CEST 2010 - dmueller(a)suse.de + +- update to 2010m: + * fix historic data of Antarctica/Vostok + +------------------------------------------------------------------- +Tue Sep 21 16:18:24 CEST 2010 - dmueller(a)suse.de + +- change execlp into execl + +------------------------------------------------------------------- +Wed Aug 25 11:59:01 CEST 2010 - ro(a)suse.de + +- add missing sentinel to tzcode-link.diff @@ -28,0 +67,5 @@ +Mon Jun 28 06:38:35 UTC 2010 - jengelh(a)medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- @@ -41,2 +84 @@ -- update tzdata to 2010e: - +- cleanup; changes since 2009u are: @@ -45,0 +88,6 @@ + +------------------------------------------------------------------- +Sun Mar 14 13:04:16 UTC 2010 - crrodriguez(a)opensuse.org + +- Update to 2010e, including Chile's emergency DST changes +- Update code to 2010c - mostly just cleanups timezone.changes: same change calling whatdependson for 11.2-i586 Old: ---- _service _service:download_url:tzcode2011c.tar.gz _service:download_url:tzdata2011c.tar.gz New: ---- tzcode2011d.tar.gz tzdata2011d.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ timezone-java.spec ++++++ --- /var/tmp/diff_new_pack.xgFlrd/_old 2011-03-25 10:20:05.000000000 +0100 +++ /var/tmp/diff_new_pack.xgFlrd/_new 2011-03-25 10:20:05.000000000 +0100 @@ -25,10 +25,10 @@ Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2011c +Version: 2011d Release: 0.<RELEASE2> Source: tzdata%{version}.tar.gz -Source1: tzcode%{version}.tar.gz +Source1: tzcode%version.tar.gz # COMMON-END # COMMON-END Url: http://www.gnu.org/software/libc/libc.html ++++++ timezone.spec ++++++ --- /var/tmp/diff_new_pack.xgFlrd/_old 2011-03-25 10:20:05.000000000 +0100 +++ /var/tmp/diff_new_pack.xgFlrd/_new 2011-03-25 10:20:05.000000000 +0100 @@ -25,10 +25,10 @@ Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2011c +Version: 2011d Release: 0.<RELEASE2> Source: tzdata%{version}.tar.gz -Source1: tzcode%{version}.tar.gz +Source1: tzcode%version.tar.gz # COMMON-END Patch0: tzdata-china.diff Patch1: tzcode-zic.diff @@ -60,8 +60,8 @@ AREA=%{AREA} ZONE=%{ZONE} export AREA LANG LC_ALL ZONE -make %{?jobs:-j%jobs} TZDIR=%{_prefix}/share/zoneinfo CFLAGS="$RPM_OPT_FLAGS -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"'" AWK=awk -make %{?jobs:-j%jobs} TZDIR=zoneinfo AWK=awk zones +make %{?_smp_mflags} TZDIR=%{_prefix}/share/zoneinfo CFLAGS="$RPM_OPT_FLAGS -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"'" AWK=awk +make %{?_smp_mflags} TZDIR=zoneinfo AWK=awk zones # Generate posixrules ./zic -y ./yearistype -d zoneinfo -p %{AREA}/%{ZONE} ++++++ tzcode-link.diff ++++++ --- /var/tmp/diff_new_pack.xgFlrd/_old 2011-03-25 10:20:05.000000000 +0100 +++ /var/tmp/diff_new_pack.xgFlrd/_new 2011-03-25 10:20:05.000000000 +0100 @@ -10,7 +10,7 @@ +const char * const toname; +{ + if (!fork()) { -+ execlp("cp", "cp", fromname, toname, (char*) NULL); ++ execl("/bin/cp", "cp", fromname, toname, (char*) NULL); + _exit(1); + } + int s; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-Class-Load for openSUSE:Factory
by root＠hilbert.suse.de 25 Mar '11

25 Mar '11

Hello community, here is the log from the commit of package perl-Class-Load for openSUSE:Factory checked in at Fri Mar 25 09:15:06 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Class-Load/perl-Class-Load.changes 2010-12-30 00:20:28.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Wed Dec 29 23:20:19 CET 2010 - pascal.bleser(a)opensuse.org + +- initial version (0.06) + calling whatdependson for head-i586 New: ---- Class-Load-0.06.tar.gz perl-Class-Load.changes perl-Class-Load.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Class-Load.spec ++++++ # # spec file for package perl-Class-Load # # Copyright (c) 2011 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: perl-Class-Load Version: 0.06 Release: 1 Summary: A working require "Class::Name" and more Source: http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/Class-Load-%{version}.ta… Url: http://search.cpan.org/dist/Class-Load Group: Development/Libraries/Perl License: Perl License BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} BuildRequires: perl-macros BuildRequires: make %if 0%{?suse_version} >= 1100 BuildRequires: perl(Test::More) BuildRequires: perl(Test::Fatal) %endif BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 BuildRequires: perl(Scalar::Util) Requires: perl(Scalar::Util) %description "require EXPR" only accepts "Class/Name.pm" style module names, not "Class::Name". How frustrating! For that, we provide "load_class 'Class::Name'". It's often useful to test whether a module can be loaded, instead of throwing an error when it's not available. For that, we provide "try_load_class 'Class::Name'". Finally, sometimes we need to know whether a particular class has been loaded. Asking %%INC is an option, but that will miss inner packages and any class for which the filename does not correspond to the package name. For that, we provide "is_class_loaded 'Class::Name'". %prep %setup -q -n "Class-Load-%{version}" %__sed -i '/^auto_install/d' Makefile.PL %build %__perl Makefile.PL PREFIX="%{_prefix}" %__make %{?jobs:-j%{jobs}} %install %perl_make_install %perl_process_packlist %if 0%{?suse_version} >= 1100 %check %__make test %endif %clean %{?buildroot:%__rm -rf "%{buildroot}"} %files %defattr(-,root,root) %doc Changes %dir %{perl_vendorlib}/Class %{perl_vendorlib}/Class/Load.pm %dir %{perl_vendorarch}/auto/Class %{perl_vendorarch}/auto/Class/Load %doc %{perl_man3dir}/Class::Load.%{perl_man3ext}%{ext_man} %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 apcupsd for openSUSE:Factory
by root＠hilbert.suse.de 25 Mar '11

25 Mar '11

Hello community, here is the log from the commit of package apcupsd for openSUSE:Factory checked in at Fri Mar 25 09:13:31 CET 2011. -------- --- apcupsd/apcupsd.changes 2010-07-27 22:12:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/apcupsd/apcupsd.changes 2011-03-24 16:36:06.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 24 15:34:50 UTC 2011 - vcizek(a)novell.com + +- fixed apcupsd-lite path in init script + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apcupsd.spec ++++++ --- /var/tmp/diff_new_pack.B2hRXb/_old 2011-03-25 09:13:19.000000000 +0100 +++ /var/tmp/diff_new_pack.B2hRXb/_new 2011-03-25 09:13:19.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package apcupsd (Version 3.14.6) +# spec file for package apcupsd # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -25,7 +25,7 @@ License: GPLv2+ Summary: APC UPS Daemon (Powerful Daemon for APC UPSs) Version: 3.14.6 -Release: 11 +Release: 15 Url: http://www.apcupsd.com/ Source: apcupsd-%{version}.tar.bz2 Source1: apcupsd.init ++++++ apcupsd.init ++++++ --- /var/tmp/diff_new_pack.B2hRXb/_old 2011-03-25 09:13:19.000000000 +0100 +++ /var/tmp/diff_new_pack.B2hRXb/_new 2011-03-25 09:13:19.000000000 +0100 @@ -26,7 +26,7 @@ ### END INIT INFO APCUPSD=@sbindir@/apcupsd -APCUPSD_LITE=@sbindir@/apcupsd-lite +APCUPSD_LITE=/sbin/apcupsd-lite test -x $APCUPSD -o -x $APCUPSD_LITE || exit 5 # Shell functions sourced from /etc/rc.status: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 apparmor for openSUSE:Factory
by root＠hilbert.suse.de 25 Mar '11

25 Mar '11

Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at Fri Mar 25 09:04:50 CET 2011. -------- --- apparmor/apparmor.changes 2011-03-01 11:03:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/apparmor/apparmor.changes 2011-03-24 21:33:19.000000000 +0100 @@ -1,0 +2,26 @@ +Thu Mar 24 21:30:15 CET 2011 - jeffm(a)suse.de + +- Added alias from Immunix::SubDomain to Immunix:AppArmor to allow + older users of perl-apparmor to work properly. + +------------------------------------------------------------------- +Tue Mar 22 21:29:49 CET 2011 - jeffm(a)suse.de + +- Properly re-created links to old utility names. + +------------------------------------------------------------------- +Mon Mar 14 19:24:02 CET 2011 - jeffm(a)suse.de + +- Added /etc/ethers and /var/run/dnsmasq-forwarders to + usr.sbin.dnsmasq (bnc#678749) + +------------------------------------------------------------------- +Mon Mar 14 16:48:53 CET 2011 - jeffm(a)suse.de + +- Update to 2.6.0 + - 19 patches eliminated + - Lots of minor fixes. + - Split out more common abstractions + - Added more local includes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- apparmor-2.5-r1445 apparmor-2.5.1-dnsmasq-libvirt-profile-fix apparmor-2.5.1-firefox-proc-fix apparmor-2.5.1-network-fixes apparmor-2.5.1-ntpd-proc-fixes apparmor-2.5.1-unconfined-fixes apparmor-2.5.1.tar.bz2 apparmor-docs-techdoc-grammar-fixes apparmor-parser-string-fixes apparmor-perl apparmor-swig-build-fix apparmor-translation-fixes apparmor-utils-SubDomain apparmor-utils-cleanup-on-abort apparmor-utils-inherit-flags-during-profile-generation apparmor-utils-null-path-fix apparmor-utils-translation-unification apparmorapplet-gnome-build-fix mod_apparmor-includes pam-apparmor-include tomcat-build-fixes New: ---- apparmor-2.6.0.tar.bz2 apparmor-profiles-usr.sbin.dnsmasq apparmor-utils-subdomain-compat ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:22.000000000 +0100 @@ -32,9 +32,6 @@ %define JAR_FILE changeHatValve.jar %define apache_module_path %(/usr/sbin/apxs2 -q LIBEXECDIR) -%define srcversion 2.5.1 -%define bzr_commit r1445 - Name: apparmor %if ! %{?distro:1}0 %if %{?suse_version:1}0 @@ -48,52 +45,35 @@ %define distro suse %endif Summary: AppArmor userlevel parser utility -Version: %{srcversion}.%{bzr_commit} -Release: 55 +Version: 2.6.0 +Release: 1 Group: Productivity/Networking/Security -Source0: apparmor-%{srcversion}.tar.bz2 +Source0: apparmor-%{version}.tar.bz2 Source1: %{name}-profile-editor.png Source2: %{name}-profile-editor.desktop Source3: update-trans.sh -Patch: apparmor-2.5-%{bzr_commit} -Patch1: pam-apparmor-include -Patch2: mod_apparmor-includes -Patch3: tomcat-build-fixes -Patch4: apparmor-swig-build-fix -Patch5: apparmor-scripts -Patch6: apparmor-translation-fixes -Patch7: apparmor-perl -Patch8: apparmor-no-caching-test -Patch9: apparmorapplet-gnome-build-fix -Patch10: apparmor-utils-SubDomain -Patch11: apparmor-utils-cleanup-on-abort -Patch12: apparmor-utils-translation-unification -Patch13: apparmor-utils-add-log-types -Patch14: apparmor-utils-filenames-in-slash -Patch15: apparmor-utils-null-path-fix -Patch16: apparmor-utils-string-split -Patch17: apparmor-profiles-cupsd-fix -Patch18: apparmor-profiles-sshd-fix -Patch19: apparmor-profiles-syslog-ng-fix -Patch20: apparmor-docs-techdoc-grammar-fixes -Patch21: apparmor-parser-string-fixes -Patch22: apparmor-startproc.patch -Patch23: apparmor-2.5.1-unified-build -Patch24: apparmor-2.5.1-rpmlint-asprintf -Patch25: apparmor-2.5.1-ntpd-proc-fixes -Patch26: apparmor-2.5.1-edirectory-profile -Patch27: apparmor-2.5.1-firefox-proc-fix -Patch28: apparmor-2.5.1-unconfined-fixes -Patch29: apparmor-utils-inherit-flags-during-profile-generation -Patch30: apparmor-2.5.1-ldapclient-profile -Patch31: genprof-whitespace-in-profile-fix -Patch32: apparmor-remove-repo -Patch33: apparmor-2.5.1-ntpd-sys_nice -Patch34: apparmor-2.5.1-ssl-fix -Patch35: apparmor-2.5.1-dnsmasq-libvirt-profile-fix -Patch36: klog-needs-CAP_SYSLOG -Patch37: apparmor-2.5.1-network-fixes -Patch38: apparmor-profiles-dhclient + +Patch1: apparmor-scripts +Patch2: apparmor-no-caching-test +Patch3: apparmor-utils-add-log-types +Patch4: apparmor-utils-filenames-in-slash +Patch5: apparmor-utils-string-split +Patch6: apparmor-profiles-cupsd-fix +Patch7: apparmor-profiles-sshd-fix +Patch8: apparmor-profiles-syslog-ng-fix +Patch9: apparmor-startproc.patch +Patch10: apparmor-2.5.1-unified-build +Patch11: apparmor-2.5.1-rpmlint-asprintf +Patch12: apparmor-2.5.1-edirectory-profile +Patch13: apparmor-2.5.1-ldapclient-profile +Patch14: genprof-whitespace-in-profile-fix +Patch15: apparmor-remove-repo +Patch16: apparmor-2.5.1-ntpd-sys_nice +Patch17: apparmor-2.5.1-ssl-fix +Patch18: apparmor-profiles-usr.sbin.dnsmasq +Patch19: klog-needs-CAP_SYSLOG +Patch20: apparmor-profiles-dhclient +Patch21: apparmor-utils-subdomain-compat License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: https://launchpad.net/apparmor @@ -463,8 +443,7 @@ %endif %prep -%setup -q -n %{name}-%{srcversion} -%patch -p1 +%setup -q -n %{name}-%{version} %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -486,23 +465,6 @@ %patch19 -p1 %patch20 -p1 %patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%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 %build export SUSE_ASNEEDED=0 @@ -574,21 +536,18 @@ ln -s %{_sysconfdir}/init.d/boot.apparmor ${RPM_BUILD_ROOT}/sbin/rcapparmor ln -s %{_sysconfdir}/init.d/boot.apparmor ${RPM_BUILD_ROOT}/sbin/rcsubdomain -for script in ${RPM_BUILD_ROOT}/usr/sbin/*; do - d=$(dirname $script) - f=$(basename $script) - if [ "${f#aa-}" = "$f" ]; then - ln -s /usr/sbin/$f $d/aa-$f +# Re-create the links to the old names +for file in ${RPM_BUILD_ROOT}/usr/{sbin,share/man/man[0-9]}/aa-*; do + d=$(dirname $file) + f=$(basename $file) + if [ "${f#aa-}" != "$f" ]; then + ln -s $f $d/${f#aa-} fi done -for man in ${RPM_BUILD_ROOT}/usr/share/man/man[18]/*; do - d=$(dirname $man) - f=$(basename $man) - if [ "${f#aa-}" = "$f" ]; then - ln -s $f $d/aa-$f - fi -done +mv -f ${RPM_BUILD_ROOT}/usr/share/man/man8/{status.8,apparmor_status.8} +mv -f ${RPM_BUILD_ROOT}/usr/share/man/man8/{notify.8,apparmor_notify.8} +rm -f ${RPM_BUILD_ROOT}/usr/share/man/man8/decode.8 %if %{with editor} %suse_update_desktop_file -i %{name}-profile-editor Utility TextEditor @@ -687,6 +646,7 @@ %config(noreplace) %{_sysconfdir}/apparmor/subdomain.conf %{_prefix}/sbin/* %dir /var/log/apparmor +%doc %{_mandir}/man2/aa_change_profile.2.gz %doc %{_mandir}/man5/logprof.conf.5.gz %doc %{_mandir}/man8/apparmor_notify.8.gz %doc %{_mandir}/man8/aa-*.gz ++++++ apparmor-2.5.1-edirectory-profile ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:22.000000000 +0100 @@ -17,7 +17,7 @@ --- a/profiles/apparmor.d/abstractions/nameservice +++ b/profiles/apparmor.d/abstractions/nameservice -@@ -71,6 +71,9 @@ +@@ -70,6 +70,9 @@ # kerberos #include <abstractions/kerberosclient> ++++++ apparmor-2.5.1-ldapclient-profile ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:22.000000000 +0100 @@ -1,7 +1,10 @@ -Index: apparmor-2.5.1/profiles/apparmor.d/abstractions/ldapclient -=================================================================== +--- + profiles/apparmor.d/abstractions/ldapclient | 21 +++++++++++++++++++++ + profiles/apparmor.d/abstractions/nameservice | 8 +++----- + 2 files changed, 24 insertions(+), 5 deletions(-) + --- /dev/null -+++ apparmor-2.5.1/profiles/apparmor.d/abstractions/ldapclient ++++ b/profiles/apparmor.d/abstractions/ldapclient @@ -0,0 +1,21 @@ +# ------------------------------------------------------------------ +# @@ -24,11 +27,9 @@ + /usr/lib{,32,64}/sasl2/* r, + + #include <abstractions/ssl_certs> -Index: apparmor-2.5.1/profiles/apparmor.d/abstractions/nameservice -=================================================================== ---- apparmor-2.5.1.orig/profiles/apparmor.d/abstractions/nameservice -+++ apparmor-2.5.1/profiles/apparmor.d/abstractions/nameservice -@@ -17,8 +17,6 @@ +--- a/profiles/apparmor.d/abstractions/nameservice ++++ b/profiles/apparmor.d/abstractions/nameservice +@@ -16,8 +16,6 @@ /etc/group r, /etc/host.conf r, /etc/hosts r, @@ -37,7 +38,7 @@ /etc/nsswitch.conf r, /etc/gai.conf r, /etc/passwd r, -@@ -33,9 +31,6 @@ +@@ -32,9 +30,6 @@ /etc/samba/lmhosts r, /etc/services r, @@ -47,7 +48,7 @@ # db backend /var/lib/misc/*.db r, # The Name Service Cache Daemon can cache lookups, sometimes leading -@@ -59,6 +54,9 @@ +@@ -58,6 +53,9 @@ # nis #include <abstractions/nis> ++++++ apparmor-2.5.1-ntpd-sys_nice ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:22.000000000 +0100 @@ -14,7 +14,7 @@ --- a/profiles/apparmor.d/usr.sbin.ntpd +++ b/profiles/apparmor.d/usr.sbin.ntpd -@@ -25,6 +25,7 @@ +@@ -24,6 +24,7 @@ capability sys_chroot, capability sys_resource, capability sys_time, ++++++ apparmor-2.5.1-rpmlint-asprintf ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:22.000000000 +0100 @@ -39,7 +39,7 @@ #include <stdio.h> --- a/parser/parser_interface.c +++ b/parser/parser_interface.c -@@ -17,6 +17,7 @@ +@@ -15,6 +15,7 @@ * along with this program; if not, contact Novell, Inc. */ @@ -59,11 +59,11 @@ + /* eliminates need to link with libfl */ %option noyywrap - + %option nounput --- a/parser/parser_main.c +++ b/parser/parser_main.c -@@ -17,6 +17,7 @@ - * along with this program; if not, contact Novell, Inc. +@@ -19,6 +19,7 @@ + * Ltd. */ +#define _GNU_SOURCE /* for asprintf in stdio.h */ @@ -72,11 +72,11 @@ #include <stdlib.h> --- a/parser/parser_variable.c +++ b/parser/parser_variable.c -@@ -17,6 +17,7 @@ +@@ -15,6 +15,7 @@ * along with this program; if not, contact Novell, Inc. */ +#define _GNU_SOURCE /* for asprintf in stdio.h */ + #include <ctype.h> + #include <stdlib.h> #include <stdio.h> - #include <stdarg.h> - #include <string.h> ++++++ apparmor-2.5.1-ssl-fix ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:22.000000000 +0100 @@ -29,7 +29,7 @@ + --- a/profiles/apparmor.d/abstractions/ssl_certs +++ b/profiles/apparmor.d/abstractions/ssl_certs -@@ -15,3 +15,7 @@ +@@ -14,3 +14,7 @@ /etc/ssl/certs/* r, /usr/share/ca-certificates/ r, /usr/share/ca-certificates/** r, @@ -39,7 +39,7 @@ + /usr/share/ca-certificates/mozilla/* r, --- a/profiles/apparmor/profiles/extras/usr.lib.postfix.smtp +++ b/profiles/apparmor/profiles/extras/usr.lib.postfix.smtp -@@ -16,6 +16,7 @@ +@@ -15,6 +15,7 @@ #include <abstractions/nameservice> #include <abstractions/kerberosclient> #include <program-chunks/postfix-common> @@ -47,7 +47,7 @@ capability dac_override, capability dac_read_search, -@@ -39,7 +40,6 @@ +@@ -38,7 +39,6 @@ /etc/postfix/{ssl/,}*.pem r, /etc/postfix/prng_exch rw, /usr/share/ssl/certs/ca-bundle.crt r, @@ -57,7 +57,7 @@ /etc/mtab r, --- a/profiles/apparmor/profiles/extras/usr.lib.postfix.smtpd +++ b/profiles/apparmor/profiles/extras/usr.lib.postfix.smtpd -@@ -16,6 +16,7 @@ +@@ -15,6 +15,7 @@ #include <abstractions/nameservice> #include <abstractions/kerberosclient> #include <program-chunks/postfix-common> @@ -65,7 +65,7 @@ capability dac_override, capability dac_read_search, -@@ -44,7 +45,6 @@ +@@ -43,7 +44,6 @@ /usr/lib/sasl2/* mr, /usr/share/ssl/certs/ca-bundle.crt r, @@ -75,7 +75,7 @@ /{var/spool/postfix/,}private/anvil w, --- a/profiles/apparmor/profiles/extras/usr.sbin.httpd2-prefork +++ b/profiles/apparmor/profiles/extras/usr.sbin.httpd2-prefork -@@ -18,6 +18,7 @@ +@@ -17,6 +17,7 @@ #include <abstractions/kerberosclient> #include <abstractions/nameservice> #include <abstractions/perl> @@ -83,7 +83,7 @@ capability kill, capability net_bind_service, -@@ -84,7 +85,6 @@ +@@ -83,7 +84,6 @@ /usr/share/snmp/mibs r, /usr/share/snmp/mibs/*.{txt,mib} r, /usr/share/snmp/mibs/.index wr, @@ -93,7 +93,7 @@ /var/log/httpd/ssl_scache.dir r, --- a/profiles/apparmor/profiles/extras/usr.sbin.imapd +++ b/profiles/apparmor/profiles/extras/usr.sbin.imapd -@@ -16,10 +16,10 @@ +@@ -15,10 +15,10 @@ #include <abstractions/nameservice> #include <abstractions/authentication> #include <abstractions/user-mail> @@ -107,7 +107,7 @@ } --- a/profiles/apparmor/profiles/extras/usr.sbin.ipop2d +++ b/profiles/apparmor/profiles/extras/usr.sbin.ipop2d -@@ -16,10 +16,10 @@ +@@ -15,10 +15,10 @@ #include <abstractions/nameservice> #include <abstractions/authentication> #include <abstractions/user-mail> @@ -121,7 +121,7 @@ } --- a/profiles/apparmor/profiles/extras/usr.sbin.ipop3d +++ b/profiles/apparmor/profiles/extras/usr.sbin.ipop3d -@@ -16,10 +16,10 @@ +@@ -15,10 +15,10 @@ #include <abstractions/nameservice> #include <abstractions/authentication> #include <abstractions/user-mail> ++++++ apparmor-2.5.1-unified-build ++++++ ++++ 5239 lines (skipped) ++++ between apparmor/apparmor-2.5.1-unified-build ++++ and /mounts/work_src_done/STABLE/apparmor/apparmor-2.5.1-unified-build ++++++ apparmor-2.5.1.tar.bz2 -> apparmor-2.6.0.tar.bz2 ++++++ ++++ 118872 lines of diff (skipped) ++++++ apparmor-no-caching-test ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:23.000000000 +0100 @@ -12,4 +12,4 @@ +tests: error_output gen_xtrans parser_sanity gen_xtrans: - perl ./gen-xtrans.pl + ./gen-xtrans.pl ++++++ apparmor-profiles-dhclient ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:23.000000000 +0100 @@ -4,13 +4,14 @@ Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> --- + profiles/apparmor/profiles/extras/sbin.dhclient | 61 +++++++++++------ profiles/apparmor/profiles/extras/sbin.dhclient-script | 21 +++++ 2 files changed, 61 insertions(+), 21 deletions(-) --- a/profiles/apparmor/profiles/extras/sbin.dhclient +++ b/profiles/apparmor/profiles/extras/sbin.dhclient -@@ -12,12 +12,12 @@ +@@ -11,12 +11,12 @@ # raw sockets, and thus cannot be confined with NetDomain # # Should these programs have their own domains? @@ -29,7 +30,7 @@ #include <tunables/global> -@@ -25,25 +25,30 @@ +@@ -24,25 +24,30 @@ #include <abstractions/base> #include <abstractions/bash> #include <abstractions/nameservice> @@ -75,7 +76,7 @@ /var/lib/dhcp/dhclient.leases rw, /var/lib/dhcp/dhclient-*.leases rw, /var/log/lastlog r, -@@ -53,4 +58,18 @@ +@@ -52,4 +57,18 @@ /var/run/dhclient-*.pid rw, /var/spool r, /var/spool/mail r, ++++++ apparmor-profiles-sshd-fix ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:23.000000000 +0100 @@ -13,7 +13,7 @@ --- a/profiles/apparmor/profiles/extras/usr.sbin.sshd +++ b/profiles/apparmor/profiles/extras/usr.sbin.sshd -@@ -30,6 +30,8 @@ +@@ -29,6 +29,8 @@ capability kill, capability setgid, capability setuid, @@ -22,7 +22,7 @@ /dev/ptmx rw, /dev/urandom r, -@@ -44,11 +46,12 @@ +@@ -43,11 +45,12 @@ @{PROC}/[0-9]*/fd/ r, @{PROC}/[0-9]*/loginuid w, ++++++ apparmor-profiles-syslog-ng-fix ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:23.000000000 +0100 @@ -1,5 +1,9 @@ ---- a/profiles/apparmor.d/sbin.syslog-ng.old 2008-11-05 15:53:00.000000000 +0100 -+++ b/profiles/apparmor.d/sbin.syslog-ng 2010-11-05 09:11:23.186489224 +0100 +--- + profiles/apparmor.d/sbin.syslog-ng | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/profiles/apparmor.d/sbin.syslog-ng ++++ b/profiles/apparmor.d/sbin.syslog-ng @@ -19,12 +19,14 @@ #include <abstractions/base> #include <abstractions/consoles> @@ -29,5 +33,5 @@ + @{CHROOT_BASE}/var/run/syslog-ng.ctl rw, + /var/run/syslog-ng/additional-log-sockets.conf r, - } - + # Site-specific additions and overrides. See local/README for details. + #include <local/sbin.syslog-ng> ++++++ apparmor-profiles-usr.sbin.dnsmasq ++++++ From: Jeff Mahoney <jeffm(a)suse.com> Subject: dnsmasq: Profile fixes References: bnc#666090 bnc#678749 Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> --- profiles/apparmor.d/usr.sbin.dnsmasq | 4 ++++ 1 file changed, 4 insertions(+) --- a/profiles/apparmor.d/usr.sbin.dnsmasq +++ b/profiles/apparmor.d/usr.sbin.dnsmasq @@ -25,10 +25,12 @@ /etc/dnsmasq.conf r, /etc/dnsmasq.d/ r, /etc/dnsmasq.d/* r, + /etc/ethers r, /usr/sbin/dnsmasq mr, /var/run/*dnsmasq*.pid w, + /var/run/dnsmasq-forwarders r, /var/run/dnsmasq/ r, /var/run/dnsmasq/* rw, @@ -37,6 +39,8 @@ # libvirt pid files for dnsmasq /var/run/libvirt/network/ r, /var/run/libvirt/network/*.pid rw, + /var/lib/libvirt/dnsmasq/ r, + /var/lib/libvirt/dnsmasq/*.hostsfile r, # Site-specific additions and overrides. See local/README for details. #include <local/usr.sbin.dnsmasq> ++++++ apparmor-remove-repo ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:23.000000000 +0100 @@ -9,14 +9,14 @@ Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> --- - utils/SubDomain.pm | 5 +++++ - utils/logprof.conf | 4 ++++ + utils/Immunix/AppArmor.pm | 5 +++++ + utils/logprof.conf | 4 ++++ 2 files changed, 9 insertions(+) ---- a/utils/SubDomain.pm -+++ b/utils/SubDomain.pm -@@ -3107,6 +3107,8 @@ sub UI_repo_signup { - sub UI_ask_to_enable_repo { +--- a/utils/Immunix/AppArmor.pm ++++ b/utils/Immunix/AppArmor.pm +@@ -3153,6 +3153,8 @@ sub UI_repo_signup() { + sub UI_ask_to_enable_repo() { my $q = { }; + return if (defined $cfg->{settings}{allow_repository} && @@ -24,7 +24,7 @@ return if ( not defined $cfg->{repository}{url} ); $q->{headers} = [ gettext("Repository"), $cfg->{repository}{url}, -@@ -3231,6 +3233,8 @@ sub get_preferred_user ($) { +@@ -3277,6 +3279,8 @@ sub get_preferred_user ($) { sub repo_is_enabled () { my $enabled; @@ -33,8 +33,8 @@ if ($cfg->{repository}{url} && $repo_cfg && $repo_cfg->{repository}{enabled} && -@@ -3244,6 +3248,7 @@ sub repo_is_enabled () { - sub update_repo_profile { +@@ -3290,6 +3294,7 @@ sub repo_is_enabled () { + sub update_repo_profile($) { my $profile = shift; + return undef if not repo_is_enabled(); @@ -43,7 +43,7 @@ my $url = $profile->{repo}{url}; --- a/utils/logprof.conf +++ b/utils/logprof.conf -@@ -35,6 +35,10 @@ +@@ -34,6 +34,10 @@ # files. custom_includes = ++++++ apparmor-scripts ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:23.000000000 +0100 @@ -1,13 +1,13 @@ --- parser/rc.aaeventd.suse | 2 +- - parser/rc.apparmor.functions | 16 ++++++++-------- + parser/rc.apparmor.functions | 14 +++++++------- parser/rc.apparmor.suse | 23 ++++++++++++++++++++++- - 3 files changed, 31 insertions(+), 10 deletions(-) + 3 files changed, 30 insertions(+), 9 deletions(-) --- a/parser/rc.aaeventd.suse +++ b/parser/rc.aaeventd.suse -@@ -30,7 +30,7 @@ +@@ -27,7 +27,7 @@ ### BEGIN INIT INFO # Provides: aaeventd # Required-Start: apparmor @@ -18,7 +18,7 @@ # Short-Description: AppArmor Notification and Reporting --- a/parser/rc.apparmor.functions +++ b/parser/rc.apparmor.functions -@@ -111,9 +111,7 @@ is_apparmor_present() { +@@ -108,9 +108,7 @@ is_apparmor_present() { # check for subdomainfs version of module grep -qE "^($modules)[[:space:]]" /proc/modules @@ -29,7 +29,7 @@ return $? } -@@ -380,10 +378,11 @@ apparmor_start() { +@@ -377,10 +375,11 @@ apparmor_start() { configure_owlsm # if there is anything in the profiles file don't load @@ -43,7 +43,7 @@ fi aa_log_end_msg 0 return 0 -@@ -415,7 +414,8 @@ remove_profiles() { +@@ -412,7 +411,8 @@ remove_profiles() { #them so stor to tmp first MODULE_PLIST=$(mktemp ${APPARMOR_TMPDIR}/tmp.XXXXXXXX) sed -e "s/ ($enforce\|complain$)$//" "$SFS_MOUNTPOINT/profiles" | sort >"$MODULE_PLIST" @@ -53,7 +53,7 @@ echo -n "$profile" > "$SFS_MOUNTPOINT/.remove" rc=$? if [ ${rc} -ne 0 ] ; then -@@ -430,7 +430,7 @@ apparmor_stop() { +@@ -427,7 +427,7 @@ apparmor_stop() { aa_log_daemon_msg "Unloading AppArmor profiles " remove_profiles rc=$? @@ -62,18 +62,9 @@ return $rc } -@@ -468,7 +468,7 @@ __apparmor_restart() { - profiles_names_list ${PNAMES_LIST} - MODULE_PLIST=$(mktemp ${APPARMOR_TMPDIR}/tmp.XXXXXXXX) - sed -e "s/ ($enforce\|complain$)$//" "$SFS_MOUNTPOINT/profiles" | sort >"$MODULE_PLIST" -- sort "$PNAMES_LIST" | comm -2 -3 "$MODULE_PLIST" - | while read profile ; do -+ sort "$PNAMES_LIST" | comm -2 -3 "$MODULE_PLIST" - | while IFS= read profile ; do - echo -n "$profile" > "$SFS_MOUNTPOINT/.remove" - done - rm "$MODULE_PLIST" --- a/parser/rc.apparmor.suse +++ b/parser/rc.apparmor.suse -@@ -34,6 +34,7 @@ +@@ -31,6 +31,7 @@ # Required-Start: boot.cleanup # Required-Stop: $null # Should-Start: $local_fs @@ -81,7 +72,7 @@ # Default-Start: B # Default-Stop: # Short-Description: AppArmor initialization -@@ -76,7 +77,19 @@ aa_log_warning_msg() { +@@ -73,7 +74,19 @@ aa_log_warning_msg() { } aa_log_failure_msg() { @@ -102,7 +93,7 @@ } aa_log_skipped_msg() { -@@ -84,6 +97,14 @@ aa_log_skipped_msg() { +@@ -81,6 +94,14 @@ aa_log_skipped_msg() { echo -e "$rc_skipped" } ++++++ apparmor-startproc.patch ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:23.000000000 +0100 @@ -4,7 +4,7 @@ --- a/parser/rc.aaeventd.suse +++ b/parser/rc.aaeventd.suse -@@ -81,9 +81,9 @@ usage() { +@@ -78,9 +78,9 @@ usage() { start_aa_event() { if [ -x "$AA_EV_BIN" -a "${APPARMOR_ENABLE_AAEVENTD}" = "yes" ] ; then ++++++ apparmor-utils-add-log-types ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:23.000000000 +0100 @@ -8,12 +8,12 @@ Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> --- - utils/SubDomain.pm | 4 +++- + utils/Immunix/AppArmor.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---- a/utils/SubDomain.pm -+++ b/utils/SubDomain.pm -@@ -2789,7 +2789,9 @@ sub add_event_to_tree ($) { +--- a/utils/Immunix/AppArmor.pm ++++ b/utils/Immunix/AppArmor.pm +@@ -2848,7 +2848,9 @@ sub add_event_to_tree ($) { "" ); } ++++++ apparmor-utils-filenames-in-slash ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:23.000000000 +0100 @@ -13,12 +13,12 @@ Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> --- - utils/SubDomain.pm | 9 +-------- + utils/Immunix/AppArmor.pm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) ---- a/utils/SubDomain.pm -+++ b/utils/SubDomain.pm -@@ -511,14 +511,7 @@ sub get_full_path ($) { +--- a/utils/Immunix/AppArmor.pm ++++ b/utils/Immunix/AppArmor.pm +@@ -553,14 +553,7 @@ sub get_full_path ($) { } } ++++++ apparmor-utils-string-split ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:23.000000000 +0100 @@ -3,12 +3,12 @@ The string split here ends up not displaying well in yast. --- - utils/SubDomain.pm | 7 ++++++- + utils/Immunix/AppArmor.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---- a/utils/SubDomain.pm -+++ b/utils/SubDomain.pm -@@ -6241,7 +6241,12 @@ sub check_qualifiers { +--- a/utils/Immunix/AppArmor.pm ++++ b/utils/Immunix/AppArmor.pm +@@ -6300,7 +6300,12 @@ sub check_qualifiers($) { if ($cfg->{qualifiers}{$program}) { unless($cfg->{qualifiers}{$program} =~ /p/) { ++++++ apparmor-utils-subdomain-compat ++++++ From: Jeff Mahoney <jeffm(a)suse.com> Subject: apparmor-utils: Add Immunix::SubDomain alias This patch adds an alias so that 'use Immunix::SubDomain;' works with older code. Acked-by: Jeff Mahoney <jeffm(a)suse.com> --- utils/Immunix/SubDomain.pm | 5 +++++ 1 file changed, 5 insertions(+) --- /dev/null +++ b/utils/Immunix/SubDomain.pm @@ -0,0 +1,5 @@ +# Use of Immunix::SubDomain is deprecated. +# Use Immunix::AppArmor directly instead. +use Immunix::AppArmor; +*Immunix::SubDomain:: = *Immunix::AppArmor::; +1; ++++++ genprof-whitespace-in-profile-fix ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:23.000000000 +0100 @@ -14,11 +14,11 @@ Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> --- - utils/SubDomain.pm | 8 ++++---- + utils/Immunix/AppArmor.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---- a/utils/SubDomain.pm -+++ b/utils/SubDomain.pm +--- a/utils/Immunix/AppArmor.pm ++++ b/utils/Immunix/AppArmor.pm @@ -1033,13 +1033,13 @@ sub setprofileflags ($$) { if (open(PROFILE, "$filename")) { if (open(NEWPROFILE, ">$filename.new")) { ++++++ klog-needs-CAP_SYSLOG ++++++ --- /var/tmp/diff_new_pack.QO1WKu/_old 2011-03-25 09:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.QO1WKu/_new 2011-03-25 09:01:23.000000000 +0100 @@ -5,7 +5,7 @@ --- a/parser/parser_misc.c +++ b/parser/parser_misc.c -@@ -122,6 +122,9 @@ static int get_table_token(const char *n +@@ -125,6 +125,9 @@ static int get_table_token(const char *n static struct keyword_table capability_table[] = { /* capabilities */ #include "cap_names.h" @@ -15,7 +15,7 @@ /* terminate */ {NULL, 0} }; -@@ -820,6 +823,7 @@ static const char *capnames[] = { +@@ -783,6 +786,7 @@ static const char *capnames[] = { "audit_control", "setfcap", "mac_override" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 post-build-checks for openSUSE:Factory
by root＠hilbert.suse.de 25 Mar '11

25 Mar '11

Hello community, here is the log from the commit of package post-build-checks for openSUSE:Factory checked in at Fri Mar 25 08:59:27 CET 2011. -------- --- post-build-checks/post-build-checks.changes 2011-03-21 00:56:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/post-build-checks/post-build-checks.changes 2011-03-25 01:30:24.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 25 01:29:44 CET 2011 - ro(a)suse.de + +- drop sync workaround again + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ post-build-checks.spec ++++++ --- /var/tmp/diff_new_pack.whKWiy/_old 2011-03-25 08:59:11.000000000 +0100 +++ /var/tmp/diff_new_pack.whKWiy/_new 2011-03-25 08:59:11.000000000 +0100 @@ -24,7 +24,7 @@ AutoReqProv: on Summary: post checks for build after rpms have been created Version: 1.0 -Release: 89 +Release: 90 PreReq: aaa_base permissions sed Url: http://gitorious.org/opensuse/post-build-checks # @@ -86,10 +86,6 @@ mv /bin/uname /bin/uname.bin ln -s /usr/lib/build/helper/uname.sh /bin/uname fi -if test -f /bin/sync -a ! -L /bin/sync ; then - mv /bin/sync /bin/sync.bin - ln -s /usr/lib/build/helper/sync.sh /bin/sync -fi %preun if ! test -e /.buildenv; then @@ -98,9 +94,6 @@ if test "$1" = 0 -a -f /bin/uname.bin ; then mv /bin/uname.bin /bin/uname fi -if test "$1" = 0 -a -f /bin/sync.bin ; then - mv /bin/sync.bin /bin/sync -fi %files %defattr(-, root, root) ++++++ post-build-checks-1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/post-build-checks-1.0/helper/sync.sh new/post-build-checks-1.0/helper/sync.sh --- old/post-build-checks-1.0/helper/sync.sh 2011-03-21 00:52:07.000000000 +0100 +++ new/post-build-checks-1.0/helper/sync.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/bash - -if test -f /.buildenv ; then - echo "sync disabled inside build environment." - exit 0 -fi - -exec /bin/sync.bin $* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rsyslog for openSUSE:Factory
by root＠hilbert.suse.de 25 Mar '11

25 Mar '11

Hello community, here is the log from the commit of package rsyslog for openSUSE:Factory checked in at Fri Mar 25 08:58:56 CET 2011. -------- --- rsyslog/rsyslog.changes 2011-02-02 17:48:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/rsyslog/rsyslog.changes 2011-03-24 17:36:11.000000000 +0100 @@ -1,0 +2,30 @@ +Thu Mar 24 16:34:31 UTC 2011 - mt(a)suse.de + +- Updated to 5.6.5 (v5-stable) with following bugfixes: + * bugfix: failover did not work correctly if repeated msg + reduction was on. + affected directive: $ActionExecOnlyWhenPreviousIsSuspended on + * bugfix: omlibdbi did not use password from rsyslog.conf + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203 + * bugfix(kind of): tell users that config graph can currently + not be generated + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232 + * bugfix: discard action did not work under some circumstances + fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=217 + (bnc#676041) + * bugfix: potential abort condition when $RepeatedMsgReduction + were set to on as well as potentially in a number of other places + where MsgDup() was used. This only happened when the imudp input + module was used and it depended on name resolution not yet had + taken place. (bnc#679030) + * bugfix: fixed a memory leak and potential abort condition + this could happen if multiple rulesets were used and some output + batches contained messages belonging to more than one ruleset. + fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=226 + fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=218 + * bugfix: memory leak when $RepeatedMsgReduction on was used + bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225 + (bnc#681568) +- Merged systemd socket activation support + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- rsyslog-5.6.3.tar.bz2 New: ---- rsyslog-5.6.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.spec ++++++ --- /var/tmp/diff_new_pack.ggs7pf/_old 2011-03-25 08:55:58.000000000 +0100 +++ /var/tmp/diff_new_pack.ggs7pf/_new 2011-03-25 08:55:58.000000000 +0100 @@ -20,9 +20,9 @@ Name: rsyslog Summary: The enhanced syslogd for Linux and Unix -Version: 5.6.3 +Version: 5.6.5 Release: 1 -%define upstream_version 5.6.3 +%define upstream_version 5.6.5 %define with_dbi 0%{?suse_version} >= 1140 || 0%{?build_with_relp:1} %define with_relp 0%{?suse_version} >= 1130 || 0%{?build_with_relp:1} %define _sbindir /sbin ++++++ rsyslog-5.6.3.tar.bz2 -> rsyslog-5.6.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/ChangeLog new/rsyslog-5.6.5/ChangeLog --- old/rsyslog-5.6.3/ChangeLog 2011-01-26 12:42:53.000000000 +0100 +++ new/rsyslog-5.6.5/ChangeLog 2011-03-22 12:28:09.000000000 +0100 @@ -1,4 +1,32 @@ --------------------------------------------------------------------------- +Version 5.6.5 [V5-STABLE] (rgerhards), 2011-03-22 +- bugfix: failover did not work correctly if repeated msg reduction was on + affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on +- bugfix: omlibdbi did not use password from rsyslog.con + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203 +- bugfix(kind of): tell users that config graph can currently not be + generated + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232 +- bugfix: discard action did not work under some circumstances + fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=217 + (backport from 5.7.8) +--------------------------------------------------------------------------- +Version 5.6.4 [V5-STABLE] (rgerhards), 2011-03-03 +- bugfix: potential abort condition when $RepeatedMsgReduction set to on + as well as potentially in a number of other places where MsgDup() was + used. This only happened when the imudp input module was used and it + depended on name resolution not yet had taken place. In other words, + this was a strange problem that could lead to hard to diagnose + instability. So if you experience instability, chances are good that + this fix will help. +- bugfix: fixed a memory leak and potential abort condition + this could happen if multiple rulesets were used and some output batches + contained messages belonging to more than one ruleset. + fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=226 + fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=218 +- bugfix: memory leak when $RepeatedMsgReduction on was used + bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225 +--------------------------------------------------------------------------- Version 5.6.3 [V5-STABLE] (rgerhards), 2011-01-26 - bugfix: action processor released mememory too early, resulting in potential issue in retry cases (but very unlikely due to another @@ -13,6 +41,8 @@ - bugfix: batches which had actions in error were not properly retried in all cases - bugfix: imfile did duplicate messages under some circumstances +- bugfix: testbench was not activated if no Java was present on system + ... what actually was a left-over. Java is no longer required. --------------------------------------------------------------------------- Version 5.6.2 [V5-STABLE] (rgerhards), 2010-11-30 - bugfix: compile failed on systems without epoll_create1() @@ -615,6 +645,11 @@ - bugfix: imfile utilizes 32 bit to track offset. Most importantly, this problem can not experienced on Fedora 64 bit OS (which has 64 bit long's!) +- bugfix: abort if imfile reads file line of more than 64KiB + Thanks to Peter Eisentraut for reporting and analysing this problem. + bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=221 +- bugfix: omlibdbi did not use password from rsyslog.con + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203 - some improvements thanks to clang's static code analyzer o overall cleanup (mostly unnecessary writes and otherwise unused stuff) o bugfix: fixed a very remote problem in msg.c which could occur when diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/action.c new/rsyslog-5.6.5/action.c --- old/rsyslog-5.6.3/action.c 2011-01-26 12:34:28.000000000 +0100 +++ new/rsyslog-5.6.5/action.c 2011-03-22 12:27:49.000000000 +0100 @@ -4,7 +4,44 @@ * * File begun on 2007-08-06 by RGerhards (extracted from syslogd.c) * - * Copyright 2007-2010 Rainer Gerhards and Adiscon GmbH. + * Some notes on processing (this hopefully makes it easier to find + * the right code in question): For performance reasons, this module + * uses different methods of message submission based on the user-selected + * configuration. This code is similar, but can not be abstracted because + * of the performanse-affecting differences in it. As such, it is often + * necessary to triple-check that everything works well in *all* modes. + * The different modes (and calling sequence) are: + * + * if set iExecEveryNthOccur > 1 || f_ReduceRepeated || iSecsExecOnceInterval + * - doSubmitToActionQComplexBatch + * - helperSubmitToActionQComplexBatch + * - doActionCallAction + * handles duplicate message processing, but in essence calls + * - actionWriteToAction + * - qqueueEnqObj + * (now queue engine processing) + * if(pThis->bWriteAllMarkMsgs == FALSE) - this is the DEFAULT + * - doSubmitToActionQNotAllMarkBatch + * - doSubmitToActionQBatch (and from here like in the else case below!) + * else + * - doSubmitToActionQBatch + * - doSubmitToActionQ + * - qqueueEnqObj + * (now queue engine processing) + * + * Note that bWriteAllMakrMsgs on or off creates almost the same processing. + * The difference ist that if WriteAllMarkMsgs is not set, we need to + * preprocess the batch and drop mark messages which are not yet due for + * writing. + * + * After dequeue, processing is as follows: + * - processBatchMain + * - processAction + * - submitBatch + * - tryDoAction + * - + * + * Copyright 2007-2011 Rainer Gerhards and Adiscon GmbH. * * This file is part of rsyslog. * @@ -898,7 +935,7 @@ if(*(pBatch->pbShutdownImmediate)) ABORT_FINALIZE(RS_RET_FORCE_TERM); if( pBatch->pElem[i].bFilterOK - && pBatch->pElem[i].state != BATCH_STATE_DISC + && pBatch->pElem[i].state != BATCH_STATE_DISC//) { && ((pAction->bExecWhenPrevSusp == 0) || pBatch->pElem[i].bPrevWasSuspended) ) { pMsg = (msg_t*) pBatch->pElem[i].pUsrp; localRet = actionProcessMessage(pAction, pMsg, pBatch->pElem[i].staticActParams); @@ -1163,11 +1200,33 @@ } +/* This submits the message to the action queue in case we do NOT need to handle repeat + * message processing. That case permits us to gain lots of freedom during processing + * and thus speed. This is also utilized to submit messages in complex case once + * the complex logic has been applied ;) + * rgerhards, 2010-06-08 + */ +static inline rsRetVal +doSubmitToActionQ(action_t *pAction, msg_t *pMsg) +{ + DEFiRet; + + if(pAction->pQueue->qType == QUEUETYPE_DIRECT) + iRet = qqueueEnqObjDirect(pAction->pQueue, (void*) MsgAddRef(pMsg)); + else + iRet = qqueueEnqObj(pAction->pQueue, pMsg->flowCtlType, (void*) MsgAddRef(pMsg)); + + RETiRet; +} + + /* This function builds up a batch of messages to be (later) * submitted to the action queue. + * Note: this function is also called from syslogd itself as part of its + * flush processing. If so, pBatch will be NULL and idxBtch undefined. */ rsRetVal -actionWriteToAction(action_t *pAction) +actionWriteToAction(action_t *pAction, batch_t *pBatch, int idxBtch) { msg_t *pMsgSave; /* to save current message pointer, necessary to restore it in case it needs to be updated (e.g. repeated msgs) */ @@ -1238,7 +1297,7 @@ pAction->f_pMsg = pMsg; /* use the new msg (pointer will be restored below) */ } - DBGPRINTF("Called action, logging to %s\n", module.GetStateName(pAction->pMod)); + DBGPRINTF("Called action(complex case), logging to %s\n", module.GetStateName(pAction->pMod)); /* now check if we need to drop the message because otherwise the action would be too * frequently called. -- rgerhards, 2008-04-08 @@ -1256,14 +1315,43 @@ FINALIZE; } - /* we use reception time, not dequeue time - this is considered more appropriate and also faster ;) -- rgerhards, 2008-09-17 */ + /* we use reception time, not dequeue time - this is considered more appropriate and also faster ;) + * rgerhards, 2008-09-17 */ pAction->tLastExec = getActNow(pAction); /* re-init time flags */ pAction->f_time = pAction->f_pMsg->ttGenTime; /* When we reach this point, we have a valid, non-disabled action. * So let's enqueue our message for execution. -- rgerhards, 2007-07-24 */ - iRet = qqueueEnqObj(pAction->pQueue, pAction->f_pMsg->flowCtlType, (void*) MsgAddRef(pAction->f_pMsg)); + if( pBatch != NULL + && (pAction->bExecWhenPrevSusp == 1 && pBatch->pElem[idxBtch].bPrevWasSuspended)) { + /* in that case, we need to create a special batch which reflects the + * suspended state. Otherwise, that information would be dropped inside + * the queue engine. TODO: in later releases (v6?) create a better + * solution than what we do here. However, for v5 this sounds much too + * intrusive. -- rgerhardsm, 2011-03-16 + * (Code is copied over from queue.c and slightly modified) + */ + batch_t singleBatch; + batch_obj_t batchObj; + int i; + memset(&batchObj, 0, sizeof(batch_obj_t)); + memset(&singleBatch, 0, sizeof(batch_t)); + batchObj.state = BATCH_STATE_RDY; + batchObj.pUsrp = (obj_t*) pAction->f_pMsg; + batchObj.bPrevWasSuspended = 1; + batchObj.bFilterOK = 1; + singleBatch.nElem = 1; /* there always is only one in direct mode */ + singleBatch.pElem = &batchObj; + + iRet = qqueueEnqObjDirectBatch(pAction->pQueue, &singleBatch); + + for(i = 0 ; i < CONF_OMOD_NUMSTRINGS_MAXSIZE ; ++i) { + free(batchObj.staticActStrings[i]); + } + } else { /* standard case, just submit */ + iRet = doSubmitToActionQ(pAction, pAction->f_pMsg); + } if(iRet == RS_RET_OK) pAction->f_prevcount = 0; /* message processed, so we start a new cycle */ @@ -1291,10 +1379,12 @@ * pthread_cleanup_push() POSIX macro... */ static inline rsRetVal -doActionCallAction(action_t *pAction, msg_t *pMsg) +doActionCallAction(action_t *pAction, batch_t *pBatch, int idxBtch) { + msg_t *pMsg; DEFiRet; + pMsg = (msg_t*)(pBatch->pElem[idxBtch].pUsrp); pAction->tActNow = -1; /* we do not yet know our current time (clear prev. value) */ /* don't output marks to recently written outputs */ @@ -1321,7 +1411,7 @@ * isolated messages), but back off so we'll flush less often in the future. */ if(getActNow(pAction) > REPEATTIME(pAction)) { - iRet = actionWriteToAction(pAction); + iRet = actionWriteToAction(pAction, pBatch, idxBtch); BACKOFF(pAction); } } else {/* new message, save it */ @@ -1330,7 +1420,7 @@ */ if(pAction->f_pMsg != NULL) { if(pAction->f_prevcount > 0) - actionWriteToAction(pAction); + actionWriteToAction(pAction, pBatch, idxBtch); /* we do not care about iRet above - I think it's right but if we have * some troubles, you know where to look at ;) -- rgerhards, 2007-08-01 */ @@ -1338,33 +1428,21 @@ } pAction->f_pMsg = MsgAddRef(pMsg); /* call the output driver */ - iRet = actionWriteToAction(pAction); + iRet = actionWriteToAction(pAction, pBatch, idxBtch); } finalize_it: - RETiRet; -} - -/* This submits the message to the action queue in case we do NOT need to handle repeat - * message processing. That case permits us to gain lots of freedom during processing - * and thus speed. - * rgerhards, 2010-06-08 - */ -static inline rsRetVal -doSubmitToActionQ(action_t *pAction, msg_t *pMsg) -{ - DEFiRet; - - if(pAction->pQueue->qType == QUEUETYPE_DIRECT) - iRet = qqueueEnqObjDirect(pAction->pQueue, (void*) MsgAddRef(pMsg)); - else - iRet = qqueueEnqObj(pAction->pQueue, pMsg->flowCtlType, (void*) MsgAddRef(pMsg)); + /* we need to update the batch to handle failover processing correctly */ + if(iRet == RS_RET_OK) { + pBatch->pElem[idxBtch].bPrevWasSuspended = 0; + } else if(iRet == RS_RET_ACTION_FAILED) { + pBatch->pElem[idxBtch].bPrevWasSuspended = 1; + } RETiRet; } - /* This submits the message to the action queue in case where we need to handle * bWriteAllMarkMessage == FALSE only. Note that we use a non-blocking CAS loop * for the synchronization. Here, we just modify the filter condition to be false when @@ -1480,8 +1558,10 @@ DBGPRINTF("Called action(complex case), logging to %s\n", module.GetStateName(pAction->pMod)); for(i = 0 ; i < batchNumMsgs(pBatch) && !*(pBatch->pbShutdownImmediate) ; ++i) { - if(pBatch->pElem[i].bFilterOK) { - doActionCallAction(pAction, (msg_t*)(pBatch->pElem[i].pUsrp)); + if( pBatch->pElem[i].bFilterOK + && pBatch->pElem[i].state != BATCH_STATE_DISC + && ((pAction->bExecWhenPrevSusp == 0) || pBatch->pElem[i].bPrevWasSuspended) ) { + doActionCallAction(pAction, pBatch, i); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/action.h new/rsyslog-5.6.5/action.h --- old/rsyslog-5.6.3/action.h 2011-01-26 12:34:28.000000000 +0100 +++ new/rsyslog-5.6.5/action.h 2011-03-22 12:27:49.000000000 +0100 @@ -101,26 +101,9 @@ rsRetVal actionDbgPrint(action_t *pThis); rsRetVal actionSetGlobalResumeInterval(int iNewVal); rsRetVal actionDoAction(action_t *pAction); -rsRetVal actionWriteToAction(action_t *pAction); +rsRetVal actionWriteToAction(action_t *pAction, batch_t *pBatch, int idxBtch); rsRetVal actionCallHUPHdlr(action_t *pAction); rsRetVal actionClassInit(void); rsRetVal addAction(action_t **ppAction, modInfo_t *pMod, void *pModData, omodStringRequest_t *pOMSR, int bSuspended); -#if 1 -#define actionIsSuspended(pThis) ((pThis)->bSuspended == 1) -#else -/* The function is a debugging aid */ -inline int actionIsSuspended(action_t *pThis) -{ - int i; - ASSERT(pThis != NULL); - i = pThis->bSuspended == 1; - dbgprintf("in IsSuspend(), returns %d\n", i); - return i; -} -#endif - #endif /* #ifndef ACTION_H_INCLUDED */ -/* - * vi:set ai: - */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/configure new/rsyslog-5.6.5/configure --- old/rsyslog-5.6.3/configure 2011-01-26 12:43:46.000000000 +0100 +++ new/rsyslog-5.6.5/configure 2011-03-22 12:28:49.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for rsyslog 5.6.3. +# Generated by GNU Autoconf 2.65 for rsyslog 5.6.5. # # Report bugs to <rsyslog(a)lists.adiscon.com>. # @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='rsyslog' PACKAGE_TARNAME='rsyslog' -PACKAGE_VERSION='5.6.3' -PACKAGE_STRING='rsyslog 5.6.3' +PACKAGE_VERSION='5.6.5' +PACKAGE_STRING='rsyslog 5.6.5' PACKAGE_BUGREPORT='rsyslog(a)lists.adiscon.com' PACKAGE_URL='' @@ -1579,7 +1579,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rsyslog 5.6.3 to adapt to many kinds of systems. +\`configure' configures rsyslog 5.6.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1649,7 +1649,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rsyslog 5.6.3:";; + short | recursive ) echo "Configuration of rsyslog 5.6.5:";; esac cat <<\_ACEOF @@ -1807,7 +1807,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rsyslog configure 5.6.3 +rsyslog configure 5.6.5 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2382,7 +2382,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rsyslog $as_me 5.6.3, which was +It was created by rsyslog $as_me 5.6.5, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3190,7 +3190,7 @@ # Define the identity of the package. PACKAGE='rsyslog' - VERSION='5.6.3' + VERSION='5.6.5' cat >>confdefs.h <<_ACEOF @@ -15464,11 +15464,6 @@ fi -if test "$enable_testbench" = "yes"; then - if test x$HAVE_JAVAC = x; then - enable_testbench='no' - fi -fi if test x$enable_testbench = xyes; then ENABLE_TESTBENCH_TRUE= ENABLE_TESTBENCH_FALSE='#' @@ -16602,7 +16597,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rsyslog $as_me 5.6.3, which was +This file was extended by rsyslog $as_me 5.6.5, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16668,7 +16663,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rsyslog config.status 5.6.3 +rsyslog config.status 5.6.5 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/configure.ac new/rsyslog-5.6.5/configure.ac --- old/rsyslog-5.6.3/configure.ac 2011-01-26 12:43:00.000000000 +0100 +++ new/rsyslog-5.6.5/configure.ac 2011-03-22 12:28:18.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[5.6.3],[rsyslog(a)lists.adiscon.com]) +AC_INIT([rsyslog],[5.6.5],[rsyslog(a)lists.adiscon.com]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -746,11 +746,6 @@ esac], [enable_testbench=yes] ) -if test "$enable_testbench" = "yes"; then - if test x$HAVE_JAVAC = x; then - enable_testbench='no' - fi -fi AM_CONDITIONAL(ENABLE_TESTBENCH, test x$enable_testbench = xyes) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/doc/manual.html new/rsyslog-5.6.5/doc/manual.html --- old/rsyslog-5.6.3/doc/manual.html 2011-01-26 12:43:31.000000000 +0100 +++ new/rsyslog-5.6.5/doc/manual.html 2011-03-22 12:28:37.000000000 +0100 @@ -19,7 +19,7 @@ Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a> to honor the project sponsors or become one yourself! We are very grateful for any help towards the project goals. -This documentation is for version 5.6.3 (beta branch) of rsyslog. +This documentation is for version 5.6.5 (stable branch) of rsyslog. Visit the <a href="http://www.rsyslog.com/status">rsyslog status page</a> to obtain current version information and project status. If you like rsyslog, you might diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/doc/rsconf1_generateconfiggraph.html new/rsyslog-5.6.5/doc/rsconf1_generateconfiggraph.html --- old/rsyslog-5.6.3/doc/rsconf1_generateconfiggraph.html 2010-12-16 14:54:48.000000000 +0100 +++ new/rsyslog-5.6.5/doc/rsconf1_generateconfiggraph.html 2011-03-11 10:58:37.000000000 +0100 @@ -8,8 +8,14 @@ <h2>$GenerateConfigGraph</h2> Type: global configuration directive Default: -Available Since: 4.3.1 +Available Since: 4.3.1 CURRENTLY NOT AVAILABLE Description: +This directive is currently not supported. We had to disable it when we improved the +rule engine. It is considerable effort to re-enable it. On the other hand, we are about +to add a new config system, which will make yet another config graph method necessary. +As such we have decided to currently disable this functionality and re-introduce it when +the new config system has been instantiated. + This directive permits to create (hopefully) good-looking visualizations of rsyslogd's configuration. It does not affect rsyslog operation. If the directive is specified multiple times, all but the last are ignored. If it is specified, a graph is created. This happens diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/plugins/omlibdbi/omlibdbi.c new/rsyslog-5.6.5/plugins/omlibdbi/omlibdbi.c --- old/rsyslog-5.6.3/plugins/omlibdbi/omlibdbi.c 2011-01-26 12:34:28.000000000 +0100 +++ new/rsyslog-5.6.5/plugins/omlibdbi/omlibdbi.c 2011-03-22 12:27:49.000000000 +0100 @@ -287,7 +287,7 @@ if(dbName != NULL) if((pData->dbName = (uchar*) strdup((char*)dbName)) == NULL) ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY); if(pwd != NULL) - if((pData->pwd = (uchar*) strdup((char*)"")) == NULL) ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY); + if((pData->pwd = (uchar*) strdup((char*)pwd)) == NULL) ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY); CHKiRet(cflineParseTemplateName(&p, *ppOMSR, 0, OMSR_RQD_TPL_OPT_SQL, (uchar*) " StdDBFmt")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/runtime/batch.h new/rsyslog-5.6.5/runtime/batch.h --- old/rsyslog-5.6.3/runtime/batch.h 2011-01-10 12:41:13.000000000 +0100 +++ new/rsyslog-5.6.5/runtime/batch.h 2011-03-11 10:58:37.000000000 +0100 @@ -136,11 +136,16 @@ /* copy one batch element to another. * This creates a complete duplicate in those cases where * it is needed. Use duplication only when absolutely necessary! + * Note that all working fields are reset to zeros. If that were + * not done, we would have potential problems with invalid + * or double pointer frees. * rgerhards, 2010-06-10 */ static inline void batchCopyElem(batch_obj_t *pDest, batch_obj_t *pSrc) { - memcpy(pDest, pSrc, sizeof(batch_obj_t)); + memset(pDest, 0, sizeof(batch_obj_t)); + pDest->pUsrp = pSrc->pUsrp; + pDest->state = pSrc->state; } @@ -171,6 +176,7 @@ static inline rsRetVal batchInit(batch_t *pBatch, int maxElem) { DEFiRet; + pBatch->iDoneUpTo = 0; pBatch->maxElem = maxElem; CHKmalloc(pBatch->pElem = calloc((size_t)maxElem, sizeof(batch_obj_t))); // TODO: replace calloc by inidividual writes? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/runtime/msg.c new/rsyslog-5.6.5/runtime/msg.c --- old/rsyslog-5.6.3/runtime/msg.c 2011-01-26 12:34:28.000000000 +0100 +++ new/rsyslog-5.6.5/runtime/msg.c 2011-03-22 12:27:49.000000000 +0100 @@ -922,13 +922,14 @@ pNew->iLenMSG = pOld->iLenMSG; pNew->iLenTAG = pOld->iLenTAG; pNew->iLenHOSTNAME = pOld->iLenHOSTNAME; - if((pOld->msgFlags & NEEDS_DNSRESOL) == 1) { + if((pOld->msgFlags & NEEDS_DNSRESOL)) { localRet = msgSetFromSockinfo(pNew, pOld->rcvFrom.pfrominet); if(localRet != RS_RET_OK) { /* if something fails, we accept loss of this property, it is * better than losing the whole message. */ pNew->msgFlags &= ~NEEDS_DNSRESOL; + pNew->rcvFrom.pRcvFrom = NULL; /* make sure no dangling values */ } } else { if(pOld->rcvFrom.pRcvFrom != NULL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/runtime/queue.c new/rsyslog-5.6.5/runtime/queue.c --- old/rsyslog-5.6.3/runtime/queue.c 2011-01-26 12:35:44.000000000 +0100 +++ new/rsyslog-5.6.5/runtime/queue.c 2011-03-22 12:27:49.000000000 +0100 @@ -839,6 +839,7 @@ { batch_t singleBatch; batch_obj_t batchObj; + int i; DEFiRet; //TODO: init batchObj (states _OK and new fields -- CHECK) @@ -860,6 +861,10 @@ singleBatch.nElem = 1; /* there always is only one in direct mode */ singleBatch.pElem = &batchObj; iRet = pThis->pConsumer(pThis->pUsr, &singleBatch, &pThis->bShutdownImmediate); + /* delete the batch string params: TODO: create its own "class" for this */ + for(i = 0 ; i < CONF_OMOD_NUMSTRINGS_MAXSIZE ; ++i) { + free(batchObj.staticActStrings[i]); + } objDestruct(pUsr); RETiRet; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/runtime/ruleset.c new/rsyslog-5.6.5/runtime/ruleset.c --- old/rsyslog-5.6.3/runtime/ruleset.c 2011-01-26 12:34:28.000000000 +0100 +++ new/rsyslog-5.6.5/runtime/ruleset.c 2011-03-17 12:25:53.000000000 +0100 @@ -171,35 +171,40 @@ int i; int iStart; /* start index of partial batch */ int iNew; /* index for new (temporary) batch */ + int bHaveUnprocessed; /* do we (still) have unprocessed entries? (loop term predicate) */ DEFiRet; - CHKiRet(batchInit(&snglRuleBatch, pBatch->nElem)); - snglRuleBatch.pbShutdownImmediate = pBatch->pbShutdownImmediate; - - while(1) { /* loop broken inside */ + do { + bHaveUnprocessed = 0; /* search for first unprocessed element */ for(iStart = 0 ; iStart < pBatch->nElem && pBatch->pElem[iStart].state == BATCH_STATE_DISC ; ++iStart) /* just search, no action */; - if(iStart == pBatch->nElem) - FINALIZE; /* everything processed */ + break; /* everything processed */ /* prepare temporary batch */ + CHKiRet(batchInit(&snglRuleBatch, pBatch->nElem)); + snglRuleBatch.pbShutdownImmediate = pBatch->pbShutdownImmediate; currRuleset = batchElemGetRuleset(pBatch, iStart); iNew = 0; for(i = iStart ; i < pBatch->nElem ; ++i) { if(batchElemGetRuleset(pBatch, i) == currRuleset) { - batchCopyElem(&(snglRuleBatch.pElem[iNew++]), &(pBatch->pElem[i])); + /* for performance reasons, we copy only those members that we actually need */ + snglRuleBatch.pElem[iNew].pUsrp = pBatch->pElem[i].pUsrp; + snglRuleBatch.pElem[iNew].state = pBatch->pElem[i].state; + ++iNew; /* We indicate the element also as done, so it will not be processed again */ pBatch->pElem[i].state = BATCH_STATE_DISC; + } else { + bHaveUnprocessed = 1; } } snglRuleBatch.nElem = iNew; /* was left just right by the for loop */ batchSetSingleRuleset(&snglRuleBatch, 1); /* process temp batch */ processBatch(&snglRuleBatch); - } - batchFree(&snglRuleBatch); + batchFree(&snglRuleBatch); + } while(bHaveUnprocessed == 1); finalize_it: RETiRet; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/runtime/stringbuf.c new/rsyslog-5.6.5/runtime/stringbuf.c --- old/rsyslog-5.6.3/runtime/stringbuf.c 2011-01-26 12:34:28.000000000 +0100 +++ new/rsyslog-5.6.5/runtime/stringbuf.c 2011-03-17 12:25:53.000000000 +0100 @@ -156,7 +156,7 @@ rsCStrExtendBuf(cstr_t *pThis, size_t iMinNeeded) { uchar *pNewBuf; - unsigned short iNewSize; + size_t iNewSize; DEFiRet; /* first compute the new size needed */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/Makefile.am new/rsyslog-5.6.5/tests/Makefile.am --- old/rsyslog-5.6.3/tests/Makefile.am 2011-01-26 12:35:44.000000000 +0100 +++ new/rsyslog-5.6.5/tests/Makefile.am 2011-03-22 12:27:49.000000000 +0100 @@ -1,6 +1,6 @@ if ENABLE_TESTBENCH TESTRUNS = rt_init rscript -check_PROGRAMS = $(TESTRUNS) ourtail nettester tcpflood chkseq msleep randomgen diagtalker uxsockrcvr +check_PROGRAMS = $(TESTRUNS) ourtail nettester tcpflood chkseq msleep randomgen diagtalker uxsockrcvr inputfilegen TESTS = $(TESTRUNS) cfg.sh \ arrayqueue.sh \ linkedlistqueue.sh \ @@ -46,6 +46,12 @@ pipe_noreader.sh \ dircreate_dflt.sh \ dircreate_off.sh \ + discard-rptdmsg.sh \ + discard.sh \ + failover-basic.sh \ + failover-rptd.sh \ + failover-no-rptd.sh \ + failover-no-basic.sh \ queue-persist.sh if ENABLE_IMPTCP @@ -68,7 +74,6 @@ inputname.sh \ threadingmq.sh \ threadingmqaq.sh \ - discard.sh \ badqi.sh \ tabescape_dflt.sh \ tabescape_off.sh \ @@ -84,6 +89,10 @@ TESTS += random.sh endif +if ENABLE_IMFILE +TESTS += imfile-basic.sh +endif + endif # if ENABLE_TESTBENCH TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/ @@ -212,6 +221,16 @@ omod-if-array.sh \ discard.sh \ testsuites/discard.conf \ + failover-no-rptd.sh \ + testsuites/failover-no-rptd.conf \ + failover-no-basic.sh \ + testsuites/failover-no-basic.conf \ + failover-rptd.sh \ + testsuites/failover-rptd.conf \ + failover-basic.sh \ + testsuites/failover-basic.conf \ + discard-rptdmsg.sh \ + testsuites/discard-rptdmsg.conf \ diag.sh \ testsuites/diag-common.conf \ testsuites/diag-common2.conf \ @@ -275,6 +294,8 @@ testsuites/complex1.conf \ random.sh \ testsuites/random.conf \ + imfile-basic.sh \ + testsuites/imfile-basic.conf \ dynfile_invld_async.sh \ dynfile_invld_sync.sh \ dynfile_cachemiss.sh \ @@ -334,6 +355,9 @@ randomgen_SOURCES = randomgen.c randomgen_LDADD = $(SOL_LIBS) +inputfilegen_SOURCES = inputfilegen.c +inputfilegen_LDADD = $(SOL_LIBS) + nettester_SOURCES = nettester.c getline.c nettester_LDADD = $(SOL_LIBS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/Makefile.in new/rsyslog-5.6.5/tests/Makefile.in --- old/rsyslog-5.6.3/tests/Makefile.in 2011-01-26 12:43:54.000000000 +0100 +++ new/rsyslog-5.6.5/tests/Makefile.in 2011-03-22 12:28:55.000000000 +0100 @@ -37,7 +37,8 @@ @ENABLE_TESTBENCH_TRUE@ ourtail$(EXEEXT) nettester$(EXEEXT) \ @ENABLE_TESTBENCH_TRUE@ tcpflood$(EXEEXT) chkseq$(EXEEXT) \ @ENABLE_TESTBENCH_TRUE@ msleep$(EXEEXT) randomgen$(EXEEXT) \ -@ENABLE_TESTBENCH_TRUE@ diagtalker$(EXEEXT) uxsockrcvr$(EXEEXT) +@ENABLE_TESTBENCH_TRUE@ diagtalker$(EXEEXT) uxsockrcvr$(EXEEXT) \ +@ENABLE_TESTBENCH_TRUE@ inputfilegen$(EXEEXT) @ENABLE_TESTBENCH_TRUE@TESTS = $(am__EXEEXT_1) cfg.sh arrayqueue.sh \ @ENABLE_TESTBENCH_TRUE@ linkedlistqueue.sh da-mainmsg-q.sh \ @ENABLE_TESTBENCH_TRUE@ validation-run.sh imtcp-multiport.sh \ @@ -63,10 +64,13 @@ @ENABLE_TESTBENCH_TRUE@ execonlywhenprevsuspended3.sh \ @ENABLE_TESTBENCH_TRUE@ execonlywhenprevsuspended4.sh \ @ENABLE_TESTBENCH_TRUE@ pipe_noreader.sh dircreate_dflt.sh \ -@ENABLE_TESTBENCH_TRUE@ dircreate_off.sh queue-persist.sh \ +@ENABLE_TESTBENCH_TRUE@ dircreate_off.sh discard-rptdmsg.sh \ +@ENABLE_TESTBENCH_TRUE@ discard.sh failover-basic.sh \ +@ENABLE_TESTBENCH_TRUE@ failover-rptd.sh failover-no-rptd.sh \ +@ENABLE_TESTBENCH_TRUE@ failover-no-basic.sh queue-persist.sh \ @ENABLE_TESTBENCH_TRUE@ $(am__append_1) $(am__append_2) \ @ENABLE_TESTBENCH_TRUE@ $(am__append_3) $(am__append_4) \ -@ENABLE_TESTBENCH_TRUE@ $(am__append_5) +@ENABLE_TESTBENCH_TRUE@ $(am__append_5) $(am__append_6) @ENABLE_IMPTCP_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_1 = \ @ENABLE_IMPTCP_TRUE@@ENABLE_TESTBENCH_TRUE@ imptcp_large.sh \ @ENABLE_IMPTCP_TRUE@@ENABLE_TESTBENCH_TRUE@ imptcp_addtlframedelim.sh \ @@ -82,7 +86,6 @@ @ENABLE_OMSTDOUT_TRUE@@ENABLE_TESTBENCH_TRUE@ inputname.sh \ @ENABLE_OMSTDOUT_TRUE@@ENABLE_TESTBENCH_TRUE@ threadingmq.sh \ @ENABLE_OMSTDOUT_TRUE@@ENABLE_TESTBENCH_TRUE@ threadingmqaq.sh \ -@ENABLE_OMSTDOUT_TRUE@@ENABLE_TESTBENCH_TRUE@ discard.sh \ @ENABLE_OMSTDOUT_TRUE@@ENABLE_TESTBENCH_TRUE@ badqi.sh \ @ENABLE_OMSTDOUT_TRUE@@ENABLE_TESTBENCH_TRUE@ tabescape_dflt.sh \ @ENABLE_OMSTDOUT_TRUE@@ENABLE_TESTBENCH_TRUE@ tabescape_off.sh \ @@ -92,6 +95,7 @@ @ENABLE_OMRULESET_TRUE@@ENABLE_TESTBENCH_TRUE@ omruleset-queue.sh @ENABLE_EXTENDED_TESTS_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_5 = random.sh +@ENABLE_IMFILE_TRUE@@ENABLE_TESTBENCH_TRUE@am__append_6 = imfile-basic.sh subdir = tests DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ INSTALL @@ -119,6 +123,9 @@ diagtalker_OBJECTS = $(am_diagtalker_OBJECTS) am__DEPENDENCIES_1 = diagtalker_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_inputfilegen_OBJECTS = inputfilegen.$(OBJEXT) +inputfilegen_OBJECTS = $(am_inputfilegen_OBJECTS) +inputfilegen_DEPENDENCIES = $(am__DEPENDENCIES_1) am_msleep_OBJECTS = msleep.$(OBJEXT) msleep_OBJECTS = $(am_msleep_OBJECTS) msleep_LDADD = $(LDADD) @@ -180,14 +187,14 @@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(chkseq_SOURCES) $(diagtalker_SOURCES) $(msleep_SOURCES) \ - $(nettester_SOURCES) $(ourtail_SOURCES) $(randomgen_SOURCES) \ - $(rscript_SOURCES) $(rt_init_SOURCES) $(tcpflood_SOURCES) \ - $(uxsockrcvr_SOURCES) +SOURCES = $(chkseq_SOURCES) $(diagtalker_SOURCES) \ + $(inputfilegen_SOURCES) $(msleep_SOURCES) $(nettester_SOURCES) \ + $(ourtail_SOURCES) $(randomgen_SOURCES) $(rscript_SOURCES) \ + $(rt_init_SOURCES) $(tcpflood_SOURCES) $(uxsockrcvr_SOURCES) DIST_SOURCES = $(chkseq_SOURCES) $(diagtalker_SOURCES) \ - $(msleep_SOURCES) $(nettester_SOURCES) $(ourtail_SOURCES) \ - $(randomgen_SOURCES) $(rscript_SOURCES) $(rt_init_SOURCES) \ - $(tcpflood_SOURCES) $(uxsockrcvr_SOURCES) + $(inputfilegen_SOURCES) $(msleep_SOURCES) $(nettester_SOURCES) \ + $(ourtail_SOURCES) $(randomgen_SOURCES) $(rscript_SOURCES) \ + $(rt_init_SOURCES) $(tcpflood_SOURCES) $(uxsockrcvr_SOURCES) ETAGS = etags CTAGS = ctags am__tty_colors = \ @@ -464,6 +471,16 @@ omod-if-array.sh \ discard.sh \ testsuites/discard.conf \ + failover-no-rptd.sh \ + testsuites/failover-no-rptd.conf \ + failover-no-basic.sh \ + testsuites/failover-no-basic.conf \ + failover-rptd.sh \ + testsuites/failover-rptd.conf \ + failover-basic.sh \ + testsuites/failover-basic.conf \ + discard-rptdmsg.sh \ + testsuites/discard-rptdmsg.conf \ diag.sh \ testsuites/diag-common.conf \ testsuites/diag-common2.conf \ @@ -527,6 +544,8 @@ testsuites/complex1.conf \ random.sh \ testsuites/random.conf \ + imfile-basic.sh \ + testsuites/imfile-basic.conf \ dynfile_invld_async.sh \ dynfile_invld_sync.sh \ dynfile_cachemiss.sh \ @@ -581,6 +600,8 @@ diagtalker_LDADD = $(SOL_LIBS) randomgen_SOURCES = randomgen.c randomgen_LDADD = $(SOL_LIBS) +inputfilegen_SOURCES = inputfilegen.c +inputfilegen_LDADD = $(SOL_LIBS) nettester_SOURCES = nettester.c getline.c nettester_LDADD = $(SOL_LIBS) rt_init_SOURCES = rt-init.c $(test_files) @@ -640,6 +661,9 @@ diagtalker$(EXEEXT): $(diagtalker_OBJECTS) $(diagtalker_DEPENDENCIES) @rm -f diagtalker$(EXEEXT) $(AM_V_CCLD)$(LINK) $(diagtalker_OBJECTS) $(diagtalker_LDADD) $(LIBS) +inputfilegen$(EXEEXT): $(inputfilegen_OBJECTS) $(inputfilegen_DEPENDENCIES) + @rm -f inputfilegen$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(inputfilegen_OBJECTS) $(inputfilegen_LDADD) $(LIBS) msleep$(EXEEXT): $(msleep_OBJECTS) $(msleep_DEPENDENCIES) @rm -f msleep$(EXEEXT) $(AM_V_CCLD)$(LINK) $(msleep_OBJECTS) $(msleep_LDADD) $(LIBS) @@ -674,6 +698,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chkseq.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diagtalker.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getline.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inputfilegen.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msleep.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nettester.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ourtail.Po@am__quote@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/diag.sh new/rsyslog-5.6.5/tests/diag.sh --- old/rsyslog-5.6.3/tests/diag.sh 2011-01-10 12:10:50.000000000 +0100 +++ new/rsyslog-5.6.5/tests/diag.sh 2011-03-22 12:27:49.000000000 +0100 @@ -10,7 +10,7 @@ #valgrind="valgrind --tool=helgrind --log-fd=1" #valgrind="valgrind --tool=exp-ptrcheck --log-fd=1" #set -o xtrace -#export RSYSLOG_DEBUG="debug nostdout" +#export RSYSLOG_DEBUG="debug nologfuncflow nostdout" #export RSYSLOG_DEBUGLOG="log" case $1 in 'init') $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason @@ -22,6 +22,7 @@ rm -f work rsyslog.out.log rsyslog2.out.log rsyslog.out.log.save # common work files rm -rf test-spool test-logdir rm -f rsyslog.out.*.log work-presort rsyslog.pipe + rm -f rsyslog.input rm -f core.* vgcore.* mkdir test-spool ;; @@ -30,6 +31,7 @@ rm -f work rsyslog.out.log rsyslog2.out.log rsyslog.out.log.save # common work files rm -rf test-spool test-logdir rm -f rsyslog.out.*.log rsyslog.random.data work-presort rsyslog.pipe + rm -f rsyslog.input stat-file1 echo ------------------------------------------------------------------------------- ;; 'startup') # start rsyslogd with default params. $2 is the config file name to use diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/discard-rptdmsg.sh new/rsyslog-5.6.5/tests/discard-rptdmsg.sh --- old/rsyslog-5.6.3/tests/discard-rptdmsg.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-5.6.5/tests/discard-rptdmsg.sh 2011-03-22 12:27:49.000000000 +0100 @@ -0,0 +1,17 @@ +# Test for discard-rptdmsg functionality +# This test checks if discard-rptdmsg works. It is not a perfect test but +# will find at least segfaults and obviously not discard-rptdmsged messages. +# added 2009-07-30 by Rgerhards +# This file is part of the rsyslog project, released under GPLv3 +# uncomment for debugging support: +echo =============================================================================== +echo \[discard-rptdmsg.sh\]: testing discard-rptdmsg functionality +source $srcdir/diag.sh init +source $srcdir/diag.sh startup discard-rptdmsg.conf +# 20000 messages should be enough - the disk test is slow enough ;) +sleep 4 +source $srcdir/diag.sh tcpflood -m10 -i1 +source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +source $srcdir/diag.sh wait-shutdown +source $srcdir/diag.sh seq-check 2 10 +source $srcdir/diag.sh exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/failover-basic.sh new/rsyslog-5.6.5/tests/failover-basic.sh --- old/rsyslog-5.6.3/tests/failover-basic.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-5.6.5/tests/failover-basic.sh 2011-03-17 12:25:53.000000000 +0100 @@ -0,0 +1,12 @@ +# This file is part of the rsyslog project, released under GPLv3 +echo =============================================================================== +echo \[failover-basic.sh\]: basic test for failover functionality +source $srcdir/diag.sh init +source $srcdir/diag.sh startup failover-basic.conf +source $srcdir/diag.sh injectmsg 0 5000 +echo doing shutdown +source $srcdir/diag.sh shutdown-when-empty +echo wait on shutdown +source $srcdir/diag.sh wait-shutdown +source $srcdir/diag.sh seq-check 0 4999 +source $srcdir/diag.sh exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/failover-no-basic.sh new/rsyslog-5.6.5/tests/failover-no-basic.sh --- old/rsyslog-5.6.3/tests/failover-no-basic.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-5.6.5/tests/failover-no-basic.sh 2011-03-17 12:25:53.000000000 +0100 @@ -0,0 +1,19 @@ +# This file is part of the rsyslog project, released under GPLv3 +echo =============================================================================== +echo \[failover-no-basic.sh\]: basic test for failover functionality - no failover +source $srcdir/diag.sh init +source $srcdir/diag.sh startup failover-no-basic.conf +source $srcdir/diag.sh injectmsg 0 5000 +echo doing shutdown +source $srcdir/diag.sh shutdown-when-empty +echo wait on shutdown +source $srcdir/diag.sh wait-shutdown +# now we need our custom logic to see if the result file is empty +# (what it should be!) +cmp rsyslog.out.log /dev/null +if [ $? -eq 1 ] +then + echo "ERROR, output file not empty" + exit 1 +fi +source $srcdir/diag.sh exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/failover-no-rptd.sh new/rsyslog-5.6.5/tests/failover-no-rptd.sh --- old/rsyslog-5.6.3/tests/failover-no-rptd.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-5.6.5/tests/failover-no-rptd.sh 2011-03-17 12:25:53.000000000 +0100 @@ -0,0 +1,19 @@ +# This file is part of the rsyslog project, released under GPLv3 +echo =============================================================================== +echo \[failover-no-rptd.sh\]: rptd test for failover functionality - no failover +source $srcdir/diag.sh init +source $srcdir/diag.sh startup failover-no-rptd.conf +source $srcdir/diag.sh injectmsg 0 5000 +echo doing shutdown +source $srcdir/diag.sh shutdown-when-empty +echo wait on shutdown +source $srcdir/diag.sh wait-shutdown +# now we need our custom logic to see if the result file is empty +# (what it should be!) +cmp rsyslog.out.log /dev/null +if [ $? -eq 1 ] +then + echo "ERROR, output file not empty" + exit 1 +fi +source $srcdir/diag.sh exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/failover-rptd.sh new/rsyslog-5.6.5/tests/failover-rptd.sh --- old/rsyslog-5.6.3/tests/failover-rptd.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-5.6.5/tests/failover-rptd.sh 2011-03-17 12:25:53.000000000 +0100 @@ -0,0 +1,12 @@ +# This file is part of the rsyslog project, released under GPLv3 +echo =============================================================================== +echo \[failover-rptd.sh\]: rptd test for failover functionality +source $srcdir/diag.sh init +source $srcdir/diag.sh startup failover-rptd.conf +source $srcdir/diag.sh injectmsg 0 5000 +echo doing shutdown +source $srcdir/diag.sh shutdown-when-empty +echo wait on shutdown +source $srcdir/diag.sh wait-shutdown +source $srcdir/diag.sh seq-check 0 4999 +source $srcdir/diag.sh exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/imfile-basic.sh new/rsyslog-5.6.5/tests/imfile-basic.sh --- old/rsyslog-5.6.3/tests/imfile-basic.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-5.6.5/tests/imfile-basic.sh 2011-03-14 09:38:32.000000000 +0100 @@ -0,0 +1,14 @@ +# This is part of the rsyslog testbench, licensed under GPLv3 +echo [imfile-basic.sh] +source $srcdir/diag.sh init +# generate input file first. Note that rsyslog processes it as +# soon as it start up (so the file should exist at that point). +./inputfilegen 50000 > rsyslog.input +ls -l rsyslog.input +source $srcdir/diag.sh startup imfile-basic.conf +# sleep a little to give rsyslog a chance to begin processing +sleep 1 +source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +source $srcdir/diag.sh wait-shutdown # we need to wait until rsyslogd is finished! +source $srcdir/diag.sh seq-check 0 49999 +source $srcdir/diag.sh exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/imtcp_conndrop.sh new/rsyslog-5.6.5/tests/imtcp_conndrop.sh --- old/rsyslog-5.6.3/tests/imtcp_conndrop.sh 2011-01-10 08:34:33.000000000 +0100 +++ new/rsyslog-5.6.5/tests/imtcp_conndrop.sh 2011-03-22 12:27:49.000000000 +0100 @@ -6,7 +6,7 @@ echo TEST: \[imtcp_conndrop.sh\]: test imtcp with random connection drops cat rsyslog.action.1.include source $srcdir/diag.sh init -source $srcdir/diag.sh startup imptcp_large.conf +source $srcdir/diag.sh startup imtcp_conndrop.conf # 100 byte messages to gain more practical data use source $srcdir/diag.sh tcpflood -c20 -m50000 -r -d100 -P129 -D sleep 4 # due to large messages, we need this time for the tcp receiver to settle... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/inputfilegen.c new/rsyslog-5.6.5/tests/inputfilegen.c --- old/rsyslog-5.6.3/tests/inputfilegen.c 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-5.6.5/tests/inputfilegen.c 2011-03-14 09:38:32.000000000 +0100 @@ -0,0 +1,23 @@ +/* generate an input file suitable for use by the testbench + * Copyright (C) 2011 by Rainer Gerhards and Adiscon GmbH. + * Part of rsyslog, licensed under GPLv3 + */ +#include <stdio.h> +#include <stdlib.h> + +int main(int argc, char* argv[]) +{ + int nmsgs; + int i; + + if(argc != 2) { + fprintf(stderr, "usage: inputfilegen num-messages\n"); + return 1; + } + + nmsgs = atoi(argv[1]); + for(i = 0 ; i < nmsgs ; ++i) { + printf("msgnum:%8.8d:\n", i); + } + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/random.sh new/rsyslog-5.6.5/tests/random.sh --- old/rsyslog-5.6.3/tests/random.sh 2010-12-17 16:20:03.000000000 +0100 +++ new/rsyslog-5.6.5/tests/random.sh 2011-03-14 09:38:32.000000000 +0100 @@ -5,9 +5,6 @@ echo =============================================================================== echo TEST: \[random.sh\]: testing random data source $srcdir/diag.sh init -# uncomment for debugging support: -#export RSYSLOG_DEBUG="debug nostdout noprintmutexaction" -#export RSYSLOG_DEBUGLOG="log" source $srcdir/diag.sh startup random.conf # generate random data ./randomgen -f rsyslog.random.data -s 100000 @@ -17,4 +14,5 @@ source $srcdir/diag.sh wait-shutdown # and wait for it to terminate # we do not check anything yet, the point is if rsyslog survived ;) # TODO: check for exit message, but we'll notice an abort anyhow, so not that important +rm -f random.data source $srcdir/diag.sh exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/tcpflood.c new/rsyslog-5.6.5/tests/tcpflood.c --- old/rsyslog-5.6.3/tests/tcpflood.c 2011-01-26 12:35:44.000000000 +0100 +++ new/rsyslog-5.6.5/tests/tcpflood.c 2011-03-22 12:27:49.000000000 +0100 @@ -355,6 +355,7 @@ int ret = 0; int opt; struct sigaction sigAct; + struct rlimit maxFiles; static char buf[1024]; srand(time(NULL)); /* seed is good enough for our needs */ @@ -431,6 +432,9 @@ maxFiles.rlim_max = numConnections + 20; if(setrlimit(RLIMIT_NOFILE, &maxFiles) < 0) { perror("setrlimit to increase file handles failed"); + fprintf(stderr, + "could net set sufficiently large number of " + "open files for required connection count!\n"); exit(1); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/testsuites/discard-rptdmsg.conf new/rsyslog-5.6.5/tests/testsuites/discard-rptdmsg.conf --- old/rsyslog-5.6.3/tests/testsuites/discard-rptdmsg.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-5.6.5/tests/testsuites/discard-rptdmsg.conf 2011-03-11 10:58:37.000000000 +0100 @@ -0,0 +1,15 @@ +# Test for discard functionality +# rgerhards, 2009-07-30 +$IncludeConfig diag-common.conf + +$ModLoad ../plugins/imtcp/.libs/imtcp +$MainMsgQueueTimeoutShutdown 10000 +$InputTCPServerRun 13514 + +$RepeatedMsgReduction on + +:msg, contains, "00000001" ~ + +$template outfmt,"%msg:F,58:2%\n" +$template dynfile,"rsyslog.out.log" # trick to use relative path names! +:msg, contains, "msgnum:" ?dynfile;outfmt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/testsuites/failover-basic.conf new/rsyslog-5.6.5/tests/testsuites/failover-basic.conf --- old/rsyslog-5.6.3/tests/testsuites/failover-basic.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-5.6.5/tests/testsuites/failover-basic.conf 2011-03-17 12:25:53.000000000 +0100 @@ -0,0 +1,8 @@ +# see the equally-named .sh file for details +$IncludeConfig diag-common.conf + +$template outfmt,"%msg:F,58:2%\n" +# note: the target server shall not be available! +:msg, contains, "msgnum:" @@127.0.0.1:13514 +$ActionExecOnlyWhenPreviousIsSuspended on +& ./rsyslog.out.log;outfmt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/testsuites/failover-no-basic.conf new/rsyslog-5.6.5/tests/testsuites/failover-no-basic.conf --- old/rsyslog-5.6.3/tests/testsuites/failover-no-basic.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-5.6.5/tests/testsuites/failover-no-basic.conf 2011-03-17 12:25:53.000000000 +0100 @@ -0,0 +1,9 @@ +# see the equally-named .sh file for details +$IncludeConfig diag-common.conf + +$RepeatedMsgReduction off + +# second action should never execute +:msg, contains, "msgnum:" /dev/null +$ActionExecOnlyWhenPreviousIsSuspended on +& ./rsyslog.out.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/testsuites/failover-no-rptd.conf new/rsyslog-5.6.5/tests/testsuites/failover-no-rptd.conf --- old/rsyslog-5.6.3/tests/testsuites/failover-no-rptd.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-5.6.5/tests/testsuites/failover-no-rptd.conf 2011-03-17 12:25:53.000000000 +0100 @@ -0,0 +1,9 @@ +# see the equally-named .sh file for details +$IncludeConfig diag-common.conf + +$RepeatedMsgReduction on + +# second action should never execute +:msg, contains, "msgnum:" /dev/null +$ActionExecOnlyWhenPreviousIsSuspended on +& ./rsyslog.out.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/testsuites/failover-rptd.conf new/rsyslog-5.6.5/tests/testsuites/failover-rptd.conf --- old/rsyslog-5.6.3/tests/testsuites/failover-rptd.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-5.6.5/tests/testsuites/failover-rptd.conf 2011-03-17 12:25:53.000000000 +0100 @@ -0,0 +1,10 @@ +# see the equally-named .sh file for details +$IncludeConfig diag-common.conf + +$RepeatedMsgReduction on + +$template outfmt,"%msg:F,58:2%\n" +# note: the target server shall not be available! +:msg, contains, "msgnum:" @@127.0.0.1:13514 +$ActionExecOnlyWhenPreviousIsSuspended on +& ./rsyslog.out.log;outfmt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/testsuites/imfile-basic.conf new/rsyslog-5.6.5/tests/testsuites/imfile-basic.conf --- old/rsyslog-5.6.3/tests/testsuites/imfile-basic.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-5.6.5/tests/testsuites/imfile-basic.conf 2011-03-14 12:13:56.000000000 +0100 @@ -0,0 +1,12 @@ +$IncludeConfig diag-common.conf + +$ModLoad ../plugins/imfile/.libs/imfile +$InputFileName ./rsyslog.input +$InputFileTag file: +$InputFileStateFile stat-file1 +$InputFileSeverity error +$InputFileFacility local7 +$InputRunFileMonitor + +$template outfmt,"%msg:F,58:2%\n" +:msg, contains, "msgnum:" ./rsyslog.out.log;outfmt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/testsuites/samples.parse-nodate new/rsyslog-5.6.5/tests/testsuites/samples.parse-nodate --- old/rsyslog-5.6.3/tests/testsuites/samples.parse-nodate 2010-12-16 14:54:48.000000000 +0100 +++ new/rsyslog-5.6.5/tests/testsuites/samples.parse-nodate 2011-03-11 10:58:37.000000000 +0100 @@ -1,5 +1,5 @@ <27>xapi: [error|xen3|15|Guest liveness monitor D:bca30ab3f1c1|master_connection] Connection to master died. I will continue to retry indefinitely (supressing future logging of this message) -27,daemon,err,localhost,xapi,xapi:, [error|xen3|15|Guest liveness monitor D:bca30ab3f1c1|master_connection] Connection to master died. I will continue to retry indefinitely (supressing future logging of this message) +27,daemon,err,localhost.localdomain,xapi,xapi:, [error|xen3|15|Guest liveness monitor D:bca30ab3f1c1|master_connection] Connection to master died. I will continue to retry indefinitely (supressing future logging of this message) # a message with just text (as permitted by rfc 3164) # it is questionable if the current sample result is really correct as of 3164! This is a message! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/testsuites/samples.snare_ccoff_udp new/rsyslog-5.6.5/tests/testsuites/samples.snare_ccoff_udp --- old/rsyslog-5.6.3/tests/testsuites/samples.snare_ccoff_udp 2010-12-16 14:54:48.000000000 +0100 +++ new/rsyslog-5.6.5/tests/testsuites/samples.snare_ccoff_udp 2011-03-11 10:58:37.000000000 +0100 @@ -3,7 +3,7 @@ # *real* cases (just mangled to anonymize them...) # Sample 1 - note the absence of PRI! windowsserver MSWinEventLog 1 Security 1167 Fri Mar 19 15:33:30 2010 540 Security SYSTEM User Success Audit WINDOWSSERVER Logon/Logoff Successful Network Logon: User Name: WINDOWSSERVER$ Domain: DOMX Logon ID: (0x0,0xF88396) Logon Type: 3 Logon Process: Kerberos Authentication Package: Kerberos Workstation Name: Logon GUID: {79b6eb79-7bcc-8a2e-7dad-953c51dc00fd} Caller User Name: - Caller Domain: - Caller Logon ID: - Caller Process ID: - Transited Services: - Source Network Address: 10.11.11.3 Source Port: 3306 733\n -13,user,notice,localhost,windowsserver,windowsserver MSWinEventLog 1 Security 1167 Fri, Mar 19 15:33:30 2010 540 Security SYSTEM User Success Audit WINDOWSSERVER Logon/Logoff Successful Network Logon: User Name: WINDOWSSERVER$ Domain: DOMX Logon ID: (0x0,0xF88396) Logon Type: 3 Logon Process: Kerberos Authentication Package: Kerberos Workstation Name: Logon GUID: {79b6eb79-7bcc-8a2e-7dad-953c51dc00fd} Caller User Name: - Caller Domain: - Caller Logon ID: - Caller Process ID: - Transited Services: - Source Network Address: 10.11.11.3 Source Port: 3306 733 +13,user,notice,localhost.localdomain,windowsserver,windowsserver MSWinEventLog 1 Security 1167 Fri, Mar 19 15:33:30 2010 540 Security SYSTEM User Success Audit WINDOWSSERVER Logon/Logoff Successful Network Logon: User Name: WINDOWSSERVER$ Domain: DOMX Logon ID: (0x0,0xF88396) Logon Type: 3 Logon Process: Kerberos Authentication Package: Kerberos Workstation Name: Logon GUID: {79b6eb79-7bcc-8a2e-7dad-953c51dc00fd} Caller User Name: - Caller Domain: - Caller Logon ID: - Caller Process ID: - Transited Services: - Source Network Address: 10.11.11.3 Source Port: 3306 733 # Sample 2 # the samples below need to be disabled for the "workaround patch" for the message # parser to work. They need to be re-enabled once a final solution has been crafted diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/testsuites/samples.snare_ccoff_udp2 new/rsyslog-5.6.5/tests/testsuites/samples.snare_ccoff_udp2 --- old/rsyslog-5.6.3/tests/testsuites/samples.snare_ccoff_udp2 2010-12-16 14:54:48.000000000 +0100 +++ new/rsyslog-5.6.5/tests/testsuites/samples.snare_ccoff_udp2 2011-03-11 10:58:37.000000000 +0100 @@ -14,13 +14,13 @@ insert into windows (Message, Facility,FromHost, Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values ('', 1, 'test',5, '20100321185328', '20100321185328', 1, '') # and yet another one we have seen in practice UX=Abcd-efg-hij-klmno; XXXXX=1111111111, Z123=192.12.231.245:11111, S1234=123456789, XXXXXX=111111111 -insert into windows (Message, Facility,FromHost, Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values (' XXXXX=1111111111, Z123=192.12.231.245:11111, S1234=123456789, XXXXXX=111111111', 1, 'localhost',5, '20100321185328', '20100321185328', 1, 'UX=Abcd-efg-hij-klmno;') +insert into windows (Message, Facility,FromHost, Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values (' XXXXX=1111111111, Z123=192.12.231.245:11111, S1234=123456789, XXXXXX=111111111', 1, 'localhost.localdomain',5, '20100321185328', '20100321185328', 1, 'UX=Abcd-efg-hij-klmno;') # Sample 1 - note the absence of PRI! windowsserver MSWinEventLog 1 Security 1167 Fri Mar 19 15:33:30 2010 540 Security SYSTEM User Success Audit WINDOWSSERVER Logon/Logoff Successful Network Logon: User Name: WINDOWSSERVER$ Domain: DOMX Logon ID: (0x0,0xF88396) Logon Type: 3 Logon Process: Kerberos Authentication Package: Kerberos Workstation Name: Logon GUID: {79b6eb79-7bcc-8a2e-7dad-953c51dc00fd} Caller User Name: - Caller Domain: - Caller Logon ID: - Caller Process ID: - Transited Services: - Source Network Address: 10.11.11.3 Source Port: 3306 733\n -insert into windows (Message, Facility,FromHost, Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values (' Mar 19 15:33:30 2010 540 Security SYSTEM User Success Audit WINDOWSSERVER Logon/Logoff Successful Network Logon: User Name: WINDOWSSERVER$ Domain: DOMX Logon ID: (0x0,0xF88396) Logon Type: 3 Logon Process: Kerberos Authentication Package: Kerberos Workstation Name: Logon GUID: {79b6eb79-7bcc-8a2e-7dad-953c51dc00fd} Caller User Name: - Caller Domain: - Caller Logon ID: - Caller Process ID: - Transited Services: - Source Network Address: 10.11.11.3 Source Port: 3306 733', 1, 'localhost',5, '20100321185328', '20100321185328', 1, 'windowsserver MSWinEventLog 1 Security 1167 Fri') +insert into windows (Message, Facility,FromHost, Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values (' Mar 19 15:33:30 2010 540 Security SYSTEM User Success Audit WINDOWSSERVER Logon/Logoff Successful Network Logon: User Name: WINDOWSSERVER$ Domain: DOMX Logon ID: (0x0,0xF88396) Logon Type: 3 Logon Process: Kerberos Authentication Package: Kerberos Workstation Name: Logon GUID: {79b6eb79-7bcc-8a2e-7dad-953c51dc00fd} Caller User Name: - Caller Domain: - Caller Logon ID: - Caller Process ID: - Transited Services: - Source Network Address: 10.11.11.3 Source Port: 3306 733', 1, 'localhost.localdomain',5, '20100321185328', '20100321185328', 1, 'windowsserver MSWinEventLog 1 Security 1167 Fri') # Sample 2 windowsserver MSWinEventLog 1 Security 1166 Fri Mar 19 15:33:30 2010 576 Security SYSTEM User Success Audit WINDOWSSERVER Logon/Logoff Special privileges assigned to new logon: User Name: WINDOWSSERVER$ Domain: DOMX Logon ID: (0x0,0xF88396) Privileges: SeSecurityPrivilege SeBackupPrivilege SeRestorePrivilege SeTakeOwnershipPrivilege SeDebugPrivilege SeSystemEnvironmentPrivilege SeLoadDriverPrivilege SeImpersonatePrivilege SeEnableDelegationPrivilege 732\n -insert into windows (Message, Facility,FromHost, Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values (' Mar 19 15:33:30 2010 576 Security SYSTEM User Success Audit WINDOWSSERVER Logon/Logoff Special privileges assigned to new logon: User Name: WINDOWSSERVER$ Domain: DOMX Logon ID: (0x0,0xF88396) Privileges: SeSecurityPrivilege SeBackupPrivilege SeRestorePrivilege SeTakeOwnershipPrivilege SeDebugPrivilege SeSystemEnvironmentPrivilege SeLoadDriverPrivilege SeImpersonatePrivilege SeEnableDelegationPrivilege 732', 1, 'localhost',5, '20100321185328', '20100321185328', 1, 'windowsserver MSWinEventLog 1 Security 1166 Fri') +insert into windows (Message, Facility,FromHost, Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values (' Mar 19 15:33:30 2010 576 Security SYSTEM User Success Audit WINDOWSSERVER Logon/Logoff Special privileges assigned to new logon: User Name: WINDOWSSERVER$ Domain: DOMX Logon ID: (0x0,0xF88396) Privileges: SeSecurityPrivilege SeBackupPrivilege SeRestorePrivilege SeTakeOwnershipPrivilege SeDebugPrivilege SeSystemEnvironmentPrivilege SeLoadDriverPrivilege SeImpersonatePrivilege SeEnableDelegationPrivilege 732', 1, 'localhost.localdomain',5, '20100321185328', '20100321185328', 1, 'windowsserver MSWinEventLog 1 Security 1166 Fri') # Sample 3 windowsserver MSWinEventLog 1 Security 1165 Fri Mar 19 15:33:30 2010 538 Security SYSTEM User Success Audit WINDOWSSERVER Logon/Logoff User Logoff: User Name: WINDOWSSERVER$ Domain: DOMX Logon ID: (0x0,0xF8830B) Logon Type: 3 731\n -insert into windows (Message, Facility,FromHost, Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values (' Mar 19 15:33:30 2010 538 Security SYSTEM User Success Audit WINDOWSSERVER Logon/Logoff User Logoff: User Name: WINDOWSSERVER$ Domain: DOMX Logon ID: (0x0,0xF8830B) Logon Type: 3 731', 1, 'localhost',5, '20100321185328', '20100321185328', 1, 'windowsserver MSWinEventLog 1 Security 1165 Fri') +insert into windows (Message, Facility,FromHost, Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values (' Mar 19 15:33:30 2010 538 Security SYSTEM User Success Audit WINDOWSSERVER Logon/Logoff User Logoff: User Name: WINDOWSSERVER$ Domain: DOMX Logon ID: (0x0,0xF8830B) Logon Type: 3 731', 1, 'localhost.localdomain',5, '20100321185328', '20100321185328', 1, 'windowsserver MSWinEventLog 1 Security 1165 Fri') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tests/testsuites/weird.parse1 new/rsyslog-5.6.5/tests/testsuites/weird.parse1 --- old/rsyslog-5.6.3/tests/testsuites/weird.parse1 2010-12-16 14:54:48.000000000 +0100 +++ new/rsyslog-5.6.5/tests/testsuites/weird.parse1 2011-03-11 10:58:37.000000000 +0100 @@ -11,10 +11,10 @@ 14,user,info,Aug 30 23:00:05,X4711,,, # there is a SP at the end of the line <14>Aug 30 23:00:05 -14,user,info,Aug 30 23:00:05,localhost,,, +14,user,info,Aug 30 23:00:05,localhost.localdomain,,, # and here is no SP at the end of the line <14>Aug 30 23:00:05 -14,user,info,Aug 30 23:00:05,localhost,,, +14,user,info,Aug 30 23:00:05,localhost.localdomain,,, # unfortunately, I can not test missing dates with this test suite, because # we would have the current date in the response, which we can not check against # @@ -31,7 +31,7 @@ 14,user,info,Aug 30 23:00:05,X4711,,, # there is a SP at the end of the line <14>2010-08-30T23:00:05Z -14,user,info,Aug 30 23:00:05,localhost,,, +14,user,info,Aug 30 23:00:05,localhost.localdomain,,, # and here is no SP at the end of the line <14>2010-08-30T23:00:05Z -14,user,info,Aug 30 23:00:05,localhost,,, +14,user,info,Aug 30 23:00:05,localhost.localdomain,,, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-5.6.3/tools/syslogd.c new/rsyslog-5.6.5/tools/syslogd.c --- old/rsyslog-5.6.3/tools/syslogd.c 2011-01-26 12:35:44.000000000 +0100 +++ new/rsyslog-5.6.5/tools/syslogd.c 2011-03-22 12:27:49.000000000 +0100 @@ -799,7 +799,7 @@ DBGPRINTF("flush %s: repeated %d times, %d sec.\n", module.GetStateName(pAction->pMod), pAction->f_prevcount, repeatinterval[pAction->f_repeatcount]); - actionWriteToAction(pAction); + actionWriteToAction(pAction, NULL, 0); BACKOFF(pAction); } UnlockObj(pAction); @@ -1334,6 +1334,11 @@ assert(pszDAGFile != NULL); + logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar*) + "Configuration graph generation is unfortunately disabled " + "in the current code base.", 0); + ABORT_FINALIZE(RS_RET_FILENAME_INVALID); + if((fp = fopen((char*) pszDAGFile, "w")) == NULL) { logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar*) "configuraton graph output file could not be opened, none generated", 0); ++++++ rsyslog-systemd-integration.bnc656104.diff ++++++ --- /var/tmp/diff_new_pack.ggs7pf/_old 2011-03-25 08:55:59.000000000 +0100 +++ /var/tmp/diff_new_pack.ggs7pf/_new 2011-03-25 08:55:59.000000000 +0100 @@ -31,15 +31,15 @@ [skipped whitespace-only changes -- mt(a)suse.de] diff --git a/ChangeLog b/ChangeLog -index 72e2946..8b7c7b7 100644 +index 89d5711..1e2aaa7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +- acquire /dev/log socket optionally from systemd + thanks to Lennart Poettering for this patch --------------------------------------------------------------------------- - Version 5.6.3 [V5-STABLE] (rgerhards), 2011-01-26 - - bugfix: action processor released mememory too early, resulting in + Version 5.6.5 [V5-STABLE] (rgerhards), 2011-03-22 + - bugfix: failover did not work correctly if repeated msg reduction was on diff --git a/plugins/imuxsock/Makefile.am b/plugins/imuxsock/Makefile.am index a2fe0ba..28f9f9e 100644 --- a/plugins/imuxsock/Makefile.am @@ -870,7 +870,7 @@ + +#endif diff --git a/tools/syslogd.c b/tools/syslogd.c -index ffcaa27..37c3848 100644 +index 1148108..e18101c 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -135,6 +135,7 @@ @@ -881,7 +881,7 @@ /* definitions for objects we access */ DEFobjCurrIf(obj) -@@ -2428,10 +2429,44 @@ doGlblProcessInit(void) +@@ -2433,10 +2434,44 @@ doGlblProcessInit(void) */ exit(1); /* "good" exit - after forking, not diasabling anything */ } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-dnspython for openSUSE:Factory
by root＠hilbert.suse.de 25 Mar '11

25 Mar '11

Hello community, here is the log from the commit of package python-dnspython for openSUSE:Factory checked in at Fri Mar 25 08:55:26 CET 2011. -------- --- python-dnspython/python-dnspython.changes 2010-11-23 12:29:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/python-dnspython/python-dnspython.changes 2011-03-24 20:56:12.000000000 +0100 @@ -1,0 +2,26 @@ +Thu Mar 24 19:54:53 UTC 2011 - alexandre(a)exatati.com.br + +- Fix SLE_10 build. + +------------------------------------------------------------------- +Thu Mar 24 18:34:32 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 1.9.3: + Bugs fixed since 1.9.2: + - Dnspython was erroneously doing case-insensitive comparisons + of the names in NSEC and RRSIG RRs. + - We now use "is" and not "==" when testing what section an RR + is in. + - The resolver now disallows metaqueries. + New since 1.9.2: + - A boolean parameter, 'raise_on_no_answer', has been added to + the query() methods. In no-error, no-data situations, this + parameter determines whether NoAnswer should be raised or not. + If True, NoAnswer is raised. If False, then an Answer() + object with a None rrset will be returned. + - Resolver Answer() objects now have a canonical_name field. + - Rdata now have a __hash__ method. +- Regenerated spec file with py2pack; +- Removed LICENSE PKG-INFO and TODO files from documentation. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- dnspython-1.9.2.tar.bz2 New: ---- dnspython-1.9.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-dnspython.spec ++++++ --- /var/tmp/diff_new_pack.igJLUl/_old 2011-03-25 08:49:25.000000000 +0100 +++ /var/tmp/diff_new_pack.igJLUl/_new 2011-03-25 08:49:25.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package python-dnspython (Version 1.9.2) +# spec file for package python-dnspython # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,51 +15,65 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# 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)")} -Name: python-dnspython -Version: 1.9.2 +%define mod_name dnspython + +Name: python-%{mod_name} +Version: 1.9.3 Release: 1 -License: Other License(s), see package, BSD -Summary: A DNS toolkit for Python Url: http://www.dnspython.org -Group: Productivity/Networking/DNS/Utilities -Source: http://www.dnspython.org/kits/stable/dnspython-%{version}.tar.bz2 -BuildRequires: python-devel +Summary: A DNS toolkit for Python +License: http://www.dnspython.org/LICENSE +Group: Development/Languages/Python +Source: %{mod_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{py_requires} -%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} +BuildRequires: python-devel +%if 0%{?suse_version} +%py_requires +%if 0%{?suse_version} > 1110 BuildArch: noarch %endif +%endif %description dnspython is a DNS toolkit for Python. It supports almost all record -types. It can be used for queries, zone transfers, and dynamic updates. -It supports TSIG authenticated messages and EDNS0. +types. It can be used for queries, zone transfers, +and dynamic updates. It supports TSIG authenticated messages and EDNS0. -dnspython provides both high and low level access to DNS. The high -level classes perform queries for data of a given name, type, and -class, and return an answer set. The low level classes allow direct -manipulation of DNS zones, messages, names, and records. +dnspython provides both high and low level access to DNS. The high level classes +perform queries for data of a given name, type, and class, and return an answer +set. The low level classes allow direct manipulation of DNS zones, messages, +names, and records. + +dnspython originated at Nominum where it was developed to facilitate the testing +of DNS software. Nominum has generously allowed it to be open sourced under a +BSD-style license. %prep -%setup -n dnspython-%{version} +%setup -q -n %{mod_name}-%{version} %build -find -name .\* -delete export CFLAGS="%{optflags}" -%{__python} setup.py build +python setup.py build %install -%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES -%{__chmod} 644 {examples,tests}/*.py +python setup.py install --prefix=%{_prefix} --root=%{buildroot} %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} -%files -f INSTALLED_FILES -%defattr(-,root,root) -%doc ChangeLog LICENSE PKG-INFO README TODO +%files +%defattr(-,root,root,-) +# You may have to add additional files here (documentation and binaries mostly) +%python_sitelib/dns* +%if 0%{?sles_version} != 10 +%python_sitelib/*.egg-info +%endif +%doc README ChangeLog %doc examples %doc tests ++++++ dnspython-1.9.2.tar.bz2 -> dnspython-1.9.3.tar.bz2 ++++++ Files old/dnspython-1.9.2/._ChangeLog and new/dnspython-1.9.3/._ChangeLog differ Files old/dnspython-1.9.2/._LICENSE and new/dnspython-1.9.3/._LICENSE differ Files old/dnspython-1.9.2/._README and new/dnspython-1.9.3/._README differ Files old/dnspython-1.9.2/._TODO and new/dnspython-1.9.3/._TODO differ Files old/dnspython-1.9.2/._setup.py and new/dnspython-1.9.3/._setup.py differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dnspython-1.9.2/ChangeLog new/dnspython-1.9.3/ChangeLog --- old/dnspython-1.9.2/ChangeLog 2010-11-23 09:06:38.000000000 +0100 +++ new/dnspython-1.9.3/ChangeLog 2011-03-22 14:46:23.000000000 +0100 @@ -1,3 +1,31 @@ +2011-03-22 Bob Halley <halley(a)dnspython.org> + + * dns/resolver.py: a boolean parameter, 'raise_on_no_answer', has + been added to the query() methods. In no-error, no-data + situations, this parameter determines whether NoAnswer should be + raised or not. If True, NoAnswer is raised. If False, then an + Answer() object with a None rrset will be returned. + + * dns/resolver.py: Answer() objects now have a canonical_name field. + +2011-01-11 Bob Halley <halley(a)dnspython.org> + + * Dnspython was erroneously doing case-insensitive comparisons + of the names in NSEC and RRSIG RRs. Thanks to Casey Deccio for + reporting this bug. + +2010-12-17 Bob Halley <halley(a)dnspython.org> + + * dns/message.py (_WireReader._get_section): use "is" and not "==" + when testing what section an RR is in. Thanks to James Raftery + for reporting this bug. + +2010-12-10 Bob Halley <halley(a)dnspython.org> + + * dns/resolver.py (Resolver.query): disallow metaqueries. + + * dns/rdata.py (Rdata.__hash__): Added a __hash__ method for rdata. + 2010-11-23 Bob Halley <halley(a)dnspython.org> * (Version 1.9.2 released) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dnspython-1.9.2/PKG-INFO new/dnspython-1.9.3/PKG-INFO --- old/dnspython-1.9.2/PKG-INFO 2010-11-23 09:14:48.000000000 +0100 +++ new/dnspython-1.9.3/PKG-INFO 2011-03-24 15:49:33.000000000 +0100 @@ -1,12 +1,12 @@ Metadata-Version: 1.1 Name: dnspython -Version: 1.9.2 +Version: 1.9.3 Summary: DNS toolkit Home-page: http://www.dnspython.org Author: Bob Halley Author-email: halley(a)dnspython.org License: BSD-like -Download-URL: http://www.dnspython.org/kits/1.9.2/dnspython-1.9.2.tar.gz +Download-URL: http://www.dnspython.org/kits/1.9.3/dnspython-1.9.3.tar.gz Description: dnspython is a DNS toolkit for Python. It supports almost all record types. It can be used for queries, zone transfers, and dynamic updates. It supports TSIG authenticated messages and EDNS0. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dnspython-1.9.2/README new/dnspython-1.9.3/README --- old/dnspython-1.9.2/README 2010-11-23 09:12:04.000000000 +0100 +++ new/dnspython-1.9.3/README 2011-03-23 18:01:11.000000000 +0100 @@ -22,7 +22,29 @@ ABOUT THIS RELEASE -This is dnspython 1.9.2 +This is dnspython 1.9.3 + +New since 1.9.2: + + A boolean parameter, 'raise_on_no_answer', has been added to + the query() methods. In no-error, no-data situations, this + parameter determines whether NoAnswer should be raised or not. + If True, NoAnswer is raised. If False, then an Answer() + object with a None rrset will be returned. + + Resolver Answer() objects now have a canonical_name field. + + Rdata now have a __hash__ method. + +Bugs fixed since 1.9.2: + + Dnspython was erroneously doing case-insensitive comparisons + of the names in NSEC and RRSIG RRs. + + We now use "is" and not "==" when testing what section an RR + is in. + + The resolver now disallows metaqueries. New since 1.9.1: Files old/dnspython-1.9.2/dns/.___init__.py and new/dnspython-1.9.3/dns/.___init__.py differ Files old/dnspython-1.9.2/dns/._e164.py and new/dnspython-1.9.3/dns/._e164.py differ Files old/dnspython-1.9.2/dns/._edns.py and new/dnspython-1.9.3/dns/._edns.py differ Files old/dnspython-1.9.2/dns/._entropy.py and new/dnspython-1.9.3/dns/._entropy.py differ Files old/dnspython-1.9.2/dns/._exception.py and new/dnspython-1.9.3/dns/._exception.py differ Files old/dnspython-1.9.2/dns/._flags.py and new/dnspython-1.9.3/dns/._flags.py differ Files old/dnspython-1.9.2/dns/._inet.py and new/dnspython-1.9.3/dns/._inet.py differ Files old/dnspython-1.9.2/dns/._ipv4.py and new/dnspython-1.9.3/dns/._ipv4.py differ Files old/dnspython-1.9.2/dns/._ipv6.py and new/dnspython-1.9.3/dns/._ipv6.py differ Files old/dnspython-1.9.2/dns/._message.py and new/dnspython-1.9.3/dns/._message.py differ Files old/dnspython-1.9.2/dns/._name.py and new/dnspython-1.9.3/dns/._name.py differ Files old/dnspython-1.9.2/dns/._namedict.py and new/dnspython-1.9.3/dns/._namedict.py differ Files old/dnspython-1.9.2/dns/._node.py and new/dnspython-1.9.3/dns/._node.py differ Files old/dnspython-1.9.2/dns/._opcode.py and new/dnspython-1.9.3/dns/._opcode.py differ Files old/dnspython-1.9.2/dns/._rcode.py and new/dnspython-1.9.3/dns/._rcode.py differ Files old/dnspython-1.9.2/dns/._rdata.py and new/dnspython-1.9.3/dns/._rdata.py differ Files old/dnspython-1.9.2/dns/._rdataclass.py and new/dnspython-1.9.3/dns/._rdataclass.py differ Files old/dnspython-1.9.2/dns/._rdataset.py and new/dnspython-1.9.3/dns/._rdataset.py differ Files old/dnspython-1.9.2/dns/._rdatatype.py and new/dnspython-1.9.3/dns/._rdatatype.py differ Files old/dnspython-1.9.2/dns/._renderer.py and new/dnspython-1.9.3/dns/._renderer.py differ Files old/dnspython-1.9.2/dns/._resolver.py and new/dnspython-1.9.3/dns/._resolver.py differ Files old/dnspython-1.9.2/dns/._reversename.py and new/dnspython-1.9.3/dns/._reversename.py differ Files old/dnspython-1.9.2/dns/._rrset.py and new/dnspython-1.9.3/dns/._rrset.py differ Files old/dnspython-1.9.2/dns/._set.py and new/dnspython-1.9.3/dns/._set.py differ Files old/dnspython-1.9.2/dns/._tsig.py and new/dnspython-1.9.3/dns/._tsig.py differ Files old/dnspython-1.9.2/dns/._tsigkeyring.py and new/dnspython-1.9.3/dns/._tsigkeyring.py differ Files old/dnspython-1.9.2/dns/._ttl.py and new/dnspython-1.9.3/dns/._ttl.py differ Files old/dnspython-1.9.2/dns/._update.py and new/dnspython-1.9.3/dns/._update.py differ Files old/dnspython-1.9.2/dns/._version.py and new/dnspython-1.9.3/dns/._version.py differ Files old/dnspython-1.9.2/dns/._zone.py and new/dnspython-1.9.3/dns/._zone.py differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dnspython-1.9.2/dns/message.py new/dnspython-1.9.3/dns/message.py --- old/dnspython-1.9.2/dns/message.py 2010-10-17 17:23:05.000000000 +0200 +++ new/dnspython-1.9.3/dns/message.py 2011-02-09 10:19:51.000000000 +0100 @@ -686,7 +686,7 @@ deleting = None if deleting == dns.rdataclass.ANY or \ (deleting == dns.rdataclass.NONE and \ - section == self.message.answer): + section is self.message.answer): covers = dns.rdatatype.NONE rd = None else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dnspython-1.9.2/dns/rdata.py new/dnspython-1.9.3/dns/rdata.py --- old/dnspython-1.9.2/dns/rdata.py 2010-03-14 13:55:42.000000000 +0100 +++ new/dnspython-1.9.3/dns/rdata.py 2011-02-09 10:19:51.000000000 +0100 @@ -28,6 +28,7 @@ import cStringIO import dns.exception +import dns.name import dns.rdataclass import dns.rdatatype import dns.tokenizer @@ -252,6 +253,18 @@ return NotImplemented return self._cmp(other) > 0 + def __hash__(self): + return hash(self.to_digestable(dns.name.root)) + + def _wire_cmp(self, other): + # A number of types compare rdata in wire form, so we provide + # the method here instead of duplicating it. + b1 = cStringIO.StringIO() + self.to_wire(b1) + b2 = cStringIO.StringIO() + other.to_wire(b2) + return cmp(b1.getvalue(), b2.getvalue()) + def from_text(cls, rdclass, rdtype, tok, origin = None, relativize = True): """Build an rdata object from text format. Files old/dnspython-1.9.2/dns/rdtypes/.___init__.py and new/dnspython-1.9.3/dns/rdtypes/.___init__.py differ Files old/dnspython-1.9.2/dns/rdtypes/._dsbase.py and new/dnspython-1.9.3/dns/rdtypes/._dsbase.py differ Files old/dnspython-1.9.2/dns/rdtypes/._keybase.py and new/dnspython-1.9.3/dns/rdtypes/._keybase.py differ Files old/dnspython-1.9.2/dns/rdtypes/._mxbase.py and new/dnspython-1.9.3/dns/rdtypes/._mxbase.py differ Files old/dnspython-1.9.2/dns/rdtypes/._nsbase.py and new/dnspython-1.9.3/dns/rdtypes/._nsbase.py differ Files old/dnspython-1.9.2/dns/rdtypes/._sigbase.py and new/dnspython-1.9.3/dns/rdtypes/._sigbase.py differ Files old/dnspython-1.9.2/dns/rdtypes/._txtbase.py and new/dnspython-1.9.3/dns/rdtypes/._txtbase.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._AFSDB.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._AFSDB.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._CERT.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._CERT.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._CNAME.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._CNAME.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._DLV.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._DLV.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._DNAME.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._DNAME.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._DNSKEY.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._DNSKEY.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._DS.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._DS.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._GPOS.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._GPOS.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._HINFO.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._HINFO.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._HIP.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._HIP.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._ISDN.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._ISDN.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._KEY.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._KEY.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._LOC.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._LOC.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._MX.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._MX.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._NS.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._NS.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._NSEC.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._NSEC.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._NSEC3.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._NSEC3.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._NSEC3PARAM.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._NSEC3PARAM.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._NXT.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._NXT.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._PTR.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._PTR.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._RP.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._RP.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._RRSIG.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._RRSIG.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._RT.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._RT.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._SIG.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._SIG.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._SOA.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._SOA.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._SPF.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._SPF.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._SSHFP.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._SSHFP.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._TXT.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._TXT.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/._X25.py and new/dnspython-1.9.3/dns/rdtypes/ANY/._X25.py differ Files old/dnspython-1.9.2/dns/rdtypes/ANY/.___init__.py and new/dnspython-1.9.3/dns/rdtypes/ANY/.___init__.py differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dnspython-1.9.2/dns/rdtypes/ANY/NSEC.py new/dnspython-1.9.3/dns/rdtypes/ANY/NSEC.py --- old/dnspython-1.9.2/dns/rdtypes/ANY/NSEC.py 2010-03-14 13:55:42.000000000 +0100 +++ new/dnspython-1.9.3/dns/rdtypes/ANY/NSEC.py 2011-02-09 10:19:51.000000000 +0100 @@ -125,17 +125,4 @@ self.next = self.next.choose_relativity(origin, relativize) def _cmp(self, other): - v = cmp(self.next, other.next) - if v == 0: - b1 = cStringIO.StringIO() - for (window, bitmap) in self.windows: - b1.write(chr(window)) - b1.write(chr(len(bitmap))) - b1.write(bitmap) - b2 = cStringIO.StringIO() - for (window, bitmap) in other.windows: - b2.write(chr(window)) - b2.write(chr(len(bitmap))) - b2.write(bitmap) - v = cmp(b1.getvalue(), b2.getvalue()) - return v + return self._wire_cmp(other) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dnspython-1.9.2/dns/rdtypes/ANY/SIG.py new/dnspython-1.9.3/dns/rdtypes/ANY/SIG.py --- old/dnspython-1.9.2/dns/rdtypes/ANY/SIG.py 2010-01-14 23:15:00.000000000 +0100 +++ new/dnspython-1.9.3/dns/rdtypes/ANY/SIG.py 2011-02-09 10:19:51.000000000 +0100 @@ -24,3 +24,18 @@ self.inception, self.key_tag) + \ self.signer.to_digestable(origin) + \ self.signature + def _cmp(self, other): + hs = struct.pack('!HBBIIIH', self.type_covered, + self.algorithm, self.labels, + self.original_ttl, self.expiration, + self.inception, self.key_tag) + ho = struct.pack('!HBBIIIH', other.type_covered, + other.algorithm, other.labels, + other.original_ttl, other.expiration, + other.inception, other.key_tag) + v = cmp(hs, ho) + if v == 0: + v = cmp(self.signer, other.signer) + if v == 0: + v = cmp(self.signature, other.signature) + return v Files old/dnspython-1.9.2/dns/rdtypes/IN/._A.py and new/dnspython-1.9.3/dns/rdtypes/IN/._A.py differ Files old/dnspython-1.9.2/dns/rdtypes/IN/._AAAA.py and new/dnspython-1.9.3/dns/rdtypes/IN/._AAAA.py differ Files old/dnspython-1.9.2/dns/rdtypes/IN/._APL.py and new/dnspython-1.9.3/dns/rdtypes/IN/._APL.py differ Files old/dnspython-1.9.2/dns/rdtypes/IN/._DHCID.py and new/dnspython-1.9.3/dns/rdtypes/IN/._DHCID.py differ Files old/dnspython-1.9.2/dns/rdtypes/IN/._IPSECKEY.py and new/dnspython-1.9.3/dns/rdtypes/IN/._IPSECKEY.py differ Files old/dnspython-1.9.2/dns/rdtypes/IN/._KX.py and new/dnspython-1.9.3/dns/rdtypes/IN/._KX.py differ Files old/dnspython-1.9.2/dns/rdtypes/IN/._NAPTR.py and new/dnspython-1.9.3/dns/rdtypes/IN/._NAPTR.py differ Files old/dnspython-1.9.2/dns/rdtypes/IN/._NSAP.py and new/dnspython-1.9.3/dns/rdtypes/IN/._NSAP.py differ Files old/dnspython-1.9.2/dns/rdtypes/IN/._NSAP_PTR.py and new/dnspython-1.9.3/dns/rdtypes/IN/._NSAP_PTR.py differ Files old/dnspython-1.9.2/dns/rdtypes/IN/._PX.py and new/dnspython-1.9.3/dns/rdtypes/IN/._PX.py differ Files old/dnspython-1.9.2/dns/rdtypes/IN/._SRV.py and new/dnspython-1.9.3/dns/rdtypes/IN/._SRV.py differ Files old/dnspython-1.9.2/dns/rdtypes/IN/._WKS.py and new/dnspython-1.9.3/dns/rdtypes/IN/._WKS.py differ Files old/dnspython-1.9.2/dns/rdtypes/IN/.___init__.py and new/dnspython-1.9.3/dns/rdtypes/IN/.___init__.py differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dnspython-1.9.2/dns/rdtypes/sigbase.py new/dnspython-1.9.3/dns/rdtypes/sigbase.py --- old/dnspython-1.9.2/dns/rdtypes/sigbase.py 2010-03-14 13:55:42.000000000 +0100 +++ new/dnspython-1.9.3/dns/rdtypes/sigbase.py 2011-02-09 10:19:51.000000000 +0100 @@ -152,17 +152,4 @@ self.signer = self.signer.choose_relativity(origin, relativize) def _cmp(self, other): - hs = struct.pack('!HBBIIIH', self.type_covered, - self.algorithm, self.labels, - self.original_ttl, self.expiration, - self.inception, self.key_tag) - ho = struct.pack('!HBBIIIH', other.type_covered, - other.algorithm, other.labels, - other.original_ttl, other.expiration, - other.inception, other.key_tag) - v = cmp(hs, ho) - if v == 0: - v = cmp(self.signer, other.signer) - if v == 0: - v = cmp(self.signature, other.signature) - return v + return self._wire_cmp(other) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dnspython-1.9.2/dns/resolver.py new/dnspython-1.9.3/dns/resolver.py --- old/dnspython-1.9.2/dns/resolver.py 2010-10-31 14:37:11.000000000 +0100 +++ new/dnspython-1.9.3/dns/resolver.py 2011-03-22 14:45:18.000000000 +0100 @@ -61,6 +61,10 @@ This should never happen!""" pass +class NoMetaqueries(dns.exception.DNSException): + """Metaqueries are not allowed.""" + pass + class Answer(object): """DNS stub resolver answer @@ -89,8 +93,11 @@ @type rrset: dns.rrset.RRset object @ivar expiration: The time when the answer expires @type expiration: float (seconds since the epoch) + @ivar canonical_name: The canonical name of the query name + @type canonical_name: dns.name.Name object """ - def __init__(self, qname, rdtype, rdclass, response): + def __init__(self, qname, rdtype, rdclass, response, + raise_on_no_answer=True): self.qname = qname self.rdtype = rdtype self.rdclass = rdclass @@ -118,11 +125,31 @@ break continue except KeyError: - raise NoAnswer - raise NoAnswer - if rrset is None: + if raise_on_no_answer: + raise NoAnswer + if raise_on_no_answer: + raise NoAnswer + if rrset is None and raise_on_no_answer: raise NoAnswer + self.canonical_name = qname self.rrset = rrset + if rrset is None: + while 1: + # Look for a SOA RR whose owner name is a superdomain + # of qname. + try: + srrset = response.find_rrset(response.authority, qname, + rdclass, dns.rdatatype.SOA) + if min_ttl == -1 or srrset.ttl < min_ttl: + min_ttl = srrset.ttl + if srrset[0].minimum < min_ttl: + min_ttl = srrset[0].minimum + break + except KeyError: + try: + qname = qname.parent() + except dns.name.NoParent: + break self.expiration = time.time() + min_ttl def __getattr__(self, attr): @@ -542,7 +569,7 @@ return min(self.lifetime - duration, self.timeout) def query(self, qname, rdtype=dns.rdatatype.A, rdclass=dns.rdataclass.IN, - tcp=False, source=None): + tcp=False, source=None, raise_on_no_answer=True): """Query nameservers to find the answer to the question. The I{qname}, I{rdtype}, and I{rdclass} parameters may be objects @@ -560,10 +587,14 @@ @type tcp: bool @param source: bind to this IP address (defaults to machine default IP). @type source: IP address in dotted quad notation + @param raise_on_no_answer: raise NoAnswer if there's no answer + (defaults is True). + @type raise_on_no_answer: bool @rtype: dns.resolver.Answer instance @raises Timeout: no answers could be found in the specified lifetime @raises NXDOMAIN: the query name does not exist - @raises NoAnswer: the response did not contain an answer + @raises NoAnswer: the response did not contain an answer and + raise_on_no_answer is True. @raises NoNameservers: no non-broken nameservers are available to answer the question.""" @@ -571,8 +602,12 @@ qname = dns.name.from_text(qname, None) if isinstance(rdtype, (str, unicode)): rdtype = dns.rdatatype.from_text(rdtype) + if dns.rdatatype.is_metatype(rdtype): + raise NoMetaqueries if isinstance(rdclass, (str, unicode)): rdclass = dns.rdataclass.from_text(rdclass) + if dns.rdataclass.is_metaclass(rdclass): + raise NoMetaqueries qnames_to_try = [] if qname.is_absolute(): qnames_to_try.append(qname) @@ -670,7 +705,8 @@ break if all_nxdomain: raise NXDOMAIN - answer = Answer(qname, rdtype, rdclass, response) + answer = Answer(qname, rdtype, rdclass, response, + raise_on_no_answer) if self.cache: self.cache.put((qname, rdtype, rdclass), answer) return answer @@ -723,14 +759,15 @@ return default_resolver def query(qname, rdtype=dns.rdatatype.A, rdclass=dns.rdataclass.IN, - tcp=False, source=None): + tcp=False, source=None, raise_on_no_answer=True): """Query nameservers to find the answer to the question. This is a convenience function that uses the default resolver object to make the query. @see: L{dns.resolver.Resolver.query} for more information on the parameters.""" - return get_default_resolver().query(qname, rdtype, rdclass, tcp, source) + return get_default_resolver().query(qname, rdtype, rdclass, tcp, source, + raise_on_no_answer) def zone_for_name(name, rdclass=dns.rdataclass.IN, tcp=False, resolver=None): """Find the name of the zone which contains the specified name. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dnspython-1.9.2/dns/version.py new/dnspython-1.9.3/dns/version.py --- old/dnspython-1.9.2/dns/version.py 2010-11-23 09:01:50.000000000 +0100 +++ new/dnspython-1.9.3/dns/version.py 2011-02-09 10:12:38.000000000 +0100 @@ -17,7 +17,7 @@ MAJOR = 1 MINOR = 9 -MICRO = 2 +MICRO = 3 RELEASELEVEL = 0x0f SERIAL = 0 Files old/dnspython-1.9.2/examples/._ddns.py and new/dnspython-1.9.3/examples/._ddns.py differ Files old/dnspython-1.9.2/examples/._e164.py and new/dnspython-1.9.3/examples/._e164.py differ Files old/dnspython-1.9.2/examples/._mx.py and new/dnspython-1.9.3/examples/._mx.py differ Files old/dnspython-1.9.2/examples/._name.py and new/dnspython-1.9.3/examples/._name.py differ Files old/dnspython-1.9.2/examples/._reverse.py and new/dnspython-1.9.3/examples/._reverse.py differ Files old/dnspython-1.9.2/examples/._reverse_name.py and new/dnspython-1.9.3/examples/._reverse_name.py differ Files old/dnspython-1.9.2/examples/._xfr.py and new/dnspython-1.9.3/examples/._xfr.py differ Files old/dnspython-1.9.2/examples/._zonediff.py and new/dnspython-1.9.3/examples/._zonediff.py differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dnspython-1.9.2/setup.py new/dnspython-1.9.3/setup.py --- old/dnspython-1.9.2/setup.py 2010-11-23 09:01:33.000000000 +0100 +++ new/dnspython-1.9.3/setup.py 2011-02-09 10:12:38.000000000 +0100 @@ -18,7 +18,7 @@ import sys from distutils.core import setup -version = '1.9.2' +version = '1.9.3' kwargs = { 'name' : 'dnspython', Files old/dnspython-1.9.2/tests/._Makefile and new/dnspython-1.9.3/tests/._Makefile differ Files old/dnspython-1.9.2/tests/._bugs.py and new/dnspython-1.9.3/tests/._bugs.py differ Files old/dnspython-1.9.2/tests/._example and new/dnspython-1.9.3/tests/._example differ Files old/dnspython-1.9.2/tests/._example1.good and new/dnspython-1.9.3/tests/._example1.good differ Files old/dnspython-1.9.2/tests/._example2.good and new/dnspython-1.9.3/tests/._example2.good differ Files old/dnspython-1.9.2/tests/._flags.py and new/dnspython-1.9.3/tests/._flags.py differ Files old/dnspython-1.9.2/tests/._message.py and new/dnspython-1.9.3/tests/._message.py differ Files old/dnspython-1.9.2/tests/._name.py and new/dnspython-1.9.3/tests/._name.py differ Files old/dnspython-1.9.2/tests/._namedict.py and new/dnspython-1.9.3/tests/._namedict.py differ Files old/dnspython-1.9.2/tests/._ntoaaton.py and new/dnspython-1.9.3/tests/._ntoaaton.py differ Files old/dnspython-1.9.2/tests/._rdtypeandclass.py and new/dnspython-1.9.3/tests/._rdtypeandclass.py differ Files old/dnspython-1.9.2/tests/._rrset.py and new/dnspython-1.9.3/tests/._rrset.py differ Files old/dnspython-1.9.2/tests/._set.py and new/dnspython-1.9.3/tests/._set.py differ Files old/dnspython-1.9.2/tests/._tokenizer.py and new/dnspython-1.9.3/tests/._tokenizer.py differ Files old/dnspython-1.9.2/tests/._update.py and new/dnspython-1.9.3/tests/._update.py differ Files old/dnspython-1.9.2/tests/._zone.py and new/dnspython-1.9.3/tests/._zone.py 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 perl-File-Remove for openSUSE:Factory
by root＠hilbert.suse.de 25 Mar '11

25 Mar '11

Hello community, here is the log from the commit of package perl-File-Remove for openSUSE:Factory checked in at Fri Mar 25 08:49:07 CET 2011. -------- --- perl-File-Remove/perl-File-Remove.changes 2011-03-24 12:26:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-File-Remove/perl-File-Remove.changes 2011-03-24 20:31:57.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 24 19:31:20 UTC 2011 - coolo(a)novell.com + +- rpm does not know that 2701 is smaller than 33 for perl + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-File-Remove.spec ++++++ --- /var/tmp/diff_new_pack.4LDO7i/_old 2011-03-25 08:48:42.000000000 +0100 +++ /var/tmp/diff_new_pack.4LDO7i/_new 2011-03-25 08:48:42.000000000 +0100 @@ -19,7 +19,7 @@ Name: perl-File-Remove Version: 1.49 -Release: 1 +Release: 3 License: GPL+ or Artistic %define cpan_name File-Remove Summary: Remove files and directories @@ -27,12 +27,12 @@ Group: Development/Libraries/Perl #Source: http://www.cpan.org/authors/id/A/AD/ADAMK/File-Remove-%{version}.tar.gz Source: %{cpan_name}-%{version}.tar.gz -BuildRequires: perl(Cwd) >= 3.2701 -BuildRequires: perl(File::Spec) >= 3.2701 +BuildRequires: perl(Cwd) >= 3.27.01 +BuildRequires: perl(File::Spec) >= 3.27.01 BuildRequires: perl BuildRequires: perl-macros -Requires: perl(Cwd) >= 3.2701 -Requires: perl(File::Spec) >= 3.2701 +Requires: perl(Cwd) >= 3.27.01 +Requires: perl(File::Spec) >= 3.27.01 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %{perl_requires} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gstreamer-0_10-plugins-good for openSUSE:11.4
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package gstreamer-0_10-plugins-good for openSUSE:11.4 checked in at Thu Mar 24 18:36:39 CET 2011. -------- --- old-versions/11.4/all/gstreamer-0_10-plugins-good/gstreamer-0_10-plugins-good.changes 2011-02-01 11:41:14.000000000 +0100 +++ 11.4/gstreamer-0_10-plugins-good/gstreamer-0_10-plugins-good.changes 2011-03-24 13:19:25.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 5 09:28:38 UTC 2011 - timshel(a)rocketmail.com + +- added possible fix for gstreamer crashes (bnc#673914, bgo#641330) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/gstreamer-0_10-plugins-good Destination is old-versions/11.4/UPDATES/all/gstreamer-0_10-plugins-good calling whatdependson for 11.4-i586 New: ---- gstreamer-0_10-plugins-good-fix-tag-list-handling-issue.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-0_10-plugins-good.spec ++++++ --- /var/tmp/diff_new_pack.mFWZMH/_old 2011-03-24 18:36:25.000000000 +0100 +++ /var/tmp/diff_new_pack.mFWZMH/_new 2011-03-24 18:36:25.000000000 +0100 @@ -24,7 +24,7 @@ %define ENABLE_AALIB 1 %define _name gst-plugins-good Version: 0.10.27 -Release: 1 +Release: 4.<RELEASE5> %define gst_branch 0.10 %if 0%{?ENABLE_AALIB} BuildRequires: aalib-devel @@ -68,6 +68,8 @@ License: LGPLv2.1+ Group: Productivity/Multimedia/Other Source0: http://gstreamer.freedesktop.org/src/gst-plugins-good/%{_name}-%{version}.t… +# PATCH-FIX-UPSTREAM gstreamer-0_10-plugins-good-fix-tag-list-handling-issue.patch bnc673914, bgo641330 timshel(a)rocketmail.com -- possible fix for gstreamer crashes in Amarok +Patch0: gstreamer-0_10-plugins-good-fix-tag-list-handling-issue.patch Url: http://gstreamer.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: GStreamer Streaming-Media Framework Plug-Ins @@ -148,6 +150,7 @@ %prep chmod 0644 %{S:0} %setup -q -n %{_name}-%{version} +%patch0 -p1 translation-update-upstream po gst-plugins-good-0.10 %build ++++++ gstreamer-0_10-plugins-good-fix-tag-list-handling-issue.patch ++++++ diff --git a/gst/icydemux/gsticydemux.c b/gst/icydemux/gsticydemux.c index 5965500..2582959 100644 --- a/gst/icydemux/gsticydemux.c +++ b/gst/icydemux/gsticydemux.c @@ -301,6 +301,7 @@ gst_icydemux_unicodify (const gchar * str) return gst_tag_freeform_string_to_utf8 (str, -1, env_vars); } +/* takes ownership of tag list */ static gboolean gst_icydemux_tag_found (GstICYDemux * icydemux, GstTagList * tags) { @@ -309,10 +310,13 @@ gst_icydemux_tag_found (GstICYDemux * icydemux, GstTagList * tags) return gst_icydemux_send_tag_event (icydemux, tags); /* if we haven't a source pad yet, cache the tags */ - if (!icydemux->cached_tags) - icydemux->cached_tags = gst_tag_list_new (); - - gst_tag_list_insert (icydemux->cached_tags, tags, GST_TAG_MERGE_REPLACE_ALL); + if (!icydemux->cached_tags) { + icydemux->cached_tags = tags; + } else { + gst_tag_list_insert (icydemux->cached_tags, tags, + GST_TAG_MERGE_REPLACE_ALL); + gst_tag_list_free (tags); + } return TRUE; } @@ -320,12 +324,11 @@ gst_icydemux_tag_found (GstICYDemux * icydemux, GstTagList * tags) static void gst_icydemux_parse_and_send_tags (GstICYDemux * icydemux) { - GstTagList *tags = gst_tag_list_new (); + GstTagList *tags; const guint8 *data; int length, i; gchar *buffer; gchar **strings; - gboolean found_tag = FALSE; length = gst_adapter_available (icydemux->meta_adapter); @@ -333,10 +336,9 @@ gst_icydemux_parse_and_send_tags (GstICYDemux * icydemux) /* Now, copy this to a buffer where we can NULL-terminate it to make things * a bit easier, then do that parsing. */ - buffer = g_malloc (length + 1); - memcpy (buffer, data, length); - buffer[length] = 0; + buffer = g_strndup ((const gchar *) data, length); + tags = gst_tag_list_new (); strings = g_strsplit (buffer, "';", 0); for (i = 0; strings[i]; i++) { @@ -347,7 +349,6 @@ gst_icydemux_parse_and_send_tags (GstICYDemux * icydemux) gst_tag_list_add (tags, GST_TAG_MERGE_REPLACE, GST_TAG_TITLE, title, NULL); g_free (title); - found_tag = TRUE; } } else if (!g_ascii_strncasecmp (strings[i], "StreamUrl=", 10)) { char *url = gst_icydemux_unicodify (strings[i] + 11); @@ -356,7 +357,6 @@ gst_icydemux_parse_and_send_tags (GstICYDemux * icydemux) gst_tag_list_add (tags, GST_TAG_MERGE_REPLACE, GST_TAG_HOMEPAGE, url, NULL); g_free (url); - found_tag = TRUE; } } } @@ -365,8 +365,10 @@ gst_icydemux_parse_and_send_tags (GstICYDemux * icydemux) g_free (buffer); gst_adapter_clear (icydemux->meta_adapter); - if (found_tag) + if (!gst_tag_list_is_empty (tags)) gst_icydemux_tag_found (icydemux, tags); + else + gst_tag_list_free (tags); } static gboolean @@ -379,7 +381,7 @@ gst_icydemux_handle_event (GstPad * pad, GstEvent * event) GstTagList *tags; gst_event_parse_tag (event, &tags); - result = gst_icydemux_tag_found (icydemux, tags); + result = gst_icydemux_tag_found (icydemux, gst_tag_list_copy (tags)); gst_event_unref (event); return result; } @@ -617,6 +619,7 @@ gst_icydemux_change_state (GstElement * element, GstStateChange transition) return ret; } +/* takes ownership of tag list */ static gboolean gst_icydemux_send_tag_event (GstICYDemux * icydemux, GstTagList * tags) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 virtualbox for openSUSE:11.4
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package virtualbox for openSUSE:11.4 checked in at Thu Mar 24 18:36:05 CET 2011. -------- --- old-versions/11.4/UPDATES/all/virtualbox/virtualbox.changes 2011-03-17 14:20:12.000000000 +0100 +++ 11.4/virtualbox/virtualbox.changes 2011-03-24 15:38:52.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 24 14:38:28 UTC 2011 - lnussel(a)suse.de + +- fix build on 11.4 + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.kunm9G/_old 2011-03-24 18:35:55.000000000 +0100 +++ /var/tmp/diff_new_pack.kunm9G/_new 2011-03-24 18:35:55.000000000 +0100 @@ -43,7 +43,7 @@ # ExclusiveArch: %ix86 x86_64 Version: 4.0.4 -Release: 1.<RELEASE4> +Release: 1.<RELEASE5> Summary: VirtualBox is an Emulator License: GPLv2+ Group: System/Emulators/PC @@ -602,7 +602,7 @@ %{_var}/adm/fillup-templates/sysconfig.vbox %{_sbindir}/rcvboxes %{_sbindir}/rcvboxdrv -%if %suse_version > 1140 +%if %suse_version >= 1140 %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP %else %{_vbox_instdir}/VBoxNetDHCP ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdelibs4 for openSUSE:11.2
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package kdelibs4 for openSUSE:11.2 checked in at Thu Mar 24 18:34:42 CET 2011. -------- --- old-versions/11.2/UPDATES/all/kdelibs4/kdelibs4.changes 2010-01-31 11:55:07.000000000 +0100 +++ 11.2/kdelibs4/kdelibs4.changes 2011-03-23 18:49:19.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 22 20:05:02 UTC 2011 - wstephenson(a)novell.com + +- Harden SSL verification against poisoned DNS attacks (bnc#669222) +- Fix launching apps with kdeinit when in su session (bnc#622304) + +------------------------------------------------------------------- calling whatdependson for 11.2-i586 New: ---- 551bfa12-ssl-wildcards.diff r1132903-kinit-xauth.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.4EdMer/_old 2011-03-24 18:33:51.000000000 +0100 +++ /var/tmp/diff_new_pack.4EdMer/_new 2011-03-24 18:33:51.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kdelibs4 (Version 4.3.5) +# spec file for package kdelibs4 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -43,7 +43,7 @@ Summary: KDE Base Libraries Url: http://www.kde.org Version: 4.3.5 -Release: 0.<RELEASE1> +Release: 0.<RELEASE3> Requires: libstrigi0 >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) @@ -74,6 +74,8 @@ Patch21: policykit-workaround.patch Patch22: oom-protect-fix.diff Patch26: kstyle-no-dynamic-cast-bnc529640.diff +Patch27: 551bfa12-ssl-wildcards.diff +Patch28: r1132903-kinit-xauth.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 1010 %requires_ge libqt4-x11 @@ -148,6 +150,8 @@ %patch21 -p1 %patch22 %patch26 +%patch27 -p1 +%patch28 -p3 # # define KDE version exactly # ++++++ 551bfa12-ssl-wildcards.diff ++++++ diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp index 84c9b82..8d66863 100644 --- a/kio/kio/tcpslavebase.cpp +++ b/kio/kio/tcpslavebase.cpp @@ -4,6 +4,7 @@ * Copyright (C) 2001 Dawit Alemayehu <adawit(a)kde.org> * Copyright (C) 2007,2008 Andreas Hartmetz <ahartmetz(a)gmail.com> * Copyright (C) 2008 Roland Harnau <tau(a)gmx.eu> + * Copyright (C) 2010 Richard Moore <rich(a)kde.org> * * This file is part of the KDE project * @@ -438,6 +439,49 @@ bool TCPSlaveBase::startSsl() return startTLSInternal(KTcpSocket::TlsV1) & ResultOk; } +// Find out if a hostname matches an SSL certificate's Common Name (including wildcards) +static bool isMatchingHostname(const QString &cnIn, const QString &hostnameIn) +{ + const QString cn = cnIn.toLower(); + const QString hostname = hostnameIn.toLower(); + + const int wildcard = cn.indexOf(QLatin1Char('*')); + + // Check this is a wildcard cert, if not then just compare the strings + if (wildcard < 0) + return cn == hostname; + + const int firstCnDot = cn.indexOf(QLatin1Char('.')); + const int secondCnDot = cn.indexOf(QLatin1Char('.'), firstCnDot+1); + + // Check at least 3 components + if ((-1 == secondCnDot) || (secondCnDot+1 >= cn.length())) + return false; + + // Check * is last character of 1st component (ie. there's a following .) + if (wildcard+1 != firstCnDot) + return false; + + // Check only one star + if (cn.lastIndexOf(QLatin1Char('*')) != wildcard) + return false; + + // Check characters preceding * (if any) match + if (wildcard && (hostname.leftRef(wildcard) != cn.leftRef(wildcard))) + return false; + + // Check characters following first . match + if (hostname.midRef(hostname.indexOf(QLatin1Char('.'))) != cn.midRef(firstCnDot)) + return false; + + // Check if the hostname is an IP address, if so then wildcards are not allowed + QHostAddress addr(hostname); + if (!addr.isNull()) + return false; + + // Ok, I guess this was a wildcard CN and the hostname matches. + return true; +} TCPSlaveBase::SslResult TCPSlaveBase::startTLSInternal(uint v_) { @@ -492,25 +536,34 @@ TCPSlaveBase::SslResult TCPSlaveBase::startTLSInternal(uint v_) // domain<->certificate matching here. d->sslErrors = d->socket.sslErrors(); QSslCertificate peerCert = d->socket.peerCertificateChain().first(); - QStringList domainPatterns(peerCert.subjectInfo(QSslCertificate::CommonName)); - domainPatterns += peerCert.alternateSubjectNames().values(QSsl::DnsEntry); - QRegExp domainMatcher(QString(), Qt::CaseInsensitive, QRegExp::Wildcard); QMutableListIterator<KSslError> it(d->sslErrors); while (it.hasNext()) { // As of 4.4.0 Qt does not assign a certificate to the QSslError it emits // *in the case of HostNameMismatch*. A HostNameMismatch, however, will always // be an error of the peer certificate so we just don't check the error's // certificate(). - if (it.next().error() != KSslError::HostNameMismatch) { - continue; + + // Remove all HostNameMismatch, we have to redo name checking later. + if (it.next().error() == KSslError::HostNameMismatch) { + it.remove(); } - foreach (const QString &dp, domainPatterns) { - domainMatcher.setPattern(dp); - if (domainMatcher.exactMatch(d->host)) { - it.remove(); - } + } + // Redo name checking here and (re-)insert HostNameMismatch to sslErrors if + // host name does not match any of the names in server certificate. + // QSslSocket may not report HostNameMismatch error, when server + // certificate was issued for the IP we are connecting to. + QStringList domainPatterns(peerCert.subjectInfo(QSslCertificate::CommonName)); + domainPatterns += peerCert.alternateSubjectNames().values(QSsl::DnsEntry); + bool names_match = false; + foreach (const QString &dp, domainPatterns) { + if (isMatchingHostname(dp,d->host)) { + names_match = true; + break; } } + if (!names_match) { + d->sslErrors.insert(0, KSslError(KSslError::HostNameMismatch, peerCert)); + } // The app side needs the metadata now for the SSL error dialog (if any) but // the same metadata will be needed later, too. When "later" arrives the slave ++++++ r1132903-kinit-xauth.diff ++++++ --- trunk/KDE/kdelibs/kinit/kinit.cpp 2010/05/31 17:23:24 1132902 +++ trunk/KDE/kdelibs/kinit/kinit.cpp 2010/05/31 17:23:36 1132903 @@ -64,6 +64,7 @@ #include <klocale.h> #include <kdebug.h> #include <kde_file.h> +#include <ksavefile.h> #ifdef Q_OS_LINUX #include <sys/prctl.h> @@ -1574,6 +1575,42 @@ { XSetIOErrorHandler(kdeinit_xio_errhandler); XSetErrorHandler(kdeinit_x_errhandler); +/* + Handle the tricky case of running via kdesu/su/sudo/etc. There the usual case + is that kdesu (etc.) creates a file with xauth information, sets XAUTHORITY, + runs the command and removes the xauth file after the command finishes. However, + dbus and kdeinit daemon currently don't clean up properly and keeping running. + Which means that running a KDE app via kdesu the second time talks to kdeinit + with obsolete xauth information, which makes it unable to connect to X or launch + any X11 applications. + Even fixing the cleanup probably wouldn't be sufficient, since it'd be possible to + launch one kdesu session, another one, exit the first one and the app from the second + session would be using kdeinit from the first one. + So the trick here is to duplicate the xauth file to another file in KDE's tmp + location, make the file have a consistent name so that future sessions will use it + as well, point XAUTHORITY there and never remove the file (except for possible + tmp cleanup). +*/ + if( !qgetenv( "XAUTHORITY" ).isEmpty()) { + QByteArray display = qgetenv( DISPLAY ); + int i; + if((i = display.lastIndexOf('.')) > display.lastIndexOf(':') && i >= 0) + display.truncate(i); + display.replace(':','_'); +#ifdef __APPLE__ + display.replace('/','_'); +#endif + QString xauth = s_instance->dirs()->saveLocation( "tmp" ) + QLatin1String( "xauth-" ) + + QString::number( getuid()) + QLatin1String( "-" ) + QString::fromLocal8Bit( display ); + KSaveFile xauthfile( xauth ); + QFile xauthfrom( QFile::decodeName( qgetenv( "XAUTHORITY" ))); + if( !xauthfrom.open( QFile::ReadOnly ) || !xauthfile.open( QFile::WriteOnly ) + || xauthfile.write( xauthfrom.readAll()) != xauthfrom.size() || !xauthfile.finalize()) { + xauthfile.abort(); + } else { + setenv( "XAUTHORITY", QFile::encodeName( xauth ), true ); + } + } } // Borrowed from kdebase/kaudio/kaudioserver.cpp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 autoconf-archive for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package autoconf-archive for openSUSE:Factory checked in at Thu Mar 24 17:42:03 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/autoconf-archive/autoconf-archive.changes 2011-03-23 16:25:05.000000000 +0100 @@ -0,0 +1,25 @@ +------------------------------------------------------------------- +Wed Mar 23 14:56:40 CET 2011 - pth(a)suse.de + +- Newer autoconfs produce wrong code if code snippets consist + only of coments, so fix ax_have_qt.m4 accordingly. +- Use AS_HELP_STRING in ax_have_qt.m4. +- Remove spurious semicolon from AC_MSG_RESULT call. + +------------------------------------------------------------------- +Thu Nov 25 11:57:57 CET 2010 - pth(a)suse.de + +- Move the lib64 patch from boost here. This sets lib64 also for + ppc64 and s390x. + +------------------------------------------------------------------- +Wed Nov 24 14:58:12 CET 2010 - sbrabec(a)suse.cz + +- Updated to the latest release 2010.10.26. + +------------------------------------------------------------------- +Tue Jun 8 15:04:56 CEST 2010 - pth(a)suse.de + +- Initial openSUSE package. + + calling whatdependson for head-i586 New: ---- autoconf-archiv-no_semicolon.patch autoconf-archive-2010.10.26.tar.xz autoconf-archive-boost_lib64.patch autoconf-archive-fix_AX_HAVE_QT.patch autoconf-archive.changes autoconf-archive.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoconf-archive.spec ++++++ # # spec file for package autoconf-archive # # Copyright (c) 2011 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: autoconf-archive Summary: A Collection of macros for GNU autoconf Version: 2010.10.26 Release: 1 License: GPL Group: Development/Tools/Building Source0: %{name}-%{version}.tar.xz Patch0: autoconf-archive-boost_lib64.patch Patch1: autoconf-archive-fix_AX_HAVE_QT.patch Patch2: autoconf-archiv-no_semicolon.patch Url: http://savannah.gnu.org/projects/autoconf-archive BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: xz BuildArch: noarch Requires(pre): info %description The GNU Autoconf Archive is a collection of more than 450 macros for `GNU Autoconf <http://www.gnu.org/software/autoconf>`_ that have been contributed as free software by friendly supporters of the cause from all over the Internet. Every single one of those macros can be re-used without imposing any restrictions whatsoever on the licensing of the generated `configure` script. In particular, it is possible to use all those macros in `configure` scripts that are meant for non-free software. This policy is unusual for a Free Software Foundation project. The FSF firmly believes that software ought to be free, and software licenses like the GPL are specifically designed to ensure that derivative work based on free software must be free as well. In case of Autoconf, however, an exception has been made, because Autoconf is at such a pivotal position in the software development tool chain that the benefits from having this tool available as widely as possible outweigh the disadvantage that some authors may choose to use it, too, for proprietary software. %prep %setup -q %patch0 %patch1 %patch2 %build %configure %install %makeinstall rm -rf %{buildroot}/%{_datadir}/%{name}/ %clean rm -rf %{buildroot} %post %install_info --info-dir=%{_infodir} %{_infodir}/autoconf-archive.info.gz %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/autoconf-archive.info.gz %files %defattr(-, root, root) %{_infodir}/%{name}* %{_datadir}/aclocal/*.m4 %doc AUTHORS COPYING README %changelog ++++++ autoconf-archiv-no_semicolon.patch ++++++ Index: m4/ax_have_qt.m4 =================================================================== --- m4/ax_have_qt.m4.orig 2011-03-23 16:04:57.000000000 +0100 +++ m4/ax_have_qt.m4 2011-03-23 16:05:47.721475469 +0100 @@ -324,7 +324,7 @@ EOF fi fi ])dnl AC_CACHE_VAL ax_cv_qt_test_result - AC_MSG_RESULT([$ax_cv_qt_test_result]); + AC_MSG_RESULT([$ax_cv_qt_test_result]) if test x"$ax_cv_qt_test_result" = "xfailure"; then AC_MSG_ERROR([Failed to find matching components of a complete Qt installation. Try using more options, ++++++ autoconf-archive-boost_lib64.patch ++++++ Index: m4/ax_boost_base.m4 =================================================================== --- m4/ax_boost_base.m4.orig 2010-08-19 00:00:00.000000000 +0200 +++ m4/ax_boost_base.m4 2010-08-26 17:53:43.000000000 +0200 @@ -84,15 +84,18 @@ if test "x$want_boost" = "xyes"; then AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req) succeeded=no - dnl On x86_64 systems check for system libraries in both lib64 and lib. + dnl On x86_64, ppc64 and s390x systems check for system libraries in both lib64 and lib. dnl The former is specified by FHS, but e.g. Debian does not adhere to dnl this (as it rises problems for generic multi-arch support). dnl The last entry in the list is chosen by default when no libraries dnl are found, e.g. when only header-only libraries are installed! + libsubdirs="lib" - if test `uname -m` = x86_64; then - libsubdirs="lib64 lib lib64" - fi + case `uname -m` in + x86_64 | ppc64 | s390x) + libsubdirs="lib64 lib lib64" + ;; + esac dnl first we check the system location for boost libraries dnl this location ist chosen if boost libraries are installed with the --layout=system option ++++++ autoconf-archive-fix_AX_HAVE_QT.patch ++++++ - Newer autoconfs get confused by code snippets that consist only of comments. - Use AS_HELP_STRING to format help messages. signed-off-by: pth(a)suse.de Index: m4/ax_have_qt.m4 =================================================================== --- m4/ax_have_qt.m4.orig 2010-10-26 00:00:00.000000000 +0200 +++ m4/ax_have_qt.m4 2011-03-23 14:53:45.959051749 +0100 @@ -101,20 +101,24 @@ AC_DEFUN([AX_HAVE_QT], AC_MSG_CHECKING(for Qt) AC_ARG_WITH([Qt-dir], - [ --with-Qt-dir=DIR DIR is equal to $QTDIR if you have followed the - installation instructions of Trolltech. Header - files are in DIR/include, binary utilities are - in DIR/bin. The library is in DIR/lib, unless - --with-Qt-lib-dir is also set.]) + AS_HELP_STRING([--with-Qt-dir=DIR], + [DIR is equal to $QTDIR if you have followed the + installation instructions of Trolltech. Header + files are in DIR/include, binary utilities are + in DIR/bin. The library is in DIR/lib, unless + --with-Qt-lib-dir is also set.])) AC_ARG_WITH([Qt-include-dir], - [ --with-Qt-include-dir=DIR - Qt header files are in DIR]) + AS_HELP_STRING([--with-Qt-include-dir=DIR], + [Qt header files are in DIR])) AC_ARG_WITH([Qt-bin-dir], - [ --with-Qt-bin-dir=DIR Qt utilities such as moc and uic are in DIR]) + AS_HELP_STRING([--with-Qt-bin-dir=DIR], + [Qt utilities such as moc and uic are in DIR])) AC_ARG_WITH([Qt-lib-dir], - [ --with-Qt-lib-dir=DIR The Qt library is in DIR]) + AS_HELP_STRING([--with-Qt-lib-dir=DIR], + [The Qt library is in DIR])) AC_ARG_WITH([Qt-lib], - [ --with-Qt-lib=LIB Use -lLIB to link with the Qt library]) + AS_HELP_STRING([--with-Qt-lib=LIB], + [Use -lLIB to link with the Qt library])) if test x"$with_Qt_dir" = x"no" || test x"$with_Qt_include-dir" = x"no" || test x"$with_Qt_bin_dir" = x"no" || @@ -494,7 +498,6 @@ AC_DEFUN([AX_PATH_QT_DIRECT], # We can link with no special library directory. ax_qt_lib_dir= ], [ - # Leave ax_qt_lib_dir defined ]) ]) ]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 thunar-plugin-vcs for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package thunar-plugin-vcs for openSUSE:Factory checked in at Thu Mar 24 17:40:56 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/thunar-plugin-vcs/thunar-plugin-vcs.changes 2011-03-24 00:47:34.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Wed Mar 23 18:48:45 UTC 2011 - gber(a)opensuse.org + +- new package + calling whatdependson for head-i586 New: ---- thunar-plugin-vcs.changes thunar-plugin-vcs.spec thunar-vcs-plugin-0.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thunar-plugin-vcs.spec ++++++ # # spec file for package thunar-plugin-vcs # # Copyright (c) 2011 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/ # %define thunar_version 1.2.0 %define plugin_name thunar-vcs-plugin Name: thunar-plugin-vcs Group: System/GUI/XFCE Url: http://thunar.xfce.org/plugins.html#thunar-archive-plugin License: GPLv2+ Version: 0.1.4 Release: 1 Source0: %{plugin_name}-%{version}.tar.bz2 Summary: Thunar Plugin Providing VCS Integration BuildRequires: intltool BuildRequires: thunar-devel >= %{thunar_version} BuildRequires: pkgconfig(thunarx-2) Requires: thunar >= %{thunar_version} Provides: %{plugin_name} = %{version} Obsoletes: %{plugin_name} < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The Thunar VCS Plugin provides integration with Subversion and GIT VCS and makes VCS actions available through the context menu. %lang_package %prep %setup -q -n %{plugin_name}-%{version} modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" TIME="\"$(date -d "${modified}" "+%%R")\"" find . -name '*.[ch]' |\ xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" %build %configure --disable-static make %{?_smp_mflags} V=1 %install %make_install # remove unsupported locales rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %find_lang %{plugin_name} rm -f %{buildroot}%{_libdir}/thunarx-2/thunar-vcs-plugin.la %clean rm -rf "%{buildroot}" %if 0%{?suse_version} >= 1140 %post %icon_theme_cache_post %postun %icon_theme_cache_postun %endif %files %defattr(-,root,root) %{_libexecdir}/tvp-git-helper %{_libdir}/thunarx-2/thunar-vcs-plugin.so %{_datadir}/icons/hicolor/*/apps/git.png %{_datadir}/icons/hicolor/*/apps/subversion.png %files lang -f %{plugin_name}.lang %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 cpanspec for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package cpanspec for openSUSE:Factory checked in at Thu Mar 24 17:39:46 CET 2011. -------- --- cpanspec/cpanspec.changes 2011-02-01 14:19:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/cpanspec/cpanspec.changes 2011-02-20 02:02:20.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Feb 20 00:39:36 UTC 2011 - chris(a)computersalat.de + +- fix some perl errors + o cpanspec Cpan-Name + o cpanspec Cpan::Name + o cpanspec Cpan-Name-{version}.tar.gz + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cpanspec.spec ++++++ --- /var/tmp/diff_new_pack.q9B7rV/_old 2011-03-24 17:39:33.000000000 +0100 +++ /var/tmp/diff_new_pack.q9B7rV/_new 2011-03-24 17:39:33.000000000 +0100 @@ -20,7 +20,7 @@ Name: cpanspec Version: 1.78 -Release: 4 +Release: 19 %define tar_version 1.78 Summary: Generate a SUSE spec file for a CPAN module License: GPL+ or Artistic ++++++ cpanspec.patch ++++++ --- /var/tmp/diff_new_pack.q9B7rV/_old 2011-03-24 17:39:33.000000000 +0100 +++ /var/tmp/diff_new_pack.q9B7rV/_new 2011-03-24 17:39:33.000000000 +0100 @@ -1,6 +1,6 @@ diff -ruN cpanspec-1.78-orig/cpanspec cpanspec-1.78/cpanspec --- cpanspec-1.78-orig/cpanspec 2009-01-16 21:35:55.000000000 +0100 -+++ cpanspec-1.78/cpanspec 2011-02-01 14:18:48.000000000 +0100 ++++ cpanspec-1.78/cpanspec 2011-02-20 01:55:34.000000000 +0100 @@ -12,9 +12,6 @@ # # $Id: cpanspec,v 1.67 2009/01/16 20:35:17 stevenpritchard Exp $ @@ -115,12 +115,12 @@ + my ($m,$d); + if ($m=$packages->package($file) and $d=$m->distribution()) { + $source=$cpan . "/authors/id/" . $d->prefix(); ++ $source=~s/$version/\%{version}/; + } else { + warn "Failed to parse '$file' or find a module by that name in $pkgdetails, skipping...\n"; + $source=''; + return; + } -+ $source=~s/$version/\%{version}/; +} + sub build_rpm($) { @@ -250,7 +250,8 @@ } + return $summary="$mod Perl module"; +} -+ + +- return(undef, undef); +sub get_author($) { + my $cont = shift; + my @lines=(); @@ -275,8 +276,7 @@ + } + + $author = join "\n", @lines; - -- return(undef, undef); ++ + # return... + return $author; + } @@ -439,15 +439,21 @@ my @doc=sort { $a cmp $b } grep { !/\// -@@ -722,6 +784,7 @@ +@@ -722,17 +784,22 @@ and $_ ne "MANIFEST.SKIP" and $_ ne "INSTALL" and $_ ne "SIGNATURE" + and $_ ne "META.json" and $_ ne "META.yml" and $_ ne "NINJA" ++ and $_ ne "c" and $_ ne "configure" -@@ -733,6 +796,8 @@ + and $_ ne "config.guess" + and $_ ne "config.sub" ++ and $_ ne "dist.ini" + and $_ ne "typemap" + and $_ ne "bin" + and $_ ne "lib" and $_ ne "t" and $_ ne "inc" and $_ ne "autobuild.sh" @@ -456,7 +462,7 @@ and $_ ne "pm_to_blib" and $_ ne "install.sh" } @files; -@@ -947,45 +1012,61 @@ +@@ -947,45 +1014,63 @@ } print $spec <<END; @@ -503,8 +509,9 @@ +Source: \%{cpan_name}-\%{version}.tar$ext END - -- printf $spec "%-16s%s\n", "BuildArch:", "noarch" if ($noarch); -- + printf $spec "%-16s%s\n", "BuildArch:", "noarch" if ($noarch); ++ print $spec "BuildRoot: \%{_tmppath}/\%{name}-\%{version}-build\n"; + - if (defined($requires{perl})) { - $build_requires{perl}=$build_requires{perl} || $requires{perl}; - delete $requires{perl}; @@ -515,12 +522,11 @@ - (($build_requires{perl} lt "5.6.0" ? "0:" : "1:") - . $build_requires{perl}) if $build_requires{perl}; - delete $build_requires{perl}; -+ -+ push(@add_buildrequires, "perl"); -+ push(@add_buildrequires, "perl-macros"); ++ printf $spec "%-16s%s\n", "BuildRequires:", "perl"; + if ($usebuildpl) { -+ push(@add_buildrequires, "perl(Module::Build)"); ++ printf $spec "%-16s%s\n", "BuildRequires:", "perl(Module::Build)"; } ++ printf $spec "%-16s%s\n", "BuildRequires:", "perl-macros"; for my $dep (keys(%requires)) { + next if ($dep eq 'perl'); @@ -537,7 +543,7 @@ if (check_dep($dep)) { verbose("$dep is available, skipping."); } else { -@@ -1000,11 +1081,12 @@ +@@ -1000,11 +1085,12 @@ print $spec "\n"; } @@ -552,7 +558,7 @@ next if (!$compat and exists($corelist{$dep})); printf $spec "%-16s%s", "Requires:", "perl($dep)"; print $spec (" >= " . $requires{$dep}) if ($requires{$dep}); -@@ -1015,11 +1097,6 @@ +@@ -1015,11 +1101,6 @@ printf $spec "%-16s%s\n", "Requires:", $dep; } @@ -564,12 +570,10 @@ for my $prov (@add_provides) { printf $spec "%-16s%s\n", "Provides:", $prov; -@@ -1043,7 +1120,12 @@ +@@ -1043,7 +1124,10 @@ END } -+ print $spec "BuildRoot: \%{_tmppath}/\%{name}-\%{version}-build\n"; -+ printf $spec "%-16s%s\n", "BuildArch:", "noarch" if ($noarch); + print $spec "%{perl_requires}\n"; + my $buildpath=$path; @@ -577,7 +581,7 @@ $buildpath=~s/$version/\%{version}/; print $spec <<END; -@@ -1085,7 +1167,8 @@ +@@ -1085,7 +1169,8 @@ if ($usebuildpl) { print $spec <<END; \%{__perl} Build.PL installdirs=vendor@{[$noarch ? '' : qq{ optimize="$macro{optimize}"} ]} @@ -587,7 +591,7 @@ END } else { print $spec <<END; -@@ -1097,15 +1180,24 @@ +@@ -1097,15 +1182,24 @@ if ($compat and !$noarch); print $spec <<END; @@ -615,7 +619,7 @@ END if ($usebuildpl) { -@@ -1113,24 +1205,12 @@ +@@ -1113,24 +1207,12 @@ "./Build install destdir=$macro{buildroot} create_packlist=0\n"; } else { print $spec <<END; @@ -644,7 +648,7 @@ if ($addlicense and !grep /copying|artistic|copyright|license/i, @doc) { print $spec <<END; -@@ -1143,43 +1223,25 @@ +@@ -1143,43 +1225,27 @@ } print $spec <<END; @@ -669,8 +673,10 @@ -\%doc @doc +\%files -f \%{name}.files END -+ print $spec "\%defattr(644,root,root,755)\n"; -+ print $spec "%doc @doc\n" if (@doc); ++ if (@doc) { ++ print $spec "\%defattr(644,root,root,755)\n"; ++ print $spec "%doc @doc\n"; ++ } if ($scripts) { print $spec "\%{_bindir}/*\n"; @@ -692,7 +698,7 @@ END $spec->close(); -@@ -1187,6 +1249,11 @@ +@@ -1187,6 +1253,11 @@ build_rpm($specfile) if ($buildsrpm or $buildrpm); push(@processed, $module); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-Net-Netmask for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package perl-Net-Netmask for openSUSE:Factory checked in at Thu Mar 24 17:39:18 CET 2011. -------- --- perl-Net-Netmask/perl-Net-Netmask.changes 2010-12-01 14:51:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Net-Netmask/perl-Net-Netmask.changes 2011-03-24 14:37:28.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Mar 24 13:25:11 UTC 2011 - vcizek(a)novell.com + +- update to 1.9016 +Fix bug rt#46996: warnings issued for bad input. +Fix bug rt#43348: use POSIX::floor() instead of int() +Rewrite netmask.t to use Test::More + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Net-Netmask-1.9015.tar.bz2 New: ---- Net-Netmask-1.9016.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Net-Netmask.spec ++++++ --- /var/tmp/diff_new_pack.xqvhKY/_old 2011-03-24 17:38:53.000000000 +0100 +++ /var/tmp/diff_new_pack.xqvhKY/_new 2011-03-24 17:38:53.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-Net-Netmask (Version 1.9015) +# spec file for package perl-Net-Netmask # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,8 +19,8 @@ Name: perl-Net-Netmask -Version: 1.9015 -Release: 113 +Version: 1.9016 +Release: 1 Provides: perl_nm Obsoletes: perl_nm AutoReqProv: on @@ -49,6 +49,8 @@ %build perl Makefile.PL make %{?_smp_mflags} + +%check make test %install ++++++ Net-Netmask-1.9015.tar.bz2 -> Net-Netmask-1.9016.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-Netmask-1.9015/CHANGELOG new/Net-Netmask-1.9016/CHANGELOG --- old/Net-Netmask-1.9015/CHANGELOG 2006-11-30 23:06:09.000000000 +0100 +++ new/Net-Netmask-1.9016/CHANGELOG 2011-02-01 14:58:01.000000000 +0100 @@ -1,3 +1,10 @@ + += 2011/03/22 1.9016 + +Fix bug #46996: warnings issued for bad input. +Fix bug #43348: use POSIX::floor() instead of int() +Rewrite netmask.t to use Test::More + = 2006/11/30 1.9015 Fix bug # 22662 reported by grjones at gmail: cidrs2inverse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-Netmask-1.9015/META.yml new/Net-Netmask-1.9016/META.yml --- old/Net-Netmask-1.9015/META.yml 2006-11-30 23:06:29.000000000 +0100 +++ new/Net-Netmask-1.9016/META.yml 2011-02-01 15:00:22.000000000 +0100 @@ -1,10 +1,21 @@ -# http://module-build.sourceforge.net/META-spec.html -#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# -name: Net-Netmask -version: 1.9015 -version_from: Netmask.pm -installdirs: site -requires: - -distribution_type: module -generated_by: ExtUtils::MakeMaker version 6.21 +--- #YAML:1.0 +name: Net-Netmask +version: 1.9016 +abstract: Understand and manipulate IP netmaks +author: + - David Muir Sharnoff <muir(a)idiom.org> +license: unknown +distribution_type: module +configure_requires: + ExtUtils::MakeMaker: 0 +build_requires: + ExtUtils::MakeMaker: 0 +requires: {} +no_index: + directory: + - t + - inc +generated_by: ExtUtils::MakeMaker version 6.56 +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-Netmask-1.9015/Makefile.PL new/Net-Netmask-1.9016/Makefile.PL --- old/Net-Netmask-1.9015/Makefile.PL 1999-06-16 08:17:01.000000000 +0200 +++ new/Net-Netmask-1.9016/Makefile.PL 2008-04-01 01:00:30.000000000 +0200 @@ -8,7 +8,7 @@ 'VERSION_FROM' => 'Netmask.pm', ($] >= 5.005 ? ('ABSTRACT' => 'Understand and manipulate IP netmaks', - 'AUTHOR' => 'David Muir Sharnoff <muir(a)idiom.com>') : ()), + 'AUTHOR' => 'David Muir Sharnoff <muir(a)idiom.org>') : ()), 'dist' => {COMPRESS=>'gzip', SUFFIX=>'gz'} ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-Netmask-1.9015/Netmask.pm new/Net-Netmask-1.9016/Netmask.pm --- old/Net-Netmask-1.9015/Netmask.pm 2006-11-30 23:03:06.000000000 +0100 +++ new/Net-Netmask-1.9016/Netmask.pm 2011-02-01 14:53:06.000000000 +0100 @@ -1,9 +1,9 @@ -# Copyright (C) 1998-2006, David Muir Sharnoff <muir(a)idiom.com> +# Copyright (C) 1998-2006, David Muir Sharnoff <muir(a)idiom.org> package Net::Netmask; use vars qw($VERSION); -$VERSION = 1.9015; +$VERSION = 1.9016; require Exporter; @ISA = qw(Exporter); @@ -28,6 +28,7 @@ use strict; use warnings; use Carp; +use POSIX qw(floor); use overload '""' => \&desc, '<=>' => \&cmp_net_netmask_block, @@ -220,7 +221,7 @@ { my ($this) = @_; my $ibase = $this->{'IBASE'}; - my $blocks = int($this->size()/256); + my $blocks = floor($this->size()/256); return (join('.',unpack('xC3', pack('V', $ibase))).".in-addr.arpa", $ibase%256, $ibase%256+$this->size()-1) if $blocks == 0; my @ary; @@ -297,6 +298,7 @@ $t = $remembered unless $t; my $ip = quad2int($ipquad); + return unless defined $ip; my %done; for (my $b = 32; $b >= 0; $b--) { @@ -462,7 +464,7 @@ my @result; while ($end >= $start) { my $maxsize = imaxblock($start, 32); - my $maxdiff = 32 - int(log($end - $start + 1)/log(2)); + my $maxdiff = 32 - floor(log($end - $start + 1)/log(2)); $maxsize = $maxdiff if $maxsize < $maxdiff; push (@result, bless { 'IBASE' => $start, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-Netmask-1.9015/Netmask.pod new/Net-Netmask-1.9016/Netmask.pod --- old/Net-Netmask-1.9015/Netmask.pod 2006-10-14 05:18:36.000000000 +0200 +++ new/Net-Netmask-1.9016/Netmask.pod 2011-02-01 14:25:58.000000000 +0100 @@ -436,12 +436,10 @@ =head1 LICENSE -Copyright (C) 1998-2006 David Muir Sharnoff. License hereby -granted for anyone to use, modify or redistribute this module at -their own risk. Please feed useful changes back to <muir(a)idiom.com>. +Copyright (C) 1998-2006 David Muir Sharnoff. + +Copyright (C) 2011 Google, Inc. + +This module may be used, modified and redistributed on the same +terms as Perl itself. -If you found this module useful, please thank me (the author) by -giving me a chance to bid to provide your next high-speed Internet -link. I run multiple ISPs and can generally save you money and -provide a top-notch service for your T1s, T3s, OC3s, etc. Please -send your request to <muir(a)idiom.com>. Thank you. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-Netmask-1.9015/README new/Net-Netmask-1.9016/README --- old/Net-Netmask-1.9015/README 2006-10-14 05:20:31.000000000 +0200 +++ new/Net-Netmask-1.9016/README 2011-02-01 14:30:31.000000000 +0100 @@ -382,13 +382,10 @@ Overlapping blocks will be collapsed. LICENSE - Copyright (C) 1998-2006 David Muir Sharnoff. License hereby granted for - anyone to use, modify or redistribute this module at their own risk. - Please feed useful changes back to <muir(a)idiom.com>. + Copyright (C) 1998-2006 David Muir Sharnoff. - If you found this module useful, please thank me (the author) by giving - me a chance to bid to provide your next high-speed Internet link. I run - multiple ISPs and can generally save you money and provide a top-notch - service for your T1s, T3s, OC3s, etc. Please send your request to - <muir(a)idiom.com>. Thank you. + Copyright (C) 2011 Google, Inc. + + This module may be used, modified and redistributed on the same terms as + Perl itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-Netmask-1.9015/t/netmasks.t new/Net-Netmask-1.9016/t/netmasks.t --- old/Net-Netmask-1.9015/t/netmasks.t 2006-11-30 23:05:03.000000000 +0100 +++ new/Net-Netmask-1.9016/t/netmasks.t 2011-02-01 14:53:27.000000000 +0100 @@ -1,11 +1,10 @@ #!/usr/bin/perl -I. -w -print "1..282\n"; - use Net::Netmask; use Net::Netmask qw(sameblock cmpblocks); use Carp; use Carp qw(verbose); +use Test::More tests => 295; # addr mask base newmask bits mb my @rtests = qw( @@ -20,11 +19,13 @@ 10/8 u 10.0.0.0 255.0.0.0 8 7 209.157.64/19 u 209.157.64.0 255.255.224.0 19 18 209.157.64.0-209.157.95.255 u 209.157.64.0 255.255.224.0 19 18 + 216.140.48.16/32 u 216.140.48.16 255.255.255.255 32 28 209.157/17 u 209.157.0.0 255.255.128.0 17 16 default u 0.0.0.0 0.0.0.0 0 0 ); push(@rtests, '209.157.68.22#0.0.31.255', 'u', '209.157.64.0', '255.255.224.0', '19', '18'); + my @store = qw( 209.157.64.0/19 default @@ -54,129 +55,122 @@ ); my $debug = 0; -my $test = 1; my $x; my ($addr, $mask, $base, $newmask, $bits, $max); while (($addr, $mask, $base, $newmask, $bits, $max) = splice(@rtests, 0, 6)) { + + print "# $addr $mask $base $newmask $bits $max\n"; + $mask = undef if $mask eq 'u'; $x = new Net::Netmask ($addr, $mask); - printf STDERR "test $test, %s %s: %s %s %d %d\n", - $addr, $mask, $x->base(), $x->mask(), - $x->bits(), $x->maxblock() if $debug; - - print $x->base() eq $base ? "ok $test\n" : "not ok $test\n"; $test++; - print $x->mask() eq $newmask ? "ok $test\n" : "not ok $test\n"; $test++; - print $x->maxblock() == $max ? "ok $test\n" : "not ok $test\n"; $test++; - print $x->bits() == $bits ? "ok $test\n" : "not ok $test\n"; $test++; + is($x->base(), $base, "base of $addr"); + is($x->mask(), $newmask, "mask of $addr"); + is($x->maxblock(), $max, "maxblock of $addr"); + is($x->bits(), $bits, "bits of $addr"); } my @y; $x = new Net::Netmask ('209.157.64.0/19'); -print $x->size() == 8192 ? "ok $test\n" : "not ok $test\n"; $test++; - -print $x->hostmask() eq '0.0.31.255' ? "ok $test\n" : "not ok $test\n"; $test++; +is($x->size(), 8192, "size of 209.157.64.0/19"); +is($x->hostmask(), '0.0.31.255', "hostmask of 209.157.64.0/19"); @y = $x->inaddr(); -print STDERR "REVERSE: @y\n" if $debug; -print $y[0] eq '64.157.209.in-addr.arpa' - ? "ok $test\n" : "not ok $test\n"; $test++; -print $y[31*3] eq '95.157.209.in-addr.arpa' - ? "ok $test\n" : "not ok $test\n"; $test++; -print defined($y[32*3]) ? "not ok $test\n" : "ok $test\n"; $test++; +print "# REVERSE: @y\n"; +is ($y[0], '64.157.209.in-addr.arpa'); +is ($y[31*3], '95.157.209.in-addr.arpa'); +ok(! defined($y[32*3])); $x = new Net::Netmask ('140.174.82.4/32'); -print $x->size() == 1 ? "ok $test\n" : "not ok $test\n"; $test++; +is($x->size(), 1, "size of 140.174.82.4/32"); # perl bug: cannot just print this. -my $p = ($x->inaddr())[0] eq '82.174.140.in-addr.arpa' - ? "ok $test\n" - : "not ok $test\n"; -print $p; -printf STDERR "REVERSE$test %s\n", $x->inaddr() if $debug; -$test++; +is(($x->inaddr())[0], '82.174.140.in-addr.arpa'); $x = new Net::Netmask ('140.174.82.64/27'); -print (($x->inaddr())[1] == 64 ? "ok $test\n" : "not ok $test\n"); $test++; -print (($x->inaddr())[2] == 95 ? "ok $test\n" : "not ok $test\n"); $test++; -@y = $x->inaddr(); -print STDERR "Y$test @y\n" if $debug; +is(($x->inaddr())[1], 64); +is(($x->inaddr())[2], 95); $x = new Net::Netmask ('default'); -print $x->size() == 4294967296 ? "ok $test\n" : "not ok $test\n"; $test++; +ok($x->size() == 4294967296); $x = new Net::Netmask ('209.157.64.0/27'); @y = $x->enumerate(); -print $y[0] eq '209.157.64.0' ? "ok $test\n" : "not ok $test\n"; $test++; -print $y[31] eq '209.157.64.31' ? "ok $test\n" : "not ok $test\n"; $test++; -print defined($y[32]) ? "not ok $test\n" : "ok $test\n"; $test++; +is($y[0], '209.157.64.0'); +is($y[31], '209.157.64.31'); +ok(! defined($y[32])); $x = new Net::Netmask ('10.2.0.16/19'); @y = $x->enumerate(); -print $y[0] eq '10.2.0.0' ? "ok $test\n" : "not ok $test\n"; $test++; -print $y[8191] eq '10.2.31.255' ? "ok $test\n" : "not ok $test\n"; $test++; -print defined($y[8192]) ? "not ok $test\n" : "ok $test\n"; $test++; +is($y[0], '10.2.0.0'); +is($y[8191], '10.2.31.255'); +ok(! defined($y[8192])); my $table = {}; my $table9 = {}; -for my $b (@store) { - $x = new Net::Netmask ($b); - $x->storeNetblock(); +{ + for my $b (@store) { + $x = new Net::Netmask ($b); + $x->storeNetblock(); + } } -for my $b (@store2) { - $x = new Net::Netmask ($b); - $x->storeNetblock($table); - $x->storeNetblock($table9); +{ + for my $b (@store2) { + $x = new Net::Netmask ($b); + $x->storeNetblock($table); + $x->storeNetblock($table9); + } } my $result; while (($addr, $result) = splice(@lookup, 0, 2)) { my $nb = findNetblock($addr); - printf STDERR "lookup(%s): %s, wanting %s.\n", - $addr, $nb->desc(), $result if $debug; - print $nb->desc() eq $result ? "ok $test\n" : "not ok $test\n"; $test++; + printf "# lookup(%s): %s, wanting %s.\n", $addr, $nb->desc(), $result; + is($nb->desc(), $result, "$addr / $result"); } while (($addr, $result) = splice(@lookup2, 0, 2)) { my $nb = findNetblock($addr, $table); - printf STDERR "lookup(%s): %s, wanting %s.\n", - $addr, $nb->desc(), $result if $debug; - print $nb->desc() eq $result ? "ok $test\n" : "not ok $test\n"; $test++; + printf "# lookup(%s): %s, wanting %s.\n", + $addr, $nb->desc(), $result; + is($nb->desc(), $result, "$addr / $result"); } $newmask = Net::Netmask->new("192.168.1.0/24"); -print (($newmask->broadcast() eq "192.168.1.255") ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->next() eq "192.168.2.0") ? "ok $test\n" : "not ok $test\n"); $test++; -print ($newmask->match("192.168.0.255") ? "not ok $test\n" : "ok $test\n"); $test++; -print ($newmask->match("192.168.2.0") ? "not ok $test\n" : "ok $test\n"); $test++; -print ($newmask->match("10.168.2.0") ? "not ok $test\n" : "ok $test\n"); $test++; -print ($newmask->match("209.168.2.0") ? "not ok $test\n" : "ok $test\n"); $test++; -print ($newmask->match("192.168.1.0") ? "ok $test\n" : "not ok $test\n"); $test++; -print ($newmask->match("192.168.1.255") ? "ok $test\n" : "not ok $test\n"); $test++; -print ($newmask->match("192.168.1.63") ? "ok $test\n" : "not ok $test\n"); $test++; - -print (($newmask->nth(1) eq '192.168.1.1') ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->nth(-1) eq '192.168.1.255') ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->nth(-2) eq '192.168.1.254') ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->nth(0) eq '192.168.1.0') ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->match('192.168.1.1') == 1) ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->match('192.168.1.100') == 100) ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->match('192.168.1.255') == 255) ? "ok $test\n" : "not ok $test\n"); $test++; - -print (($newmask->match('192.168.2.1') == 0) ? "ok $test\n" : "not ok $test\n"); $test++; -print (!($newmask->match('192.168.2.1')) ? "ok $test\n" : "not ok $test\n"); $test++; -print (((0+$newmask->match('192.168.1.0')) == 0) ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->match('192.168.1.0')) ? "ok $test\n" : "not ok $test\n"); $test++; +is($newmask->broadcast(), "192.168.1.255"); +is($newmask->next(), "192.168.2.0"); +ok($newmask->match("192.168.1.0")); +ok($newmask->match("192.168.1.255")); +ok($newmask->match("192.168.1.63")); + +ok(! $newmask->match("192.168.0.255")); +ok(! $newmask->match("192.168.2.0")); +ok(! $newmask->match("10.168.2.0")); +ok(! $newmask->match("209.168.2.0")); + +is($newmask->nth(1),'192.168.1.1'); +is($newmask->nth(-1),'192.168.1.255'); +is($newmask->nth(-2),'192.168.1.254'); +is($newmask->nth(0),'192.168.1.0'); + +ok($newmask->match('192.168.1.1') == 1); +ok($newmask->match('192.168.1.100') == 100); +ok($newmask->match('192.168.1.255') == 255); + +ok(($newmask->match('192.168.2.1') == 0)); +ok(!($newmask->match('192.168.2.1'))); +ok(((0+$newmask->match('192.168.1.0')) == 0)); +ok(($newmask->match('192.168.1.0'))); my $bks; $block = new Net::Netmask '209.157.64.1/32'; $block->storeNetblock($bks); -print findNetblock('209.157.64.1',$bks) ? "ok $test\n" : "not ok $test\n"; $test++; +ok(findNetblock('209.157.64.1',$bks)); my @store3 = qw( @@ -231,40 +225,37 @@ my ($table, $value, $result) = @_; my $found = findNetblock($value, $table); if ($result) { -#printf "value = $value eresult = $result found = @{[$found->desc]}\n"; - print (($found->desc eq $result) ? "ok $test\n" : "not ok $test\n"); + is($found->desc, $result, "value='$value' found=@{[$found->desc]}"); } else { - print ($found ? "not ok $test\n" : "ok $test\n"); + ok(! $found, $value); } - $test++; } sub fdel { my ($value, $result, $table) = @_; my $found = findNetblock($value, $table); #print "search for $value, found and deleting @{[ $found->desc ]} eq $result\n"; - print (($found->desc eq $result) ? "ok $test\n" : "not ok $test\n"); + is($found->desc, $result, "$value / $result"); $found->deleteNetblock($table); - $test++; } my (@c) = range2cidrlist("66.33.85.239", "66.33.85.240"); my $dl = dlist(@c); -print ($dl eq '66.33.85.239/32 66.33.85.240/32' ? "ok $test\n" : "not ok $test\n"); $test++; +ok($dl eq '66.33.85.239/32 66.33.85.240/32'); (@c) = range2cidrlist('216.240.32.128', '216.240.36.127'); $dl = dlist(@c); -print ($dl eq '216.240.32.128/25 216.240.33.0/24 216.240.34.0/23 216.240.36.0/25' ? "ok $test\n" : "not ok $test\n"); $test++; +ok($dl eq '216.240.32.128/25 216.240.33.0/24 216.240.34.0/23 216.240.36.0/25'); my @d; @d = (@c[0,1,3]); my (@e) = cidrs2contiglists(@d); -print (@e == 2 ? "ok $test\n" : "not ok $test\n"); $test++; +ok(@e == 2); -print (dlist(@{$e[0]}) eq '216.240.32.128/25 216.240.33.0/24' ? "ok $test\n" : "not ok $test\n"); $test++; -print (dlist(@{$e[1]}) eq '216.240.36.0/25' ? "ok $test\n" : "not ok $test\n"); $test++; +is(dlist(@{$e[0]}), '216.240.32.128/25 216.240.33.0/24'); +is(dlist(@{$e[1]}), '216.240.36.0/25'); sub dlist { @@ -308,59 +299,53 @@ my (@blist) = map { new Net::Netmask $_ } @iplist; my (@clist) = sort @blist; my (@sorted2) = map { $_->base() } @clist; - -if ($] < 5.006_001) { - print "ok $test # skip Overload not supported at $[\n"; $test++; -} else { - print ("@sorted1" eq "@sorted2" ? "ok $test\n" : "not ok $test\n"); $test++; -} - my (@dlist) = sort @blist; my (@sorted3) = map { $_->base() } @dlist; -if ($] < 5.006_001) { - print "ok $test # skip Overload not supported at $[\n"; $test++; -} else { - print "# AT TEST $test\n"; - print ("@sorted1" eq "@sorted3" ? "ok $test\n" : "not ok $test\n"); $test++; +SKIP: { + skip 2 if $] < 5.006_001; + is("@sorted1", "@sorted2"); + is("@sorted1", "@sorted3"); } my $q144 = new Net::Netmask '216.240.32.0/25'; for my $i (qw(216.240.32.0/24 216.240.32.0/26 216.240.33.0/25)) { my $q144p = new Net::Netmask $i; - print ($q144 eq $q144p ? "not ok $test\n" : "ok $test\n"); $test++; - print ($q144 == $q144p ? "not ok $test\n" : "ok $test\n"); $test++; - print (sameblock($q144, $i) ? "not ok $test\n" : "ok $test\n"); $test++; - print (cmpblocks($q144, $i) ? "ok $test\n" : "not ok $test\n"); $test++; - print ($q144->sameblock($i) ? "not ok $test\n" : "ok $test\n"); $test++; - print ($q144->cmpblocks($i) ? "ok $test\n" : "not ok $test\n"); $test++; + + print "# working on $i\n"; + ok (! ($q144 eq $q144p)); + ok (! ($q144 == $q144p)); + ok (! (sameblock($q144, $i))); + ok (! ($q144->sameblock($i))); + ok (cmpblocks($q144, $i)); + ok ($q144->cmpblocks($i)); } my $q144pp = new Net::Netmask '216.240.32.0/25'; -print ($q144 == $q144pp ? "ok $test\n" : "not ok $test\n"); $test++; -print ($q144 eq $q144pp ? "ok $test\n" : "not ok $test\n"); $test++; -print (sameblock($q144, '216.240.32.0/25') ? "ok $test\n" : "not ok $test\n"); $test++; -print (cmpblocks($q144, '216.240.32.0/25') ? "not ok $test\n" : "ok $test\n"); $test++; -print ($q144->sameblock('216.240.32.0/25') ? "ok $test\n" : "not ok $test\n"); $test++; -print ($q144->cmpblocks('216.240.32.0/25') ? "not ok $test\n" : "ok $test\n"); $test++; +ok (($q144 == $q144pp)); +ok (($q144 eq $q144pp)); +ok (($q144->desc eq "$q144")); +ok ($q144->sameblock('216.240.32.0/25')); +ok (sameblock($q144, '216.240.32.0/25')); + +ok (! (cmpblocks($q144, '216.240.32.0/25'))); +ok (! ($q144->cmpblocks('216.240.32.0/25'))); + -print ($q144->desc eq "$q144" ? "ok $test\n" : "not ok $test\n"); $test++; my $dnts = join(' ',dumpNetworkTable($table9)); -print ($dnts eq '0.0.0.0/0 209.157.64.0/19 209.157.80.0/24 209.157.81.16/28' ? "ok $test\n" : "not ok $test\n"); $test++; +is($dnts, '0.0.0.0/0 209.157.64.0/19 209.157.80.0/24 209.157.81.16/28'); sub lookouter { my ($table, $value, $result) = @_; my $found = findOuterNetblock($value, $table); if ($result) { -#printf "value = $value eresult = $result found = @{[$found->desc]}\n"; - print (($found->desc eq $result) ? "ok $test\n" : "not ok $test\n"); + is($found->desc, $result, "value = $value, result = $result"); } else { - print ($found ? "not ok $test\n" : "ok $test\n"); + ok(! $found, "value = $value"); } - $test++; } # 216.240.32.0/19 @@ -405,12 +390,10 @@ my $block = new2 Net::Netmask $value; my $found = findOuterNetblock($block, $table); if ($result) { -#printf "value = $value eresult = $result found = @{[$found->desc]}\n"; - print (($found->desc eq $result) ? "ok $test\n" : "not ok $test\n"); + is($found->desc, $result, "value = $value"); } else { - print ($found ? "not ok $test\n" : "ok $test\n"); + ok(! $found); } - $test++; } lookouterO($table7, "216.240.40.5/30", "216.240.32.0/19"); @@ -449,10 +432,10 @@ my $b = new Net::Netmask shift; print "# ctest($a, $b)\n"; - print ($a->contains($a) ? "ok $test\n" : "not ok $test\n"); $test++; - print ($b->contains($b) ? "ok $test\n" : "not ok $test\n"); $test++; - print ($a->contains($b) ? "ok $test\n" : "not ok $test\n"); $test++; - print (($a->sameblock($b) || ! $b->contains($a)) ? "ok $test\n" : "not ok $test\n"); $test++; + ok($a->contains($a)); + ok($b->contains($b)); + ok($a->contains($b)); + ok(($a->sameblock($b) || ! $b->contains($a))); } sub ctestno @@ -461,8 +444,8 @@ my $b = new Net::Netmask shift; print "# ctestno($a, $b)\n"; - print ($a->contains($b) ? "not ok $test\n" : "ok $test\n"); $test++; - print ($b->contains($a) ? "not ok $test\n" : "ok $test\n"); $test++; + ok (! $a->contains($b)); + ok (! $b->contains($a)); } ctest("10.20.30.0/24", "10.20.30.0/25"); @@ -486,23 +469,23 @@ (@c) = cidrs2cidrs(multinew(qw(216.240.32.0/25 216.240.32.128/25 216.240.33.0/25 216.240.34.0/24))); $dl = dlist(@c); -print ($dl eq '216.240.32.0/24 216.240.33.0/25 216.240.34.0/24' ? "ok $test\n" : "not ok $test\n"); $test++; +ok ($dl eq '216.240.32.0/24 216.240.33.0/25 216.240.34.0/24'); (@c) = cidrs2cidrs(multinew(qw(216.240.32.0/32 216.240.32.1/32 216.240.32.2/32 216.240.32.3/32 216.240.32.4/32))); $dl = dlist(@c); -print ($dl eq '216.240.32.0/30 216.240.32.4/32' ? "ok $test\n" : "not ok $test\n"); $test++; +ok ($dl eq '216.240.32.0/30 216.240.32.4/32'); (@c) = cidrs2cidrs(multinew(qw(216.240.32.64/28 216.240.32.0/25 216.240.32.128/25 216.240.33.0/25 216.240.34.0/24))); $dl = dlist(@c); -print ($dl eq '216.240.32.0/24 216.240.33.0/25 216.240.34.0/24' ? "ok $test\n" : "not ok $test\n"); $test++; +ok ($dl eq '216.240.32.0/24 216.240.33.0/25 216.240.34.0/24'); my $block = new Net::Netmask ('172.2.4.0', '255.255.255.0'); $table = {}; $block->storeNetblock($table); @b = findAllNetblock('172.2.4.1', $table); -print $#b == 0 ? "ok $test\n" : "not ok $test\n"; $test++; +ok( $#b == 0 ); $block->tag('a', 'b'); $block->tag('b', 'c'); @@ -511,34 +494,29 @@ $block->tag('d', 'x'); $block->tag('d'); -print $block->tag('a') eq 'b' ? "ok $test\n" : "not ok $test\n"; $test++; -print $block->tag('b') eq 'c' ? "ok $test\n" : "not ok $test\n"; $test++; -print(!defined($block->tag('c')) ? "ok $test\n" : "not ok $test\n"); $test++; -print $block->tag('d') eq 'x' ? "ok $test\n" : "not ok $test\n"; $test++; -print $block->tag('a') eq 'b' ? "ok $test\n" : "not ok $test\n"; $test++; +ok( $block->tag('a') eq 'b'); +ok( $block->tag('b') eq 'c'); +ok( !defined($block->tag('c'))); +ok( $block->tag('d') eq 'x'); +ok( $block->tag('a') eq 'b'); (@c) = cidrs2inverse('216.240.32.0/22', (multinew(qw(216.240.32.64/28 216.240.32.0/25 216.240.32.128/25 216.240.33.0/25 216.240.34.0/24)))); $dl = dlist(@c); -print ($dl eq '216.240.33.128/25 216.240.35.0/24' ? "ok $test\n" : "not ok $test\n"); $test++; +ok ($dl eq '216.240.33.128/25 216.240.35.0/24'); (@c) = cidrs2inverse('216.240.32.0/22', (multinew(qw(215.0.0.0/16 216.240.32.64/28 216.240.32.0/25 216.240.32.128/25 216.240.33.0/25 216.240.34.0/24 216.240.45.0/24)))); $dl = dlist(@c); -print ($dl eq '216.240.33.128/25 216.240.35.0/24' ? "ok $test\n" : "not ok $test\n"); $test++; +ok ($dl eq '216.240.33.128/25 216.240.35.0/24'); (@c) = cidrs2inverse('216.240.32.0/22', (multinew(qw(216.240.0.0/16 215.0.0.0/16 216.240.32.64/28 216.240.32.0/25 216.240.32.128/25 216.240.33.0/25 216.240.34.0/24 216.240.45.0/24)))); $dl = dlist(@c); -print ($dl eq '' ? "ok $test\n" : "not ok $test\n"); $test++; +ok ($dl eq ''); my $table77 = {}; my $block77 = new2 Net::Netmask("10.1.2.0/24", $table77); $block77->storeNetblock(); -if(defined(findNetblock("10.2.1.0", $table77))) { - print "not ok $test\n"; -} else { - print "ok $test\n"; -} -$test++; +ok(! defined(findNetblock("10.2.1.0", $table77))); { @@ -552,12 +530,7 @@ while (@t) { my $arg = shift(@t); my $result = shift(@t); - if ($b->nextblock($arg)."" eq $result) { - print "ok $test\n"; - } else { - print "not ok $test\n"; - } - $test++; + is($b->nextblock($arg)."", $result, "$result"); } } @@ -567,70 +540,61 @@ my $obj2 = new2 Net::Netmask ('1.0.0.4/32'); my @leftover = cidrs2inverse($obj1, $obj2); # print "leftover = @leftover\n"; - if (@leftover == 1 && "$leftover[0]" eq "1.0.0.5/32") { - print "ok $test\n"; - } else { - print "not ok $test\n"; - } - $test++; + ok(@leftover == 1); + ok("$leftover[0]" eq "1.0.0.5/32"); } { my $obj1 = new2 Net::Netmask ('1.0.0.4/32'); my $obj2 = new2 Net::Netmask ('1.0.0.0/8'); my @leftover = cidrs2inverse($obj1, $obj2); - if (@leftover) { - print "not ok $test # leftover = @leftover\n"; - } else { - print "ok $test\n"; - } - $test++; + ok(! @leftover, "@leftover"); } { my $obj1 = new2 Net::Netmask ('1.0.0.4/32'); my $obj2 = new2 Net::Netmask ('1.0.0.4/32'); my @leftover = cidrs2inverse($obj1, $obj2); - if (@leftover) { - print "not ok $test # leftover2 = @leftover\n"; - } else { - print "ok $test\n"; - } - $test++; + ok(! @leftover, "@leftover"); } { my $obj1 = new2 Net::Netmask ('1.0.0.4/32'); my $obj2 = new2 Net::Netmask ('1.0.0.6/32'); my @leftover = cidrs2inverse($obj1, $obj2); - if (@leftover == 1 && "$leftover[0]" eq '1.0.0.4/32') { - print "ok $test\n"; - } else { - print "not ok $test # leftover3 = @leftover\n"; - } - $test++; + ok(@leftover == 1); + ok("$leftover[0]" eq '1.0.0.4/32'); } { my $obj1 = new2 Net::Netmask ('1.0.0.4/31'); my $obj2 = new2 Net::Netmask ('1.0.0.5/32'); my @leftover = cidrs2inverse($obj1, $obj2); - if (@leftover == 1 && "$leftover[0]" eq '1.0.0.4/32') { - print "ok $test\n"; - } else { - print "not ok $test # leftover3 = @leftover\n"; - } - $test++; + ok(@leftover == 1); + ok("$leftover[0]" eq '1.0.0.4/32'); } { my $obj1 = new2 Net::Netmask ('1.0.0.4/31'); my $obj2 = new2 Net::Netmask ('1.0.0.4/32'); my @leftover = cidrs2inverse($obj1, $obj2); - if (@leftover == 1 && "$leftover[0]" eq '1.0.0.5/32') { - print "ok $test\n"; - } else { - print "not ok $test # leftover3 = @leftover\n"; - } - $test++; + ok(@leftover == 1); + ok("$leftover[0]" eq '1.0.0.5/32'); +} + +{ + my $obj1 = new2 Net::Netmask ('217.173.192.0/21'); + my $obj2 = new2 Net::Netmask ('217.173.200.0/21'); + is("$obj1", '217.173.192.0/21'); + is("$obj2", '217.173.200.0/21'); + ok(! $obj1->contains($obj2)); + ok(! $obj2->contains($obj1)); } + +{ + my $warnings = ''; + local($SIG{__WARN__}) = sub { $warnings = $_[0] }; + my $block = findNetblock("127.0.0.", { 1 => []}); + is($warnings, ''); +} + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-libconfigfile for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package perl-libconfigfile for openSUSE:Factory checked in at Thu Mar 24 17:38:39 CET 2011. -------- --- perl-libconfigfile/perl-libconfigfile.changes 2010-11-29 19:56:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-libconfigfile/perl-libconfigfile.changes 2011-01-17 17:01:59.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 17 16:01:50 UTC 2011 - coolo(a)novell.com + +- buildrequire perl-macros + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-libconfigfile.spec ++++++ --- /var/tmp/diff_new_pack.1cnxta/_old 2011-03-24 17:38:20.000000000 +0100 +++ /var/tmp/diff_new_pack.1cnxta/_new 2011-03-24 17:38:20.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-libconfigfile (Version 1.1.1) +# spec file for package perl-libconfigfile # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,13 +21,13 @@ Name: perl-libconfigfile Summary: Parses simple configuration files Version: 1.1.1 -Release: 145 +Release: 151 License: GPLv2+ Group: Development/Libraries/Perl Url: http://packages.qa.debian.org/libc/libconfigfile-perl.html Source0: libconfigfile-perl_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: perl +BuildRequires: perl perl-macros %description ConfigFile parses simple configuration files and store its values in an ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 schedtop for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package schedtop for openSUSE:Factory checked in at Thu Mar 24 17:38:07 CET 2011. -------- --- schedtop/schedtop.changes 2009-08-02 17:14:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/schedtop/schedtop.changes 2011-03-17 12:40:46.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Mar 17 12:35:51 CET 2011 - pth(a)suse.de + +- Use CXXFLAGS for compiler options not CFLAGS. +- Compile using RPM_OPT_FLAGS. +- Default since boost 1.46.0 is boost::filesystem v3 so adapt to + the changes. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- schedtop-boost_filesystem_changes.patch schedtop-cxxflags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ schedtop.spec ++++++ --- /var/tmp/diff_new_pack.YlwNJ8/_old 2011-03-24 17:37:47.000000000 +0100 +++ /var/tmp/diff_new_pack.YlwNJ8/_new 2011-03-24 17:37:47.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package schedtop (Version 1.1) +# spec file for package schedtop # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -31,11 +31,13 @@ Name: schedtop Version: 1.1 -Release: 3 +Release: 13 License: GPL Requires: ncurses Group: System/Monitoring Source: %{name}-%{version}.tar.gz +Patch0: schedtop-cxxflags.patch +Patch1: schedtop-boost_filesystem_changes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,9 +52,11 @@ %prep %setup +%patch0 +%patch1 %build -make +make CXXFLAGS="%{optflags}" %install make install PREFIX=$RPM_BUILD_ROOT ++++++ schedtop-boost_filesystem_changes.patch ++++++ Index: schedtop.cc =================================================================== --- schedtop.cc.orig 2009-03-25 01:24:52.000000000 +0100 +++ schedtop.cc 2011-03-17 12:19:45.617622677 +0100 @@ -267,21 +267,21 @@ void ProcSnapshot(StatMap &smap) fs::directory_iterator end; for (fs::directory_iterator iter("/proc"); iter != end; ++iter) { - std::string path(iter->string() + "/schedstat"); + std::string path(iter->path().string() + "/schedstat"); if (fs::exists(path)) { std::ifstream is(path.c_str()); if (!is.is_open()) throw std::runtime_error("could not open " + path); - Importer importer(smap, is, iter->string() + "/"); + Importer importer(smap, is, iter->path().string() + "/"); importer += "sched_info.cpu_time"; importer += "sched_info.run_delay"; importer += "sched_info.pcount"; } - path = iter->string() + "/sched"; + path = iter->path().string() + "/sched"; if (fs::exists(path)) { std::ifstream is(path.c_str()); @@ -312,7 +312,7 @@ void ProcSnapshot(StatMap &smap) lis >> tmp; Importer importer(smap, lis, - iter->string() + "/"); + iter->path().string() + "/"); importer += type; } ++++++ schedtop-cxxflags.patch ++++++ Index: Makefile =================================================================== --- Makefile.orig 2009-05-22 20:12:28.000000000 +0200 +++ Makefile 2011-03-17 12:00:17.320827379 +0100 @@ -1,5 +1,5 @@ -CFLAGS += -g -O0 +CXXFLAGS += -g -O0 ARCH=$(shell uname -m) OBJDIR ?= obj/$(ARCH) LIBRARIES += -lboost_regex @@ -29,12 +29,12 @@ $(OUTPUT): $(OBJS) $(OBJDIR)/%.o: %.cc Makefile @echo "Compiling (C++) $< to $@" @mkdir -p $(OBJDIR) - $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< + $(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $@ $< $(OBJDIR)/%: @echo "Linking $@" @mkdir -p $(OBJDIR) - $(CXX) $(CFLAGS) $(INCLUDES) -o $@ $(filter %.o %.a,$+) $(LIBDIR) $(LIBRARIES) + $(CXX) $(CXXFLAGS) $(INCLUDES) -o $@ $(filter %.o %.a,$+) $(LIBDIR) $(LIBRARIES) clean: @rm -f $(OBJDIR)/* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 seamonkey for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package seamonkey for openSUSE:Factory checked in at Thu Mar 24 17:37:31 CET 2011. -------- --- seamonkey/seamonkey.changes 2011-03-02 08:30:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/seamonkey/seamonkey.changes 2011-03-23 07:45:39.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 23 06:32:52 UTC 2011 - wr(a)rosenauer.org + +- security update to version 2.0.13 (bnc#680771) + * MFSA 2011-11 (bmo#642395) + Update HTTPS certificate blacklist + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- l10n-2.0.12.tar.bz2 seamonkey-2.0.12-source.tar.bz2 New: ---- l10n-2.0.13.tar.bz2 seamonkey-2.0.13-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seamonkey.spec ++++++ --- /var/tmp/diff_new_pack.DilHWE/_old 2011-03-24 17:37:03.000000000 +0100 +++ /var/tmp/diff_new_pack.DilHWE/_new 2011-03-24 17:37:03.000000000 +0100 @@ -29,7 +29,7 @@ %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Provides: web_browser -Version: 2.0.12 +Version: 2.0.13 Release: 1 Summary: The successor of the Mozilla Application Suite Url: http://www.mozilla.org/projects/seamonkey @@ -62,7 +62,7 @@ Obsoletes: seamonkey-mail <= 2.0 Provides: seamonkey-spellchecker = %{version} Obsoletes: seamonkey-spellchecker <= 2.0 -%define releasedate 2011012100 +%define releasedate 2011032000 %define progname %{name} %define prefix /usr %define progdir %_libdir/%{progname} ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.DilHWE/_old 2011-03-24 17:37:03.000000000 +0100 +++ /var/tmp/diff_new_pack.DilHWE/_new 2011-03-24 17:37:03.000000000 +0100 @@ -1,8 +1,8 @@ #!/bin/bash BRANCH="releases/comm-1.9.1" -RELEASE_TAG="SEAMONKEY_2_0_12_RELEASE" -VERSION="2.0.12" +RELEASE_TAG="SEAMONKEY_2_0_13_RELEASE" +VERSION="2.0.13" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH seamonkey ++++++ l10n-2.0.12.tar.bz2 -> l10n-2.0.13.tar.bz2 ++++++ seamonkey/l10n-2.0.12.tar.bz2 /mounts/work_src_done/STABLE/seamonkey/l10n-2.0.13.tar.bz2 differ: char 11, line 1 ++++++ seamonkey-2.0.12-source.tar.bz2 -> seamonkey-2.0.13-source.tar.bz2 ++++++ seamonkey/seamonkey-2.0.12-source.tar.bz2 /mounts/work_src_done/STABLE/seamonkey/seamonkey-2.0.13-source.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 sssd for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package sssd for openSUSE:Factory checked in at Thu Mar 24 17:36:37 CET 2011. -------- --- sssd/sssd.changes 2011-03-08 14:47:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/sssd/sssd.changes 2011-03-24 16:46:34.000000000 +0100 @@ -1,0 +2,20 @@ +Thu Mar 24 15:42:02 UTC 2011 - rhafer(a)suse.de + +- Updated to 1.5.3 + * Support for libldb >= 1.0.0 + * Proper detection of manpage translations + * Changes between 1.5.1 and 1.5.2 + * Fixes for support of FreeIPA v2 + * Fixes for failover if DNS entries change + * Improved sss_obfuscate tool with better interactive mode + * Fix several crash bugs + * Don't attempt to use START_TLS over SSL. Some LDAP servers + can't handle this + * Delete users from the local cache if initgroups calls return + 'no such user' (previously only worked for getpwnam/getpwuid) + * Use new Transifex.net translations + * Better support for automatic TGT renewal (now survives + restart) + * Netgroup fixes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sssd-1.5.1.tar.bz2 New: ---- sssd-1.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sssd.spec ++++++ --- /var/tmp/diff_new_pack.kaQYpg/_old 2011-03-24 17:36:18.000000000 +0100 +++ /var/tmp/diff_new_pack.kaQYpg/_new 2011-03-24 17:36:18.000000000 +0100 @@ -18,7 +18,7 @@ Name: sssd -Version: 1.5.1 +Version: 1.5.3 Release: 1 Group: System/Daemons Summary: System Security Services Daemon @@ -200,10 +200,13 @@ %config %{_sysconfdir}/sssd/sssd.api.d/sssd-simple.conf /%{_lib}/libnss_sss.so.2 /%{_lib}/security/pam_sss.so +%dir %{_mandir}/uk +%dir %{_mandir}/uk/man5 %{_mandir}/man5/sssd-krb5.* %{_mandir}/man5/sssd-ldap.* %{_mandir}/man5/sssd-simple.* %{_mandir}/man5/sssd.conf.* +%{_mandir}/uk/man5/sssd.conf.* %files tools %defattr(-,root,root,-) @@ -211,9 +214,15 @@ %dir %{_mandir}/cs/man8 %dir %{_mandir}/uk %dir %{_mandir}/uk/man8 +%dir %{_mandir}/es +%dir %{_mandir}/es/man8 +%dir %{_mandir}/nl +%dir %{_mandir}/nl/man8 %{_mandir}/man8/* %{_mandir}/cs/man8/* %{_mandir}/uk/man8/* +%{_mandir}/es/man8/* +%{_mandir}/nl/man8/* %{_sbindir}/sss_useradd %{_sbindir}/sss_userdel %{_sbindir}/sss_usermod ++++++ sssd-1.5.1.tar.bz2 -> sssd-1.5.3.tar.bz2 ++++++ ++++ 18403 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 yast2-snapper for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package yast2-snapper for openSUSE:Factory checked in at Thu Mar 24 17:35:57 CET 2011. -------- --- yast2-snapper/yast2-snapper.changes 2011-03-23 11:49:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-snapper/yast2-snapper.changes 2011-03-24 13:25:29.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 24 13:21:37 CET 2011 - jsuchome(a)suse.cz + +- added agent documentation +- 2.21.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-snapper-2.21.1.tar.bz2 New: ---- yast2-snapper-2.21.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-snapper.spec ++++++ --- /var/tmp/diff_new_pack.1SepSS/_old 2011-03-24 17:35:48.000000000 +0100 +++ /var/tmp/diff_new_pack.1SepSS/_new 2011-03-24 17:35:48.000000000 +0100 @@ -19,12 +19,12 @@ Name: yast2-snapper -Version: 2.21.1 +Version: 2.21.2 Release: 1 Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-snapper-2.21.1.tar.bz2 +Source0: yast2-snapper-2.21.2.tar.bz2 Prefix: /usr @@ -38,7 +38,7 @@ YaST module for accessing and managing btrfs system snapshots %prep -%setup -n yast2-snapper-2.21.1 +%setup -n yast2-snapper-2.21.2 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-snapper-2.21.1.tar.bz2 -> yast2-snapper-2.21.2.tar.bz2 ++++++ ++++ 3372 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-snapper-2.21.1/VERSION new/yast2-snapper-2.21.2/VERSION --- old/yast2-snapper-2.21.1/VERSION 2011-03-23 11:48:17.000000000 +0100 +++ new/yast2-snapper-2.21.2/VERSION 2011-03-24 13:22:02.000000000 +0100 @@ -1 +1 @@ -2.21.1 +2.21.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-snapper-2.21.1/agent-snapper/doc/Makefile.am new/yast2-snapper-2.21.2/agent-snapper/doc/Makefile.am --- old/yast2-snapper-2.21.1/agent-snapper/doc/Makefile.am 2011-03-07 08:25:45.000000000 +0100 +++ new/yast2-snapper-2.21.2/agent-snapper/doc/Makefile.am 2011-03-24 10:35:15.000000000 +0100 @@ -1 +1,7 @@ SUBDIRS = autodocs + +htmldir = $(docdir) + +html_DATA = snapper.html +EXTRA_DIST = $(html_DATA) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-snapper-2.21.1/agent-snapper/doc/snapper.html new/yast2-snapper-2.21.2/agent-snapper/doc/snapper.html --- old/yast2-snapper-2.21.1/agent-snapper/doc/snapper.html 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-snapper-2.21.2/agent-snapper/doc/snapper.html 2011-03-24 13:15:50.000000000 +0100 @@ -0,0 +1,114 @@ +<html> +<head> +<title>Snapper agent description</title> +</head> +<body> +<h1>Snapper agent description</h1> +<hr> + +<h2>Purpose</h2> +The Snapper agent (<tt>ag_snapper</tt>) is used to access API of <tt>libsnapper<tt> library from YaST +(libsnapper is a library for managing btrfs filesystem snapshots). + +It is part of YaST2 SCR, the system configuration repository, +used to access configuration data on the target system. The general +SCR API allows <tt>Read()</tt> and <tt>Write()</tt> access to get and +change data. However, snapper agent currently provides only Read calls. + + +<h2>Implementation</h2> +It is simple wrapper for libsnapper C++ library. The library initialization routines are used to read list of current snapshots and their data. + +Each snapshot is described in YCPMap. Snapshot is identified by number. The map also contains the snapshot type (`SINGLE, `PRE, `POST) and the date of snapshot creation. SINGLE and PRE types of snapshot have the description string. The snapshot of PRE type contains number of relevant POST snapshot and vice versa. + + +Note: The complete development documentation is available in the +<a href="autodocs/index.html"><tt>autodocs/</tt></a> directory. + + +<h2>Interface for snapper-agent</h2> +The interface is implemented as a SCR agent with the usual <tt>Read()</tt>, +<tt>Write()</tt> and <tt>Dir()</tt> interface. The path prefix used is + +<ul><tt>.snapper</tt></ul> + + +<h2>Complete Read paths table</h2> + +<table border=3> + <tr> + <th width="20%" align="left">Path</th> + <th width="10%" align="left">Argument</th> + <th width="10%" align="left">Type of Result</th> + <th align="left">Result</th> + </tr> + + <tr><td><tt>.snapper.snapshots</td><td></td><td align="left">YCPList</td> + <td>Return list of current snapshot maps. + Example of result: + <pre> + [ + $[ + "date" : 1297364138, + "description" : "before yast2-users", + "name" : "1", + "num" : 1, + "post_num" : 2, + "type" : `PRE + ], + $[ + "date" : 1297364204, + "name" : "2", + "num" : 2, + "pre_num" : 1, + "type" : `POST + ], + $[ + "date" : 1297758106, + "description" : "Tuesday", + "name" : "3", + "num" : 3, + "type" : `SINGLE + ] + ] + </pre> + </td> + </tr> + + <tr><td><tt>.snapper.diff</td><td>YCPMap</td><td align="left">YCPList</td> + <td>Returns the list of files modified between given snapshots. + Each file is described by YCPMap which contains file path and type of the change. + Argument map contains 2 integers, identifying the snapshots. + Example of argument map: + <pre> + $[ + "from" : 1, + "to" : 2 + $] + </pre> + Example of result: + <pre> + [ + $[ + "changes" : "c...", + "name" : "/etc/group" + ], + $[ + "changes" : "c...", + "name" : "/etc/group.YaST2save" + ] + ] + </pre> + </td></tr> +</table> + + + + +<address> +Jiri Suchomel <jsuchome(a)suse.cz> +</address> + + +</body> +</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-snapper-2.21.1/config.h.in new/yast2-snapper-2.21.2/config.h.in --- old/yast2-snapper-2.21.1/config.h.in 2011-03-07 10:27:34.000000000 +0100 +++ new/yast2-snapper-2.21.2/config.h.in 2011-03-24 13:23:18.000000000 +0100 @@ -83,3 +83,6 @@ /* Version number of package */ #undef VERSION + +/* Define to `unsigned int' if <sys/types.h> does not define. */ +#undef size_t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-snapper-2.21.1/configure.in new/yast2-snapper-2.21.2/configure.in --- old/yast2-snapper-2.21.1/configure.in 2011-03-07 10:27:26.000000000 +0100 +++ new/yast2-snapper-2.21.2/configure.in 2011-03-24 13:23:10.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-snapper, 2.21.0, http://bugs.opensuse.org/, yast2-snapper) +AC_INIT(yast2-snapper, 2.21.2, http://bugs.opensuse.org/, yast2-snapper) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.21.0" +VERSION="2.21.2" RPMNAME="yast2-snapper" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-snapper-2.21.1/libtool.m4 new/yast2-snapper-2.21.2/libtool.m4 --- old/yast2-snapper-2.21.1/libtool.m4 2011-03-07 10:27:30.000000000 +0100 +++ new/yast2-snapper-2.21.2/libtool.m4 2011-03-24 13:23:14.000000000 +0100 @@ -1020,7 +1020,7 @@ # to the aix ld manual. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +AC_LINK_IFELSE([AC_LANG_PROGRAM],[ lt_aix_libpath_sed=' /Import File Strings/,/^$/ { /^0/ { @@ -4825,9 +4825,18 @@ # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], [ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) + ]) LDFLAGS="$save_LDFLAGS" else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $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/yast2-snapper-2.21.1/ltversion.m4 new/yast2-snapper-2.21.2/ltversion.m4 --- old/yast2-snapper-2.21.1/ltversion.m4 2011-03-07 10:27:30.000000000 +0100 +++ new/yast2-snapper-2.21.2/ltversion.m4 2011-03-24 13:23:15.000000000 +0100 @@ -9,15 +9,15 @@ # Generated from ltversion.in. -# serial 3017 ltversion.m4 +# serial 3018 ltversion.m4 # This file is part of GNU Libtool m4_define([LT_PACKAGE_VERSION], [2.2.6b]) -m4_define([LT_PACKAGE_REVISION], [1.3017]) +m4_define([LT_PACKAGE_REVISION], [1.3018]) AC_DEFUN([LTVERSION_VERSION], [macro_version='2.2.6b' -macro_revision='1.3017' +macro_revision='1.3018' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Parse-CPAN-Packages for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package perl-Parse-CPAN-Packages for openSUSE:Factory checked in at Thu Mar 24 17:35:26 CET 2011. -------- --- perl-Parse-CPAN-Packages/perl-Parse-CPAN-Packages.changes 2010-11-11 16:22:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Parse-CPAN-Packages/perl-Parse-CPAN-Packages.changes 2010-12-01 12:48:01.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 1 11:47:59 UTC 2010 - coolo(a)novell.com + +- switch to perl_requires macro + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Parse-CPAN-Packages.spec ++++++ --- /var/tmp/diff_new_pack.laRumI/_old 2011-03-24 17:35:15.000000000 +0100 +++ /var/tmp/diff_new_pack.laRumI/_new 2011-03-24 17:35:15.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-Parse-CPAN-Packages (Version 2.31) +# spec file for package perl-Parse-CPAN-Packages # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -23,17 +23,16 @@ %define cpan_name Parse-CPAN-Packages Summary: Parse 02packages.details.txt.gz Version: 2.31 -Release: 1 +Release: 7 License: GPL+ or Artistic Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Parse-CPAN-Packages/ Source: http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/Parse-CPAN-Packages-2.… BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{perl_requires} BuildRequires: perl -%if 0%{?suse_version} < 1120 BuildRequires: perl-macros -%endif %if %{with pod} BuildRequires: perl(Test::Pod) >= 1.14 BuildRequires: perl(Test::Pod::Coverage) >= 1.00 @@ -45,7 +44,6 @@ BuildRequires: perl(Moose) BuildRequires: perl(version) # -Requires: perl = %{perl_version} Requires: perl(Compress::Zlib) Requires: perl(CPAN::DistnameInfo) Requires: perl(Moose) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-Config-Tiny for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package perl-Config-Tiny for openSUSE:Factory checked in at Thu Mar 24 17:34:52 CET 2011. -------- --- perl-Config-Tiny/perl-Config-Tiny.changes 2010-11-30 20:24:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Config-Tiny/perl-Config-Tiny.changes 2011-03-24 09:42:16.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 24 08:38:30 UTC 2011 - pascal.bleser(a)opensuse.org + +- update to 2.14: + * fix RT#63080: module can write multiline values but not read them + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Config-Tiny-2.13.tar.bz2 New: ---- Config-Tiny-2.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Config-Tiny.spec ++++++ --- /var/tmp/diff_new_pack.V4i4mA/_old 2011-03-24 17:34:38.000000000 +0100 +++ /var/tmp/diff_new_pack.V4i4mA/_new 2011-03-24 17:34:38.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-Config-Tiny (Version 2.13) +# spec file for package perl-Config-Tiny # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,12 +21,12 @@ Name: perl-Config-Tiny %define cpan_name Config-Tiny Summary: Read/Write .ini style files with as little code as possible -Version: 2.13 +Version: 2.14 Release: 1 License: GPL+ or Artistic Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Config-Tiny/ -#Source: http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-2.13.tar.gz +#Source: http://www.cpan.org/authors/id/A/AD/ADAMK/Config-Tiny-%{version}.tar.gz Source: %{cpan_name}-%{version}.tar.bz2 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -48,6 +48,9 @@ Config::Tiny manpage does *not* preserve your comments, whitespace, or the order of your config file. + + + Authors: -------- Adam Kennedy <adamk(a)cpan.org> @@ -68,7 +71,7 @@ %perl_gen_filelist %clean -%{__rm} -rf $RPM_BUILD_ROOT +%{?buildroot:%__rm -rf "%{buildroot}"} %files -f %{name}.files %defattr(-,root,root,-) ++++++ Config-Tiny-2.13.tar.bz2 -> Config-Tiny-2.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Tiny-2.13/Changes new/Config-Tiny-2.14/Changes --- old/Config-Tiny-2.13/Changes 2010-09-03 03:26:11.000000000 +0200 +++ new/Config-Tiny-2.14/Changes 2011-03-24 03:18:32.000000000 +0100 @@ -1,5 +1,9 @@ Revision history for Perl extension Config-Tiny +2.14 Thu 24 Mar 2011 + - Resolved #63080: module can write multiline values but not read them + - Removed -w from tests to allow tests with tainting on + 2.13 Fri 3 Sep 2010 - Resolved #60703: Display glitch in Config::Tiny 2.12 POD - Resolved #40585: member 'set;' doesn't exist diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Tiny-2.13/META.yml new/Config-Tiny-2.14/META.yml --- old/Config-Tiny-2.13/META.yml 2010-09-03 03:26:17.000000000 +0200 +++ new/Config-Tiny-2.14/META.yml 2011-03-24 03:18:38.000000000 +0100 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: Config-Tiny -version: 2.13 +version: 2.14 abstract: Read/Write .ini style files with as little code as possible author: - Adam Kennedy <adamk(a)cpan.org> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Tiny-2.13/Makefile.PL new/Config-Tiny-2.14/Makefile.PL --- old/Config-Tiny-2.13/Makefile.PL 2010-09-03 03:26:11.000000000 +0200 +++ new/Config-Tiny-2.14/Makefile.PL 2011-03-24 03:18:32.000000000 +0100 @@ -2,7 +2,7 @@ use vars qw{$VERSION}; BEGIN { require 5.003_96; - $VERSION = '2.13'; + $VERSION = '2.14'; } use ExtUtils::MakeMaker; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Tiny-2.13/README new/Config-Tiny-2.14/README --- old/Config-Tiny-2.13/README 2010-09-03 03:26:11.000000000 +0200 +++ new/Config-Tiny-2.14/README 2011-03-24 03:18:32.000000000 +0100 @@ -128,7 +128,7 @@ Config::Simple, Config::General, ali.as COPYRIGHT - Copyright 2002 - 2010 Adam Kennedy. + Copyright 2002 - 2011 Adam Kennedy. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Tiny-2.13/lib/Config/Tiny.pm new/Config-Tiny-2.14/lib/Config/Tiny.pm --- old/Config-Tiny-2.13/lib/Config/Tiny.pm 2010-09-03 03:26:11.000000000 +0200 +++ new/Config-Tiny-2.14/lib/Config/Tiny.pm 2011-03-24 03:18:32.000000000 +0100 @@ -5,7 +5,7 @@ use strict; BEGIN { require 5.004; - $Config::Tiny::VERSION = '2.13'; + $Config::Tiny::VERSION = '2.14'; $Config::Tiny::errstr = ''; } @@ -97,15 +97,16 @@ # 1. Leading whitespace # 2. Trailing whitespace # 3. Newlines in section name - if ( $section =~ /(?:^\s|\n|\s$)/s ) { - return $self->_error( - "Illegal whitespace in section name '$section'" - ); - } + return $self->_error( + "Illegal whitespace in section name '$section'" + ) if $section =~ /(?:^\s|\n|\s$)/s; my $block = $self->{$section}; $contents .= "\n" if length $contents; $contents .= "[$section]\n" unless $section eq '_'; foreach my $property ( sort keys %$block ) { + return $self->_error( + "Illegal newlines in property '$section.$property'" + ) if $block->{$property} =~ /(?:\012|\015)/s; $contents .= "$property=$block->{$property}\n"; } } @@ -268,7 +269,7 @@ =head1 COPYRIGHT -Copyright 2002 - 2010 Adam Kennedy. +Copyright 2002 - 2011 Adam Kennedy. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Tiny-2.13/t/01_compile.t new/Config-Tiny-2.14/t/01_compile.t --- old/Config-Tiny-2.13/t/01_compile.t 2010-09-03 03:26:11.000000000 +0200 +++ new/Config-Tiny-2.14/t/01_compile.t 2011-03-24 03:18:32.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # Compile testing for Config::Tiny @@ -8,9 +8,6 @@ $^W = 1; } -use Test::More tests => 2; +use Test::More tests => 1; -ok( $] >= 5.004, "Your perl is new enough" ); use_ok('Config::Tiny'); - -exit(0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Tiny-2.13/t/02_main.t new/Config-Tiny-2.14/t/02_main.t --- old/Config-Tiny-2.13/t/02_main.t 2010-09-03 03:26:11.000000000 +0200 +++ new/Config-Tiny-2.14/t/02_main.t 2011-03-24 03:18:32.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # Main testing script for Config::Tiny @@ -8,25 +8,22 @@ $^W = 1; } -use UNIVERSAL; use Test::More tests => 33; +use Config::Tiny (); +use UNIVERSAL (); use vars qw{$VERSION}; BEGIN { - $VERSION = '2.13'; + $VERSION = '2.14'; } # Check their perl version -BEGIN { - ok( $] >= 5.004, "Your perl is new enough" ); - use_ok('Config::Tiny'); -} is( $Config::Tiny::VERSION, $VERSION, 'Loaded correct version of Config::Tiny' ); # Test trivial creation -my $Trivial = Config::Tiny->new(); +my $Trivial = Config::Tiny->new; ok( $Trivial, '->new returns true' ); ok( ref $Trivial, '->new returns a reference' ); # Legitimate use of UNIVERSAL::isa @@ -46,31 +43,33 @@ my $expected = { '_' => { root => 'something', - }, + }, section => { one => 'two', Foo => 'Bar', this => 'Your Mother!', blank => '', - }, + }, 'Section Two' => { 'something else' => 'blah', 'remove' => 'whitespace', - }, - }; + }, +}; bless $expected, 'Config::Tiny'; is_deeply( $Config, $expected, 'Config structure matches expected' ); # Add some stuff to the trivial config and check write_string() for it -$Trivial->{_} = { root1 => 'root2' }; +$Trivial->{_} = { + root1 => 'root2', +}; $Trivial->{section} = { foo => 'bar', this => 'that', blank => '', - }; +}; $Trivial->{section2} = { 'this little piggy' => 'went to market' - }; +}; my $string = <<END; root1=root2 @@ -120,20 +119,18 @@ ##################################################################### # Bugs that happened we don't want to happen again -{ -# Reading in an empty file, or a defined but zero length string, should yield -# a valid, but empty, object. -my $Empty = Config::Tiny->read_string(''); -isa_ok( $Empty, 'Config::Tiny' ); -is( scalar(keys %$Empty), 0, 'Config::Tiny object from empty string, is empty' ); +SCOPE: { + # Reading in an empty file, or a defined but zero length string, should yield + # a valid, but empty, object. + my $Empty = Config::Tiny->read_string(''); + isa_ok( $Empty, 'Config::Tiny' ); + is( scalar(keys %$Empty), 0, 'Config::Tiny object from empty string, is empty' ); } - - -{ -# A Section header like [ section ] doesn't end up at ->{' section '}. -# Trim off whitespace from the section header. -my $string = <<'END'; +SCOPE: { + # A Section header like [ section ] doesn't end up at ->{' section '}. + # Trim off whitespace from the section header. + my $string = <<'END_CONFIG'; # The need to trim off whitespace makes a lot more sense # when you are trying to maximise readability. [ /path/to/file.txt ] @@ -145,14 +142,37 @@ [section3 ] this=that -END +END_CONFIG -my $Trim = Config::Tiny->read_string($string); -isa_ok( $Trim, 'Config::Tiny' ); -ok( exists $Trim->{'/path/to/file.txt'}, 'First section created' ); -is( $Trim->{'/path/to/file.txt'}->{this}, 'that', 'First section created properly' ); -ok( exists $Trim->{section2}, 'Second section created' ); -is( $Trim->{section2}->{this}, 'that', 'Second section created properly' ); -ok( exists $Trim->{section3}, 'Third section created' ); -is( $Trim->{section3}->{this}, 'that', 'Third section created properly' ); + my $Trim = Config::Tiny->read_string($string); + isa_ok( $Trim, 'Config::Tiny' ); + ok( exists $Trim->{'/path/to/file.txt'}, 'First section created' ); + is( $Trim->{'/path/to/file.txt'}->{this}, 'that', 'First section created properly' ); + ok( exists $Trim->{section2}, 'Second section created' ); + is( $Trim->{section2}->{this}, 'that', 'Second section created properly' ); + ok( exists $Trim->{section3}, 'Third section created' ); + is( $Trim->{section3}->{this}, 'that', 'Third section created properly' ); +} + + + + + +###################################################################### +# Refuse to write config files with newlines in them + +SCOPE: { + my $newline = Config::Tiny->new; + $newline->{_}->{string} = "foo\nbar"; + local $@; + my $output = undef; + eval { + $output = $newline->write_string; + }; + is( $output, undef, '->write_string returns undef on newlines' ); + is( + Config::Tiny->errstr, + "Illegal newlines in property '_.string'", + '->errstr returns expected error', + ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Tiny-2.13/xt/pmv.t new/Config-Tiny-2.14/xt/pmv.t --- old/Config-Tiny-2.13/xt/pmv.t 2010-09-03 03:26:11.000000000 +0200 +++ new/Config-Tiny-2.14/xt/pmv.t 2011-03-24 03:18:32.000000000 +0100 @@ -9,7 +9,7 @@ } my @MODULES = ( - 'Perl::MinimumVersion 1.25', + 'Perl::MinimumVersion 1.27', 'Test::MinimumVersion 0.101080', ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-PPI for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package perl-PPI for openSUSE:Factory checked in at Thu Mar 24 17:33:22 CET 2011. -------- --- perl-PPI/perl-PPI.changes 2010-07-13 15:36:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-PPI/perl-PPI.changes 2010-12-01 10:46:04.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 1 09:44:37 UTC 2010 - coolo(a)novell.com + +- switch to perl_requires macro + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-PPI.spec ++++++ --- /var/tmp/diff_new_pack.KxakmN/_old 2011-03-24 17:31:22.000000000 +0100 +++ /var/tmp/diff_new_pack.KxakmN/_new 2011-03-24 17:31:22.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-PPI (Version 1.213) +# spec file for package perl-PPI # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,7 +22,7 @@ %define cpan_name PPI Summary: Parse, Analyze and Manipulate Perl (without perl) Version: 1.213 -Release: 1 +Release: 6 License: GPL+ or Artistic Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/PPI/ @@ -30,10 +30,9 @@ Source: %{cpan_name}-%{version}.tar.bz2 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{perl_requires} BuildRequires: perl -%if 0%{?suse_version} < 1120 BuildRequires: perl-macros -%endif BuildRequires: perl(Class::Inspector) >= 1.22 BuildRequires: perl(Clone) >= 0.30 BuildRequires: perl(Digest::MD5) >= 2.35 @@ -49,7 +48,6 @@ BuildRequires: perl(Test::Object) >= 0.07 BuildRequires: perl(Test::SubCalls) >= 1.07 # -Requires: perl = %{perl_version} Requires: perl(Clone) >= 0.30 Requires: perl(Digest::MD5) >= 2.35 Requires: perl(File::Spec) >= 0.84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-File-Remove for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package perl-File-Remove for openSUSE:Factory checked in at Thu Mar 24 17:31:00 CET 2011. -------- --- perl-File-Remove/perl-File-Remove.changes 2011-01-17 16:08:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-File-Remove/perl-File-Remove.changes 2011-03-24 12:26:39.000000000 +0100 @@ -1,0 +2,18 @@ +Thu Mar 24 11:25:37 UTC 2011 - coolo(a)novell.com + +- update to 1.49 + - Restoring 02_directoreis to no_plan as it runs different test counts + on different systems. + - Promoting dev code to production version + - Fixed a major bug in the 1.46 logic that works out what to change the + cwd to when deleting while inside a directory. + - Add test counts to all test scripts + - Added a test for space-safe globs + - Updated to Module::Install::DSL 1.00 + - Skip test on cygwin due to non-root users not being able to deny + themselves write permissions to files. + - Added a test to delete directories when the current working + directory is inside the location to delete (ADAMK) + - Fixes for trash() with callbacks and on Mac (MIYAGAWA) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- File-Remove-1.42.tar.gz New: ---- File-Remove-1.49.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-File-Remove.spec ++++++ --- /var/tmp/diff_new_pack.Ck1sj1/_old 2011-03-24 17:25:11.000000000 +0100 +++ /var/tmp/diff_new_pack.Ck1sj1/_new 2011-03-24 17:25:11.000000000 +0100 @@ -15,55 +15,57 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: perl-File-Remove -Version: 1.42 -Release: 2 +Version: 1.49 +Release: 1 +License: GPL+ or Artistic %define cpan_name File-Remove -Summary: File::Remove::remove removes files and directories -License: GPL, Artistic License +Summary: Remove files and directories +Url: http://search.cpan.org/dist/File-Remove/ Group: Development/Libraries/Perl -Url: http://search.cpan.org/~adamk/File-Remove-1.42/lib/File/Remove.pm -Source0: %{cpan_name}-%{version}.tar.gz +#Source: http://www.cpan.org/authors/id/A/AD/ADAMK/File-Remove-%{version}.tar.gz +Source: %{cpan_name}-%{version}.tar.gz +BuildRequires: perl(Cwd) >= 3.2701 +BuildRequires: perl(File::Spec) >= 3.2701 +BuildRequires: perl +BuildRequires: perl-macros +Requires: perl(Cwd) >= 3.2701 +Requires: perl(File::Spec) >= 3.2701 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %{perl_requires} -BuildRequires: perl perl-macros %description -File::Remove::remove removes files and directories. It acts like -/bin/rm, for the most part. Although unlink can be given a list of -files, it will not remove directories; this module remedies that. It -also accepts wildcards, * and ?, as arguments for filenames. - -Author: -------- - Adam Kennedy <adamk(a)cpan.org> - Richard Soderberg +*File::Remove::remove* removes files and directories. It acts like +*/bin/rm*, for the most part. Although 'unlink' can be given a list of +files, it will not remove directories; this module remedies that. It also +accepts wildcards, * and ?, as arguments for filenames. + +*File::Remove::trash* accepts the same arguments as *remove*, with the +addition of an optional, infrequently used "other platforms" hashref. %prep %setup -q -n %{cpan_name}-%{version} %build -%__perl Makefile.PL -%__make +%{__perl} Makefile.PL INSTALLDIRS=vendor +%{__make} %{?_smp_mflags} %check -%__make test +%{__make} test %install %perl_make_install %perl_process_packlist +%perl_gen_filelist %clean -%__rm -rf %{BuildRoot} +%{__rm} -rf %{buildroot} -%files -%defattr(-, root, root) -%doc Changes README LICENSE -%dir %{perl_vendorlib}/File -%{perl_vendorlib}/File/Remove.pm -%{_mandir}/man3/File::Remove.3pm.* +%files -f %{name}.files +%defattr(644,root,root,755) +%doc Changes LICENSE README %changelog ++++++ File-Remove-1.42.tar.gz -> File-Remove-1.49.tar.gz ++++++ ++++ 4522 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 arpwatch-ethercodes for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory checked in at Thu Mar 24 17:28:37 CET 2011. -------- --- AUTO/all/arpwatch-ethercodes/arpwatch-ethercodes.changes 2011-03-23 05:40:08.000000000 +0100 +++ arpwatch-ethercodes/arpwatch-ethercodes.changes 2011-03-24 05:40:08.000000000 +0100 @@ -2 +2 @@ -Wed Mar 23 05:40:08 CET 2011 - autobuild(a)suse.de +Thu Mar 24 05:40:08 CET 2011 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2011-03-23 +- automated update on 2011-03-24 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ --- /var/tmp/diff_new_pack.kEx7gX/_old 2011-03-24 17:28:31.000000000 +0100 +++ /var/tmp/diff_new_pack.kEx7gX/_new 2011-03-24 17:28:31.000000000 +0100 @@ -25,7 +25,7 @@ Group: Productivity/Networking/Diagnostic AutoReqProv: on Summary: Ethercodes Data for arpwatch -Version: 2011.3.23 +Version: 2011.3.24 Release: 1 Source: http://standards.ieee.org/regauth/oui/oui.txt.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ oui.txt.bz2 ++++++ --- /var/tmp/diff_new_pack.kEx7gX/_old 2011-03-24 17:28:31.000000000 +0100 +++ /var/tmp/diff_new_pack.kEx7gX/_new 2011-03-24 17:28:31.000000000 +0100 @@ -74879,7 +74879,7 @@ 00-A1-DE (hex) ShenZhen ShiHua Technology CO.,LTD 00A1DE (base 16) ShenZhen ShiHua Technology CO.,LTD - Room505,5/F��TsingYi Building,LangShan 2ed Road,High-Tech Industrial Park, + Room505,5/F TsingYi Building,LangShan 2ed Road,High-Tech Industrial Park, ShenZhen GuangDong 518052 CHINA @@ -81697,6 +81697,12 @@ Mumbai Maharashtra 400059 INDIA +0C-39-56 (hex) Observator instruments +0C3956 (base 16) Observator instruments + Rietdekkerstraat 6 + Ridderkerk Zuid Holland 2984 BM + NETHERLANDS + 0C-3C-65 (hex) Dome Imaging Inc 0C3C65 (base 16) Dome Imaging Inc 400 Fifth Av @@ -82010,6 +82016,12 @@ Petaluma CA 94954 UNITED STATES +10-76-8A (hex) EoCell +10768A (base 16) EoCell + 149 Beaconsfield Street + Silverwater NSW 2128 + AUSTRALIA + 10-78-D2 (hex) ELITEGROUP COMPUTER SYSTEM CO., LTD. 1078D2 (base 16) ELITEGROUP COMPUTER SYSTEM CO., LTD. NO. 239, Sec. 2, Ti Ding Blvd. @@ -87904,7 +87916,7 @@ 88-B1-68 (hex) Delta Control GmbH 88B168 (base 16) Delta Control GmbH Rondorfer Hauptstr. 33 - K�ln NRW 50997 + Cologne NRW 50997 GERMANY 88-B6-27 (hex) Gembird Europe BV @@ -87952,6 +87964,13 @@ Seoul 137-868 KOREA, REPUBLIC OF +88-F0-77 (hex) Cisco Systems +88F077 (base 16) Cisco Systems + 80 West Tasman Dr. + SJCM1-1 + San Jose CA 95134 + UNITED STATES + 88-FD-15 (hex) LINEEYE CO., LTD 88FD15 (base 16) LINEEYE CO., LTD 5F Marufuku Bldg. 39-1 Karahashi @@ -88155,6 +88174,13 @@ Shanghai 201613 CHINA +90-09-17 (hex) Far-sighted mobile +900917 (base 16) Far-sighted mobile + Technology Park Desay Building 6th-Floor + Nanshan District + Shenzhen Guangdong Province 518000 + CHINA + 90-18-AE (hex) Shanghai Meridian Technologies, Co. Ltd. 9018AE (base 16) Shanghai Meridian Technologies, Co. Ltd. Suite 6A Tongsheng Tower @@ -89615,6 +89641,12 @@ Maynard MA 01754 UNITED STATES +AC-47-23 (hex) Genelec +AC4723 (base 16) Genelec + Olvitie 5 + Iisalmi 74100 + FINLAND + AC-4F-FC (hex) SVS-VISTEK GmbH AC4FFC (base 16) SVS-VISTEK GmbH Muehlbachstr. 20 @@ -92025,8 +92057,8 @@ Budapest 1191 HUNGARY -DC-05-ED (hex) Nabtesco Automotive Corporation -DC05ED (base 16) Nabtesco Automotive Corporation +DC-05-ED (hex) Nabtesco Corporation +DC05ED (base 16) Nabtesco Corporation 9-18, Kaigan 1-chome Minato-ku Tokyo 105-0022 JAPAN @@ -92778,6 +92810,13 @@ San Jose CA 95134 UNITED STATES +E8-BA-70 (hex) Cisco Systems +E8BA70 (base 16) Cisco Systems + 80 West Tasman Dr. + SJCM1-1 + San Jose CA 95134 + UNITED STATES + E8-BE-81 (hex) SAGEMCOM E8BE81 (base 16) SAGEMCOM 250 route de l'Empereur ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-Number-Delta for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package perl-Test-Number-Delta for openSUSE:Factory checked in at Thu Mar 24 17:24:40 CET 2011. -------- --- perl-Test-Number-Delta/perl-Test-Number-Delta.changes 2010-11-30 20:28:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Test-Number-Delta/perl-Test-Number-Delta.changes 2011-01-17 17:12:34.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 17 16:12:26 UTC 2011 - coolo(a)novell.com + +- buildrequire perl-macros + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Test-Number-Delta.spec ++++++ --- /var/tmp/diff_new_pack.qXJ5zN/_old 2011-03-24 17:24:25.000000000 +0100 +++ /var/tmp/diff_new_pack.qXJ5zN/_new 2011-03-24 17:24:25.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-Test-Number-Delta (Version 1.03) +# spec file for package perl-Test-Number-Delta # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,7 +20,7 @@ Name: perl-Test-Number-Delta Version: 1.03 -Release: 1 +Release: 6 Summary: Compare the difference between numbers against a given tolerance Source: http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/Test-Number-Delta-%{ve… Url: http://search.cpan.org/dist/Test-Number-Delta/ @@ -28,7 +28,7 @@ License: Perl License BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} -BuildRequires: make perl +BuildRequires: make perl perl-macros %description At some point or another, most programmers find they need to compare @@ -66,4 +66,5 @@ %dir %{perl_vendorarch}/auto/Test/Number %{perl_vendorarch}/auto/Test/Number/Delta %doc %{perl_man3dir}/Test::Number::Delta.%{perl_man3ext}%{ext_man} + %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 libvirt for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at Thu Mar 24 17:24:07 CET 2011. -------- --- libvirt/libvirt.changes 2011-02-25 20:42:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/libvirt/libvirt.changes 2011-03-24 11:33:36.000000000 +0100 @@ -1,0 +2,21 @@ +Thu Mar 24 10:23:30 UTC 2011 - coolo(a)novell.com + +- use %first_lang before changing symlinks, find_lang removes + unsupported languages + +------------------------------------------------------------------- +Tue Mar 15 09:37:20 MDT 2011 - jfehlig(a)novell.com + +- VUL-0: libvirt: several API calls do not honour read-only + connection + 71753cb7-CVE-2011-1146.patch + bnc#678406 + +------------------------------------------------------------------- +Mon Mar 7 11:47:17 MST 2011 - jfehlig(a)novell.com + +- Add baselibs.conf file to build xxbit packages + for multilib support + bnc#676921 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 71753cb7-CVE-2011-1146.patch baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.I1YzDd/_old 2011-03-24 17:23:38.000000000 +0100 +++ /var/tmp/diff_new_pack.I1YzDd/_new 2011-03-24 17:23:38.000000000 +0100 @@ -145,7 +145,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: yes Version: 0.8.8 -Release: 2 +Release: 3 Summary: A C toolkit to interract with the virtualization capabilities of Linux # The client side, i.e. shared libs and virsh are in a subpackage Requires: %{name}-client = %{version}-%{release} @@ -170,6 +170,7 @@ Source1: libvirtd.init # Upstream patches Patch0: efc2594b-boot-param.patch +Patch1: 71753cb7-CVE-2011-1146.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch102: clone.patch @@ -285,6 +286,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %patch100 -p1 %patch102 %patch103 -p1 @@ -409,6 +411,8 @@ %if ! %{with_uml} rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml %endif +%find_lang %{name} + ln_dupes() { target="" @@ -430,7 +434,6 @@ install %SOURCE1 $RPM_BUILD_ROOT/etc/init.d/libvirtd ln -s /etc/init.d/libvirtd $RPM_BUILD_ROOT/usr/sbin/rclibvirtd ln -s /etc/init.d/libvirt-guests $RPM_BUILD_ROOT/usr/sbin/rclibvirt-guests -%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT ++++++ 71753cb7-CVE-2011-1146.patch ++++++ commit 71753cb7f7a16ff800381c0b5ee4e99eea92fed3 Author: Guido Günther <agx(a)sigxcpu.org> Date: Mon Mar 14 10:56:28 2011 +0800 Add missing checks for read only connections As pointed on CVE-2011-1146, some API forgot to check the read-only status of the connection for entry point which modify the state of the system or may lead to a remote execution using user data. The entry points concerned are: - virConnectDomainXMLToNative - virNodeDeviceDettach - virNodeDeviceReAttach - virNodeDeviceReset - virDomainRevertToSnapshot - virDomainSnapshotDelete * src/libvirt.c: fix the above set of entry points to error on read-only connections Index: libvirt-0.8.8/src/libvirt.c =================================================================== --- libvirt-0.8.8.orig/src/libvirt.c +++ libvirt-0.8.8/src/libvirt.c @@ -3152,6 +3152,10 @@ char *virConnectDomainXMLToNative(virCon virDispatchError(NULL); return NULL; } + if (conn->flags & VIR_CONNECT_RO) { + virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } if (nativeFormat == NULL || domainXml == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); @@ -9579,6 +9583,11 @@ virNodeDeviceDettach(virNodeDevicePtr de return -1; } + if (dev->conn->flags & VIR_CONNECT_RO) { + virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + if (dev->conn->driver->nodeDeviceDettach) { int ret; ret = dev->conn->driver->nodeDeviceDettach (dev); @@ -9622,6 +9631,11 @@ virNodeDeviceReAttach(virNodeDevicePtr d return -1; } + if (dev->conn->flags & VIR_CONNECT_RO) { + virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + if (dev->conn->driver->nodeDeviceReAttach) { int ret; ret = dev->conn->driver->nodeDeviceReAttach (dev); @@ -9667,6 +9681,11 @@ virNodeDeviceReset(virNodeDevicePtr dev) return -1; } + if (dev->conn->flags & VIR_CONNECT_RO) { + virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + if (dev->conn->driver->nodeDeviceReset) { int ret; ret = dev->conn->driver->nodeDeviceReset (dev); @@ -12962,6 +12981,10 @@ virDomainRevertToSnapshot(virDomainSnaps } conn = snapshot->domain->conn; + if (conn->flags & VIR_CONNECT_RO) { + virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } if (conn->driver->domainRevertToSnapshot) { int ret = conn->driver->domainRevertToSnapshot(snapshot, flags); @@ -13008,6 +13031,10 @@ virDomainSnapshotDelete(virDomainSnapsho } conn = snapshot->domain->conn; + if (conn->flags & VIR_CONNECT_RO) { + virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } if (conn->driver->domainSnapshotDelete) { int ret = conn->driver->domainSnapshotDelete(snapshot, flags); ++++++ baselibs.conf ++++++ libvirt-client libvirt-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 perl-Algorithm-Diff for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package perl-Algorithm-Diff for openSUSE:Factory checked in at Thu Mar 24 17:08:44 CET 2011. -------- --- perl-Algorithm-Diff/perl-Algorithm-Diff.changes 2010-11-30 20:23:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Algorithm-Diff/perl-Algorithm-Diff.changes 2011-03-18 13:14:48.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 18 12:14:46 UTC 2011 - cdenicolo(a)novell.com + +- license update: GPL+ or Artistic + fix license string + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Algorithm-Diff.spec ++++++ --- /var/tmp/diff_new_pack.41EZpC/_old 2011-03-24 17:08:30.000000000 +0100 +++ /var/tmp/diff_new_pack.41EZpC/_new 2011-03-24 17:08:30.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-Algorithm-Diff (Version 1.1902) +# spec file for package perl-Algorithm-Diff # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,8 +22,8 @@ %define cpan_name %( echo %{name} | %{__sed} -e 's,perl-,,' ) Summary: Compute 'Intelligent' Differences Between Two Files or Lists Version: 1.1902 -Release: 134 -License: Artistic License .. +Release: 139 +License: GPL+ or Artistic Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Algorithm-Diff Source0: %{cpan_name}-%{version}.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-Text-CSV for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package perl-Text-CSV for openSUSE:Factory checked in at Thu Mar 24 17:03:40 CET 2011. -------- --- perl-Text-CSV/perl-Text-CSV.changes 2010-12-01 14:56:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Text-CSV/perl-Text-CSV.changes 2011-03-24 12:32:28.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Mar 24 11:30:38 UTC 2011 - coolo(a)novell.com + +- update to 1.21 + * updated the compatibility for Text::CSV_XS version 0.80 + * added getline_all() and getaline_hr_all() + * added missing test file + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Text-CSV-1.20.tar.bz2 New: ---- Text-CSV-1.21.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Text-CSV.spec ++++++ --- /var/tmp/diff_new_pack.21jNcb/_old 2011-03-24 17:01:08.000000000 +0100 +++ /var/tmp/diff_new_pack.21jNcb/_new 2011-03-24 17:01:08.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-Text-CSV (Version 1.20) +# spec file for package perl-Text-CSV # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,35 +15,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%bcond_with pod Name: perl-Text-CSV -%define cpan_name Text-CSV -Summary: Comma-separated values manipulator (using XS or PurePerl) -Version: 1.20 -Release: 2 +Version: 1.21 +Release: 1 License: GPL+ or Artistic -Group: Development/Libraries/Perl +%define cpan_name Text-CSV +Summary: comma-separated values manipulator (using XS or PurePerl) Url: http://search.cpan.org/dist/Text-CSV/ -#Source: http://www.cpan.org/modules/by-module/Text/Text-CSV-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.bz2 -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} +Group: Development/Libraries/Perl +#Source: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/Text-CSV-%{version}.tar.gz +Source: %{cpan_name}-%{version}.tar.gz +BuildRequires: perl(IO::Handle) BuildRequires: perl BuildRequires: perl-macros -%if %{with pod} -BuildRequires: perl(Test::Pod) -%endif -BuildRequires: perl(Test::More) -BuildRequires: perl(IO::Handle) Requires: perl(IO::Handle) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +%{perl_requires} %description Text::CSV provides facilities for the composition and decomposition of -comma-separated values using Text::CSV_XS or its pure Perl version. +comma-separated values using the Text::CSV_XS manpage or its pure Perl +version. An instance of the Text::CSV class can combine fields into a CSV string and parse a CSV string into fields. @@ -52,13 +47,6 @@ user-specified characters as delimiters, separators, and escapes so it is perhaps better called ASV (anything separated values) rather than just CSV. -Author: -------- - Alan Citterman - Jochen Wiedmann - H.Merijn Brand - Makamaka Hannyaharamitu - %prep %setup -q -n %{cpan_name}-%{version} @@ -71,18 +59,14 @@ %install %perl_make_install -# do not perl_process_packlist (noarch) -# remove .packlist file -%{__rm} -rf $RPM_BUILD_ROOT%perl_vendorarch -# remove perllocal.pod file -%{__rm} -rf $RPM_BUILD_ROOT%perl_archlib +%perl_process_packlist %perl_gen_filelist %clean -%{__rm} -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files -f %{name}.files -%defattr(-,root,root,-) +%defattr(644,root,root,755) %doc Changes README %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 perl-DateTime-TimeZone for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package perl-DateTime-TimeZone for openSUSE:Factory checked in at Thu Mar 24 17:00:35 CET 2011. -------- --- perl-DateTime-TimeZone/perl-DateTime-TimeZone.changes 2010-12-01 07:56:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-DateTime-TimeZone/perl-DateTime-TimeZone.changes 2011-03-14 23:28:39.000000000 +0100 @@ -1,0 +2,29 @@ +Mon Mar 14 22:07:05 UTC 2011 - pascal.bleser(a)opensuse.org + +- regenerated to use proper dependencies +- update to 1.30: + * based on version 2011d of the Olson database + * includes changes for Samoa, Turkey, and Cuba +- changes from 1.29: + * includes new zones, America/Sitka and America/Metlakatla, as well as + changes for Alaska and Chile +- changes from 1.28: + * includes a new zone, America/North_Dakota/Beulah +- changes from 1.27: + * includes historical updates for Australia and Hawaii +- changes from 1.26: + * fix prereqs +- changes from 1.25: + * attempting to determine the local time zone while inside a sort subroutine + could cause an error "Can't return outside a subroutine"; this was caused + by stack corruption that happens when an eval "use $module" fails + (RT#63106) +- changes from 1.24: + * includes updates for Fiji + * all modules in the distro now have the same $VERSION +- changes from 1.22: + * historical updates for Hong Kong +- changes from 1.21: + * updates for Egypt and Palestine + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- DateTime-TimeZone-1.20.tar.bz2 New: ---- DateTime-TimeZone-1.30.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-DateTime-TimeZone.spec ++++++ --- /var/tmp/diff_new_pack.6yTw5p/_old 2011-03-24 16:52:56.000000000 +0100 +++ /var/tmp/diff_new_pack.6yTw5p/_new 2011-03-24 16:52:56.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-DateTime-TimeZone (Version 1.20) +# spec file for package perl-DateTime-TimeZone # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,75 +15,77 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%bcond_with test Name: perl-DateTime-TimeZone -%define cpan_name DateTime-TimeZone +Version: 1.30 +Release: 1 Summary: Time zone object base class and factory -Version: 1.20 -Release: 2 -License: GPL+ or Artistic +# http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/DateTime-TimeZone-%{ver… +Source: DateTime-TimeZone-%{version}.tar.bz2 +Url: http://search.cpan.org/dist/DateTime-TimeZone Group: Development/Libraries/Perl -Url: http://search.cpan.org/dist/DateTime-TimeZone/ -#Source: http://www.cpan.org/modules/by-module/DateTime/DateTime-TimeZone-%{version}… -Source: %{cpan_name}-%{version}.tar.bz2 -BuildArch: noarch +License: GPL+ or Artistic BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} -BuildRequires: perl -BuildRequires: perl(Module::Build) BuildRequires: perl-macros -%if %{with test} -BuildRequires: perl(DateTime) >= 0.16 -%endif +BuildRequires: make BuildRequires: perl(Test::More) >= 0.88 +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.31 BuildRequires: perl(Class::Singleton) >= 1.03 -BuildRequires: perl(Cwd) >= 3 +BuildRequires: perl(parent) BuildRequires: perl(Params::Validate) >= 0.72 -# +BuildRequires: perl(Pod::Man) >= 1.14 +BuildRequires: perl(Class::Load) +BuildRequires: perl(Cwd) >= 3 Requires: perl(Class::Singleton) >= 1.03 -Requires: perl(Cwd) >= 3 +Requires: perl(parent) Requires: perl(Params::Validate) >= 0.72 Requires: perl(Pod::Man) >= 1.14 +Requires: perl(Class::Load) +Requires: perl(Cwd) >= 3 +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description This class is the base class for all time zone objects. A time zone is -represented internally as a set of observances, each of which describes the -offset from GMT for a given time period. - -Note that without the DateTime.pm module, this module does not do much. -It's primary interface is through a DateTime object, and most users will -not need to directly use DateTime::TimeZone methods. - -Authors: --------- - Dave Rolsky <autarch(a)urth.org> +represented internally as a set of observances, each of which describes +the offset from GMT for a given time period. +Note that without the "DateTime.pm" module, this module does not do much. +It's primary interface is through a "DateTime" object, and most users will +not need to directly use "DateTime::TimeZone" methods. %prep -%setup -q -n %{cpan_name}-%{version} +%setup -q -n "DateTime-TimeZone-%{version}" +%__sed -i '/^auto_install/d' Makefile.PL + # rpmlint: spurious-executable-perm pushd tools find -type f -exec %{__chmod} 0644 {} \; popd %build -%{__perl} Build.PL installdirs=vendor -./Build - -%check -./Build test +%__perl Makefile.PL PREFIX="%{_prefix}" +%__make %{?jobs:-j%{jobs}} %install -./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -%perl_gen_filelist +%perl_make_install +%perl_process_packlist -%clean -%{__rm} -rf $RPM_BUILD_ROOT +%check +%__make test -%files -f %{name}.files -%defattr(-,root,root,-) -%doc Changes LICENSE MANIFEST.base perltidyrc README tools xt +%clean +%{?buildroot:%__rm -rf "%{buildroot}"} +%files +%defattr(-,root,root) +%doc README Changes LICENSE +%doc tools +%dir %{perl_vendorlib}/DateTime +%{perl_vendorlib}/DateTime/TimeZone +%{perl_vendorlib}/DateTime/TimeZone.pm +%doc %{perl_man3dir}/DateTime::TimeZone.%{perl_man3ext}%{ext_man} +%doc %{perl_man3dir}/DateTime::TimeZone::*.%{perl_man3ext}%{ext_man} %changelog ++++++ DateTime-TimeZone-1.20.tar.bz2 -> DateTime-TimeZone-1.30.tar.bz2 ++++++ ++++ 26249 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-RPC-XML for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package perl-RPC-XML for openSUSE:Factory checked in at Thu Mar 24 16:52:32 CET 2011. -------- --- perl-RPC-XML/perl-RPC-XML.changes 2010-12-10 11:58:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-RPC-XML/perl-RPC-XML.changes 2011-03-22 07:47:11.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 22 06:26:33 UTC 2011 - coolo(a)novell.com + +- update to 0.74 + * tons and tons of fixes and new functions since 0.67, see ChangeLog +- take out patches of unclear use, to be removed on next update +- regenerate with cpanspec + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- RPC-XML-0.67.tar.bz2 New: ---- RPC-XML-0.74.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-RPC-XML.spec ++++++ --- /var/tmp/diff_new_pack.M68XwW/_old 2011-03-24 16:47:57.000000000 +0100 +++ /var/tmp/diff_new_pack.M68XwW/_new 2011-03-24 16:47:57.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-RPC-XML (Version 0.67) +# spec file for package perl-RPC-XML # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,83 +15,77 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: perl-RPC-XML -BuildRequires: perl perl-XML-Parser perl-libwww-perl perl-macros -#BuildRequires: perl-XML-LibXML -Url: http://search.cpan.org/search?module=RPC::XML -License: Artistic License .. -Group: Development/Libraries/Perl -Requires: perl = %{perl_version} perl-XML-Parser perl-libwww-perl -AutoReqProv: on +Version: 0.74 +Release: 1 +License: GPL+ or Artistic +%define cpan_name RPC-XML Summary: A set of classes for core data, message and XML handling -Version: 0.67 -Release: 10 -Source: RPC-XML-%{version}.tar.bz2 -Patch0: RPC-XML-0.53-ext-daemon-and-header-cb.dif -Patch1: RPC-XML-0.60-fix-utf8.dif +Url: http://search.cpan.org/dist/RPC-XML/ +Group: Development/Libraries/Perl +#Source: http://www.cpan.org/authors/id/R/RJ/RJRAY/RPC-XML-%{version}.tar.gz +Source: %{cpan_name}-%{version}.tar.gz +# UNCLEAR +Source1: RPC-XML-0.53-ext-daemon-and-header-cb.dif +# UNCLEAR +Source2: RPC-XML-0.60-fix-utf8.dif +#PATCH-FIX-OPENSUSE - ro(a)suse.de - fix build in chroot/buildservice Patch2: RPC-XML-0.60-rev127.dif +BuildRequires: perl(constant) >= 1.03 +BuildRequires: perl(File::Spec) >= 0.8 +BuildRequires: perl(LWP) >= 5.834 +BuildRequires: perl(Scalar::Util) >= 1.19 +BuildRequires: perl(XML::LibXML) >= 1.70 +BuildRequires: perl(XML::Parser) >= 2.31 +BuildRequires: perl +BuildRequires: perl-macros +Requires: perl(constant) >= 1.03 +Requires: perl(File::Spec) >= 0.8 +Requires: perl(LWP) >= 5.834 +Requires: perl(Scalar::Util) >= 1.19 +Requires: perl(XML::LibXML) >= 1.70 +Requires: perl(XML::Parser) >= 2.31 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %{perl_requires} %description -The RPC::XML package is a reference implementation of the XML-RPC -standard. - +The *RPC::XML* package is an implementation of the *XML-RPC* standard. - -Authors: --------- - Randy J. Ray <rjray(a)blackperl.com> +The package provides a set of classes for creating values to pass to the +constructors for requests and responses. These are lightweight objects, +most of which are implemented as tied scalars so as to associate specific +type information with the value. Classes are also provided for requests, +responses, faults (errors) and a parser based on the the XML::Parser +manpage package from CPAN. + +This module does not actually provide any transport implementation or +server basis. For these, see the RPC::XML::Client manpage and the +RPC::XML::Server manpage, respectively. %prep -%setup -n RPC-XML-%{version} -%patch0 -p0 -%patch1 -p1 -%patch2 -# --------------------------------------------------------------------------- +%setup -q -n %{cpan_name}-%{version} +%patch2 -p0 %build -perl Makefile.PL -make %{?_smp_mflags} -make test -# --------------------------------------------------------------------------- +%{__perl} Makefile.PL INSTALLDIRS=vendor +%{__make} %{?_smp_mflags} + +%check +%{__make} test %install -make DESTDIR=$RPM_BUILD_ROOT \ - INSTALLMAN1DIR=$RPM_BUILD_ROOT/%{_mandir}/man1 \ - INSTALLMAN3DIR=$RPM_BUILD_ROOT/%{_mandir}/man3 \ - install_vendor +%perl_make_install %perl_process_packlist +%perl_gen_filelist %clean -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; +%{__rm} -rf %{buildroot} -%files -%defattr(-,root,root) -/usr/bin/make_method -%dir %{perl_vendorlib}/RPC -%dir %{perl_vendorlib}/RPC/XML -%{perl_vendorlib}/RPC/XML.pm -%{perl_vendorlib}/RPC/XML/* -%dir %{perl_vendorlib}/Apache -%dir %{perl_vendorlib}/Apache/RPC -%{perl_vendorlib}/Apache/RPC/* -%dir %{perl_vendorlib}/auto/RPC -%dir %{perl_vendorlib}/auto/RPC/XML -%dir %{perl_vendorlib}/auto/RPC/XML/Server -%dir %{perl_vendorlib}/auto/RPC/XML/Procedure -%dir %{perl_vendorlib}/auto/RPC/XML/Function -%{perl_vendorlib}/auto/RPC/XML/Server/* -%{perl_vendorlib}/auto/RPC/XML/Procedure/* -%{perl_vendorlib}/auto/RPC/XML/Function/* -%dir %{perl_vendorarch}/auto/RPC -%dir %{perl_vendorarch}/auto/RPC/XML -%doc MANIFEST ChangeLog README README.apache2 -%{_mandir}/man3/RPC::XML* -%{_mandir}/man3/Apache::RPC::* -%{_mandir}/man1/make_method.1.gz +%files -f %{name}.files +%defattr(644,root,root,755) +%doc ChangeLog ChangeLog.xml README README.apache2 %changelog ++++++ RPC-XML-0.60-rev127.dif ++++++ --- /var/tmp/diff_new_pack.M68XwW/_old 2011-03-24 16:47:57.000000000 +0100 +++ /var/tmp/diff_new_pack.M68XwW/_new 2011-03-24 16:47:57.000000000 +0100 @@ -1,8 +1,23 @@ Index: t/40_server.t =================================================================== ---- t/40_server.t.orig -+++ t/40_server.t -@@ -59,8 +59,9 @@ isa_ok($srv, 'RPC::XML::Server', '$srv<2 +--- t/40_server.t.orig 2010-10-22 10:15:38.000000000 +0200 ++++ t/40_server.t 2011-03-22 07:35:52.549287223 +0100 +@@ -63,8 +63,9 @@ isa_ok($srv, 'RPC::XML::Server', '$srv<2 + # 22/09/2008 - Just allow for anything the user has attached to this address. + # Aliases keep causing this test to falsely fail. + my @localhostinfo = gethostbyname('localhost'); ++my $loc_reverse = gethostbyaddr(inet_aton("127.0.0.1"),AF_INET); + my $localIP = join('.', unpack('C4', $localhostinfo[4])); +-my @allhosts = ($localIP, $localhostinfo[0], split(' ', $localhostinfo[1])); ++my @allhosts = ($localIP, $localhostinfo[0], split(' ', $localhostinfo[1]), $loc_reverse); + for (@allhosts) { s/\./\\./g } + # Per RT 27778: For some reason gethostbyname('localhost') does not return + # "localhost" on win32 +Index: t/40_server_xmllibxml.t +=================================================================== +--- t/40_server_xmllibxml.t.orig 2010-10-22 10:15:38.000000000 +0200 ++++ t/40_server_xmllibxml.t 2011-03-22 07:36:56.583394893 +0100 +@@ -80,8 +80,9 @@ isa_ok($srv, 'RPC::XML::Server', '$srv<2 # 22/09/2008 - Just allow for anything the user has attached to this address. # Aliases keep causing this test to falsely fail. my @localhostinfo = gethostbyname('localhost'); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 latex2html for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package latex2html for openSUSE:Factory checked in at Thu Mar 24 16:47:36 CET 2011. -------- --- latex2html/latex2html.changes 2009-11-03 20:19:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/latex2html/latex2html.changes 2011-03-23 09:54:32.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 23 08:52:40 UTC 2011 - vcizek(a)novell.com + +- stopped using deprecated multiline matching (bnc#417982) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- latex2html-2008-match-multiline.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ latex2html.spec ++++++ --- /var/tmp/diff_new_pack.NYM3M3/_old 2011-03-24 16:46:46.000000000 +0100 +++ /var/tmp/diff_new_pack.NYM3M3/_new 2011-03-24 16:46:46.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package latex2html (Version 2008) +# spec file for package latex2html # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -24,13 +24,13 @@ Obsoletes: l2h Provides: l2h Url: http://www.latex2html.org/ -License: GPLv2+ ; LPPL .. +License: GPLv2+ Group: Productivity/Publishing/TeX/Utilities Provides: l2h99_1 Requires: texlive-latex netpbm perl ghostscript_any latex2html-pngicons AutoReqProv: on Version: 2008 -Release: 3 +Release: 13 Summary: LaTeX2HTML Converter BuildArch: noarch Source: latex2html-%{version}.tar.bz2 @@ -42,6 +42,7 @@ Patch2: latex2html-%{version}-gsout.diff Patch3: latex2html-%{version}-buildroot.diff Patch4: latex2html-%{version}-perl-bindir.diff +Patch5: latex2html-%{version}-match-multiline.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -105,6 +106,7 @@ %patch2 %patch3 %patch4 +%patch5 -p1 cp %{S:1} manual.ps.gz cp %{S:3} README.SuSE ++++++ latex2html-2008-match-multiline.patch ++++++ ++++ 1330 lines (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 libwps for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package libwps for openSUSE:Factory checked in at Thu Mar 24 16:46:20 CET 2011. -------- --- libwps/libwps.changes 2010-12-08 21:42:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/libwps/libwps.changes 2011-03-24 09:01:06.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 24 07:58:40 UTC 2011 - idoenmez(a)novell.com + +- Add libwps-0.2.0-gcc46.patch: fix compilation with gcc 4.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libwps-0.2.0-gcc46.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwps.spec ++++++ --- /var/tmp/diff_new_pack.b5fxXu/_old 2011-03-24 16:45:51.000000000 +0100 +++ /var/tmp/diff_new_pack.b5fxXu/_new 2011-03-24 16:45:51.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libwps (Version 0.2.0) +# spec file for package libwps # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,11 +22,13 @@ BuildRequires: gcc-c++ libwpd-devel >= 0.9.0 pkgconfig Summary: Library for importing the Microsoft Works word processor file format Version: 0.2.0 -Release: 1 +Release: 6 License: LGPLv2.1+ Group: System/Libraries Url: http://libwps.sourceforge.net/ Source: libwps-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM libwps-0.2.0-gcc46.patch idoenmez(a)suse.de -- Fix compilation with gcc 4.6 +Patch1: libwps-0.2.0-gcc46.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libwps-0_2-2 = %{version}-%{release} @@ -91,6 +93,7 @@ %prep %setup -q +%patch1 %build %configure --disable-static --docdir=%_docdir/%name ++++++ libwps-0.2.0-gcc46.patch ++++++ --- src/lib/WPS4.cpp 2010-06-16 00:19:39.000000000 +0200 +++ src/lib/WPS4.cpp 2011-03-24 08:55:06.428440089 +0100 @@ -156,11 +156,6 @@ } input->seek(page_offset, WPX_SEEK_SET); - uint32_t fcFirst; /* Byte number of first character covered by this page - of formatting information */ - - fcFirst = readU32(input); - int first_fod = FODs->size(); /* Read array of fcLim of FODs. The fcLim refers to the offset of the ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at Thu Mar 24 16:45:18 CET 2011. -------- --- yast2-installation/yast2-installation.changes 2011-02-28 15:10:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2011-03-24 16:17:10.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 24 16:14:02 CET 2011 - jsuchome(a)suse.cz + +- do not start automatic configuration for autoYaST (bnc#679435) +- 2.21.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-installation-2.20.6.tar.bz2 New: ---- yast2-installation-2.21.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.zHNIOb/_old 2011-03-24 16:42:33.000000000 +0100 +++ /var/tmp/diff_new_pack.zHNIOb/_new 2011-03-24 16:42:33.000000000 +0100 @@ -19,11 +19,11 @@ Name: yast2-installation -Version: 2.20.6 +Version: 2.21.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.20.6.tar.bz2 +Source0: yast2-installation-2.21.0.tar.bz2 Prefix: /usr @@ -136,7 +136,7 @@ System installation code as present on installation media. %prep -%setup -n yast2-installation-2.20.6 +%setup -n yast2-installation-2.21.0 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-installation-2.20.6.tar.bz2 -> yast2-installation-2.21.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.20.6/MAINTAINER new/yast2-installation-2.21.0/MAINTAINER --- old/yast2-installation-2.20.6/MAINTAINER 2009-11-24 15:14:37.000000000 +0100 +++ new/yast2-installation-2.21.0/MAINTAINER 2011-03-24 16:13:22.000000000 +0100 @@ -1 +1 @@ -Lukas Ocilka <locilka(a)suse.cz> +Jiří Suchomel <jsuchome(a)suse.cz> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.20.6/VERSION new/yast2-installation-2.21.0/VERSION --- old/yast2-installation-2.20.6/VERSION 2011-02-28 14:56:56.000000000 +0100 +++ new/yast2-installation-2.21.0/VERSION 2011-03-24 16:14:33.000000000 +0100 @@ -1 +1 @@ -2.20.6 +2.21.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.20.6/configure new/yast2-installation-2.21.0/configure --- old/yast2-installation-2.20.6/configure 2011-02-28 15:02:13.000000000 +0100 +++ new/yast2-installation-2.21.0/configure 2011-03-24 16:14:42.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-installation 2.20.6. +# Generated by GNU Autoconf 2.68 for yast2-installation 2.21.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.20.6' -PACKAGE_STRING='yast2-installation 2.20.6' +PACKAGE_VERSION='2.21.0' +PACKAGE_STRING='yast2-installation 2.21.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1240,7 +1240,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-installation 2.20.6 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.21.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1312,7 +1312,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-installation 2.20.6:";; + short | recursive ) echo "Configuration of yast2-installation 2.21.0:";; esac cat <<\_ACEOF @@ -1392,7 +1392,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.20.6 +yast2-installation configure 2.21.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1409,7 +1409,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-installation $as_me 2.20.6, which was +It was created by yast2-installation $as_me 2.21.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2339,7 +2339,7 @@ # Define the identity of the package. PACKAGE='yast2-installation' - VERSION='2.20.6' + VERSION='2.21.0' cat >>confdefs.h <<_ACEOF @@ -2461,9 +2461,9 @@ -VERSION="2.20.6" +VERSION="2.21.0" RPMNAME="yast2-installation" -MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" +MAINTAINER="Jiří Suchomel <jsuchome(a)suse.cz>" pkgconfigdir=\${libdir}/pkgconfig pkgconfigdatadir=\${datadir}/pkgconfig @@ -3624,7 +3624,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-installation $as_me 2.20.6, which was +This file was extended by yast2-installation $as_me 2.21.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3677,7 +3677,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-installation config.status 2.20.6 +yast2-installation config.status 2.21.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.20.6/configure.in new/yast2-installation-2.21.0/configure.in --- old/yast2-installation-2.20.6/configure.in 2011-02-28 15:02:09.000000000 +0100 +++ new/yast2-installation-2.21.0/configure.in 2011-03-24 16:14:39.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.20.6, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.21.0, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,9 +18,9 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.20.6" +VERSION="2.21.0" RPMNAME="yast2-installation" -MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" +MAINTAINER="Jiří Suchomel <jsuchome(a)suse.cz>" dnl pkgconfig honors lib64 pkgconfigdir=\${libdir}/pkgconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.20.6/control/control.openSUSE.xml new/yast2-installation-2.21.0/control/control.openSUSE.xml --- old/yast2-installation-2.20.6/control/control.openSUSE.xml 2011-02-08 15:06:59.000000000 +0100 +++ new/yast2-installation-2.21.0/control/control.openSUSE.xml 2011-03-07 15:09:51.000000000 +0100 @@ -192,7 +192,7 @@ <online_repos_preselected config:type="boolean">false</online_repos_preselected>  - <external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_113_Servers.xml</external_sources_link> + <external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_114_Servers.xml</external_sources_link> <dropped_packages></dropped_packages> <extra_urls config:type="list"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.20.6/src/include/inst_inc_first.ycp new/yast2-installation-2.21.0/src/include/inst_inc_first.ycp --- old/yast2-installation-2.20.6/src/include/inst_inc_first.ycp 2009-11-24 15:14:37.000000000 +0100 +++ new/yast2-installation-2.21.0/src/include/inst_inc_first.ycp 2011-03-21 15:51:38.000000000 +0100 @@ -99,6 +99,13 @@ boolean enable_autoconfiguration = ProductFeatures::GetBooleanFeature ("globals", "enable_autoconfiguration"); boolean autoconfiguration_default = ProductFeatures::GetBooleanFeature ("globals", "autoconfiguration_default"); + // bnc#679435: leave normal second stage for autoYaST + if (Mode::autoinst ()) + { + enable_autoconfiguration = false; + autoconfiguration_default = false; + } + // Enabled only when AC is selected InstData::enable_autoconfiguration = (enable_autoconfiguration == true); // Default state diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.20.6/src/include/scr_switch_debugger.ycp new/yast2-installation-2.21.0/src/include/scr_switch_debugger.ycp --- old/yast2-installation-2.20.6/src/include/scr_switch_debugger.ycp 2010-02-08 15:04:54.000000000 +0100 +++ new/yast2-installation-2.21.0/src/include/scr_switch_debugger.ycp 2011-03-08 09:48:36.000000000 +0100 @@ -117,7 +117,7 @@ // link to the Yast Bug Reporting HOWTO // for translators: use the localized page for your language if it exists, // check the combo box "In other laguages" on top of the page - _("http://en.opensuse.org/Bugs/YaST") + _("http://en.opensuse.org/openSUSE:Report_a_YaST_bug") ))) ) ), ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mozilla-xulrunner192 for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package mozilla-xulrunner192 for openSUSE:Factory checked in at Thu Mar 24 16:41:53 CET 2011. -------- --- mozilla-xulrunner192/mozilla-xulrunner192.changes 2011-03-07 08:14:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-xulrunner192/mozilla-xulrunner192.changes 2011-03-23 00:54:39.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 19 22:11:41 UTC 2011 - wr(a)rosenauer.org + +- security update to 1.9.2.16 (bnc#680771) + * MFSA 2011-11 + Update HTTPS certificate blacklist (bmo#642395) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- l10n-1.9.2.15.tar.bz2 xulrunner-source-1.9.2.15.tar.bz2 New: ---- l10n-1.9.2.16.tar.bz2 xulrunner-source-1.9.2.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner192.spec ++++++ --- /var/tmp/diff_new_pack.cokKOG/_old 2011-03-24 16:40:21.000000000 +0100 +++ /var/tmp/diff_new_pack.cokKOG/_new 2011-03-24 16:40:21.000000000 +0100 @@ -39,12 +39,12 @@ BuildRequires: wireless-tools %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 1.9.2.15 +Version: 1.9.2.16 Release: 1 -%define releasedate 2011030300 -%define version_internal 1.9.2.15 +%define releasedate 2011031900 +%define version_internal 1.9.2.16 %define apiversion 1.9.2 -%define uaweight 192150 +%define uaweight 192160 Summary: Mozilla Runtime Environment 1.9.2 Url: http://www.mozilla.org Group: Productivity/Other ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.cokKOG/_old 2011-03-24 16:40:21.000000000 +0100 +++ /var/tmp/diff_new_pack.cokKOG/_new 2011-03-24 16:40:21.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_6_15_RELEASE" -VERSION="1.9.2.15" +RELEASE_TAG="FIREFOX_3_6_16_RELEASE" +VERSION="1.9.2.16" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla ++++++ l10n-1.9.2.15.tar.bz2 -> l10n-1.9.2.16.tar.bz2 ++++++ mozilla-xulrunner192/l10n-1.9.2.15.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner192/l10n-1.9.2.16.tar.bz2 differ: char 11, line 1 ++++++ xulrunner-source-1.9.2.15.tar.bz2 -> xulrunner-source-1.9.2.16.tar.bz2 ++++++ mozilla-xulrunner192/xulrunner-source-1.9.2.15.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner192/xulrunner-source-1.9.2.16.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 libevent for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package libevent for openSUSE:Factory checked in at Thu Mar 24 16:39:34 CET 2011. -------- --- libevent/libevent.changes 2010-06-21 16:46:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/libevent/libevent.changes 2011-03-22 12:51:50.000000000 +0100 @@ -1,0 +2,27 @@ +Mon Mar 22 11:51:31 UTC 2011 - dimstar(a)opensuse.org + +- Drop autoreconf call from build section. We do not carry any + patches at this time. + +------------------------------------------------------------------- +Mon Mar 21 23:02:31 UTC 2011 - dimstar(a)opensuse.org + +- Update to version 2.0.10: + + Bugfixes: + - Minor fix for IOCP shutdown handling fix + - Correctly notify the main thread when activating an event + from a subthread + - Reject overlong http requests early when Expect:100-continue + is set + - EVUTIL_ASSERT: Use sizeof() to avoid "unused variable" + warnings with -DNDEBUG. + + Code cleanups: + - bufferevent-internal.h: Use the new event2/util.h header, + not evutil.h + - Use relative includes instead of system includes consistently + - Make whitespace more consistent +- For all changes between 1.4.14 and 2.0.10, see ChangeLog. +- BuildRequire pkg-config, for proper pkgconfig() provides. +- Change library soname to libevent-2_0-5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libevent-1.4.14b-stable.tar.bz2 New: ---- libevent-2.0.10-stable.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libevent.spec ++++++ --- /var/tmp/diff_new_pack.ZnmFlH/_old 2011-03-24 16:39:17.000000000 +0100 +++ /var/tmp/diff_new_pack.ZnmFlH/_new 2011-03-24 16:39:17.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libevent (Version 1.4.14b) +# spec file for package libevent # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -18,13 +18,14 @@ Name: libevent -Version: 1.4.14b +Version: 2.0.10 Release: 1 License: BSD3c(or similar) Summary: Library Providing an Event Handling API Url: http://monkey.org/~provos/libevent/ Group: Development/Libraries/C and C++ Source: http://monkey.org/~provos/libevent-%{version}-stable.tar.bz2 +BuildRequires: pkg-config PreReq: %fillup_prereq PreReq: %insserv_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,41 +35,31 @@ specific event on a file descriptor occurs or after a given time has passed. -Author: --------- - Nils Provos <provos(a)citi.umich.edu> - -%define library_name libevent-1_4-2 +%define library_name libevent-2_0-5 %define debug_package_requires %{library_name} = %{version}-%{release} -%package -n libevent-1_4-2 +%package -n libevent-2_0-5 License: BSD3c(or similar) -# Summary: Shared libraries from libevent Group: Development/Libraries/C and C++ Provides: %{name} = %{version} Obsoletes: %{name} <= %{version} -%description -n libevent-1_4-2 +%description -n libevent-2_0-5 The libevent library provides a mechanism to execute a function when a specific event on a file descriptor occurs or after a given time has passed. This package holds the shared libraries for libevent. -Author: --------- - Nils Provos <provos(a)citi.umich.edu> - %package devel License: BSD3c(or similar) -# -Summary: Development files for libevent +Summary: Development files for libevent2 Group: Development/Libraries/C and C++ Requires: %{library_name} = %{version} Requires: glibc-devel Provides: %{name}:/usr/include/event.h -# both have /usr/include/event.h +# Both have /usr/include/event.h Conflicts: libev-devel %description devel @@ -76,23 +67,18 @@ specific event on a file descriptor occurs or after a given time has passed. -This package holds the development files for libevent. - -Author: --------- - Nils Provos <provos(a)citi.umich.edu> +This package holds the development files for libevent2. %prep -%setup -q -n %name-%version-stable +%setup -q -n %{name}-%{version}-stable %build -autoreconf -i -f %configure --disable-static -%{__make} %{?jobs:-j%jobs} +%{__make} %{?_smp_mflags} %install %makeinstall -%{__rm} -v %{buildroot}%{_libdir}/*.la +find %{buildroot}%{_libdir} -name "*.la" -delete -print %clean rm -rf %{buildroot} @@ -103,17 +89,21 @@ %files -n %{library_name} %defattr(-,root,root,-) -%{_libdir}/libevent-1.4.so.2* -%{_libdir}/libevent_core-1.4.so.2* -%{_libdir}/libevent_extra-1.4.so.2* +%{_libdir}/libevent-2.0.so.5* +%{_libdir}/libevent_core-2.0.so.5* +%{_libdir}/libevent_extra-2.0.so.5* +%{_libdir}/libevent_pthreads-2.0.so.5* %files devel %defattr(-,root,root) %{_bindir}/event_rpcgen.py %{_includedir}/*.h -%{_mandir}/man3/* +%{_includedir}/event2 %{_libdir}/libevent.so %{_libdir}/libevent_core.so %{_libdir}/libevent_extra.so +%{_libdir}/libevent_pthreads.so +%{_libdir}/pkgconfig/libevent.pc +%{_libdir}/pkgconfig/libevent_pthreads.pc %changelog ++++++ libevent-1.4.14b-stable.tar.bz2 -> libevent-2.0.10-stable.tar.bz2 ++++++ ++++ 105105 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 gsd for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package gsd for openSUSE:Factory checked in at Thu Mar 24 16:33:17 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/gsd/gsd.changes 2011-02-11 23:11:17.000000000 +0100 @@ -0,0 +1,104 @@ +------------------------------------------------------------------- +Fri Feb 11 21:32:40 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 1.1.0 + * Added man page to gsd. + * Removed OMP 1.0 compatibility. + * Added commandline options --version and --help. + * Split target credentials into SSH and SMB credentials to match OMP 2.0. + * Updated about dialog. + * Added dialog to start gsa in external web browser. + * Added shortcuts: "Ctrl+q" to quit, "F5" to refresh. + * Added custom make target to create Linux desktop menu item for GSD. + +------------------------------------------------------------------- +Fri Feb 4 21:56:54 UTC 2011 - bitshuffler(a)opensuse.org + +- Update to 1.0.98.1 + * A couple of small GUI improvements. + * Added language configuration via menu (German/English/Default). + * Fixed Umlaut/UTF-8 problems. + * Code hardening activated. + * Improved build environment, now uses pkg-config and makes + OpenVAS Libraries 4.0 mandatory requirement. + +------------------------------------------------------------------- +Mon Dec 20 12:49:07 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 1.0.1 + * Added pagination for reports. + * Added animated process working icon to report widget. + * Reload reports after adding or deleting notes or overrides. + * Added report download size selection. + * Added context menu to notes and overrides. + * Added logo to login dialog. + +------------------------------------------------------------------- +Thu Dec 2 15:32:31 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 1.0.0 + * Added support for scan configuration import. + * Disable the manual start for scheduled tasks. + * Cleaned up UI components and about dialog. + +------------------------------------------------------------------- +Fri Nov 19 21:13:42 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 0.9.99.2 + * Improved editing of NVT preferences. + * Improved editing of scanner preferences. + * Fixed a bug that caused crash on windows systems. + * Added support for report format download. + * Added support for deleting reports. + * Improved report presentation and filter. + +------------------------------------------------------------------- +Thu Oct 28 17:08:48 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 0.9.99.1 + * Added details dialog for NVT families. + * Added details dialog for NVTs. + * Added functionality to modify the nvt families for a scan config. + * Added functionality to modify scanner configuration. + * Added functionality to modify NVT preferences. + * Added new feature: Display and filter reports in html format. + * Added New Feature: Notes can be added to a report now. + * Added New Feature: Overrides can be added to a report now. + * Changed details windows to dockwidgets. + * Load system reports on startup. + * Saving window state on close. + * Improved dock widget behavior. + * Added function to clear dock widget settings. + * Reports can be requested from manager using omp version 1.0 or 2.0. + * Refactored major parts of gsd, espacially the object hierachy and + the data request layer for omp 1.0. + * Renamed GSA-Desktop to GSD (Greenbone Security Desktop). + +------------------------------------------------------------------- +Wed Sep 8 12:12:36 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 0.3.0 + * Details dialogs for tasks and scan configurations have been added. + * Scan configurations can be downloaded in xml format. + * Support for system reports has been added. + * System reports can be saved as png image. + * Improved style for progress bar. The bar now looks better especially + on Windows systems. + * Improved focus handling for widgets. + * Doubleclicks in lists now issue default action. + * Improved About Dialog. + +------------------------------------------------------------------- +Thu Aug 12 17:09:33 UTC 2010 - bitshuffler(a)opensuse.org + +- Update to 0.2.0 + * Missing details dialogs for omp resources have been added. + * Support for notes and overrides has been added. + * German translation has been improved and completed. + * Cross compile support for mingw32 has been added. + +------------------------------------------------------------------- +Thu Jul 29 15:04:02 UTC 2010 - bitshuffler(a)opensuse.org + +- Initial package. + calling whatdependson for head-i586 New: ---- debian.changelog debian.compat debian.control debian.gsd.dirs debian.gsd.install debian.rules debian.series gsd-1.1.0-linking.patch gsd-1.1.0.tar.gz gsd.changes gsd.dsc gsd.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gsd.spec ++++++ # # spec file for package gsd # # Copyright (c) 2011 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: gsd Version: 1.1.0 Release: 1 License: GNU GPL v2 or later Group: Productivity/Networking/Security Url: http://www.openvas.org Source: %{name}-%{version}.tar.gz Patch0: gsd-1.1.0-linking.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: glib2-devel BuildRequires: libopenvas-devel BuildRequires: libqt4-devel BuildRequires: pkgconfig %if 0%{?fedora_version} > 13 BuildRequires: qt-webkit-devel %endif %if 0%{?mandriva_version} BuildRequires: pinentry-gtk2 %endif %if 0%{?suse_version} BuildRequires: libQtWebKit-devel %endif Summary: A Desktop Client that connects to the OpenVAS Manager %description GSD is a desktop client that connects to the OpenVAS Manager using the OMP protocol. %prep %setup -q %patch0 %build export CXXFLAGS="$RPM_OPT_FLAGS" %__mkdir build cd build cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DSYSCONFDIR=%{_sysconfdir} \ -DLOCALSTATEDIR=%{_localstatedir} \ -DCMAKE_BUILD_TYPE=Release %__make %{?_smp_mflags} VERBOSE=1 %install cd build %__make install DESTDIR=%{buildroot} install %__mkdir_p %{buildroot}%{_localstatedir}/log/openvas touch %{buildroot}%{_localstatedir}/log/openvas/gsd.log %clean test "%{buildroot}" != "/" && %__rm -rf %{buildroot} %files %defattr(-,root,root) %doc CHANGES README %dir %{_sysconfdir}/openvas %config(noreplace) %{_sysconfdir}/openvas/gsd_log.conf %{_bindir}/gsd %dir %{_datadir}/openvas/translations %{_datadir}/openvas/translations/gsd_de.qm %{_mandir}/man8/gsd.8* %dir %{_localstatedir}/log/openvas %ghost %{_localstatedir}/log/openvas/gsd.log %changelog ++++++ debian.changelog ++++++ gsd (1.1.0-1) UNRELEASED; urgency=low * New upstream release. - Added man page to gsd. - Removed OMP 1.0 compatibility. - Added commandline options --version and --help. - Split target credentials into SSH and SMB credentials to match OMP 2.0. - Updated about dialog. - Added dialog to start gsa in external web browser. - Added shortcuts: "Ctrl+q" to quit, "F5" to refresh. - Added custom make target to create Linux desktop menu item for GSD. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 11 Feb 2011 22:53:38 +0100 gsd (1.0.98.1-1) UNRELEASED; urgency=low * New upstream release. - A couple of small GUI improvements. - Added language configuration via menu (German/English/Default). - Fixed Umlaut/UTF-8 problems. - Code hardening activated. - Improved build environment, now uses pkg-config and makes OpenVAS Libraries 4.0 mandatory requirement. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 04 Feb 2011 22:53:38 +0100 gsd (1.0.1-1) UNRELEASED; urgency=low * New upstream release. - Added pagination for reports. - Added animated process working icon to report widget. - Reload reports after adding or deleting notes or overrides. - Added report download size selection. - Added context menu to notes and overrides. - Added logo to login dialog. -- Stephan Kleine <bitshuffler(a)opensuse.org> Mon, 20 Dec 2010 13:47:59 +0100 gsd (1.0.0-1) UNRELEASED; urgency=low * New upstream release. - Added support for scan configuration import. - Disable the manual start for scheduled tasks. - Cleaned up UI components and about dialog. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 02 Dec 2010 16:31:52 +0100 gsd (0.9.99.2-1) UNRELEASED; urgency=low * New upstream release. - Improved editing of NVT preferences. - Improved editing of scanner preferences. - Fixed a bug that caused crash on windows systems. - Added support for report format download. - Added support for deleting reports. - Improved report presentation and filter. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 19 Nov 2010 22:12:48 +0100 gsd (0.9.99.1-1) UNRELEASED; urgency=low * New upstream release. - Added details dialog for NVT families. - Added details dialog for NVTs. - Added functionality to modify the nvt families for a scan config. - Added functionality to modify scanner configuration. - Added functionality to modify NVT preferences. - Added new feature: Display and filter reports in html format. - Added New Feature: Notes can be added to a report now. - Added New Feature: Overrides can be added to a report now. - Changed details windows to dockwidgets. - Load system reports on startup. - Saving window state on close. - Improved dock widget behavior. - Added function to clear dock widget settings. - Reports can be requested from manager using omp version 1.0 or 2.0. - Refactored major parts of gsd, espacially the object hierachy and the data request layer for omp 1.0. - Renamed GSA-Desktop to GSD (Greenbone Security Desktop). -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 28 Oct 2010 19:08:19 +0200 gsd (0.3.0-1) UNRELEASED; urgency=low * New upstream release. - Details dialogs for tasks and scan configurations have been added. - Scan configurations can be downloaded in xml format. - Support for system reports has been added. - System reports can be saved as png image. - Improved style for progress bar. The bar now looks better especially on Windows systems. - Improved focus handling for widgets. - Doubleclicks in lists now issue default action. - Improved About Dialog. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 08 Sep 2010 14:10:54 +0200 gsd (0.2.0-1) UNRELEASED; urgency=low * New upstream release. - Missing details dialogs for omp resources have been added. - Support for notes and overrides has been added. - German translation has been improved and completed. - Cross compile support for mingw32 has been added. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 12 Aug 2010 19:08:11 +0200 gsd (0.1.0-1) UNRELEASED; urgency=low * Initial package. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 29 Jul 2010 17:18:29 +0200 ++++++ debian.compat ++++++ 5 ++++++ debian.control ++++++ Source: gsd Section: admin Priority: optional Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Build-Depends: debhelper (>= 5), cmake, doxygen, dpatch, hardening-wrapper, libopenvas3-dev | libopenvas4-dev, libqtwebkit-dev | libqt4-dev, pkg-config Standards-Version: 3.8.0 Package: gsd Section: net Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: A Desktop Client that connects to the OpenVAS Manager GSD is a desktop client that connects to the OpenVAS Manager using the OMP protocol. Package: gsd-dbg Section: debug Priority: extra Architecture: any Depends: ${misc:Depends}, gsd (= ${binary:Version}) Description: A Desktop Client that connects to the OpenVAS Manager (debug) GSD is a desktop client that connects to the OpenVAS Manager using the OMP protocol. . This package contains the debugging symbols. ++++++ debian.gsd.dirs ++++++ var/log/openvas ++++++ debian.gsd.install ++++++ etc/openvas usr/bin usr/share/doc/gsd usr/share/openvas/translations/gsd_de.qm usr/share/man/man8/gsd.8* ++++++ debian.rules ++++++ #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 # Enable hardening-wrapper export DEB_BUILD_HARDENING=1 config: config-stamp config-stamp: dh_testdir # Add here commands to configure the package. cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc -DLOCALSTATEDIR=/var -DCMAKE_BUILD_TYPE=Release . touch $@ build: build-stamp build-stamp: config-stamp dh_testdir # Add here commands to compile the package. $(MAKE) VERBOSE=1 touch $@ clean: dh_testdir dh_testroot rm -f build-stamp config.stamp # Add here commands to clean up after the build process. dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs # Add here commands to install the package into debian/tmp $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp install -Dm 0644 README $(CURDIR)/debian/tmp/usr/share/doc/gsd/README # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installchangelogs CHANGES dh_installdocs dh_install --sourcedir=debian/tmp dh_installdebconf dh_installlogrotate dh_installinit -n -r -u stop 20 0 6 . dh_installman --sourcedir=debian/tmp dh_link dh_strip --dbg-package=gsd-dbg dh_compress dh_fixperms dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install ++++++ debian.series ++++++ gsd-1.1.0-linking.patch -p0 ++++++ gsd-1.1.0-linking.patch ++++++ Index: src/CMakeLists.txt =================================================================== --- src/CMakeLists.txt.orig 2011-02-11 16:27:16.000000000 +0100 +++ src/CMakeLists.txt 2011-02-11 22:45:15.567085589 +0100 @@ -203,7 +203,7 @@ else (MINGW) set_target_properties (gsd PROPERTIES COMPILE_FLAGS "${HEADER_TEMP} ${GNUTLS_CFLAGS} ${OPENVAS_CFLAGS} ${GLIB_CFLAGS}") - target_link_libraries (gsd openvas_omp openvas_base ${QT_LIBRARIES} gthread-2.0) + target_link_libraries (gsd openvas_omp openvas_base ${QT_LIBRARIES} gthread-2.0 gcrypt) endif (MINGW) ## Install ++++++ gsd.dsc ++++++ Format: 1.0 Source: gsd Binary: gsd Architecture: any Version: 1.1.0-1 Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Homepage: http://www.openvas.org/ Standards-Version: 3.8.0 Build-Depends: debhelper (>= 5), cmake, doxygen, dpatch, hardening-wrapper, libopenvas3-dev | libopenvas4-dev, libqtwebkit-dev | libqt4-dev, pkg-config Files: 776ce4e1000137c9aec7863372c8c876 373800 gsd-1.1.0.orig.tar.gz 131e6720b0526ade9405eade0d9150ac 56625 gsd-1.1.0.diff.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libmicrohttpd for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package libmicrohttpd for openSUSE:Factory checked in at Thu Mar 24 14:45:47 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/libmicrohttpd/libmicrohttpd.changes 2011-03-05 22:49:52.000000000 +0100 @@ -0,0 +1,64 @@ +------------------------------------------------------------------- +Sat Mar 5 21:38:11 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 0.9.8 + +------------------------------------------------------------------- +Tue Feb 15 16:54:35 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 0.9.7 + +------------------------------------------------------------------- +Thu Jan 27 02:33:32 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 0.9.6 + +------------------------------------------------------------------- +Sat Jan 15 15:02:29 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 0.9.5 + +------------------------------------------------------------------- +Wed Dec 29 15:15:48 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 0.9.4 + +------------------------------------------------------------------- +Wed Nov 24 16:02:15 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 0.9.3 + +------------------------------------------------------------------- +Thu Oct 21 13:21:06 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 0.9.2 + +------------------------------------------------------------------- +Mon Sep 20 17:17:03 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 0.9.1 + +------------------------------------------------------------------- +Tue Jul 27 07:26:27 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 0.9.0 + +------------------------------------------------------------------- +Mon Mar 15 08:35:12 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 0.4.6: + * fixes use of poll causing busy waiting + * fixes a segfault if inconsistent options were used + * fixes SSL support on big-endian architectures + * fixes an issue with error signalling for PUT/POST requests in HTTP 1.1 + +------------------------------------------------------------------- +Tue Feb 2 13:10:52 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 0.4.5. + +------------------------------------------------------------------- +Sun Jan 17 19:52:07 UTC 2010 - bitshuffler(a)opensuse.org + +- Initial RPM. + calling whatdependson for head-i586 New: ---- debian.changelog debian.compat debian.control debian.libmicrohttpd-dev.install debian.libmicrohttpd10.install debian.rules libmicrohttpd-0.9.8.tar.gz libmicrohttpd.changes libmicrohttpd.dsc libmicrohttpd.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmicrohttpd.spec ++++++ # # spec file for package libmicrohttpd # # Copyright (c) 2011 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 soname 10 Name: libmicrohttpd Version: 0.9.8 Release: 1 License: LGPLv2.1+ Group: Productivity/Networking/Web/Servers Url: http://gnunet.org/libmicrohttpd/ Source: http://ftpmirror.gnu.org/libmicrohttpd/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libcurl-devel BuildRequires: libgcrypt-devel >= 1.2.4 BuildRequires: libtasn1-devel %if 0%{?suse_version} BuildRequires: libgnutls-devel BuildRequires: pkg-config %else BuildRequires: gnutls-devel BuildRequires: pkgconfig %endif Summary: Small Embeddable HTTP Server Library %description GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application. GNU libmicrohttpd is free software and part of the GNU project. Key features that distinguish libmicrohttpd from other projects are: * C library: fast and small * API is simple, expressive and fully reentrant * Implementation is http 1.1 compliant * HTTP server can listen on multiple ports * Support for IPv6 * Support for incremental processing of POST data * Creates binary of only 30k (without TLS/SSL support) * Three different threading models * Supported platforms include GNU/Linux, FreeBSD, OpenBSD, NetBSD, OS X, W32, Symbian and z/OS * Optional support for SSL3 and TLS (requires libgcrypt) libmicrohttpd was started because the author needed an easy way to add a concurrent HTTP server to other projects. Existing alternatives were either non-free, not reentrant, standalone, of terrible code quality or a combination thereof. Do not use libmicrohttpd if you are looking for a standalone http server, there are many other projects out there that provide that kind of functionality already. However, if you want to be able to serve simple WWW pages from within your C or C++ application, check it out. %package -n %{name}%{soname} Group: System/Libraries Summary: Small Embeddable HTTP Server Library %description -n %{name}%{soname} GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application. GNU libmicrohttpd is free software and part of the GNU project. Key features that distinguish libmicrohttpd from other projects are: * C library: fast and small * API is simple, expressive and fully reentrant * Implementation is http 1.1 compliant * HTTP server can listen on multiple ports * Support for IPv6 * Support for incremental processing of POST data * Creates binary of only 30k (without TLS/SSL support) * Three different threading models * Supported platforms include GNU/Linux, FreeBSD, OpenBSD, NetBSD, OS X, W32, Symbian and z/OS * Optional support for SSL3 and TLS (requires libgcrypt) libmicrohttpd was started because the author needed an easy way to add a concurrent HTTP server to other projects. Existing alternatives were either non-free, not reentrant, standalone, of terrible code quality or a combination thereof. Do not use libmicrohttpd if you are looking for a standalone http server, there are many other projects out there that provide that kind of functionality already. However, if you want to be able to serve simple WWW pages from within your C or C++ application, check it out. %package devel License: LGPLv2.1+ Group: Development/Libraries/C and C++ Requires: %{name}%{soname} = %{version} PreReq: info Summary: Small Embeddable HTTP Server Library %description devel GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application. GNU libmicrohttpd is free software and part of the GNU project. Key features that distinguish libmicrohttpd from other projects are: * C library: fast and small * API is simple, expressive and fully reentrant * Implementation is http 1.1 compliant * HTTP server can listen on multiple ports * Support for IPv6 * Support for incremental processing of POST data * Creates binary of only 30k (without TLS/SSL support) * Three different threading models * Supported platforms include GNU/Linux, FreeBSD, OpenBSD, NetBSD, OS X, W32, Symbian and z/OS * Optional support for SSL3 and TLS (requires libgcrypt) libmicrohttpd was started because the author needed an easy way to add a concurrent HTTP server to other projects. Existing alternatives were either non-free, not reentrant, standalone, of terrible code quality or a combination thereof. Do not use libmicrohttpd if you are looking for a standalone http server, there are many other projects out there that provide that kind of functionality already. However, if you want to be able to serve simple WWW pages from within your C or C++ application, check it out. %prep %setup -q %build %configure --disable-static \ --enable-curl \ --enable-client-side %__make %{?_smp_mflags} %install %makeinstall find %{buildroot} -name "*.la" -delete # Some tests fail due to some issue in gnutls #%check #%__make %{?_smp_mflags} check %post -n %{name}%{soname} -p /sbin/ldconfig %post devel %if 0%{?fedora_version} /sbin/install-info --info-dir=%{_infodir} --info-file=%{_infodir}/microhttpd.info%{ext_info} /sbin/install-info --info-dir=%{_infodir} --info-file=%{_infodir}/microhttpd-tutorial.info%{ext_info} %endif %if 0%{?mandriva_version} %_install_info libmicrohttpd.info %_install_info libmicrohttpd-tutorial.info %endif %if 0%{?suse_version} %install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} %install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} %endif %postun -n %{name}%{soname} -p /sbin/ldconfig %postun devel %if 0%{?fedora_version} /sbin/install-info --delete --info-dir=%{_infodir} --info-file=%{_infodir}/microhttpd.info%{ext_info} /sbin/install-info --delete --info-dir=%{_infodir} --info-file=%{_infodir}/microhttpd-tutorial.info%{ext_info} %endif %if 0%{?mandriva_version} %_remove_install_info libmicrohttpd.info %_remove_install_info libmicrohttpd-tutorial.info %endif %if 0%{?suse_version} %install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} %install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} %endif %clean test "%{buildroot}" != "/" && %__rm -rf "%{buildroot}" %files -n %{name}%{soname} %defattr(-,root,root) %{_libdir}/libmicrohttpd.so.%{soname} %{_libdir}/libmicrohttpd.so.%{soname}.* %files devel %defattr(-,root,root) %{_includedir}/microhttpd.h %{_libdir}/libmicrohttpd.so %{_libdir}/pkgconfig/libmicrohttpd.pc %{_infodir}/microhttpd.info* %{_infodir}/microhttpd-tutorial.info* %{_mandir}/man3/libmicrohttpd.3* # Do NOT delete this cause I need it for Fedora & Mandriva too! %if 0%{?fedora_version} || 0%{?scientificlinux_version} %exclude %{_infodir}/dir %endif %changelog ++++++ debian.changelog ++++++ libmicrohttpd (0.9.8-1) unstable; urgency=low * Updated to 0.9.8. -- Stephan Kleine <bitshuffler(a)opensuse.org> Sat, 05 Mar 2011 22:37:25 +0100 libmicrohttpd (0.9.7-1) unstable; urgency=low * Updated to 0.9.7. -- Stephan Kleine <bitshuffler(a)opensuse.org> Tue, 15 Feb 2011 17:55:00 +0100 libmicrohttpd (0.9.6-1) unstable; urgency=low * Updated to 0.9.6. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 27 Jan 2011 03:34:03 +0100 libmicrohttpd (0.9.5-1) unstable; urgency=low * Updated to 0.9.5. * Enabled hardening-wrapper -- Stephan Kleine <bitshuffler(a)opensuse.org> Sat, 15 Jan 2011 16:04:09 +0100 libmicrohttpd (0.9.4-1) unstable; urgency=low * Updated to 0.9.4. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 29 Dec 2010 16:15:21 +0100 libmicrohttpd (0.9.3-1) unstable; urgency=low * Updated to 0.9.3. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 24 Nov 2010 17:01:38 +0100 libmicrohttpd (0.9.2-1) unstable; urgency=low * Updated to 0.9.2. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 21 Oct 2010 15:21:16 +0200 libmicrohttpd (0.9.1-1) unstable; urgency=low * Updated to 0.9.1. -- Stephan Kleine <bitshuffler(a)opensuse.org> Mon, 20 Sep 2010 19:15:20 +0200 libmicrohttpd (0.9.0-1) unstable; urgency=low * Updated to 0.9.0. -- Stephan Kleine <bitshuffler(a)opensuse.org> Tue, 27 Jul 2010 09:25:19 +0200 libmicrohttpd (0.4.6-1) unstable; urgency=low * Updated to 0.4.6. -- Pascal Bleser <pascal.bleser(a)opensuse.org> Mon, 15 Mar 2010 09:37:00 +0100 libmicrohttpd (0.4.5-1) unstable; urgency=low * Updated to 0.4.5. -- Stephan Kleine <bitshuffler(a)opensuse.org> Sat, 02 Feb 2010 13:10:52 +0100 libmicrohttpd (0.4.4-1) unstable; urgency=low * Initial package. -- Stephan Kleine <bitshuffler(a)opensuse.org> Sat, 23 Jan 2010 14:04:38 +0100 ++++++ debian.compat ++++++ 5 ++++++ debian.control ++++++ Source: libmicrohttpd Section: libs Priority: optional Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Build-Depends: debhelper (>= 5), autotools-dev, libcurl4-openssl-dev, libgcrypt11-dev (>= 1.2.4), libgnutls-dev Standards-Version: 3.8.3 Homepage: http://www.gnu.org/software/libmicrohttpd/ Vcs-Browser: http://git.debian-maintainers.org/?p=gnunet/libmicrohttpd.git Vcs-Git: git://git.debian-maintainers.org/git/gnunet/libmicrohttpd.git Package: libmicrohttpd10 Section: libs Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: library embedding HTTP server functionality libmicrohttpd is a small C library for embedding HTTP server functionality into applications. . It will be used in future GNUnet versions as part of the HTTP transport. Package: libmicrohttpd10-dbg Section: debug Priority: extra Architecture: any Depends: ${misc:Depends}, libmicrohttpd10 (= ${binary:Version}), libmicrohttpd-dev (= ${binary:Version}) Description: library embedding HTTP server functionality (debug) libmicrohttpd is a small C library for embedding HTTP server functionality into applications. . This package contains the debugging symbols. Package: libmicrohttpd-dev Section: libdevel Architecture: any Depends: ${misc:Depends}, libmicrohttpd10 (= ${binary:Version}), Description: library embedding HTTP server functionality (development) libmicrohttpd is a small C library for embedding HTTP server functionality into applications. . This package contains the development files. ++++++ debian.libmicrohttpd-dev.install ++++++ /usr/include/* /usr/lib/*.so /usr/lib/pkgconfig /usr/share/info /usr/share/man ++++++ debian.libmicrohttpd10.install ++++++ usr/lib/*.so.* ++++++ debian.rules ++++++ #!/usr/bin/make -f # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 # Enable hardening-wrapper export DEB_BUILD_HARDENING=1 # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) config.status: configure dh_testdir # Configuring package ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --disable-static --enable-curl --enable-client-side build: build-stamp build-stamp: config.status dh_testdir # Building package $(MAKE) touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp # Cleaning package [ ! -f Makefile ] || $(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs # Installing package $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install binary-indep: build install binary-arch: build install dh_testdir dh_testroot dh_installchangelogs ChangeLog dh_installdocs # Removing useless files rm -f debian/tmp/usr/lib/*.a rm -f debian/tmp/usr/lib/*.la rm -f debian/tmp/usr/share/info/dir* dh_install --fail-missing --sourcedir=debian/tmp dh_link dh_strip --dbg-package=libmicrohttpd10-dbg dh_compress dh_fixperms dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install ++++++ libmicrohttpd.dsc ++++++ Format: 1.0 Source: libmicrohttpd Binary: libmicrohttpd10, libmicrohttpd10-dbg, libmicrohttpd-dev Architecture: any Version: 0.9.8-1 Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Homepage: http://www.gnu.org/software/libmicrohttpd/ Standards-Version: 3.8.3 Vcs-Browser: http://git.debian-maintainers.org/?p=gnunet/libmicrohttpd.git Vcs-Git: git://git.debian-maintainers.org/git/gnunet/libmicrohttpd.git Build-Depends: debhelper (>= 5), autotools-dev, libcurl4-openssl-dev, libgcrypt11-dev (>= 1.2.4), libgnutls-dev, hardening-wrapper Files: bcd61ebb10286379f55c7db9c79e0465 843590 libmicrohttpd-0.9.8.tar.gz ee55b467a355f4669023ca61fa04aaf4 3595 libmicrohttpd-0.9.8.diff.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libsatsolver for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package libsatsolver for openSUSE:Factory checked in at Thu Mar 24 11:23:34 CET 2011. -------- --- libsatsolver/libsatsolver.changes 2011-03-02 12:34:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/libsatsolver/libsatsolver.changes 2011-03-24 11:04:36.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 24 10:04:16 UTC 2011 - mls(a)suse.de + +- add missing else part in rpmdbid2db() + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 5d6f117d6df9e179f06221ea9c29a7a95de1027c.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsatsolver.spec ++++++ --- /var/tmp/diff_new_pack.IJgtXb/_old 2011-03-24 11:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.IJgtXb/_new 2011-03-24 11:23:25.000000000 +0100 @@ -19,10 +19,11 @@ Name: libsatsolver Version: 0.16.4 -Release: 1 +Release: 2 License: BSD3c Url: git://gitorious.org/opensuse/sat-solver.git Source: satsolver-%{version}.tar.bz2 +Patch0: 5d6f117d6df9e179f06221ea9c29a7a95de1027c.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/C and C++ Prefix: /usr @@ -121,6 +122,7 @@ %prep %setup -n satsolver-%{version} +%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ 5d6f117d6df9e179f06221ea9c29a7a95de1027c.patch ++++++ >From 5d6f117d6df9e179f06221ea9c29a7a95de1027c Mon Sep 17 00:00:00 2001 From: Michael Schroeder <mls(a)suse.de> Date: Thu, 24 Mar 2011 10:53:52 +0100 Subject: [PATCH] - add missing else part in rpmdbid2db() --- ext/repo_rpmdb.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c index 801ed4b..77d8542 100644 --- a/ext/repo_rpmdb.c +++ b/ext/repo_rpmdb.c @@ -1259,11 +1259,12 @@ static inline void rpmdbid2db(unsigned char *db, Id id, int byteswapped) #else # if defined(WORDS_BIGENDIAN) if (!byteswapped) - db[0] = id >> 24, db[1] = id >> 16, db[2] = id >> 8, db[3] = id; # else if (byteswapped) - db[3] = id >> 24, db[2] = id >> 16, db[1] = id >> 8, db[0] = id; # endif + db[0] = id >> 24, db[1] = id >> 16, db[2] = id >> 8, db[3] = id; + else + db[3] = id >> 24, db[2] = id >> 16, db[1] = id >> 8, db[0] = id; #endif } -- 1.6.1 ++++++ satsolver-0.16.4.tar.bz2 ++++++ libsatsolver/satsolver-0.16.4.tar.bz2 /mounts/work_src_done/STABLE/libsatsolver/satsolver-0.16.4.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 openvas-cli for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package openvas-cli for openSUSE:Factory checked in at Thu Mar 24 11:20:50 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/openvas-cli/openvas-cli.changes 2011-02-23 20:58:59.000000000 +0100 @@ -0,0 +1,68 @@ +------------------------------------------------------------------- +Wed Feb 23 19:49:54 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 1.1.2 + * The build environment has been consolidated. + * The documentation for the password parameter on the man page has been + corrected. + +------------------------------------------------------------------- +Fri Feb 4 20:54:15 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 1.1.1 + * Hardening flags are now enabled during compile time to increase code quality. + * The output of --version is now compliant with the GNU Coding Standards. + * The omp binary now warns about revealing passwords when verbose output is + requested. + * OpenVAS CLI now use pkg-config to find required libraries. + * OpenVAS CLI now provides a manual page for the omp binary. + * The authentication password can now be entered interactively. + +------------------------------------------------------------------- +Fri Dec 3 18:10:06 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.1.0 + * New parameter: --get-configs for retrieving a list of scan configs. + * New parameter: --get-targets for retrieving a list of targets. + * Special characters in OMP commands (like umlauts) are now handled correctly. + * The documentation has been improved; source code documentation can now be + generated using the "make doc" and "make doc-full" commands. + * Compatibility with different OMP versions has been improved. + * New parameter: --get-report-formats for retrieving the available report + formats (OMP 2.0 only). + * New parameter: --get-omp-version for determining the OMP version used by the + server. + +------------------------------------------------------------------- +Thu Oct 28 16:52:14 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.1 + * Special characters in OMP commands (like umlauts) are now handled correctly. + * The documentation has been improved; source code documentation can now be + generated using the "make doc" and "make doc-full" commands. + +------------------------------------------------------------------- +Wed Aug 4 14:02:26 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.0 + * The build environment and the code have been cleaned up and made more + consistent with the other OpenVAS modules. + * The documentation has been updated. + +------------------------------------------------------------------- +Mon Jul 19 15:29:46 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 0.2.0 + * The build environment has been improved. It is now possible to use MinGW to + compile openvas-cli for Microsoft Windows. + * Support for storing the connection credentials in a configuration file has + been added. + * The --get-status parameter has been renamed to --get-tasks to reflect the + updates in the OMP specification. + * The openvas-libraries dependency has been raised to 3.1.0. + +------------------------------------------------------------------- +Mon Mar 22 15:32:53 UTC 2010 - bitshuffler(a)opensuse.org + +- Initial package + calling whatdependson for head-i586 New: ---- debian.changelog debian.compat debian.control debian.rules openvas-cli-1.1.2.tar.gz openvas-cli.changes openvas-cli.dsc openvas-cli.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvas-cli.spec ++++++ # # spec file for package openvas-cli # # Copyright (c) 2011 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: openvas-cli Version: 1.1.2 Release: 1 License: GNU GPLv2 or later Group: Productivity/Networking/Security Url: http://www.openvas.org Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?mandriva_version} BuildRequires: pinentry-gtk2 %endif BuildRequires: cmake BuildRequires: glib2-devel BuildRequires: libopenvas-devel BuildRequires: pkgconfig Summary: Command Line Tools for OpenVAS %description OpenVAS-CLI collects command line tools to handle with the OpenVAS services via the respective protocols. %prep %setup -q %build export CFLAGS="$RPM_OPT_FLAGS" %__mkdir build cd build cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_BUILD_TYPE=Release %__make %{?_smp_mflags} %install cd build %__make install DESTDIR=%{buildroot} %clean test "%{buildroot}" != "/" && %__rm -rf %{buildroot} %files %defattr(-,root,root) %doc CHANGES COPYING README %{_bindir}/omp %{_mandir}/man8/omp.8* %changelog ++++++ debian.changelog ++++++ openvas-cli (1.1.2-1) unstable; urgency=low * New upstream release. - The build environment has been consolidated. - The documentation for the password parameter on the man page has been corrected. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 23 Feb 2011 20:49:31 +0100 openvas-cli (1.1.1-1) unstable; urgency=low * New upstream release. - Hardening flags are now enabled during compile time to increase code quality. - The output of --version is now compliant with the GNU Coding Standards. - The omp binary now warns about revealing passwords when verbose output is requested. - OpenVAS CLI now use pkg-config to find required libraries. - OpenVAS CLI now provides a manual page for the omp binary. - The authentication password can now be entered interactively. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 04 Feb 2011 21:53:44 +0100 openvas-cli (1.1.0-1) unstable; urgency=low * New upstream release. - New parameter: --get-configs for retrieving a list of scan configs. - New parameter: --get-targets for retrieving a list of targets. - Special characters in OMP commands (like umlauts) are now handled correctly. - The documentation has been improved; source code documentation can now be generated using the "make doc" and "make doc-full" commands. - Compatibility with different OMP versions has been improved. - New parameter: --get-report-formats for retrieving the available report formats (OMP 2.0 only). - New parameter: --get-omp-version for determining the OMP version used by the server. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 03 Dec 2010 19:08:38 +0100 openvas-cli (1.0.1-1) unstable; urgency=low * New upstream release. - Special characters in OMP commands (like umlauts) are now handled correctly. - The documentation has been improved; source code documentation can now be generated using the "make doc" and "make doc-full" commands. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 28 Oct 2010 18:53:26 +0200 openvas-cli (1.0.0-1) unstable; urgency=low * New upstream release. - The build environment and the code have been cleaned up and made more consistent with the other OpenVAS modules. - The documentation has been updated. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 04 Aug 2010 16:01:26 +0200 openvas-cli (0.2.0-1) unstable; urgency=low * New upstream release. - The build environment has been improved. It is now possible to use MinGW to compile openvas-cli for Microsoft Windows. - Support for storing the connection credentials in a configuration file has been added. - The --get-status parameter has been renamed to --get-tasks to reflect the updates in the OMP specification. - The openvas-libraries dependency has been raised to 3.1.0. -- Stephan Kleine <bitshuffler(a)opensuse.org> Mon, 19 Jul 2010 17:28:25 +0200 openvas-cli (0.1.0-1) unstable; urgency=low * Initial package. -- Stephan Kleine <bitshuffler(a)opensuse.org> Mon, 22 Mar 2010 16:32:16 +0100 ++++++ debian.compat ++++++ 5 ++++++ debian.control ++++++ Source: openvas-cli Section: net Priority: extra Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Build-Depends: cdbs, debhelper (>= 5), dpatch, cmake, hardening-wrapper, libopenvas4-dev, pkg-config Homepage: http://www.openvas.org/ Standards-Version: 3.8.0 Package: openvas-cli Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Command Line Tools for OpenVAS OpenVAS-CLI collects command line tools to handle with the OpenVAS services via the respective protocols. Package: openvas-cli-dbg Section: debug Priority: extra Architecture: any Depends: ${misc:Depends}, openvas-cli (= ${binary:Version}) Description: Command Line Tools for OpenVAS (debug) OpenVAS-CLI collects command line tools to handle with the OpenVAS services via the respective protocols. . This package contains the debugging symbols. ++++++ debian.rules ++++++ #!/usr/bin/make -f # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 # Enable hardening-wrapper export DEB_BUILD_HARDENING=1 include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk DEB_INSTALL_CHANGELOGS_ALL = CHANGES DEB_INSTALL_DOCS_ALL = README install/openvas-cli:: install -Dm 0755 debian/tmp/usr/bin/omp debian/openvas-cli/usr/bin/omp install -Dm 0644 doc/omp.8 debian/openvas-cli/usr/share/man/man8/omp.8 ++++++ openvas-cli.dsc ++++++ Format: 1.0 Source: openvas-cli Binary: openvas-cli Architecture: any Version: 1.1.2-1 Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Homepage: http://www.openvas.org/ Standards-Version: 3.8.0 Build-Depends: cdbs, debhelper (>= 5), dpatch, cmake, hardening-wrapper, libopenvas4-dev, pkg-config Files: d57283ebb8157ae919762c58419353c8 133282 openvas-cli-1.1.2.tar.gz 2fecf324a32123b08cefc0f047bca5ee 63176 openvas-cli-1.1.2.diff.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-snapper for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package yast2-snapper for openSUSE:Factory checked in at Thu Mar 24 11:15:51 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-snapper/yast2-snapper.changes 2011-03-23 11:49:50.000000000 +0100 @@ -0,0 +1,38 @@ +------------------------------------------------------------------- +Wed Mar 23 11:48:04 CET 2011 - jsuchome(a)suse.cz + +- license update +- 2.21.1 + +------------------------------------------------------------------- +Mon Mar 7 08:26:14 CET 2011 - jsuchome(a)suse.cz + +- first release for Factory +- 2.21.0 + +------------------------------------------------------------------- +Thu Mar 3 15:03:55 CET 2011 - jsuchome(a)suse.cz + +- check selected file mode and ownership + +------------------------------------------------------------------- +Mon Feb 28 10:37:40 CET 2011 - jsuchome(a)suse.cz + +- added option to compare with arbitrary snapshot + +------------------------------------------------------------------- +Thu Feb 24 14:37:00 CET 2011 - jsuchome(a)suse.cz + +- tree handling in YCP +- added restore function +- show 3 possible ways to diff + +------------------------------------------------------------------- +Wed Feb 2 15:55:03 CET 2011 - jsuchome(a)suse.cz + +- added scr agent to access snapper library + +------------------------------------------------------------------- +Mon Dec 13 18:51:43 2010 - jsuchome(a)suse.cz + +- initial version calling whatdependson for head-i586 New: ---- _cvsignore yast2-snapper-2.21.1.tar.bz2 yast2-snapper.changes yast2-snapper.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-snapper.spec ++++++ # # spec file for package yast2-snapper # # Copyright (c) 2011 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: yast2-snapper Version: 2.21.1 Release: 1 Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-snapper-2.21.1.tar.bz2 Prefix: /usr Requires: yast2 License: GPLv2+ BuildRequires: doxygen gcc-c++ libsnapper libsnapper-devel perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite Summary: YaST - file system snapshots review %description YaST module for accessing and managing btrfs system snapshots %prep %setup -n yast2-snapper-2.21.1 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" [ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done %clean rm -rf "$RPM_BUILD_ROOT" %files %defattr(-,root,root) %dir /usr/share/YaST2/include/snapper /usr/share/YaST2/include/snapper/* /usr/share/YaST2/clients/snapper.ycp /usr/share/YaST2/modules/Snapper.* %{prefix}/share/applications/YaST2/snapper.desktop /usr/share/YaST2/scrconf/*.scr %{_libdir}/YaST2/plugin/libpy2ag_snapper* %doc %{prefix}/share/doc/packages/yast2-snapper %changelog ++++++ _cvsignore ++++++ *.spec *.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 calibre for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package calibre for openSUSE:Factory checked in at Thu Mar 24 11:14:08 CET 2011. -------- --- calibre/calibre.changes 2011-02-16 16:57:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/calibre/calibre.changes 2011-03-19 00:19:20.000000000 +0100 @@ -1,0 +2,300 @@ +Fri Mar 18 23:12:29 UTC 2011 - saigkill(a)opensuse.org + +- updated to version 0.7.50 +- added short fix for RPMLINTs "wrong-end-of-line-encoding" +- New Features + o Add 'Read a random book' to the view menu + o Add option to show composite columns in the tag browser. + o Add a tweak in Preferences->Tweaks to control where news that is + automatically uploaded to a reader is sent. + o Do not also show text in composite columns when showing an icon + o Add a menu item to clear the last viewed books history in the ebook + viewer + o Kobo driver: Add support for the 'Closed' collection + o Add rename/delete saved search options to Tag browser context menu + o Make searches in the tag browser a possible hierarchical field + o Allow using empty username and password when setting up an SMTP relay + +- Bug Fixes + o Fix regression in 0.7.49 that broke deleting of news downloads older + than x days. + o Restore the ability to remove missing formats from metadata.db to the + o Check Library operation + o EPUB metadata: Read ISBN from Penguin epubs that dont correctly + specify it + o Conversion pipeline: Handle the case where the ncx file is incorrectly + given an HTML mimetype + o Make numpad navigation keys work in viewer + o Fix ratings not being downloaded from Amazon + o Content server: Add workaround for Internet Explorer not supporting + the ' entity. + o Conversion pipeline: When detecting chapters/toc links from HTML + normalize spaces and increase maximum TOC title length to 1000 + characters from 100 characters. + o Fix regression that broke Search and Replace on custom fields + o Fix regression that caused currently selected row to be unfocussed int + he device view when updataing metadata + o Coversion S&R: Do not strip leading and trailing whitespace from the + search and replace expressions in the GUI + +------------------------------------------------------------------- +Sat Mar 12 22:22:39 UTC 2011 - saigkill(a)opensuse.org + +- updated to version 0.7.49 +- New Features + - News download: More flexible news downlaod scheduling. You can now + schedule by days of the week, days of the month and an interval, which + can be as small as an hour for news sources that change rapidly + - Improved support for dragging and dropping cover images directly from + web browsers into calibre. + - Add shortcuts of Alt+Left and Alt+Right for the next and previous + buttons in the edit metadata dialog. + - When adding a GUI plugin, prompt the user for where the plugin should + be displayed + - Conversion: When using the Level x Table of Contents options, support + the case when the level 1,2,3 items are spread over multiple HTML + files. + - Support for the Optimus V + - FB2 Input: Support for tables + - Display a checkmark/cross next to 'true' and 'false' items in custom + columns. Controlled via Preferences->Add a custom column + - Catalog generation: Reuse cover from existing catalog, allows the use + of a custom cover for catalogs + - When setting covers in calibre, resize to fit within a maximum size of + (1200, 1600), to prevent slowdowns due to extra large covers. This + size can be controlled via Preferences->Tweaks. + +- Bug Fixes + - Fix long standing bug that caused errors when saving books to disk if + the book metadata has certain chinese/russian characters on windows. + - The fix required some changes to how unicode paths are handled in + calibre, so it might have broken something else. If so, please open a + ticket. + - Custom recipes: Store custom recipes in the calibre config directory + instead of the library database. This allows scheduling of custom + recipes to work with multiple libraries. Note that you may have to + re-schedule any existing custom recipes. + - Restore the ability to do search and replace on ISBN. Use the + 'identifiers' field with type isbn to do this + - Fix amazon metadata download plugin not working with ISBN-13 and + social metadata not downloading if the supplied ISBN 10 is not for an + edition available on Amazon + - Workaround for openlibrary blocking the user agent used by calibre, + preventing cover downloads from that site + - FB2 Output: Add sequence to metadata. Fix bugs with author names. Fix + bug where elements were put inside tags. + - Conversion pipeline: If the input HTML document uses uppercase tag and + attribute names, convert them to lowercase + - RTF Input: Fix space after unicode quote character being incorrectly + removed + - Fix regression that broke the ebook-device command line program in the + previous release + - Fix custom columns with numbers not allowing entry of positive numbers + of 64-bit machines + - Fix regression that caused focus to be lost when editing metadata in + the device view + - CHM Input: If an input encoding is specified, use it rather than + trying to detect the encoding of the text in the CHM file. + - Fix regression that caused the viewer to forget its window size and + other attributes when launched from within calibre, after calibre is + restarted. + - News download: Fix regression that caused the delay parameter in + recipes to not actually delay downloads. + - Conversion pipeline: When converting the :first-letter pseudo CSS + selector to a follow W3C rules for handling leading punctuation + characters. + - Fix regression that caused clicking saved searches in the Tag Browser + to not work + - Comic Input: Fix conversion failing when output profile is set to + Tablet Output + - Replace leading periods in all path components generated by calibre + with underscores + - Search and replace preferences: Prevent very long strings from causing + the wizard button to get pushed off the screen + - Content server: Fix regression that caused various metadata to be + missing in the book details view. + - Apple driver: Ignore invalid EPUBs when sending to iTunes + +------------------------------------------------------------------- +Mon Mar 7 18:50:17 UTC 2011 - saigkill(a)opensuse.org + +- updated to version 0.7.48 +- New Features + - Changes to the internal database structure used by calibre + - Launch of a new website that catalogues DRM free ebooks. + http://drmfree.calibre-ebook.com + - News download: Add an option to keep at most x issues of a particular + periodical in the calibre library. Use the Advanced tab in the Fetch + news dialog for your news source to set this option. + - You can now right click on the cover in the book details panel to + copy/paste a new cover. + - Add an entry to the add books drop down menu to easily add formats to + an existing book record + - Tag browser: Clicking on a nested category now searches for the + category alone. Clicking twice searches for the category and all its + descendants and so on. + - Add a button to the Manage authors dialog to copy author sort values + to author + - Decrease startup times on large libraries by using a faster algorithm + to parse stored dates + - Add quick create links to easily create custom columns of commonly + used types to the add custom column dialog + - Allow drag drop of images to change cover in book details window. + - Device susbsytem: Create a drive info file named driveinfo.calibre in + the root of each device drive for USB connected devices. This file + contains various useful data. API Change: The open method of the + device plugins now accepts an extra parameter library_uuid which is + the id of the calibre library connected tot eh device +- Bug Fixes + - Conversion pipeline: Fix regression in 0.7.46 that caused loss of some + CSS information when converting HTML produced by Microsoft Word. Also + remove empty tags from microsoft namespaces when parsing HTML + - Try harder to ensure that the worker log temporary files are deleted + in windows + - CHM Input: Handle CHM files that dont specify a topics file. + - Fix regression that caused memory leak in Tag Browser. This would show + up as the memory usage of calibre increasing when switching libraries. + - Fix bug that caused preferences->behavior to not show the output + format set by the welcome wizard, and instead default to showing EPUB + - Fix bug that caused wrong books to be deleted from library if you + choose 'delete from library and device' while the library is sorted by + the On device column + - MOBI Input: Ignore all ASCII control codes except CR, NL and Tab. + +------------------------------------------------------------------- +Mon Feb 28 22:29:48 UTC 2011 - saigkill(a)opensuse.org + +- update to version 0.7.47 +- New Features + o Tag Browser: Support the creation of nested User Categories + o Disable Kent District Library plugin to download series information. + o The website could not handle the load calibre's 2 million users put on + o it. You can manually re-enable it if you really want series + information, but it is very slow + o Drivers for the Wexler T7001, Archos 7, Wink and Xperia X10 + o Comic Input: Add option to not add links to individual pages to the + o Table of Contents when converting CBC files + o EPUB Output: Try to ensure that the cover image always has an + id='cover' to workaround Nook cover reading bug. + o ODT input: Update odfpy library to latest version, adds support for + bookmarks + o EPUB Output: Remove unnecessary CSS page breaks as they confuse the + latest release of iBooks +- Bug Fixes + o Fix regression in 0.7.46 that broke creating date and composite custom + columns + o Linux binary build: Fix ImageMagick trying to load system modules + instead of bundled modules + o Kobo driver: Handle missing firmware version file + o ODT Input: Do not force the background color to white. + o MOBI Input: Do not speciy text-align for every paragraph. Fixes + text-align inheritance issues for newer MOBIs with nested divs. + o EPUB Output: Do not set the file-as attribute on title elements in the + o OPF as the current OPF spec does not support file-as. Instead use a + calibre extension to OPF. + o Content server: Fix regression that broke browsing User Categories via + OPDS + o Update the book details panel after adding books incase automerge is ++++ 103 more lines (skipped) ++++ between calibre/calibre.changes ++++ and /mounts/work_src_done/STABLE/calibre/calibre.changes calling whatdependson for head-i586 Old: ---- calibre-0.7.45-nofonts.tar.bz2 New: ---- calibre-0.7.50-nofonts.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calibre.spec ++++++ --- /var/tmp/diff_new_pack.a6aWzd/_old 2011-03-24 11:13:18.000000000 +0100 +++ /var/tmp/diff_new_pack.a6aWzd/_new 2011-03-24 11:13:18.000000000 +0100 @@ -19,7 +19,7 @@ Summary: EBook Management Application Name: calibre -Version: 0.7.45 +Version: 0.7.50 Release: 1 Url: http://calibre-ebook.com Group: Productivity/Other @@ -168,6 +168,9 @@ %find_lang %{name} %find_lang iso639 +# fix for wrong-end-of-line-encoding +%{__sed} -i 's/\r//' %{buildroot}%{_datadir}/%{name}/recipes/kompiutierra.recipe + %fdupes $RPM_BUILD_ROOT%{_libdir}/%{name}/ %fdupes $RPM_BUILD_ROOT%{_datadir}/%{name}/ @@ -191,11 +194,7 @@ %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %{_datadir}/%{name}/ -# # these languages are not supported -%if 0%{?suse_version} <= 1130 -%exclude %{_datadir}/locale/ast/LC_MESSAGES/* -%endif -%exclude %{_datadir}/locale/sc/LC_MESSAGES/* +#%%exclude %%{_datadir}/locale/sc/LC_MESSAGES/* %{_mandir}/man1/* %changelog ++++++ calibre-0.7.45-nofonts.tar.bz2 -> calibre-0.7.50-nofonts.tar.bz2 ++++++ calibre/calibre-0.7.45-nofonts.tar.bz2 /mounts/work_src_done/STABLE/calibre/calibre-0.7.50-nofonts.tar.bz2 differ: char 11, line 1 ++++++ calibre-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.a6aWzd/_old 2011-03-24 11:13:18.000000000 +0100 +++ /var/tmp/diff_new_pack.a6aWzd/_new 2011-03-24 11:13:18.000000000 +0100 @@ -2,3 +2,4 @@ addFilter("non-executable-script") addFilter("no-manual-page-for-binary") addFilter("unstripped-binary-or-object") +addFilter("explicit-lib-dependency") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 lftp for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package lftp for openSUSE:Factory checked in at Thu Mar 24 11:12:55 CET 2011. -------- --- lftp/lftp.changes 2010-11-28 16:50:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/lftp/lftp.changes 2011-03-22 12:59:24.000000000 +0100 @@ -1,0 +2,24 @@ +Tue Mar 22 10:31:35 UTC 2011 - puzel(a)novell.com + +- update to lftp-4.2.0 + * changed ssl:verify-certificate default to yes. + * check certificate common name in openssl case (code from curl). + * disable weak algorithms in openssl (Ludwig Nussel + <ludwig.nussel(a)suse.de>). + * new setting xfer:log-file (Timur Sufiev). + * support for netkey pasword in ftp (). + * added torrent ipv6 support (new setting torrent:ipv6) + * don't accept new connections when no torrent can accept them. + * allow to specify job numbers in `jobs' command. + * fixed a segfault in pget when an error happens on second chunk. + Version 4.1.3 + * fixed a coredump in torrent (introduced in 4.1.2). + Version 4.1.2 + * new command ln [-s], supported by FTP (SITE [SYM]LINK), FISH, + SFTP, and locally via file: schema. + * create remote symlinks in mirror -R if supported by server. + * detect and remove duplicate peers in torrent. +- run spec-cleaner +- refresh patches + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lftp-4.1.1.tar.bz2 New: ---- lftp-4.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lftp.spec ++++++ --- /var/tmp/diff_new_pack.3AW9nS/_old 2011-03-24 11:11:59.000000000 +0100 +++ /var/tmp/diff_new_pack.3AW9nS/_new 2011-03-24 11:11:59.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package lftp (Version 4.1.1) +# spec file for package lftp # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -18,7 +18,7 @@ Name: lftp -Version: 4.1.1 +Version: 4.2.0 Release: 1 License: GPLv2+ Summary: Command Line File Transfer Program @@ -70,10 +70,10 @@ LDFLAGS=' ' \ %configure \ --with-modules -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -%makeinstall +%make_install touch %{buildroot}%{_bindir}/ftp chmod +x %{buildroot}%{_bindir}/ftp # We don't package the .la files ++++++ lftp-4.1.1.tar.bz2 -> lftp-4.2.0.tar.bz2 ++++++ ++++ 64736 lines of diff (skipped) ++++++ lftp-compat-mode.patch ++++++ --- /var/tmp/diff_new_pack.3AW9nS/_old 2011-03-24 11:11:59.000000000 +0100 +++ /var/tmp/diff_new_pack.3AW9nS/_new 2011-03-24 11:11:59.000000000 +0100 @@ -1,6 +1,8 @@ ---- src/CmdExec.cc +Index: src/CmdExec.cc +=================================================================== +--- src/CmdExec.cc.orig +++ src/CmdExec.cc -@@ -1178,6 +1178,47 @@ +@@ -1188,6 +1188,47 @@ void CmdExec::RegisterCommand(const char dyn_cmd_table.insert(new_entry,i); } @@ -48,9 +50,11 @@ void CmdExec::ChangeSession(FileAccess *new_session) { session=new_session; ---- src/CmdExec.h +Index: src/CmdExec.h +=================================================================== +--- src/CmdExec.h.orig +++ src/CmdExec.h -@@ -224,6 +224,9 @@ +@@ -228,6 +228,9 @@ public: static void RegisterCommand(const char *name,cmd_creator_t creator, const char *short_name=0,const char *long_name=0); @@ -60,7 +64,9 @@ Job *builtin_lcd(); Job *builtin_cd(); Job *builtin_open(); ---- src/CompatMode.cc +Index: src/CompatMode.cc +=================================================================== +--- /dev/null +++ src/CompatMode.cc @@ -0,0 +1,232 @@ +/* @@ -295,7 +301,9 @@ + CmdExec::RegisterCommand("binary", cmd_bin, "binary", "set binary transfer type\n"); + CmdExec::RegisterCommand("type", cmd_type, "type [ascii|binary]", "set file transfer type\n"); +} ---- src/CompatMode.h +Index: src/CompatMode.h +=================================================================== +--- /dev/null +++ src/CompatMode.h @@ -0,0 +1,28 @@ +/* @@ -326,9 +334,11 @@ + + +#endif //COMPATMODE_H ---- src/Makefile.am +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am.orig +++ src/Makefile.am -@@ -20,7 +20,7 @@ +@@ -20,7 +20,7 @@ example_module1_la_SOURCES = example-mod example_module1_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir) TASK_MODULES = liblftp-pty.la liblftp-network.la proto-ftp.la proto-http.la proto-file.la proto-fish.la proto-sftp.la @@ -337,7 +347,7 @@ if WITH_MODULES pkgverlib_LTLIBRARIES = $(TASK_MODULES) $(JOB_MODULES) else -@@ -42,6 +42,7 @@ +@@ -42,6 +42,7 @@ liblftp_pty_la_SOURCES = PtyShell.cc liblftp_network_la_SOURCES = NetAccess.cc NetAccess.h Resolver.cc Resolver.h\ lftp_ssl.cc lftp_ssl.h buffer_ssl.cc buffer_ssl.h RateLimit.cc RateLimit.h\ network.cc network.h SSH_Access.cc SSH_Access.h @@ -345,18 +355,20 @@ if NEED_TRIO TRIO = $(top_builddir)/trio/libtrio.la -@@ -60,6 +61,8 @@ +@@ -60,6 +61,8 @@ liblftp_pty_la_LDFLAGS = -avoid-vers liblftp_network_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir) $(OPENSSL_LDFLAGS) - liblftp_network_la_LIBADD = $(SOCKSLIBS) $(OPENSSL_LIBS) $(LIBGNUTLS_LIBS) + liblftp_network_la_LIBADD = $(SOCKSLIBS) $(OPENSSL_LIBS) $(LIBGNUTLS_LIBS) $(GNULIB) +compat_mode_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir) + proto_ftp_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la proto_http_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la $(EXPAT_LIBS) proto_fish_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la liblftp-pty.la ---- src/lftp_wrapper.c +Index: src/lftp_wrapper.c +=================================================================== +--- src/lftp_wrapper.c.orig +++ src/lftp_wrapper.c -@@ -507,17 +507,6 @@ +@@ -507,17 +507,6 @@ int main(int argc, char *argv[]) char *buf_url = NULL; int is = haveFile(buf2); @@ -374,7 +386,7 @@ int ishtml,isftp,isfile,ishost,isuser; //flags for url int tmp_port; ishtml=isHTML(buf2); -@@ -569,8 +558,7 @@ +@@ -569,8 +558,7 @@ int main(int argc, char *argv[]) buf_url = get_url(buf2); tmp_port= isPortInUrl(buf2);/* no need to test error message, it is done in get_url() */ if(tmp_port)ftp_port_i=tmp_port; @@ -384,7 +396,7 @@ snprintf(buf, BUFSIZE, "%s %s:%d; %s %s", open, buf_url, ftp_port_i, get, buf_file); -@@ -591,9 +579,6 @@ +@@ -591,9 +579,6 @@ int main(int argc, char *argv[]) } } ++++++ lftp-wrapper.patch ++++++ --- /var/tmp/diff_new_pack.3AW9nS/_old 2011-03-24 11:12:00.000000000 +0100 +++ /var/tmp/diff_new_pack.3AW9nS/_new 2011-03-24 11:12:00.000000000 +0100 @@ -3,7 +3,7 @@ --- src/CopyJob.cc.orig +++ src/CopyJob.cc @@ -21,6 +21,7 @@ - /* $Id: CopyJob.cc,v 1.46 2010/06/02 07:25:59 lav Exp $ */ + /* $Id: CopyJob.cc,v 1.47 2010/12/28 11:46:25 lav Exp $ */ #include <config.h> +#include <unistd.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mumble for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package mumble for openSUSE:Factory checked in at Thu Mar 24 11:11:46 CET 2011. -------- --- mumble/mumble.changes 2011-02-21 15:46:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/mumble/mumble.changes 2011-03-08 17:34:44.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 8 16:07:54 UTC 2011 - lnussel(a)suse.de + +- change log dir owner to root +- clean up init script + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 0001-open-log-file-early-so-log-dir-can-be-root-owned.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mumble.spec ++++++ --- /var/tmp/diff_new_pack.STHex0/_old 2011-03-24 11:00:41.000000000 +0100 +++ /var/tmp/diff_new_pack.STHex0/_new 2011-03-24 11:00:41.000000000 +0100 @@ -97,6 +97,7 @@ Source2: mumble-server.init Patch0: 0001-fix-build-error-with-capability.h.diff Patch1: 0001-fix-user-switching.diff +Patch2: 0001-open-log-file-early-so-log-dir-can-be-root-owned.diff Patch50: mumble-1.2.2-buildcompare.diff # hack, no clue about glx so no idea to fix this properly Patch99: mumble-1.1.4-sle10glx.diff @@ -162,6 +163,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 # %patch50 -p1 %if 0%{?suse_version} && 0%{?suse_version} < 1020 @@ -408,7 +410,7 @@ %{_mandir}/man1/murmurd.* %{_mandir}/man1/murmur-user-wrapper.* %dir %attr(-,mumble-server,mumble-server) /var/lib/mumble-server -%dir %attr(-,mumble-server,mumble-server) /var/log/mumble-server +%dir /var/log/mumble-server %if 0%{?suse_version} < 1130 %dir %attr(-,mumble-server,mumble-server) /var/run/mumble-server %else ++++++ 0001-open-log-file-early-so-log-dir-can-be-root-owned.diff ++++++ >From d79587e5570ec036355ada3de76521d981ce9596 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel(a)suse.de> Date: Tue, 8 Mar 2011 16:31:33 +0100 Subject: [PATCH] open log file early so log dir can be root owned http://article.gmane.org/gmane.comp.security.oss.general/4404 --- src/murmur/UnixMurmur.cpp | 2 +- src/murmur/main.cpp | 46 ++++++++++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/murmur/UnixMurmur.cpp b/src/murmur/UnixMurmur.cpp index 773701c..3dc9c08 100644 --- a/src/murmur/UnixMurmur.cpp +++ b/src/murmur/UnixMurmur.cpp @@ -255,7 +255,7 @@ void UnixMurmur::setuid() { void UnixMurmur::initialcap() { #ifdef Q_OS_LINUX - cap_value_t caps[] = {CAP_NET_ADMIN, CAP_SETUID, CAP_SETGID, CAP_SYS_RESOURCE, CAP_DAC_OVERRIDE }; + cap_value_t caps[] = {CAP_NET_ADMIN, CAP_SETUID, CAP_SETGID, CAP_CHOWN, CAP_SYS_RESOURCE, CAP_DAC_OVERRIDE }; if (! bRoot) return; diff --git a/src/murmur/main.cpp b/src/murmur/main.cpp index 5a4810d..695f8cc 100644 --- a/src/murmur/main.cpp +++ b/src/murmur/main.cpp @@ -273,6 +273,33 @@ int main(int argc, char **argv) { Meta::mp.read(inifile); + // need to open log file early so log dir can be root owned: + // http://article.gmane.org/gmane.comp.security.oss.general/4404 + if (detach && ! Meta::mp.qsLogfile.isEmpty()) { + qfLog = new QFile(Meta::mp.qsLogfile); + if (! qfLog->open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) { + delete qfLog; + qfLog = NULL; +#ifdef Q_OS_UNIX + fprintf(stderr, "murmurd: failed to open logfile %s: no logging will be done\n",qPrintable(Meta::mp.qsLogfile)); +#else + qWarning("Failed to open logfile %s. Will not detach.",qPrintable(Meta::mp.qsLogfile)); + detach = false; +#endif + } else { + qfLog->setTextModeEnabled(true); + QFileInfo qfi(*qfLog); + Meta::mp.qsLogfile = qfi.absoluteFilePath(); +#ifdef Q_OS_UNIX + if (Meta::mp.uiUid != 0 && fchown(qfLog->handle(), Meta::mp.uiUid, Meta::mp.uiGid) == -1) { + qFatal("can't change log file owner to %d %d:%d - %s", qfLog->handle(), Meta::mp.uiUid, Meta::mp.uiGid, strerror(errno)); + } +#endif + } + } else { + detach = false; + } + #ifdef Q_OS_UNIX unixhandler.setuid(); #endif @@ -318,25 +345,6 @@ int main(int argc, char **argv) { } } - if (detach && ! Meta::mp.qsLogfile.isEmpty()) { - qfLog = new QFile(Meta::mp.qsLogfile); - if (! qfLog->open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) { - delete qfLog; - qfLog = NULL; -#ifdef Q_OS_UNIX - fprintf(stderr, "murmurd: failed to open logfile %s: no logging will be done\n",qPrintable(Meta::mp.qsLogfile)); -#else - qWarning("Failed to open logfile %s. Will not detach.",qPrintable(Meta::mp.qsLogfile)); - detach = false; -#endif - } else { - qfLog->setTextModeEnabled(true); - QFileInfo qfi(*qfLog); - Meta::mp.qsLogfile = qfi.absoluteFilePath(); - } - } else { - detach = false; - } #ifdef Q_OS_UNIX if (detach) { if (fork() != 0) { -- 1.7.3.4 ++++++ mumble-server.init ++++++ --- /var/tmp/diff_new_pack.STHex0/_old 2011-03-24 11:00:41.000000000 +0100 +++ /var/tmp/diff_new_pack.STHex0/_new 2011-03-24 11:00:41.000000000 +0100 @@ -21,10 +21,6 @@ INIFILE=/etc/mumble-server.ini DAEMON_OPTS="-ini $INIFILE" -MURMUR_DAEMON_START=0 -MURMUR_USE_CAPABILITIES=0 -MURMUR_LIMIT_NOFILE=0 -MURMUR_LIMIT_RTPRIO=0 # Include murmur defaults if available if [ -f /etc/default/$NAME ] ; then @@ -33,26 +29,12 @@ . /etc/rc.status -if [ "$MURMUR_LIMIT_NOFILE" -gt 0 ] ; then - ulimit -n $MURMUR_LIMIT_NOFILE -fi -if [ "$MURMUR_LIMIT_RTPRIO" -gt 0 ]; then - ulimit -r 1 -fi - case "$1" in start) echo -n "Starting $NAME " - user=`sed -ne '/^uname=/s/.*=//p' < $INIFILE` - if [ -z "$user" ]; then - echo -n "${ext}No user configured in $INIFILE, refusing to run as root${norm}" - rc_status -v 6 - else - eval HOME=~$user - cd $HOME - /sbin/start_daemon -p $PIDFILE -u $user $DAEMON $DAEMON_OPTS - rc_status -v - fi + test -d $PIDDIR || /usr/bin/install -d -m 0755 -o mumble-server -g mumble-server $PIDDIR + /sbin/start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS + rc_status -v ;; stop) echo -n "Shutting down $NAME " ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 nagios-plugins-zypper for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package nagios-plugins-zypper for openSUSE:Factory checked in at Thu Mar 24 10:59:30 CET 2011. -------- --- nagios-plugins-zypper/nagios-plugins-zypper.changes 2011-02-04 09:21:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/nagios-plugins-zypper/nagios-plugins-zypper.changes 2011-03-23 22:30:47.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 23 21:30:08 UTC 2011 - lars(a)linux-schulserver.de + +- update to 1.39: + + SLE-10-SP4 and openSUSE 11.5 are supported + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-plugins-zypper.spec ++++++ --- /var/tmp/diff_new_pack.9qAN1O/_old 2011-03-24 10:56:31.000000000 +0100 +++ /var/tmp/diff_new_pack.9qAN1O/_new 2011-03-24 10:56:31.000000000 +0100 @@ -20,7 +20,7 @@ Name: nagios-plugins-zypper Summary: Nagios plugin for checking software updates -Version: 1.38 +Version: 1.39 Release: 1 Url: http://en.opensuse.org/Nagios-plugins-zypper License: BSD4c ++++++ check_zypper.pl ++++++ --- /var/tmp/diff_new_pack.9qAN1O/_old 2011-03-24 10:56:31.000000000 +0100 +++ /var/tmp/diff_new_pack.9qAN1O/_new 2011-03-24 10:56:31.000000000 +0100 @@ -49,7 +49,7 @@ # constants $PROGNAME = "check_zypper"; -$VERSION = '1.38'; +$VERSION = '1.39'; $DEBUG = 0; # variables @@ -84,8 +84,8 @@ 0 => 'OK', ); our %supported_release = ( - 'openSUSE' => [ '11.2', '11.3', '11.4' ], - 'SLE' => [ '10.3', '11.1' ], + 'openSUSE' => [ '11.2', '11.3', '11.4', '11.5' ], + 'SLE' => [ '10.3', '10.4', '11.1' ], ); $opt_w = 'recommended,optional,unsupported'; $opt_c = 'security'; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rekonq for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package rekonq for openSUSE:Factory checked in at Thu Mar 24 10:56:09 CET 2011. -------- --- KDE/rekonq/rekonq.changes 2010-12-23 10:57:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/rekonq/rekonq.changes 2011-03-23 09:13:47.000000000 +0100 @@ -1,0 +2,20 @@ +Wed Mar 23 08:12:34 UTC 2011 - wstephenson(a)novell.com + +- update to 0.7 beta + - General Cleanup + - OpenSearch support (XML & JSON parsers) + - Better cache management (WebKit Page Cache feature support) + - enhanced Private Browsing mode (needs KDE SC 4.6) + - new restore session notification system + - Images in visual suggestions + - Various improvements in bookmarks management + - Optional tab list menu entry + - User Agent switch support + - Save zoom settings per host + +------------------------------------------------------------------- +Tue Mar 22 05:14:00 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- rekonq-0.6.1.tar.bz2 New: ---- rekonq-0.6.95.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rekonq.spec ++++++ --- /var/tmp/diff_new_pack.boH3NK/_old 2011-03-24 10:55:36.000000000 +0100 +++ /var/tmp/diff_new_pack.boH3NK/_new 2011-03-24 10:55:36.000000000 +0100 @@ -20,12 +20,12 @@ BuildRequires: kdebase4-workspace-devel >= 4.4.0 BuildRequires: libqt4-devel >= 4.7.0 -BuildRequires: konqueror-plugins licenses update-desktop-files +BuildRequires: konqueror-plugins update-desktop-files BuildRequires: gtk2-devel kwebkitpart-devel Name: rekonq Summary: WebKit Based Web Browser for KDE4 -Version: 0.6.1 +Version: 0.6.95 Release: 1 License: GPLv3 Group: Productivity/Networking/Web/Browsers @@ -33,7 +33,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: yes -Requires: kdebase4-workspace licenses +Requires: kdebase4-workspace %kde4_runtime_requires Url: http://rekonq.sourceforge.net @@ -59,10 +59,6 @@ cd builddir %kde4_makeinstall cd .. - MD5SUM=$(md5sum COPYING | sed 's/ .*//') - if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM COPYING - fi rm -rf %{buildroot}/%_datadir/locale/sr@ijekavian rm -rf %{buildroot}/%_datadir/locale/sr@ijekavianlatin %find_lang %{name} %{name}.lang ++++++ rekonq-0.6.1.tar.bz2 -> rekonq-0.6.95.tar.bz2 ++++++ ++++ 75543 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 rfc for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package rfc for openSUSE:Factory checked in at Thu Mar 24 10:55:16 CET 2011. -------- --- AUTO/all/rfc/rfc.changes 2011-03-23 08:42:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/rfc/rfc.changes 2011-03-24 06:42:26.000000000 +0100 @@ -2 +2 @@ -Wed Mar 23 08:42:23 CET 2011 - autobuild(a)suse.de +Thu Mar 24 06:42:25 CET 2011 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2011-03-23 +- automated update on 2011-03-24 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfc.spec ++++++ --- /var/tmp/diff_new_pack.iaxIe2/_old 2011-03-24 10:55:06.000000000 +0100 +++ /var/tmp/diff_new_pack.iaxIe2/_new 2011-03-24 10:55:06.000000000 +0100 @@ -25,7 +25,7 @@ Summary: The RFCs (Request For Comments) Source: rfc.tgz BuildArch: noarch -Version: 2011.3.23 +Version: 2011.3.24 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 virt-manager for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at Thu Mar 24 10:54:46 CET 2011. -------- --- virt-manager/virt-manager.changes 2011-02-04 22:36:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/virt-manager/virt-manager.changes 2011-03-23 16:36:15.000000000 +0100 @@ -1,0 +2,27 @@ +Wed Mar 23 08:31:23 MDT 2011 - carnold(a)novell.com + +- bnc#681908 - Virtualization/virt-manager: Bug + virtman-connect-consoles-fix.diff + +------------------------------------------------------------------- +Thu Mar 21 13:34:41 MST 2011 - carnold(a)novell.com + +- Update to virt-manager 0.8.6 + * SPICE support (requires spice-gtk) (Marc-André Lureau) + * Option to configure CPU model + * Option to configure CPU topology + * Save and migration cancellation (Wen Congyang) + * Save and migration progress reporting + * Option to enable bios boot menu + * Option to configure direct kernel/initrd boot +- Update to virtinst 0.500.5 + * New virt-install --cpu option for configuring CPU + model/features + * virt-install --vcpus option can not specify topology and + maxvcpus + * New virt-install --graphics option to unify --vnc, --sdl, + spice config + * New virt-install --print-xml option to skip install and print + XML + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- virt-manager-0.8.5.tar.bz2 virt-manager-fix-python27.diff virtinst-0.500.4.tar.bz2 virtman-bridge.diff virtman-manager.diff virtman-pointer.diff New: ---- virt-manager-0.8.6.tar.bz2 virtinst-0.500.5.tar.bz2 virtman-connect-consoles-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.jl38m5/_old 2011-03-24 10:53:49.000000000 +0100 +++ /var/tmp/diff_new_pack.jl38m5/_new 2011-03-24 10:53:49.000000000 +0100 @@ -22,15 +22,15 @@ %define gconftool /usr/bin/gconftool-2 %define virtinst_maj 0 %define virtinst_min 500 -%define virtinst_rel 4 +%define virtinst_rel 5 %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.5 -Release: 4 +Version: 0.8.6 +Release: 1 Group: System/Monitoring License: LGPLv2.1+ Url: http://virt-manager.et.redhat.com @@ -38,17 +38,14 @@ Source1: %{virtinst_name}.tar.bz2 # 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 -Patch53: virtman-cdrom.diff -Patch54: virtman-kvm.diff -Patch55: virtman-bridge.diff -Patch56: virtman-manager.diff -Patch57: virtman-help.diff -Patch58: virtman-keycombo.diff -Patch59: virtman-autoconnect.diff +Patch52: virtman-cdrom.diff +Patch53: virtman-kvm.diff +Patch54: virtman-help.diff +Patch55: virtman-keycombo.diff +Patch56: virtman-autoconnect.diff +Patch57: virtman-connect-consoles-fix.diff Patch60: virtman-device-flags.diff Patch61: virtman-autorestart.diff Patch62: virtman-storage-pool.diff @@ -118,6 +115,7 @@ # Add requires for non Xen installations Requires: python-urlgrabber Requires: vm-install +#Requires: spice-gtk %description Virtual Machine Manager provides a graphical tool for administering @@ -134,20 +132,17 @@ %prep %setup -q %setup -b 1 -%patch1 -p1 %patch50 -p1 %patch51 -p1 -#%patch52 -p1 +%patch52 -p1 %patch53 -p1 -%patch54 -p1 -#%patch55 -p1 -#%patch56 -p1 -#%patch57 -p1 -%patch58 -p1 -%patch59 -p1 +#%patch54 -p1 +%patch55 -p1 +%patch56 -p1 +%patch57 -p1 %patch60 -p1 %patch61 -p1 -%patch62 -p1 +#%patch62 -p1 pushd $RPM_BUILD_DIR/%{virtinst_name} %patch81 -p1 %patch82 -p1 @@ -169,8 +164,6 @@ python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --install-lib=%{pysite}/ rm -rf $RPM_BUILD_ROOT/var/scrollkeeper popd -#rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a -#rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la # Unsupport languages: rm -rf $RPM_BUILD_ROOT/usr/share/locale/or %find_gconf_schemas @@ -182,10 +175,6 @@ sed -i '\^/usr/share/gnome/help/^d' %{name}.lst %suse_update_desktop_file %{name} X-SuSE-YaST-Virtualization sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;/' $RPM_BUILD_ROOT/%{_datadir}/applications/YaST2/%{name}.desktop -# Nuking these because old version didnt have any -# rm -rf $RPM_BUILD_ROOT/usr/share/gnome -# Also fixing the %{name}.lang file forcibly. -# sed -i '\^/usr/share/gnome/help/^d' %{name}.lang %clean # rm -rf $RPM_BUILD_ROOT @@ -204,6 +193,7 @@ %defattr(-,root,root,-) %doc COPYING AUTHORS ChangeLog %{_bindir}/%{name} +%{_bindir}/%{name}-tui %{_bindir}/virt-clone %{_bindir}/virt-convert %{_bindir}/virt-image @@ -220,16 +210,12 @@ %{_datadir}/%{name}/pixmaps/hicolor/*/*/*.png %{_datadir}/%{name}/*.py %dir %{_datadir}/%{name}/virtManager +%dir %{_datadir}/%{name}/virtManagerTui %{_datadir}/%{name}/virtManager/*.py +%{_datadir}/%{name}/virtManagerTui/*.py %dir %{pysite}/virtinst %{pysite}/virtinst/*.py %{pysite}/virtinst/*.pyc -# %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}/applications/YaST2/%{name}.desktop %{_datadir}/dbus-1/services/%{name}.service %{_mandir}/man1/%{name}.1* @@ -238,7 +224,6 @@ %{_mandir}/man1/virt-image.1* %{_mandir}/man1/virt-install.1* %{_mandir}/man5/virt-image.5* -# new files for virt-manager-0.8.1 %dir %{pysite}/virtconv %{pysite}/virtconv/*.py %{pysite}/virtconv/*.pyc @@ -246,8 +231,6 @@ %{pysite}/virtconv/parsers/*.py %{pysite}/virtconv/parsers/*.pyc %{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.5.tar.bz2 -> virt-manager-0.8.6.tar.bz2 ++++++ ++++ 246539 lines of diff (skipped) ++++++ virtinst-0.500.4.tar.bz2 -> virtinst-0.500.5.tar.bz2 ++++++ ++++ 53845 lines of diff (skipped) ++++++ virtinst-cdrom.diff ++++++ --- /var/tmp/diff_new_pack.jl38m5/_old 2011-03-24 10:53:51.000000000 +0100 +++ /var/tmp/diff_new_pack.jl38m5/_new 2011-03-24 10:53:51.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virtinst-0.500.4/virtinst/VirtualDisk.py +Index: virtinst-0.500.5/virtinst/VirtualDisk.py =================================================================== ---- virtinst-0.500.4.orig/virtinst/VirtualDisk.py -+++ virtinst-0.500.4/virtinst/VirtualDisk.py -@@ -1444,14 +1444,18 @@ class VirtualDisk(VirtualDevice): +--- virtinst-0.500.5.orig/virtinst/VirtualDisk.py ++++ virtinst-0.500.5/virtinst/VirtualDisk.py +@@ -1598,14 +1598,18 @@ class VirtualDisk(VirtualDevice): self.target = "hdc" return self.target ++++++ virtinst-storage-ocfs2.diff ++++++ --- /var/tmp/diff_new_pack.jl38m5/_old 2011-03-24 10:53:51.000000000 +0100 +++ /var/tmp/diff_new_pack.jl38m5/_new 2011-03-24 10:53:51.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virtinst-0.500.4/virtinst/Storage.py +Index: virtinst-0.500.5/virtinst/Storage.py =================================================================== ---- virtinst-0.500.4.orig/virtinst/Storage.py -+++ virtinst-0.500.4/virtinst/Storage.py +--- virtinst-0.500.5.orig/virtinst/Storage.py ++++ virtinst-0.500.5/virtinst/Storage.py @@ -523,7 +523,7 @@ class FilesystemPool(StoragePool): get_volume_class = staticmethod(get_volume_class) ++++++ virtman-autoconnect.diff ++++++ --- /var/tmp/diff_new_pack.jl38m5/_old 2011-03-24 10:53:51.000000000 +0100 +++ /var/tmp/diff_new_pack.jl38m5/_new 2011-03-24 10:53:51.000000000 +0100 @@ -1,10 +1,10 @@ -Index: virt-manager-0.8.5/src/virtManager/engine.py +Index: virt-manager-0.8.6/src/virtManager/engine.py =================================================================== ---- virt-manager-0.8.5.orig/src/virtManager/engine.py -+++ virt-manager-0.8.5/src/virtManager/engine.py -@@ -719,7 +719,7 @@ class vmmEngine(gobject.GObject): - self.emit("connection-added", conn) +--- virt-manager-0.8.6.orig/src/virtManager/engine.py ++++ virt-manager-0.8.6/src/virtManager/engine.py +@@ -495,7 +495,7 @@ class vmmEngine(vmmGObject): self.config.add_connection(conn.get_uri()) + if autoconnect: - conn.set_autoconnect(True) + self.connect_to_uri(uri) ++++++ virtman-autorestart.diff ++++++ --- /var/tmp/diff_new_pack.jl38m5/_old 2011-03-24 10:53:51.000000000 +0100 +++ /var/tmp/diff_new_pack.jl38m5/_new 2011-03-24 10:53:51.000000000 +0100 @@ -1,41 +1,32 @@ -Index: virt-manager-0.8.5/src/virtManager/details.py +Index: virt-manager-0.8.6/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): +--- virt-manager-0.8.6.orig/src/virtManager/details.py ++++ virt-manager-0.8.6/src/virtManager/details.py +@@ -1659,8 +1659,9 @@ class vmmDetails(vmmGObjectUI): 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,)) -+ +- def config_boot_options_apply(self): + # 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") % +@@ -1671,6 +1672,8 @@ class vmmDetails(vmmGObjectUI): 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,)) + return False + ++ # Boot device ++ def config_boot_options_apply(self): + bootdevs = self.get_config_boot_devs() + bootmenu = self.window.get_widget("boot-menu").get_active() + +@@ -1882,6 +1885,8 @@ class vmmDetails(vmmGObjectUI): + buttons=gtk.BUTTONS_OK, + dialog_type=dtype) - # 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.jl38m5/_old 2011-03-24 10:53:51.000000000 +0100 +++ /var/tmp/diff_new_pack.jl38m5/_new 2011-03-24 10:53:51.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.5/src/virtManager/addhardware.py +Index: virt-manager-0.8.6/src/virtManager/addhardware.py =================================================================== ---- 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): +--- virt-manager-0.8.6.orig/src/virtManager/addhardware.py ++++ virt-manager-0.8.6/src/virtManager/addhardware.py +@@ -480,6 +480,7 @@ class vmmAddHardware(vmmGObjectUI): if self.vm.get_hv_type() == "kvm": add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk") if self.vm.get_connection().is_xen(): ++++++ virtman-connect-consoles-fix.diff ++++++ Subject: manager: Don't always launch consoles for running domains, dumb regression From: Cole Robinson crobinso(a)redhat.com Fri Jan 21 14:43:19 2011 -0500 Date: Fri Jan 21 14:43:19 2011 -0500: Git: ffb82a87f0587ef326becc80887ef8a806fbb0ec Index: virt-manager-0.8.6/src/virtManager/manager.py =================================================================== --- virt-manager-0.8.6.orig/src/virtManager/manager.py +++ virt-manager-0.8.6/src/virtManager/manager.py @@ -721,6 +721,7 @@ class vmmManager(vmmGObjectUI): if (self.config.get_console_popup() != 2 or vm.is_management_domain()): self.emit("action-refresh-console", uri, vmuuid) + return # user has requested consoles on all vms gtype = vm.get_graphics_console()[0] ++++++ virtman-desktop.diff ++++++ --- /var/tmp/diff_new_pack.jl38m5/_old 2011-03-24 10:53:51.000000000 +0100 +++ /var/tmp/diff_new_pack.jl38m5/_new 2011-03-24 10:53:51.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-manager-0.8.5/src/Makefile.am +Index: virt-manager-0.8.6/src/Makefile.am =================================================================== ---- virt-manager-0.8.5.orig/src/Makefile.am -+++ virt-manager-0.8.5/src/Makefile.am +--- virt-manager-0.8.6.orig/src/Makefile.am ++++ virt-manager-0.8.6/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.5/src/Makefile.in +Index: virt-manager-0.8.6/src/Makefile.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 +--- virt-manager-0.8.6.orig/src/Makefile.in ++++ virt-manager-0.8.6/src/Makefile.in +@@ -254,7 +254,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.5/src/virt-manager.desktop.in.in +Index: virt-manager-0.8.6/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 +--- virt-manager-0.8.6.orig/src/virt-manager.desktop.in.in ++++ virt-manager-0.8.6/src/virt-manager.desktop.in.in @@ -1,9 +1,19 @@ [Desktop Entry] _Name=Virtual Machine Manager ++++++ virtman-device-flags.diff ++++++ --- /var/tmp/diff_new_pack.jl38m5/_old 2011-03-24 10:53:51.000000000 +0100 +++ /var/tmp/diff_new_pack.jl38m5/_new 2011-03-24 10:53:51.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.5/src/virtManager/addhardware.py +Index: virt-manager-0.8.6/src/virtManager/addhardware.py =================================================================== ---- 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): +--- virt-manager-0.8.6.orig/src/virtManager/addhardware.py ++++ virt-manager-0.8.6/src/virtManager/addhardware.py +@@ -906,6 +906,18 @@ class vmmAddHardware(vmmGObjectUI): 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.5/src/virtManager/details.py +Index: virt-manager-0.8.6/src/virtManager/details.py =================================================================== ---- 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): +--- virt-manager-0.8.6.orig/src/virtManager/details.py ++++ virt-manager-0.8.6/src/virtManager/details.py +@@ -1770,6 +1770,17 @@ class vmmDetails(vmmGObjectUI): return self.config.set_confirm_removedev(not skip_prompt) @@ -42,25 +42,25 @@ + # Define the change try: - self.vm.remove_device(dev_type, dev_id_info) -Index: virt-manager-0.8.5/src/virtManager/domain.py + self.vm.remove_device(dev_id_info) +Index: virt-manager-0.8.6/src/virtManager/domain.py =================================================================== ---- 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): - +--- virt-manager-0.8.6.orig/src/virtManager/domain.py ++++ virt-manager-0.8.6/src/virtManager/domain.py +@@ -1158,6 +1158,10 @@ class vmmDomain(vmmDomainBase): + devxml = devobj.get_xml_config() self._backend.attachDevice(devxml) + def attach_device_flags(self, devobj, flags): + xml = devobj.get_xml_config() + self._backend.attachDeviceFlags(xml, flags) + - def detach_device(self, devtype, dev_id_info): + def detach_device(self, devobj): """ Hotunplug device from running guest -@@ -1421,6 +1425,10 @@ class vmmDomain(vmmDomainBase): - if self.is_active(): - self._backend.detachDevice(xml) +@@ -1176,6 +1180,10 @@ class vmmDomain(vmmDomainBase): + xml = devobj.get_xml_config() + self._backend.updateDeviceFlags(xml, flags) + def detach_device_flags(self, devtype, dev_id_info, flags): + xml = self._get_device_xml(devtype, dev_id_info) ++++++ virtman-keycombo.diff ++++++ --- /var/tmp/diff_new_pack.jl38m5/_old 2011-03-24 10:53:51.000000000 +0100 +++ /var/tmp/diff_new_pack.jl38m5/_new 2011-03-24 10:53:51.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.5/src/vmm-details.glade +Index: virt-manager-0.8.6/src/vmm-details.glade =================================================================== ---- virt-manager-0.8.5.orig/src/vmm-details.glade -+++ virt-manager-0.8.5/src/vmm-details.glade -@@ -351,11 +351,93 @@ +--- virt-manager-0.8.6.orig/src/vmm-details.glade ++++ virt-manager-0.8.6/src/vmm-details.glade +@@ -350,11 +350,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> -@@ -452,7 +534,7 @@ +@@ -451,7 +533,7 @@ </widget> </child> <child> @@ -105,11 +105,11 @@ <property name="visible">True</property> </widget> </child> -Index: virt-manager-0.8.5/src/virtManager/details.py +Index: virt-manager-0.8.6/src/virtManager/details.py =================================================================== ---- 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): +--- virt-manager-0.8.6.orig/src/virtManager/details.py ++++ virt-manager-0.8.6/src/virtManager/details.py +@@ -404,6 +404,15 @@ class vmmDetails(vmmGObjectUI): "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.5/src/virtManager/console.py +Index: virt-manager-0.8.6/src/virtManager/console.py =================================================================== ---- 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): +--- virt-manager-0.8.6.orig/src/virtManager/console.py ++++ virt-manager-0.8.6/src/virtManager/console.py +@@ -665,6 +665,24 @@ class vmmConsolePages(vmmGObjectUI): 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.jl38m5/_old 2011-03-24 10:53:51.000000000 +0100 +++ /var/tmp/diff_new_pack.jl38m5/_new 2011-03-24 10:53:51.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.5/src/virtManager/engine.py +Index: virt-manager-0.8.6/src/virtManager/engine.py =================================================================== ---- virt-manager-0.8.5.orig/src/virtManager/engine.py -+++ virt-manager-0.8.5/src/virtManager/engine.py -@@ -69,6 +69,7 @@ def default_uri(): +--- virt-manager-0.8.6.orig/src/virtManager/engine.py ++++ virt-manager-0.8.6/src/virtManager/engine.py +@@ -54,6 +54,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") or ++++++ virtman-vminstall.diff ++++++ --- /var/tmp/diff_new_pack.jl38m5/_old 2011-03-24 10:53:51.000000000 +0100 +++ /var/tmp/diff_new_pack.jl38m5/_new 2011-03-24 10:53:51.000000000 +0100 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.5/src/virtManager/engine.py +Index: virt-manager-0.8.6/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,6 @@ from virtManager.manager import vmmManag +--- virt-manager-0.8.6.orig/src/virtManager/engine.py ++++ virt-manager-0.8.6/src/virtManager/engine.py +@@ -41,7 +41,6 @@ from virtManager.manager import vmmManag from virtManager.migrate import vmmMigrateDialog from virtManager.details import vmmDetails from virtManager.asyncjob import vmmAsyncJob @@ -10,27 +10,26 @@ from virtManager.host import vmmHost from virtManager.error import vmmErrorDialog from virtManager.systray import vmmSystray -@@ -665,13 +664,44 @@ class vmmEngine(gobject.GObject): - return False - return True +@@ -702,12 +701,45 @@ class vmmEngine(vmmGObject): + self.windowCreate = obj + return self.windowCreate + def _vmmcreate_closing(self,signal,key): + self.windowCreate = None + - def show_create(self, uri): -- if self.windowCreate == None: -- create = vmmCreate(self.get_config(), self) -- create.connect("action-show-console", self._do_show_console) -- create.connect("action-show-help", self._do_show_help) -- self.windowCreate = create -- self.windowCreate.show(uri) + def _do_show_create(self, src, uri): +- try: +- self._get_create_dialog().show(uri) +- except Exception, e: +- src.err.show_err(_("Error launching manager: %s") % str(e), +- "".join(traceback.format_exc())) + conn = self._lookup_connection(uri) + do_remote = conn.is_remote() + if self.windowCreate == None or do_remote != self.remote_install: + try: + if do_remote: + from virtManager.create import vmmCreate -+ create = vmmCreate(self.get_config(),self) ++ create = vmmCreate(self) + create.connect("action-show-console", self._do_show_console) + create.connect("action-show-help", self._do_show_help) + create.connect("vmmcreate-closing", self._vmmcreate_closing) @@ -46,7 +45,8 @@ + self.windowCreate = create + self.windowCreate.show() + except Exception, e: -+ self.err.show_err("%s" % str(e),"".join(traceback.format_exc())) ++ src.err.show_err(_("Error launching manager: %s") % str(e), ++ "".join(traceback.format_exc())) + else: + if do_remote: + self.windowCreate.show(uri) @@ -59,22 +59,22 @@ + message_box.run() + message_box.destroy() - def add_connection(self, uri, readOnly=None, autoconnect=False): - conn = vmmConnection(self.get_config(), uri, readOnly, self) -Index: virt-manager-0.8.5/src/virtManager/create.py + def _do_show_migrate(self, src, uri, uuid): + try: +Index: virt-manager-0.8.6/src/virtManager/create.py =================================================================== ---- virt-manager-0.8.5.orig/src/virtManager/create.py -+++ virt-manager-0.8.5/src/virtManager/create.py -@@ -65,6 +65,8 @@ class vmmCreate(gobject.GObject): - gobject.TYPE_NONE, (str,str)), +--- virt-manager-0.8.6.orig/src/virtManager/create.py ++++ virt-manager-0.8.6/src/virtManager/create.py +@@ -63,6 +63,8 @@ class vmmCreate(vmmGObjectUI): + gobject.TYPE_NONE, (str, str)), "action-show-help": (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, [str]), + "vmmcreate-closing": (gobject.SIGNAL_RUN_FIRST, + gobject.TYPE_NONE, (int,)), } - def __init__(self, config, engine): -@@ -154,6 +156,7 @@ class vmmCreate(gobject.GObject): + def __init__(self, engine): +@@ -148,6 +150,7 @@ class vmmCreate(vmmGObjectUI): self.topwin.present() def close(self, ignore1=None, ignore2=None): ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-input for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory checked in at Thu Mar 24 10:53:32 CET 2011. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2011-02-14 22:19:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2011-03-23 19:12:14.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 23 18:11:00 UTC 2011 - sndirsch(a)novell.com + +- 11-mouse.conf + * support buttons 6+7 (sideways tilted scroll wheel) on the + "Logitech Easy Optical Mouse RX250" (bnc #681503) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.liSaTc/_old 2011-03-24 10:53:00.000000000 +0100 +++ /var/tmp/diff_new_pack.liSaTc/_new 2011-03-24 10:53:00.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel pkgconfig udev xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.6 -Release: 5 +Release: 32 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 ++++++ 11-mouse.conf ++++++ --- /var/tmp/diff_new_pack.liSaTc/_old 2011-03-24 10:53:00.000000000 +0100 +++ /var/tmp/diff_new_pack.liSaTc/_new 2011-03-24 10:53:00.000000000 +0100 @@ -24,6 +24,18 @@ EndSection Section "InputClass" + # 046d:c050 + Identifier "Logitech Easy Optical Mouse" + MatchVendor "Logitech, Inc." + MatchProduct "RX 250 Optical Mouse" + MatchIsPointer "on" + Driver "evdev" + Option "Buttons" "7" + Option "YAxisMapping" "4 5" + Option "XAxisMapping" "6 7" +EndSection + +Section "InputClass" # 045e:0095 Identifier "Microsoft IntelliMouse Explorer" MatchVendor "Microsoft Corp." ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-nis-client for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package yast2-nis-client for openSUSE:Factory checked in at Thu Mar 24 10:52:20 CET 2011. -------- --- yast2-nis-client/yast2-nis-client.changes 2009-07-27 15:53:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-nis-client/yast2-nis-client.changes 2011-03-23 15:02:21.000000000 +0100 @@ -1,0 +2,19 @@ +Wed Mar 23 12:35:14 CET 2011 - jsuchome(a)suse.cz + +- aborting in Stage::cont does not abort installation (bnc#678650) +- 2.21.0 + +------------------------------------------------------------------- +Mon Sep 20 21:59:33 CEST 2010 - jsuchome(a)suse.cz + +- added button to call NFS client (bnc#626515) +- 2.20.0 + +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-nis-client-2.18.2.tar.bz2 New: ---- yast2-nis-client-2.21.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nis-client.spec ++++++ --- /var/tmp/diff_new_pack.rWQIfQ/_old 2011-03-24 10:51:17.000000000 +0100 +++ /var/tmp/diff_new_pack.rWQIfQ/_new 2011-03-24 10:51:17.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-nis-client (Version 2.18.2) +# spec file for package yast2-nis-client # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,22 +19,27 @@ Name: yast2-nis-client -Version: 2.18.2 +Version: 2.21.0 Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-nis-client-2.18.2.tar.bz2 +Source0: yast2-nis-client-2.21.0.tar.bz2 + Prefix: /usr + Group: System/YaST -License: GPL v2 or later +License: GPLv2+ BuildRequires: doxygen gcc-c++ perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-pam yast2-testsuite Requires: yast2 yast2-pam # .net.hostnames.rpc Conflicts: yast2-core < 2.8.0 + Provides: yast2-config-nis yast2-config-nis-devel Obsoletes: yast2-config-nis yast2-config-nis-devel Provides: yast2-trans-nis Obsoletes: yast2-trans-nis Provides: yast2-config-network:/usr/lib/YaST2/clients/lan_ypclient.ycp + Summary: YaST2 - Network Information Services (NIS, YP) Configuration %description @@ -42,14 +47,16 @@ yellow pages. %prep -%setup -n yast2-nis-client-2.18.2 +%setup -n yast2-nis-client-2.21.0 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) ++++++ yast2-nis-client-2.18.2.tar.bz2 -> yast2-nis-client-2.21.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nis-client-2.18.2/VERSION new/yast2-nis-client-2.21.0/VERSION --- old/yast2-nis-client-2.18.2/VERSION 2009-07-27 15:42:56.000000000 +0200 +++ new/yast2-nis-client-2.21.0/VERSION 2011-03-23 12:35:27.000000000 +0100 @@ -1 +1 @@ -2.18.2 +2.21.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nis-client-2.18.2/src/nis.desktop new/yast2-nis-client-2.21.0/src/nis.desktop --- old/yast2-nis-client-2.18.2/src/nis.desktop 2008-12-18 14:47:15.000000000 +0100 +++ new/yast2-nis-client-2.21.0/src/nis.desktop 2010-01-15 09:17:34.000000000 +0100 @@ -18,9 +18,8 @@ X-SuSE-YaST-AutoInstSchema=nis.rnc Icon=yast-nis -Exec=/sbin/yast2 nis +Exec=xdg-su -c "/sbin/yast2 nis" Name=NIS Client GenericName=Configure a NIS client -X-KDE-SubstituteUID=true StartupNotify=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nis-client-2.18.2/src/ui.ycp new/yast2-nis-client-2.21.0/src/ui.ycp --- old/yast2-nis-client-2.18.2/src/ui.ycp 2009-07-27 15:42:01.000000000 +0200 +++ new/yast2-nis-client-2.21.0/src/ui.ycp 2011-03-23 14:59:18.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: ui.ycp 54607 2009-01-14 10:59:22Z jsuchome $ + * $Id: ui.ycp 63650 2011-03-23 13:59:17Z jsuchome $ * * All user interface functions. * @@ -63,9 +63,7 @@ */ define boolean ReallyAbort (boolean touched) ``{ - if (Stage::cont () && !contains (WFM::Args (), "from_users")) - return Popup::ConfirmAbort (`incomplete); - return touched ? Popup::ReallyAbort (true) : true; + return (touched || Stage::cont ()) ? Popup::ReallyAbort (true) : true; } /** @@ -211,10 +209,13 @@ help_text = help_text + broadcast_help; // help text - help_text = help_text + _("Automounter is a daemon that mounts directories automatically, + help_text = help_text + _("Automounter is a daemon that mounts directories automatically, such as users' home directories. It is assumed that its configuration files (auto.*) already exist, -either locally or over NIS."); +either locally or over NIS.") + + // help text + + _("NFS Settings which affects how the automouter operates could be set in NFS Client, which can be configured using NFS Configuration button."); help_text = help_text + firewall_widget["help"]:""; @@ -348,10 +349,15 @@ // checkbox label `CheckBox (`id(`autofs), _("Start Auto&mounter"), autofs), `VSpacing (0.4), - `PushButton (`id (`expert), `opt (`key_F7), - // button label - // (short for Expert settings) - _("E&xpert...") + `HBox ( + `PushButton (`id (`expert), `opt (`key_F7), + // button label (short for Expert settings) + _("E&xpert...") + ), + `PushButton (`id (`nfs), `opt (`key_F8), + // button label + _("NFS Configuration...") + ) ), `VSpacing (0.4) )), `HSpacing (0.5)); @@ -392,6 +398,7 @@ UI::ChangeWidget (`id (`policy), `Enabled, yp_client); //UI::ChangeWidget (`id (`custompolicy), `Enabled, yp_client); UI::ChangeWidget (`id (`autofs), `Enabled, yp_client); + UI::ChangeWidget (`id (`nfs), `Enabled, yp_client); boolean manual = (UI::QueryWidget(`id(`policy),`Value)== `nomodify); UI::ChangeWidget (`id (`domain), `Enabled, !manual && yp_client); @@ -446,6 +453,13 @@ } } } + else if (result == `nfs) + { + if (Package::InstallAll ( ["yast2-nfs-client"])) + { + WFM::CallFunction ("nfs-client", []); + } + } else if (contains ([`next, `edit, `expert], result)) { yp_client = ((symbol) UI::QueryWidget (`id (`rd), `CurrentButton) != `nisno); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-samba-client for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package yast2-samba-client for openSUSE:Factory checked in at Thu Mar 24 10:51:00 CET 2011. -------- --- yast2-samba-client/yast2-samba-client.changes 2011-01-05 16:04:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-samba-client/yast2-samba-client.changes 2011-03-23 15:05:03.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 23 12:40:12 CET 2011 - jsuchome(a)suse.cz + +- aborting in Stage::cont does not abort installation (bnc#678650) +- 2.21.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-samba-client-2.20.2.tar.bz2 New: ---- yast2-samba-client-2.21.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.mIEuYc/_old 2011-03-24 10:50:40.000000000 +0100 +++ /var/tmp/diff_new_pack.mIEuYc/_new 2011-03-24 10:50:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-samba-client (Version 2.20.2) +# spec file for package yast2-samba-client # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-samba-client -Version: 2.20.2 +Version: 2.21.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-samba-client-2.20.2.tar.bz2 +Source0: yast2-samba-client-2.21.0.tar.bz2 Prefix: /usr @@ -47,7 +47,7 @@ workgroup/domain and authentication against an SMB domain. %prep -%setup -n yast2-samba-client-2.20.2 +%setup -n yast2-samba-client-2.21.0 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-samba-client-2.20.2.tar.bz2 -> yast2-samba-client-2.21.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.20.2/VERSION new/yast2-samba-client-2.21.0/VERSION --- old/yast2-samba-client-2.20.2/VERSION 2011-01-05 16:01:45.000000000 +0100 +++ new/yast2-samba-client-2.21.0/VERSION 2011-03-23 12:40:31.000000000 +0100 @@ -1 +1 @@ -2.20.2 +2.21.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.20.2/src/Samba.ycp new/yast2-samba-client-2.21.0/src/Samba.ycp --- old/yast2-samba-client-2.20.2/src/Samba.ycp 2011-01-05 15:57:38.000000000 +0100 +++ new/yast2-samba-client-2.21.0/src/Samba.ycp 2011-01-10 12:25:35.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Data for configuration of samba-client, input and output functions. * Authors: Stanislav Visnovsky <visnov(a)suse.cz> * - * $Id: Samba.ycp 60041 2009-12-10 12:59:56Z jsuchome $ + * $Id: Samba.ycp 63096 2011-01-05 15:15:19Z jsuchome $ * * Representation of the configuration of samba-client. * Input and output routines. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.20.2/src/SambaConfig.pm new/yast2-samba-client-2.21.0/src/SambaConfig.pm --- old/yast2-samba-client-2.20.2/src/SambaConfig.pm 2011-01-05 15:53:53.000000000 +0100 +++ new/yast2-samba-client-2.21.0/src/SambaConfig.pm 2011-01-05 16:15:21.000000000 +0100 @@ -4,7 +4,7 @@ # Summary: Manage samba configuration data (smb.conf). # Authors: Martin Lazar <mlazar(a)suse.cz> # -# $Id: SambaConfig.pm 60974 2010-02-23 10:41:10Z jsuchome $ +# $Id: SambaConfig.pm 63096 2011-01-05 15:15:19Z jsuchome $ # # Functions for acess to samba configuration file. It provide # unified acces to configuration keys including aliases and other diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.20.2/src/routines.ycp new/yast2-samba-client-2.21.0/src/routines.ycp --- old/yast2-samba-client-2.20.2/src/routines.ycp 2010-07-15 13:44:50.000000000 +0200 +++ new/yast2-samba-client-2.21.0/src/routines.ycp 2011-03-23 15:00:09.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Miscelanous functions for configuration of samba-client. * Authors: Stanislav Visnovsky <visnov(a)suse.cz> * - * $Id: routines.ycp 62262 2010-07-15 11:44:50Z jsuchome $ + * $Id: routines.ycp 63652 2011-03-23 14:00:08Z jsuchome $ */ { @@ -132,9 +132,7 @@ * @return true if abort is confirmed */ define boolean ReallyAbort() ``{ - return (Stage::cont() && !contains (WFM::Args (), "from_users")) ? - Popup::ConfirmAbort (`incomplete) : - (!Samba::GetModified() || Popup::ReallyAbort(true)); + return (Samba::GetModified () || Stage::cont ()) ? Popup::ReallyAbort (true) : 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 banshee-1 for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package banshee-1 for openSUSE:Factory checked in at Thu Mar 24 10:50:28 CET 2011. -------- --- GNOME/banshee-1/banshee-1.changes 2011-02-27 21:28:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/banshee-1/banshee-1.changes 2011-03-09 18:59:16.000000000 +0100 @@ -1,0 +2,29 @@ +Wed Mar 9 11:56:45 CST 2011 - gburt(a)suse.de + +- Update to 1.9.5 release + + Enhancements: + * Add support for handling u1ms:// links + * Windows: Add Win7 thumbnail toolbar playback buttons + * OS X Build: Work with new bockbuild, add MonoMac + + Notable Bugs Fixed (20 fixed since 1.9.4): + * bgo#644315: Fix album browser's border on Windows + * bgo#641608: windows: Fix notification icon menu positioning + * bgo#643188: Help: Fix help URL to library.gnome.org + * bgo#643407: GStreamerSharp: Properly handle GStreamer errors + * bgo#641674: SmartPlaylists: Fix queries with { and } + * Hide 'Unknown Artist' in 'All Albums' browser entry + + + Enhancements from 1.9.4: + * Various fixes and improvements to the Windows build + * MultimediaKeys: Support Pause, FastForward, Rewind, Repeat and Shuffle + * Advertise lastfm scheme handling in the .desktop files + + Notable Bugs Fixed (25 fixed since 1.9.3): + * AmazonMp3.Store: Fix the server 'Home' redirect + * Misc theme and string fixes + * bgo#638541: Don't try to find subtitle files for music + * Fix the position label when the stream ends + * TrackInfoDisplay: Don't display last track when idle + * bgo#614530: Fixed a ListView glitch + * bgo#642717: SoundMenu: don't call BlacklistMediaPlayer on startup + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- banshee-1-1.9.3.tar.bz2 New: ---- banshee-1-1.9.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ banshee-1.spec ++++++ --- /var/tmp/diff_new_pack.PbljJa/_old 2011-03-24 10:49:18.000000000 +0100 +++ /var/tmp/diff_new_pack.PbljJa/_new 2011-03-24 10:49:18.000000000 +0100 @@ -24,8 +24,8 @@ %define upstream_project 0 Name: banshee-1 -Version: 1.9.3 -Release: 7 +Version: 1.9.5 +Release: 1 License: MIT Summary: A media playback and management application Group: Productivity/Multimedia/Sound/Players ++++++ banshee-1-1.9.3.tar.bz2 -> banshee-1-1.9.5.tar.bz2 ++++++ ++++ 53612 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 MozillaFirefox for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at Thu Mar 24 10:47:33 CET 2011. -------- --- MozillaFirefox/MozillaFirefox.changes 2011-02-23 10:27:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/MozillaFirefox/MozillaFirefox.changes 2011-03-21 10:47:37.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 18 08:49:15 UTC 2011 - wr(a)rosenauer.org + +- update to version 4.0 (rc2) +- fixed rpm macros delivered with devel package (bnc#679950) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- firefox-4.0b12-source.tar.bz2 l10n-4.0b12.tar.bz2 New: ---- firefox-4.0.0-source.tar.bz2 l10n-4.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.vqbSuW/_old 2011-03-24 10:46:29.000000000 +0100 +++ /var/tmp/diff_new_pack.vqbSuW/_new 2011-03-24 10:46:29.000000000 +0100 @@ -31,15 +31,15 @@ BuildRequires: wireless-tools %endif %if 0%{?use_xulrunner} -BuildRequires: %{xulrunner}-devel = 2.0b12 +BuildRequires: %{xulrunner}-devel = 2.0.0 %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: %{mainver}b12 +Version: %{mainver}.0 Release: 1 Provides: web_browser Provides: firefox = %{version}-%{release} Provides: firefox = %{mainver} -%define releasedate 2011022200 +%define releasedate 2011031700 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -137,7 +137,7 @@ %package translations-other Summary: Extra translations for MozillaFirefox License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu) +Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu) Group: System/Localization Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -338,10 +338,10 @@ %%firefox_major %{major} %%firefox_version %{version} %%firefox_mainver %{mainver} -%%firefox_mozillapath %{progdir} +%%firefox_mozillapath %%{_libdir}/%{progname} %%firefox_xulrunner %{xulrunner} %%firefox_xulrunner_version %(rpm -q --queryformat '%{VERSION}' %{xulrunner}) -%%firefox_pluginsdir %{_libdir}/browser-plugins +%%firefox_pluginsdir %%{_libdir}/browser-plugins %%firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %%firefox_extdir %%(if [ "%%_target_cpu" = "noarch" ]; then echo %%{_datadir}/mozilla/extensions/%%{firefox_appid}; else echo %%{_libdir}/mozilla/extensions/%%{firefox_appid}; fi) ++++++ compare-locales.tar.bz2 ++++++ ++++++ firefox-4.0b12-source.tar.bz2 -> firefox-4.0.0-source.tar.bz2 ++++++ MozillaFirefox/firefox-4.0b12-source.tar.bz2 /mounts/work_src_done/STABLE/MozillaFirefox/firefox-4.0.0-source.tar.bz2 differ: char 11, line 1 ++++++ l10n-4.0b12.tar.bz2 -> l10n-4.0.0.tar.bz2 ++++++ MozillaFirefox/l10n-4.0b12.tar.bz2 /mounts/work_src_done/STABLE/MozillaFirefox/l10n-4.0.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 yast2-users for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at Thu Mar 24 10:45:22 CET 2011. -------- --- yast2-users/yast2-users.changes 2011-03-11 11:40:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-users/yast2-users.changes 2011-03-23 12:12:53.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 23 12:10:32 CET 2011 - jsuchome(a)suse.cz + +- do not abort whole installation from auth clients (bnc#678650) +- 2.21.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-users-2.21.1.tar.bz2 New: ---- yast2-users-2.21.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.N5Hs6A/_old 2011-03-24 10:41:12.000000000 +0100 +++ /var/tmp/diff_new_pack.N5Hs6A/_new 2011-03-24 10:41:12.000000000 +0100 @@ -19,11 +19,11 @@ Name: yast2-users -Version: 2.21.1 +Version: 2.21.2 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-users-2.21.1.tar.bz2 +Source0: yast2-users-2.21.2.tar.bz2 Prefix: /usr @@ -50,7 +50,7 @@ This package provides GUI for maintenance of linux users and groups. %prep -%setup -n yast2-users-2.21.1 +%setup -n yast2-users-2.21.2 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-users-2.21.1.tar.bz2 -> yast2-users-2.21.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.21.1/VERSION new/yast2-users-2.21.2/VERSION --- old/yast2-users-2.21.1/VERSION 2011-03-11 11:39:36.000000000 +0100 +++ new/yast2-users-2.21.2/VERSION 2011-03-23 12:11:01.000000000 +0100 @@ -1 +1 @@ -2.21.1 +2.21.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.21.1/src/inst_user.ycp new/yast2-users-2.21.2/src/inst_user.ycp --- old/yast2-users-2.21.1/src/inst_user.ycp 2010-02-26 14:05:31.000000000 +0100 +++ new/yast2-users-2.21.2/src/inst_user.ycp 2011-03-23 11:27:36.000000000 +0100 @@ -179,10 +179,16 @@ UsersSimple::SetAfterAuth ("users"); y2milestone("calling users module to enable creating LDAP user..."); } + // ldap not used, or the client configuration is different than + // proposal from ldap server else { - // ldap not used, or the client configuration is different than - // proposal from ldap server + // make it possible to skip authentication step (bnc#678650) + if (ret == `abort || ret == `cancel) + { + y2milestone ("called client aborted, skipping the step"); + ret = `next; + } return (symbol) ret; } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xen for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at Thu Mar 24 10:40:56 CET 2011. -------- --- xen/xen.changes 2011-02-24 19:24:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/xen/xen.changes 2011-03-22 22:15:08.000000000 +0100 @@ -2 +2 @@ -Thu Feb 24 10:17:03 CET 2011 - ohering(a)suse.de +Tue Mar 22 15:13:08 MDT 2011 - carnold(a)novell.com @@ -4,3 +4 @@ -- bnc#674063 - drop xenpaging.autostart_delay.patch - avoid python excpetions due to intermediate xenstore and .sxp - state caused by change of xenpaging variable from int to str +- Update to c/s 23010 Xen 4.1 rc8 @@ -9 +7 @@ -Fri Feb 11 16:25:51 MST 2011 - carnold(a)novell.com +Tue Mar 22 10:53:00 CET 2011 - ohering(a)suse.de @@ -11 +9,26 @@ -- Update to Xen 4.0.2 rc2, changeset 21452 +- use _smp_mflags instead of jobs, jobs is not expanded everywhere + +------------------------------------------------------------------- +Mon Mar 21 10:09:50 MDT 2011 - carnold(a)novell.com + +- bnc#681302 - xm create -x <guest> returns "ImportError: No module + named ext" + xm-create-xflag.patch + +------------------------------------------------------------------- +Mon Mar 14 22:20:39 MDT 2011 - jfehlig(a)novell.com + +- Fix xen-utils to cope with xen-unstable c/s 21483 + +------------------------------------------------------------------- +Fri Mar 11 22:28:37 CET 2011 - ohering(a)suse.de + +- xz-devel is available since 11.2, make it optional for SLES11SP1 + +------------------------------------------------------------------- +Fri Feb 18 09:46:56 CST 2011 - lidongyang(a)novell.com + +- bnc#665610 - xm console > 1 to same VM messes up both consoles + Upstream rejected due to portability concern, see + http://lists.xensource.com/archives/html/xen-devel/2011-02/msg00942.html + xenconsole-no-multiple-connections.patch @@ -18,0 +42,5 @@ + +------------------------------------------------------------------- +Wed Feb 9 16:38:12 MST 2011 - carnold(a)novell.com + +- Update to Xen 4.1.0 c/s 22861 calling whatdependson for head-i586 Old: ---- 20158-revert.patch 21089-x86-startup-irq-from-setup-gsi.patch 21235-crashkernel-advanced.patch 21271-x86-cache-flush-global.patch 21301-svm-lmsl.patch 21304-keyhandler-alternative.patch 21406-x86-microcode-quiet.patch 21421-vtd-ats-enabling.patch 21526-x86-nehalem-cpuid-mask.patch 21542-amd-erratum-411.patch 21615-dont-save-xen-heap-pages.patch 21627-cpuidle-wrap.patch 21653-xend-mac-addr.patch 21678-xend-mac-fix.patch 21683-vtd-kill-timer-conditional.patch 21723-get-domu-state.patch 21810-x2apic-acpi.patch 21847-pscsi.patch 21866-xenapi.patch 21894-intel-unmask-cpuid.patch 22019-x86-cpuidle-online-check.patch 22214-x86-msr-misc-enable.patch 22231-x86-pv-ucode-msr-intel.patch 22235-lxml-validator.patch 22326-cpu-pools-numa-placement.patch 22332-vtd-workarounds.patch 22369-xend-pci-passthru-fix.patch 22388-x2apic-panic.patch 22408-vpmu-nehalem.patch 22431-p2m-remove-bug-check.patch 22475-x2apic-cleanup.patch 22484-vlapic-tmcct-periodic.patch 22504-iommu-dom0-holes.patch 22533-x86-32bit-apicid.patch 22534-x86-max-local-apic.patch 22535-x2apic-preenabled.patch 22645-amd-flush-filter.patch 22693-fam10-mmio-conf-base-protect.patch 22694-x86_64-no-weak.patch 22707-x2apic-preenabled-check.patch 22708-xenctx-misc.patch 22744-ept-pod-locking.patch 22749-vtd-workarounds.patch 22777-vtd-ats-fixes.patch 22781-pod-hap-logdirty.patch 22789-i386-no-x2apic.patch 22790-svm-resume-migrate-pirqs.patch 7410-qemu-alt-gr.patch 7426-xenfb-depth.patch 7433-qemu-altgr.patch 7434-qemu-rlimit-as.patch blktap2.patch cpu-pools-docs.patch cpu-pools-libxc.patch cpu-pools-libxen.patch cpu-pools-python.patch cpu-pools-xmtest.patch cpupools-core-fixup.patch cpupools-core.patch dump-exec-state.patch enable_more_nic_pxe.patch hotplug-block-losetup-a.patch network-route.patch popen2-argument-fix.patch xen-4.0.2-testing-src.tar.bz2 xen-extra-fixes.patch New: ---- xen-4.1.0-testing-src.tar.bz2 xenconsole-no-multiple-connections.patch xenpaging.autostart_delay.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100 @@ -20,12 +20,12 @@ Name: xen ExclusiveArch: %ix86 x86_64 -%define xvers 4.0 +%define xvers 4.1 %define xvermaj 4 -%define changeset 21452 -%define xen_build_dir xen-4.0.2-testing +%define changeset 23010 +%define xen_build_dir xen-4.1.0-testing %define with_kmp 1 -%define with_stubdom 1 +%define with_stubdom 0 BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel BuildRequires: automake @@ -44,7 +44,9 @@ BuildRequires: texinfo BuildRequires: transfig BuildRequires: libbz2-devel +%if %suse_version >= 1120 BuildRequires: xz-devel +%endif %if %suse_version <= 1110 BuildRequires: pmtools %else @@ -72,14 +74,14 @@ %if %{?with_kmp}0 BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11 %endif -Version: 4.0.2_02 -Release: 6 +Version: 4.1.0_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.2-testing-src.tar.bz2 +Source0: xen-4.1.0-testing-src.tar.bz2 Source1: stubdom.tar.bz2 Source2: xen-utils-0.1.tar.bz2 Source3: README.SuSE @@ -112,56 +114,7 @@ # http://xenbits.xensource.com/ext/xenalyze.hg Source20000: xenalyze.hg.tar.bz2 # Upstream patches -Patch0: 21089-x86-startup-irq-from-setup-gsi.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-vtd-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: 21810-x2apic-acpi.patch -Patch16: 21847-pscsi.patch -Patch17: 21866-xenapi.patch -Patch18: 21894-intel-unmask-cpuid.patch -Patch19: 22019-x86-cpuidle-online-check.patch -Patch20: 22214-x86-msr-misc-enable.patch -Patch21: 22332-vtd-workarounds.patch -Patch22: 22231-x86-pv-ucode-msr-intel.patch -Patch23: 22235-lxml-validator.patch -Patch24: 22369-xend-pci-passthru-fix.patch -Patch25: 22388-x2apic-panic.patch -Patch26: 22408-vpmu-nehalem.patch -Patch27: 22431-p2m-remove-bug-check.patch -Patch28: 22475-x2apic-cleanup.patch -Patch29: 22484-vlapic-tmcct-periodic.patch -Patch30: 22504-iommu-dom0-holes.patch -Patch31: 22533-x86-32bit-apicid.patch -Patch32: 22534-x86-max-local-apic.patch -Patch33: 22535-x2apic-preenabled.patch -Patch34: 22645-amd-flush-filter.patch -Patch35: 22693-fam10-mmio-conf-base-protect.patch -Patch36: 22694-x86_64-no-weak.patch -Patch37: 22707-x2apic-preenabled-check.patch -Patch38: 22708-xenctx-misc.patch -Patch39: 22744-ept-pod-locking.patch -Patch40: 22749-vtd-workarounds.patch -Patch41: 22777-vtd-ats-fixes.patch -Patch42: 22781-pod-hap-logdirty.patch -Patch43: 22789-i386-no-x2apic.patch -Patch44: 22790-svm-resume-migrate-pirqs.patch # Upstream qemu patches -Patch200: 7410-qemu-alt-gr.patch -Patch201: 7426-xenfb-depth.patch -Patch202: 7433-qemu-altgr.patch -Patch203: 7434-qemu-rlimit-as.patch # Our patches Patch300: xen-config.diff Patch301: xend-config.diff @@ -178,16 +131,14 @@ Patch312: serial-split.patch Patch313: xen-xm-top-needs-root.diff Patch314: xen-max-free-mem.diff -Patch317: xen-extra-fixes.patch Patch322: bridge-opensuse.patch Patch323: bridge-vlan.diff Patch324: bridge-bonding.diff Patch325: bridge-record-creation.patch Patch326: network-nat.patch Patch327: udev-rules.patch -Patch328: network-route.patch -Patch329: vif-route-ifup.patch -Patch330: network-nat-open-SuSEfirewall2-FORWARD.patch +Patch328: vif-route-ifup.patch +Patch329: network-nat-open-SuSEfirewall2-FORWARD.patch Patch340: xen-hvm-default-bridge.diff Patch341: xen-hvm-default-pae.diff Patch342: xm-test-cleanup.diff @@ -206,25 +157,16 @@ Patch356: ioemu-vnc-resize.patch Patch357: ioemu-debuginfo.patch Patch358: vif-bridge-no-iptables.patch +Patch359: xenconsole-no-multiple-connections.patch # Needs to go upstream Patch360: checkpoint-rename.patch Patch361: xm-save-check-file.patch Patch362: xm-create-xflag.patch -Patch363: cpupools-core.patch -Patch364: cpupools-core-fixup.patch -Patch365: cpu-pools-libxc.patch -Patch366: cpu-pools-python.patch -Patch367: cpu-pools-libxen.patch -Patch368: cpu-pools-xmtest.patch -Patch369: cpu-pools-docs.patch Patch370: xend-sysconfig.patch Patch371: domu-usb-controller.patch -Patch372: popen2-argument-fix.patch -Patch373: usb-list.patch -Patch374: xend-devid-or-name.patch -Patch375: 22326-cpu-pools-numa-placement.patch -Patch376: 20158-revert.patch -Patch377: suspend_evtchn_lock.patch +Patch372: usb-list.patch +Patch373: xend-devid-or-name.patch +Patch374: suspend_evtchn_lock.patch # Patches for snapshot support Patch400: snapshot-ioemu-save.patch Patch401: snapshot-ioemu-restore.patch @@ -250,7 +192,6 @@ 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 Patch435: change_home_server.patch @@ -258,7 +199,6 @@ Patch438: stdvga-cache.patch Patch439: minios-fixups.patch Patch440: bdrv_default_rwflag.patch -Patch441: blktap2.patch Patch442: xen-minimum-restart-time.patch Patch443: vif-bridge.mtu.patch Patch444: xentrace.dynamic_sized_tbuf.patch @@ -268,7 +208,6 @@ Patch500: 32on64-extra-mem.patch Patch501: x86-ioapic-ack-default.patch Patch502: x86-cpufreq-report.patch -Patch503: dump-exec-state.patch Patch504: dom-print.patch Patch505: pvdrv-import-shared-info.patch Patch506: x86-show-page-walk-early.patch @@ -285,7 +224,6 @@ # Build patch Patch999: tmp_build.patch # FATE 310510 -Patch902: hotplug-block-losetup-a.patch Patch10001: xenpaging.tools_xenpaging_cleanup.patch Patch10002: xenpaging.pageout_policy.patch Patch10003: xenpaging.get_paged_frame.patch @@ -302,6 +240,7 @@ Patch10020: xenpaging.guest_remove_page.patch Patch10021: xenpaging.mem_event_check_ring-free_requests.patch Patch10022: xenpaging.blacklist.patch +Patch10023: xenpaging.autostart_delay.patch Patch10024: xenpaging.page_already_populated.patch Patch10025: xenpaging.notify_policy_only_once.patch Patch10026: xenpaging.num_pages_equal_max_pages.patch @@ -646,55 +585,6 @@ %prep %setup -q -n %xen_build_dir -a 1 -a 20000 tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%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 -%patch200 -p1 -%patch201 -p1 -%patch202 -p1 -%patch203 -p1 %patch300 -p1 %patch301 -p1 %patch302 -p1 @@ -710,7 +600,6 @@ %patch312 -p1 %patch313 -p1 %patch314 -p1 -%patch317 -p1 %patch322 -p1 %patch323 -p1 %patch324 -p1 @@ -719,11 +608,10 @@ %patch327 -p1 %patch328 -p1 %patch329 -p1 -%patch330 -p1 %patch340 -p1 %patch341 -p1 %patch342 -p1 -%patch343 -p1 +#%patch343 -p1 kexec %patch344 -p1 %patch345 -p1 %patch346 -p1 @@ -734,28 +622,19 @@ %patch352 -p1 %patch353 -p1 %patch354 -p1 -%patch355 -p1 +###%patch355 -p1 gdbserver %patch356 -p1 %patch357 -p1 %patch358 -p1 +%patch359 -p1 %patch360 -p1 %patch361 -p1 %patch362 -p1 -%patch363 -p1 -%patch364 -p1 -%patch365 -p1 -%patch366 -p1 -%patch367 -p1 -%patch368 -p1 -%patch369 -p1 %patch370 -p1 %patch371 -p1 %patch372 -p1 %patch373 -p1 -%patch374 -p1 -%patch375 -p1 -%patch376 -p1 -#%patch377 -p1 +#%patch374 -p1 suspend_evtchn_lock, buildservice build problem %patch400 -p1 %patch401 -p1 %patch402 -p1 @@ -778,7 +657,6 @@ %patch429 -p1 %patch430 -p1 %patch431 -p1 -%patch432 -p1 %patch433 -p1 %patch434 -p1 %patch435 -p1 @@ -786,7 +664,6 @@ %patch438 -p1 %patch439 -p1 %patch440 -p1 -%patch441 -p1 %patch442 -p1 %patch443 -p1 %patch444 -p1 @@ -794,7 +671,6 @@ %patch500 -p1 %patch501 -p1 %patch502 -p1 -%patch503 -p1 %patch504 -p1 %patch505 -p1 %patch506 -p1 @@ -809,34 +685,34 @@ %patch652 -p1 %patch700 -p1 %patch999 -p1 -%patch902 -p1 -%patch10001 -p1 -%patch10002 -p1 -%patch10003 -p1 -%patch10004 -p1 -%patch10010 -p1 -%patch10011 -p1 -%patch10012 -p1 -%patch10013 -p1 -%patch10014 -p1 -%patch10015 -p1 -%patch10017 -p1 -%patch10018 -p1 -%patch10019 -p1 -%patch10020 -p1 -%patch10021 -p1 -%patch10022 -p1 -%patch10024 -p1 -%patch10025 -p1 -%patch10026 -p1 -%patch10027 -p1 -%patch10028 -p1 -%patch10029 -p1 -%patch10030 -p1 -%patch10031 -p1 -%patch10032 -p1 -%patch10033 -p1 -%patch10040 -p1 +#%patch10001 -p1 +#%patch10002 -p1 +#%patch10003 -p1 +#%patch10004 -p1 +#%patch10010 -p1 +#%patch10011 -p1 +#%patch10012 -p1 +#%patch10013 -p1 +#%patch10014 -p1 +#%patch10015 -p1 +#%patch10017 -p1 +#%patch10018 -p1 +#%patch10019 -p1 +#%patch10020 -p1 +#%patch10021 -p1 +#%patch10022 -p1 +#%patch10023 -p1 +#%patch10024 -p1 +#%patch10025 -p1 +#%patch10026 -p1 +#%patch10027 -p1 +#%patch10028 -p1 +#%patch10029 -p1 +#%patch10030 -p1 +#%patch10031 -p1 +#%patch10032 -p1 +#%patch10033 -p1 +#%patch10040 -p1 %build XEN_EXTRAVERSION=%version-%release @@ -846,13 +722,13 @@ RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/} export CFLAGS="${RPM_OPT_FLAGS}" export RPM_OPT_FLAGS -make -C xenalyze.hg CC="gcc -I../xen/include" %{?jobs:-j%{jobs}} -make -C tools/include/xen-foreign %{?jobs:-j%{jobs}} -make tools docs %{?jobs:-j%{jobs}} -cd tools/debugger/gdb -# there are code problems that don't pass the 02-check-gcc-output, hence bitbucket -env MAKE="make %{?jobs:-j%{jobs}}" ./gdbbuild 1>/dev/null 2>/dev/null -cd ../../.. +make -C xenalyze.hg CC="gcc -I../xen/include" %{?_smp_mflags} +make -C tools/include/xen-foreign %{?_smp_mflags} +make tools docs %{?_smp_mflags} +make -C tools/debugger/gdbsx +#### there are code problems that don't pass the 02-check-gcc-output, hence bitbucket +###env MAKE="make %{?_smp_mflags}" ./gdbbuild 1>/dev/null 2>/dev/null +###cd ../../.. %if %{?with_kmp}0 # pv driver modules export XL=/usr/src/linux @@ -864,7 +740,7 @@ cd obj/$flavor ./mkbuildtree make -C /usr/src/linux-obj/%_target_cpu/$flavor modules \ - %{?jobs:-j%{jobs}} \ + %{?_smp_mflags} \ M=$PWD cd ../.. done @@ -894,23 +770,23 @@ ln -s xen${ext}-%{version}-%{release}.gz $RPM_BUILD_ROOT/boot/xen${ext}.gz ln -sf xen-syms${ext}-%{version}-%{release} $RPM_BUILD_ROOT/boot/xen-syms${ext} } -make -C xen install max_phys_cpus=%{max_cpus} pae=%{pae_enabled} debug=y crash_debug=y DESTDIR=$RPM_BUILD_ROOT %{?jobs:-j%{jobs}} +make -C xen install max_phys_cpus=%{max_cpus} pae=%{pae_enabled} debug=y crash_debug=y DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags} install_xen dbg make -C xen clean -make -C xen install max_phys_cpus=%{max_cpus} pae=%{pae_enabled} debug=n crash_debug=n DESTDIR=$RPM_BUILD_ROOT %{?jobs:-j%{jobs}} +make -C xen install max_phys_cpus=%{max_cpus} pae=%{pae_enabled} debug=n crash_debug=n DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags} install_xen make -C xen clean export CFLAGS="$RPM_OPT_FLAGS" export RPM_OPT_FLAGS -make -C tools/include/xen-foreign %{?jobs:-j%{jobs}} +make -C tools/include/xen-foreign %{?_smp_mflags} # tools export XEN_PYTHON_NATIVE_INSTALL=1 make -C tools install \ - DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} %{?jobs:-j%{jobs}} -cp tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/gdb/gdbserver/gdbserver-xen $RPM_BUILD_ROOT/usr/bin/gdbserver-xen + DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} %{?_smp_mflags} +###cp tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/gdb/gdbserver/gdbserver-xen $RPM_BUILD_ROOT/usr/bin/gdbserver-xen rm -f $RPM_BUILD_ROOT/usr/sbin/{qcow-create,img2qcow,qcow2raw} make -C tools/misc/serial-split install \ - DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} %{?jobs:-j%{jobs}} + DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} %{?_smp_mflags} %ifarch x86_64 mkdir -p $RPM_BUILD_ROOT/${_libdir}/xen/bin/ ln -s /usr/lib/xen/bin/qemu-dm $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm @@ -930,7 +806,7 @@ %endif %if %{?with_stubdom}0 # stubdom -make stubdom %{?jobs:-j%{jobs}} +make stubdom %{?_smp_mflags} make -C stubdom install \ DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} \ DOCDIR=%{_defaultdocdir}/xen INCDIR=%{_includedir} @@ -1052,6 +928,7 @@ %{_libdir}/libxen*.so.* %{_libdir}/libvhd.so.* %{_libdir}/libxlutil.so.* +%{_libdir}/libblktapctl.so.* %files tools %defattr(-,root,root) @@ -1065,7 +942,7 @@ #/usr/bin/qemu-img-xen #/usr/bin/qemu-nbd-xen /usr/bin/tapdisk-ioemu -/usr/bin/gdbserver-xen +#/usr/bin/gdbserver-xen #/usr/bin/remus /usr/sbin/blktapctrl /usr/sbin/flask-loadpolicy @@ -1077,7 +954,7 @@ /usr/sbin/xen* /usr/sbin/xm /usr/sbin/xsview -/usr/sbin/fs-backend +#/usr/sbin/fs-backend /usr/sbin/gtracestat /usr/sbin/gtraceview /usr/sbin/lock-util @@ -1091,6 +968,8 @@ /usr/sbin/xen-list /usr/sbin/gdbsx /usr/sbin/xl +/usr/sbin/kdd +/usr/sbin/tap-ctl %dir %{_libdir}/xen %dir %{_libdir}/xen/bin %ifarch x86_64 @@ -1104,7 +983,7 @@ %{_libdir}/xen/bin/xenconsole %{_libdir}/xen/bin/xenctx %{_libdir}/xen/bin/lsevtchn -%{_libdir}/xen/bin/imqebt +#%{_libdir}/xen/bin/imqebt %{_mandir}/man1/*.1.gz %{_mandir}/man5/*.5.gz %{_mandir}/man8/*.8.gz @@ -1122,18 +1001,22 @@ %dir /var/log/xen /etc/init.d/xend /etc/init.d/xendomains +/etc/init.d/xencommons +/etc/init.d/xen-watchdog %config /etc/logrotate.d/xen %dir %attr(700,root,root) /etc/xen /etc/xen/auto %config /etc/xen/examples /etc/xen/images /etc/xen/scripts +/etc/xen/cpupool #/etc/xen/scripts/qemu-ifup /etc/xen/README* %config /etc/xen/vm %config(noreplace) /etc/xen/*.sxp %config(noreplace) /etc/xen/*.xml %config(noreplace) /etc/xen/xenapiusers +%config(noreplace) /etc/xen/xl.conf %config /etc/pam.d/xen-api %config /etc/modprobe.d/xen_loop.conf %dir /etc/modprobe.d @@ -1177,9 +1060,11 @@ %{_libdir}/xen/bin/qemu-dm %ifarch x86_64 /usr/lib/xen/bin/qemu-dm -/usr/lib64/xen/bin/xc_kexec +# NEEDS FIXING +##/usr/lib64/xen/bin/xc_kexec %else -/usr/lib/xen/bin/xc_kexec +# NEEDS FIXING +#/usr/lib/xen/bin/xc_kexec %endif /usr/lib/xen/boot/hvmloader #%pysite/xen/* @@ -1216,6 +1101,8 @@ %{_libdir}/libvhd.so %{_libdir}/libxlutil.a %{_libdir}/libxlutil.so +%{_libdir}/libblktapctl.a +%{_libdir}/libblktapctl.so /usr/bin/serial-split /usr/include/blktaplib.h /usr/include/fsimage* @@ -1224,6 +1111,8 @@ /usr/include/xs.h /usr/include/xs_lib.h /usr/include/libxl.h +/usr/include/_libxl_types.h +/usr/include/libxl_uuid.h %files doc-html %defattr(-,root,root) ++++++ 32on64-extra-mem.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -2919,7 +2919,7 @@ class XendDomainInfo: +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py +@@ -2912,7 +2912,7 @@ class XendDomainInfo: self.guest_bitsize = self.image.getBitSize() # Make sure there's enough RAM available for the domain ++++++ altgr_2.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100 @@ -29,10 +29,10 @@ Signed-off by Chunyan Liu (cyliu(a)novell.com) -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/vnc.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/vnc.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/vnc.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/vnc.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/vnc.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/vnc.c @@ -1308,6 +1308,9 @@ static void do_key_event(VncState *vs, i shift_keys = vs->modifiers_state[0x2a] | vs->modifiers_state[0x36]; altgr_keys = vs->modifiers_state[0xb8]; ++++++ bdrv_default_rwflag.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100 @@ -1,11 +1,11 @@ Subject: modify default read/write flag in bdrv_init. Signed-off by Chunyan Liu <cyliu(a)novell.com> -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/vl.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/vl.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/vl.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/vl.c -@@ -2612,6 +2612,8 @@ int drive_init(struct drive_opt *arg, in +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/vl.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/vl.c +@@ -2617,6 +2617,8 @@ int drive_init(struct drive_opt *arg, in strncpy(drives_table[nb_drives].serial, serial, sizeof(serial)); nb_drives++; @@ -13,8 +13,8 @@ + switch(type) { case IF_IDE: - case IF_SCSI: -@@ -2624,6 +2626,7 @@ int drive_init(struct drive_opt *arg, in + case IF_XEN: +@@ -2630,6 +2632,7 @@ int drive_init(struct drive_opt *arg, in break; case MEDIA_CDROM: bdrv_set_type_hint(bdrv, BDRV_TYPE_CDROM); @@ -22,7 +22,7 @@ break; } break; -@@ -2644,7 +2647,6 @@ int drive_init(struct drive_opt *arg, in +@@ -2650,7 +2653,6 @@ int drive_init(struct drive_opt *arg, in } if (!file[0]) return -2; ++++++ bdrv_open2_fix_flags.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/block.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/block.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/block.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/block.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/block.c ++++ xen-4.1.0-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) @@ -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.2-testing/tools/ioemu-qemu-xen/hw/usb-msd.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/usb-msd.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/usb-msd.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/usb-msd.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/usb-msd.c ++++ xen-4.1.0-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.2-testing/tools/ioemu-qemu-xen/qemu-img.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-img.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/qemu-img.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-img.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/qemu-img.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-img.c @@ -32,7 +32,7 @@ #endif ++++++ bdrv_open2_flags_2.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c @@ -237,6 +237,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.2-testing/tools/ioemu-qemu-xen/xenstore.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c @@ -136,7 +136,8 @@ static void insert_media(void *opaque) else format = &bdrv_raw; @@ -33,7 +33,7 @@ #ifdef CONFIG_STUBDOM { char *buf, *backend, *params_path, *params; -@@ -469,7 +470,8 @@ void xenstore_parse_domain_config(int hv +@@ -511,7 +512,8 @@ void xenstore_parse_domain_config(int hv } for (i = 0; i < num; i++) { @@ -43,7 +43,7 @@ /* read the backend path */ xenstore_get_backend_path(&bpath, "vbd", danger_path, hvm_domid, e_danger[i]); if (bpath == NULL) -@@ -555,6 +557,17 @@ void xenstore_parse_domain_config(int hv +@@ -597,6 +599,17 @@ void xenstore_parse_domain_config(int hv format = &bdrv_raw; } @@ -61,7 +61,7 @@ #if 0 /* Phantom VBDs are disabled because the use of paths * from guest-controlled areas in xenstore is unsafe. -@@ -622,7 +635,7 @@ void xenstore_parse_domain_config(int hv +@@ -664,7 +677,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; @@ -70,7 +70,7 @@ pstrcpy(bs->filename, sizeof(bs->filename), params); } #else -@@ -668,7 +681,7 @@ void xenstore_parse_domain_config(int hv +@@ -710,7 +723,7 @@ void xenstore_parse_domain_config(int hv fprintf(stderr, "Using file %s in read-%s mode\n", bs->filename, is_readonly ? "only" : "write"); ++++++ blktap-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/blktap/drivers/block-cdrom.c +Index: xen-4.1.0-testing/tools/blktap/drivers/block-cdrom.c =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/blktap/drivers/block-cdrom.c ++++ xen-4.1.0-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.2-testing/xen/include/public/io/cdromif.h +Index: xen-4.1.0-testing/xen/include/public/io/cdromif.h =================================================================== --- /dev/null -+++ xen-4.0.2-testing/xen/include/public/io/cdromif.h ++++ xen-4.1.0-testing/xen/include/public/io/cdromif.h @@ -0,0 +1,122 @@ +/****************************************************************************** + * cdromif.h @@ -665,19 +665,19 @@ + sizeof(struct vcd_generic_command) - sizeof(struct request_sense)) + +#endif -Index: xen-4.0.2-testing/tools/blktap/drivers/Makefile +Index: xen-4.1.0-testing/tools/blktap/drivers/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/blktap/drivers/Makefile -+++ xen-4.0.2-testing/tools/blktap/drivers/Makefile +--- xen-4.1.0-testing.orig/tools/blktap/drivers/Makefile ++++ xen-4.1.0-testing/tools/blktap/drivers/Makefile @@ -28,8 +28,9 @@ CFLAGS += -DMEMSHR MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a endif --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_xen) -+LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz $(LDFLAGS_xen) +-LDLIBS_blktapctrl := $(MEMSHRLIBS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) -L../lib -lblktap -lrt -lm -lpthread +-LDLIBS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz ++LDLIBS_xen := $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) ++LDLIBS_blktapctrl := $(MEMSHRLIBS) $(LDLIBS_xen) -L../lib -lblktap -lrt -lm -lpthread ++LDLIBS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz $(LDLIBS_xen) BLK-OBJS-y := block-aio.o BLK-OBJS-y += block-sync.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.2-testing/tools/blktap/drivers/tapdisk.h +Index: xen-4.1.0-testing/tools/blktap/drivers/tapdisk.h =================================================================== ---- xen-4.0.2-testing.orig/tools/blktap/drivers/tapdisk.h -+++ xen-4.0.2-testing/tools/blktap/drivers/tapdisk.h +--- xen-4.1.0-testing.orig/tools/blktap/drivers/tapdisk.h ++++ xen-4.1.0-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.2-testing/tools/blktap/lib/blktaplib.h +Index: xen-4.1.0-testing/tools/blktap/lib/blktaplib.h =================================================================== ---- xen-4.0.2-testing.orig/tools/blktap/lib/blktaplib.h -+++ xen-4.0.2-testing/tools/blktap/lib/blktaplib.h +--- xen-4.1.0-testing.orig/tools/blktap/lib/blktaplib.h ++++ xen-4.1.0-testing/tools/blktap/lib/blktaplib.h @@ -225,6 +225,7 @@ typedef struct msg_pid { #define DISK_TYPE_RAM 3 #define DISK_TYPE_QCOW 4 @@ -749,25 +749,23 @@ /* xenstore/xenbus: */ #define DOMNAME "Domain-0" -Index: xen-4.0.2-testing/xen/include/public/io/blkif.h +Index: xen-4.1.0-testing/xen/include/public/io/blkif.h =================================================================== ---- xen-4.0.2-testing.orig/xen/include/public/io/blkif.h -+++ xen-4.0.2-testing/xen/include/public/io/blkif.h -@@ -76,6 +76,10 @@ - * "feature-flush-cache" node! +--- xen-4.1.0-testing.orig/xen/include/public/io/blkif.h ++++ xen-4.1.0-testing/xen/include/public/io/blkif.h +@@ -80,7 +80,7 @@ + * Used in SLES sources for device specific command packet + * contained within the request. Reserved for that purpose. */ - #define BLKIF_OP_FLUSH_DISKCACHE 3 -+/* -+ * Device specific command packet contained within the request -+ */ -+#define BLKIF_OP_PACKET 4 - +-#define BLKIF_OP_RESERVED_1 4 ++#define BLKIF_OP_PACKET 4 /* - * Maximum scatter/gather segments per request. -Index: xen-4.0.2-testing/tools/blktap/drivers/tapdisk.c + * Recognised only if "feature-trim" is present in backend xenbus info. + * The "feature-trim" node contains a boolean indicating whether trim +Index: xen-4.1.0-testing/tools/blktap/drivers/tapdisk.c =================================================================== ---- xen-4.0.2-testing.orig/tools/blktap/drivers/tapdisk.c -+++ xen-4.0.2-testing/tools/blktap/drivers/tapdisk.c +--- xen-4.1.0-testing.orig/tools/blktap/drivers/tapdisk.c ++++ xen-4.1.0-testing/tools/blktap/drivers/tapdisk.c @@ -735,6 +735,22 @@ static void get_io_request(struct td_sta goto out; } @@ -791,11 +789,11 @@ default: DPRINTF("Unknown block operation\n"); break; -Index: xen-4.0.2-testing/tools/python/xen/xend/server/BlktapController.py +Index: xen-4.1.0-testing/tools/python/xen/xend/server/BlktapController.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/server/BlktapController.py -+++ xen-4.0.2-testing/tools/python/xen/xend/server/BlktapController.py -@@ -21,6 +21,7 @@ blktap1_disk_types = [ +--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/BlktapController.py ++++ xen-4.1.0-testing/tools/python/xen/xend/server/BlktapController.py +@@ -15,6 +15,7 @@ blktap1_disk_types = [ 'ram', 'qcow', 'qcow2', ++++++ blktap.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100 @@ -1,11 +1,11 @@ bug #239173 bug #242953 -Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -3291,7 +3291,7 @@ class XendDomainInfo: +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py +@@ -3295,7 +3295,7 @@ class XendDomainInfo: (fn, BOOTLOADER_LOOPBACK_DEVICE)) vbd = { @@ -14,11 +14,11 @@ 'device': BOOTLOADER_LOOPBACK_DEVICE, } -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c -@@ -397,9 +397,9 @@ void xenstore_parse_domain_config(int hv +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c +@@ -447,9 +447,9 @@ void xenstore_parse_domain_config(int hv { char **e_danger = NULL; char *buf = NULL; @@ -30,7 +30,7 @@ unsigned int len, num, hd_index, pci_devid = 0; BlockDriverState *bs; BlockDriver *format; -@@ -444,6 +444,14 @@ void xenstore_parse_domain_config(int hv +@@ -486,6 +486,14 @@ void xenstore_parse_domain_config(int hv e_danger[i]); if (bpath == NULL) continue; @@ -45,7 +45,7 @@ /* read the name of the device */ if (pasprintf(&buf, "%s/dev", bpath) == -1) continue; -@@ -738,6 +746,7 @@ void xenstore_parse_domain_config(int hv +@@ -775,6 +783,7 @@ void xenstore_parse_domain_config(int hv free(mode); free(params); free(dev); ++++++ blktapctrl-default-to-ioemu.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/blktap/drivers/tapdisk.h +Index: xen-4.1.0-testing/tools/blktap/drivers/tapdisk.h =================================================================== ---- xen-4.0.2-testing.orig/tools/blktap/drivers/tapdisk.h -+++ xen-4.0.2-testing/tools/blktap/drivers/tapdisk.h +--- xen-4.1.0-testing.orig/tools/blktap/drivers/tapdisk.h ++++ xen-4.1.0-testing/tools/blktap/drivers/tapdisk.h @@ -168,7 +168,7 @@ static disk_info_t aio_disk = { "raw image (aio)", "aio", ++++++ bridge-bonding.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/hotplug/Linux/network-bridge +Index: xen-4.1.0-testing/tools/hotplug/Linux/network-bridge =================================================================== ---- xen-4.0.2-testing.orig/tools/hotplug/Linux/network-bridge -+++ xen-4.0.2-testing/tools/hotplug/Linux/network-bridge -@@ -245,6 +245,9 @@ op_start () { +--- xen-4.1.0-testing.orig/tools/hotplug/Linux/network-bridge ++++ xen-4.1.0-testing/tools/hotplug/Linux/network-bridge +@@ -249,6 +249,9 @@ op_start () { claim_lock "network-bridge" @@ -12,14 +12,14 @@ vlans=$(find_active_vlans "${netdev}") for vlan in $vlans ; do ifdown $vlan ; done -@@ -262,18 +265,32 @@ op_start () { +@@ -266,18 +269,32 @@ op_start () { ip link set ${netdev} down ip addr flush ${netdev} fi - ip link set ${netdev} name ${pdev} - ip link set ${tdev} name ${bridge} - -- setup_bridge_port ${pdev} +- setup_physical_bridge_port ${pdev} - # Restore slaves - if [ -n "${slaves}" ]; then ++++++ bridge-opensuse.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/hotplug/Linux/network-bridge +Index: xen-4.1.0-testing/tools/hotplug/Linux/network-bridge =================================================================== ---- xen-4.0.2-testing.orig/tools/hotplug/Linux/network-bridge -+++ xen-4.0.2-testing/tools/hotplug/Linux/network-bridge -@@ -270,19 +270,19 @@ op_stop () { +--- xen-4.1.0-testing.orig/tools/hotplug/Linux/network-bridge ++++ xen-4.1.0-testing/tools/hotplug/Linux/network-bridge +@@ -278,19 +278,19 @@ op_stop () { transfer_addrs ${bridge} ${pdev} if ! ifdown ${bridge}; then get_ip_info ${bridge} ++++++ bridge-record-creation.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/hotplug/Linux/network-bridge +Index: xen-4.1.0-testing/tools/hotplug/Linux/network-bridge =================================================================== ---- xen-4.0.2-testing.orig/tools/hotplug/Linux/network-bridge -+++ xen-4.0.2-testing/tools/hotplug/Linux/network-bridge -@@ -253,6 +253,11 @@ op_start () { +--- xen-4.1.0-testing.orig/tools/hotplug/Linux/network-bridge ++++ xen-4.1.0-testing/tools/hotplug/Linux/network-bridge +@@ -257,6 +257,11 @@ op_start () { create_bridge ${tdev} @@ -14,7 +14,7 @@ preiftransfer ${netdev} transfer_addrs ${netdev} ${tdev} # Remember slaves for bonding interface. -@@ -330,6 +335,13 @@ op_stop () { +@@ -338,6 +343,13 @@ op_stop () { ip link set ${pdev} name ${netdev} do_ifup ${netdev} ++++++ bridge-vlan.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/hotplug/Linux/network-bridge +Index: xen-4.1.0-testing/tools/hotplug/Linux/network-bridge =================================================================== ---- xen-4.0.2-testing.orig/tools/hotplug/Linux/network-bridge -+++ xen-4.0.2-testing/tools/hotplug/Linux/network-bridge +--- xen-4.1.0-testing.orig/tools/hotplug/Linux/network-bridge ++++ xen-4.1.0-testing/tools/hotplug/Linux/network-bridge @@ -193,6 +193,28 @@ antispoofing () { iptables -A FORWARD -m physdev --physdev-in ${pdev} -j ACCEPT } @@ -31,7 +31,7 @@ # Usage: show_status dev bridge # Print ifconfig and routes. show_status () { -@@ -223,6 +245,9 @@ op_start () { +@@ -227,6 +249,9 @@ op_start () { claim_lock "network-bridge" @@ -41,7 +41,7 @@ create_bridge ${tdev} preiftransfer ${netdev} -@@ -250,6 +275,8 @@ op_start () { +@@ -254,6 +279,8 @@ op_start () { add_to_bridge2 ${bridge} ${pdev} do_ifup ${bridge} @@ -50,7 +50,7 @@ if [ ${antispoof} = 'yes' ] ; then antispoofing fi -@@ -267,6 +294,9 @@ op_stop () { +@@ -275,6 +302,9 @@ op_stop () { claim_lock "network-bridge" @@ -60,7 +60,7 @@ transfer_addrs ${bridge} ${pdev} if ! ifdown ${bridge}; then get_ip_info ${bridge} -@@ -283,6 +313,8 @@ op_stop () { +@@ -291,6 +321,8 @@ op_stop () { ip link set ${pdev} name ${netdev} do_ifup ${netdev} ++++++ build-tapdisk-ioemu.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -15,10 +15,10 @@ tapdisk-ioemu.c | 17 ----------------- 4 files changed, 17 insertions(+), 26 deletions(-) -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/Makefile +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/Makefile -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/Makefile +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/Makefile ++++ xen-4.1.0-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.2-testing/tools/ioemu-qemu-xen/configure +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/configure =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/configure -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/configure +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/configure ++++ xen-4.1.0-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.2-testing/tools/ioemu-qemu-xen/qemu-tool.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-tool.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/qemu-tool.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-tool.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/qemu-tool.c ++++ xen-4.1.0-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.2-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/vnc.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/vnc.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/vnc.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/vnc.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/vnc.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/vnc.c @@ -1342,6 +1342,11 @@ static void do_key_event(VncState *vs, i } break; ++++++ cdrom-removable.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/python/xen/xend/server/HalDaemon.py +Index: xen-4.1.0-testing/tools/python/xen/xend/server/HalDaemon.py =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/python/xen/xend/server/HalDaemon.py ++++ xen-4.1.0-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.2-testing/tools/python/xen/xend/server/Hald.py +Index: xen-4.1.0-testing/tools/python/xen/xend/server/Hald.py =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/python/xen/xend/server/Hald.py ++++ xen-4.1.0-testing/tools/python/xen/xend/server/Hald.py @@ -0,0 +1,125 @@ +#============================================================================ +# This library is free software; you can redistribute it and/or @@ -376,11 +376,11 @@ + watcher.run() + time.sleep(10) + watcher.shutdown() -Index: xen-4.0.2-testing/tools/python/xen/xend/server/SrvServer.py +Index: xen-4.1.0-testing/tools/python/xen/xend/server/SrvServer.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/server/SrvServer.py -+++ xen-4.0.2-testing/tools/python/xen/xend/server/SrvServer.py -@@ -56,6 +56,7 @@ from xen.web.SrvDir import SrvDir +--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/SrvServer.py ++++ xen-4.1.0-testing/tools/python/xen/xend/server/SrvServer.py +@@ -57,6 +57,7 @@ from xen.web.SrvDir import SrvDir from SrvRoot import SrvRoot from XMLRPCServer import XMLRPCServer @@ -388,7 +388,7 @@ xoptions = XendOptions.instance() -@@ -245,6 +246,8 @@ def _loadConfig(servers, root, reload): +@@ -252,6 +253,8 @@ def _loadConfig(servers, root, reload): if xoptions.get_xend_unix_xmlrpc_server(): servers.add(XMLRPCServer(XendAPI.AUTH_PAM, False)) @@ -397,10 +397,10 @@ def create(): root = SrvDir() -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++ xen-4.1.0-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" -@@ -553,6 +554,21 @@ void xenstore_parse_domain_config(int hv +@@ -595,6 +596,21 @@ void xenstore_parse_domain_config(int hv #endif bs = bdrv_new(dev); @@ -431,8 +431,8 @@ /* check if it is a cdrom */ if (danger_type && !strcmp(danger_type, "cdrom")) { bdrv_set_type_hint(bs, BDRV_TYPE_CDROM); -@@ -961,6 +977,50 @@ void xenstore_record_dm_state(const char - xenstore_record_dm("state", state); +@@ -1028,6 +1044,50 @@ static void xenstore_process_vcpu_set_ev + return; } +static void xenstore_process_media_change_event(char **vec) @@ -482,7 +482,7 @@ void xenstore_process_event(void *opaque) { char **vec, *offset, *bpath = NULL, *buf = NULL, *drv = NULL, *image = NULL; -@@ -991,6 +1051,11 @@ void xenstore_process_event(void *opaque +@@ -1063,6 +1123,11 @@ void xenstore_process_event(void *opaque xenstore_watch_callbacks[i].cb(vec[XS_WATCH_TOKEN], xenstore_watch_callbacks[i].opaque); ++++++ change_home_server.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -3135,6 +3135,11 @@ class XendDomainInfo: +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py +@@ -3130,6 +3130,11 @@ class XendDomainInfo: self._cleanup_phantom_devs(paths) self._cleanupVm() ++++++ check_device_status.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -5,10 +5,11 @@ returned. To fix this problem, we do not depend on ev.wait() result, but read xenstore directly to get correct device status. -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 @@ +Index: xen-4.1.0-testing/tools/python/xen/xend/server/DevController.py +=================================================================== +--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/DevController.py ++++ xen-4.1.0-testing/tools/python/xen/xend/server/DevController.py +@@ -149,7 +149,10 @@ class DevController: (status, err) = self.waitForBackend(devid) if status == Timeout: @@ -20,7 +21,7 @@ raise VmError("Device %s (%s) could not be connected. " "Hotplug scripts not working." % (devid, self.deviceClass)) -@@ -554,7 +557,17 @@ +@@ -554,7 +557,17 @@ class DevController: xswatch(statusPath, hotplugStatusCallback, ev, result) @@ -39,7 +40,7 @@ err = xstransact.Read(backpath, HOTPLUG_ERROR_NODE) -@@ -571,7 +584,12 @@ +@@ -571,7 +584,12 @@ class DevController: xswatch(statusPath, deviceDestroyCallback, ev, result) ++++++ checkpoint-rename.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/python/xen/xend/XendCheckpoint.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendCheckpoint.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendCheckpoint.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendCheckpoint.py -@@ -165,7 +165,7 @@ def save(fd, dominfo, network, live, dst +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendCheckpoint.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendCheckpoint.py +@@ -172,7 +172,7 @@ def save(fd, dominfo, network, live, dst dominfo.destroy() dominfo.testDeviceComplete() try: ++++++ del_usb_xend_entry.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -1312,8 +1312,15 @@ class XendDomainInfo: +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py +@@ -1297,8 +1297,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.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +Index: xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c =================================================================== ---- xen-4.0.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c -+++ xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c -@@ -396,6 +396,11 @@ static int __devinit platform_pci_init(s +--- xen-4.1.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c ++++ xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +@@ -398,6 +398,11 @@ static int __devinit platform_pci_init(s platform_mmio = mmio_addr; platform_mmiolen = mmio_len; ++++++ dom-print.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/xen/arch/x86/domain.c +Index: xen-4.1.0-testing/xen/arch/x86/domain.c =================================================================== ---- xen-4.0.2-testing.orig/xen/arch/x86/domain.c -+++ xen-4.0.2-testing/xen/arch/x86/domain.c -@@ -144,15 +144,30 @@ void dump_pageframe_info(struct domain * +--- xen-4.1.0-testing.orig/xen/arch/x86/domain.c ++++ xen-4.1.0-testing/xen/arch/x86/domain.c +@@ -150,15 +150,30 @@ void dump_pageframe_info(struct domain * printk("Memory pages belonging to domain %u:\n", d->domain_id); ++++++ domu-usb-controller.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendConfig.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendConfig.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py -@@ -1861,7 +1861,14 @@ class XendConfig(dict): +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendConfig.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendConfig.py +@@ -1874,7 +1874,14 @@ class XendConfig(dict): ports = sxp.child(dev_sxp, 'port') for port in ports[1:]: try: ++++++ hibernate.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/firmware/hvmloader/acpi/dsdt.asl +Index: xen-4.1.0-testing/tools/firmware/hvmloader/acpi/dsdt.asl =================================================================== ---- xen-4.0.2-testing.orig/tools/firmware/hvmloader/acpi/dsdt.asl -+++ xen-4.0.2-testing/tools/firmware/hvmloader/acpi/dsdt.asl +--- xen-4.1.0-testing.orig/tools/firmware/hvmloader/acpi/dsdt.asl ++++ xen-4.1.0-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: @@ -11,18 +11,18 @@ */ - Name (\_S3, Package (0x04) - { -- 0x05, /* PM1a_CNT.SLP_TYP */ -- 0x05, /* PM1b_CNT.SLP_TYP */ +- 0x01, /* PM1a_CNT.SLP_TYP */ +- 0x01, /* PM1b_CNT.SLP_TYP */ - 0x0, /* reserved */ - 0x0 /* reserved */ - }) - Name (\_S4, Package (0x04) - { -- 0x06, /* PM1a_CNT.SLP_TYP */ -- 0x06, /* PM1b_CNT.SLP_TYP */ +- 0x00, /* PM1a_CNT.SLP_TYP */ +- 0x00, /* PM1b_CNT.SLP_TYP */ - 0x00, /* reserved */ - 0x00 /* reserved */ - }) Name (\_S5, Package (0x04) { - 0x07, /* PM1a_CNT.SLP_TYP */ + 0x00, /* PM1a_CNT.SLP_TYP */ ++++++ hv_extid_compatibility.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendConfig.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendConfig.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py -@@ -157,6 +157,7 @@ XENAPI_PLATFORM_CFG_TYPES = { +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendConfig.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendConfig.py +@@ -159,6 +159,7 @@ XENAPI_PLATFORM_CFG_TYPES = { 'nographic': int, 'nomigrate': int, 'pae' : int, @@ -10,7 +10,7 @@ 'rtc_timeoffset': int, 'parallel': str, 'serial': str, -@@ -509,6 +510,8 @@ class XendConfig(dict): +@@ -515,6 +516,8 @@ class XendConfig(dict): if self.is_hvm(): if 'timer_mode' not in self['platform']: self['platform']['timer_mode'] = 1 @@ -19,10 +19,10 @@ if 'viridian' not in self['platform']: self['platform']['viridian'] = 0 if 'rtc_timeoffset' not in self['platform']: -Index: xen-4.0.2-testing/tools/python/xen/xend/image.py +Index: xen-4.1.0-testing/tools/python/xen/xend/image.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/image.py -+++ xen-4.0.2-testing/tools/python/xen/xend/image.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/image.py ++++ xen-4.1.0-testing/tools/python/xen/xend/image.py @@ -839,6 +839,7 @@ class HVMImageHandler(ImageHandler): self.apic = int(vmConfig['platform'].get('apic', 0)) @@ -31,10 +31,10 @@ self.guest_os_type = vmConfig['platform'].get('guest_os_type') self.memory_sharing = int(vmConfig['memory_sharing']) try: -Index: xen-4.0.2-testing/tools/python/xen/xm/create.py +Index: xen-4.1.0-testing/tools/python/xen/xm/create.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xm/create.py -+++ xen-4.0.2-testing/tools/python/xen/xm/create.py +--- xen-4.1.0-testing.orig/tools/python/xen/xm/create.py ++++ xen-4.1.0-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).""") ++++++ ioemu-7615-qcow2-fix-alloc_cluster_link_l2.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -17,10 +17,10 @@ Signed-off-by: Kevin Wolf <kwolf(a)redhat.com> -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/block-qcow2.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/block-qcow2.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/block-qcow2.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/block-qcow2.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/block-qcow2.c ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c @@ -259,8 +259,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.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c @@ -360,6 +360,15 @@ static void qemu_send_responses(void* op } ++++++ ioemu-blktap-fv-init.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_machine_fv.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_machine_fv.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_machine_fv.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_machine_fv.c -@@ -268,6 +268,7 @@ void qemu_invalidate_entry(uint8_t *buff +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_machine_fv.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_machine_fv.c +@@ -269,6 +269,7 @@ void qemu_invalidate_entry(uint8_t *buff #endif /* defined(MAPCACHE) */ @@ -10,7 +10,7 @@ static void xen_init_fv(ram_addr_t ram_size, int vga_ram_size, const char *boot_device, -@@ -293,6 +294,11 @@ static void xen_init_fv(ram_addr_t ram_s +@@ -294,6 +295,11 @@ static void xen_init_fv(ram_addr_t ram_s } #endif ++++++ ioemu-blktap-image-format.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -15,10 +15,10 @@ hw/xen_blktap.h | 14 ++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c @@ -230,9 +230,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.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.h -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.h ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h @@ -53,4 +53,18 @@ typedef struct fd_list_entry { int init_blktap(void); ++++++ ioemu-blktap-zero-size.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -12,10 +12,10 @@ hw/xen_blktap.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c @@ -268,6 +268,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); return 0; -Index: xen-4.0.2-testing/tools/python/xen/xend/server/DevController.py +Index: xen-4.1.0-testing/tools/python/xen/xend/server/DevController.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/server/DevController.py -+++ xen-4.0.2-testing/tools/python/xen/xend/server/DevController.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/DevController.py ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/Makefile +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/Makefile -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/Makefile +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/Makefile ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/Makefile @@ -243,7 +243,7 @@ endif install: all $(if $(BUILD_DOCS),install-doc) mkdir -p "$(DESTDIR)$(bindir)" @@ -11,11 +11,11 @@ endif ifneq ($(BLOBS),) mkdir -p "$(DESTDIR)$(datadir)" -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/Makefile.target +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/Makefile.target =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/Makefile.target -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/Makefile.target -@@ -754,7 +754,7 @@ clean: +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/Makefile.target ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/Makefile.target +@@ -755,7 +755,7 @@ clean: install: all install-hook ifneq ($(PROGS),) ++++++ ioemu-disable-emulated-ide-if-pv.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-xen.h =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-xen.h @@ -1,6 +1,8 @@ #ifndef QEMU_XEN_H #define QEMU_XEN_H @@ -11,46 +11,45 @@ /* vl.c */ extern int restore; extern int vga_ram_size; -@@ -73,7 +75,7 @@ void handle_buffered_pio(void); - #endif - +@@ -75,7 +77,7 @@ void handle_buffered_pio(void); /* xenstore.c */ + void xenstore_init(void); + uint32_t xenstore_read_target(void); -void xenstore_parse_domain_config(int domid); +void xenstore_parse_domain_config(int domid, QEMUMachine *machine); int xenstore_parse_disable_pf_config(void); int xenstore_fd(void); void xenstore_process_event(void *opaque); -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/vl.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/vl.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/vl.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/vl.c -@@ -5827,10 +5827,10 @@ int main(int argc, char **argv, char **e +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/vl.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/vl.c +@@ -5830,9 +5830,9 @@ int main(int argc, char **argv, char **e if ((msg = xenbus_read(XBT_NIL, "domid", &domid_s))) fprintf(stderr,"Can not read our own domid: %s\n", msg); else - xenstore_parse_domain_config(atoi(domid_s)); + xenstore_parse_domain_config(atoi(domid_s), machine); - } #else -- xenstore_parse_domain_config(domid); -+ xenstore_parse_domain_config(domid, machine); +- xenstore_parse_domain_config(domid); ++ xenstore_parse_domain_config(domid, machine); #endif /* CONFIG_STUBDOM */ + } - /* we always create the cdrom drive, even if no disk is there */ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c -@@ -397,7 +397,7 @@ static const char *xenstore_get_guest_uu - #define PT_PCI_POWER_MANAGEMENT_DEFAULT 0 - int direct_pci_msitranslate; - int direct_pci_power_mgmt; +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c +@@ -447,7 +447,7 @@ void xenstore_init(void) + } + } + -void xenstore_parse_domain_config(int hvm_domid) +void xenstore_parse_domain_config(int hvm_domid, QEMUMachine *machine) { char **e_danger = NULL; char *buf = NULL; -@@ -712,15 +712,19 @@ void xenstore_parse_domain_config(int hv +@@ -754,15 +754,19 @@ void xenstore_parse_domain_config(int hv #endif ++++++ ioemu-disable-scsi.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_platform.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_platform.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_platform.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c ++++ xen-4.1.0-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.2-testing/tools/ioemu-qemu-xen/qemu-xen.h +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-xen.h =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-xen.h @@ -57,6 +57,7 @@ void unset_vram_mapping(void *opaque); #endif @@ -23,11 +23,11 @@ void destroy_hvm_domain(void); void unregister_iomem(target_phys_addr_t start); -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/pci.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/pci.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/pci.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/pci.c -@@ -892,6 +892,50 @@ void pci_unplug_netifs(void) +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/pci.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/pci.c +@@ -871,6 +871,50 @@ void pci_unplug_netifs(void) } } @@ -45,7 +45,7 @@ + dev = bus->devices[x]; + if (dev && + dev->config[0xa] == 0 && -+ dev->config[0xb] == 1 ++ dev->config[0xb] == 1 +#ifdef CONFIG_PASSTHROUGH + && test_pci_devfn(x) != 1 +#endif ++++++ ioemu-vnc-resize.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/vnc.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/vnc.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/vnc.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/vnc.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/vnc.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/vnc.c @@ -1734,6 +1734,25 @@ static int protocol_client_msg(VncState } ++++++ libxen_permissive.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/libxen/src/xen_common.c +Index: xen-4.1.0-testing/tools/libxen/src/xen_common.c =================================================================== ---- xen-4.0.2-testing.orig/tools/libxen/src/xen_common.c -+++ xen-4.0.2-testing/tools/libxen/src/xen_common.c +--- xen-4.1.0-testing.orig/tools/libxen/src/xen_common.c ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -2,11 +2,11 @@ Signed-off-by: K. Y. Srinivasan <ksrinivasan(a)novell.com> -Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +Index: xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c =================================================================== ---- xen-4.0.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c -+++ xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c -@@ -320,7 +320,10 @@ static int check_platform_magic(struct d +--- xen-4.1.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c ++++ xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +@@ -322,7 +322,10 @@ static int check_platform_magic(struct d if (magic != XEN_IOPORT_MAGIC_VAL) { err = "unrecognised magic value"; ++++++ minios-fixups.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,23 +1,8 @@ -Index: xen-4.0.2-testing/extras/mini-os/netfront.c +Index: xen-4.1.0-testing/extras/mini-os/lib/math.c =================================================================== ---- xen-4.0.2-testing.orig/extras/mini-os/netfront.c -+++ xen-4.0.2-testing/extras/mini-os/netfront.c -@@ -25,8 +25,8 @@ DECLARE_WAIT_QUEUE_HEAD(netfront_queue); - - - --#define NET_TX_RING_SIZE __RING_SIZE((struct netif_tx_sring *)0, PAGE_SIZE) --#define NET_RX_RING_SIZE __RING_SIZE((struct netif_rx_sring *)0, PAGE_SIZE) -+#define NET_TX_RING_SIZE __CONST_RING_SIZE(netif_tx, PAGE_SIZE) -+#define NET_RX_RING_SIZE __CONST_RING_SIZE(netif_rx, PAGE_SIZE) - #define GRANT_INVALID_REF 0 - - -Index: xen-4.0.2-testing/extras/mini-os/lib/math.c -=================================================================== ---- xen-4.0.2-testing.orig/extras/mini-os/lib/math.c -+++ xen-4.0.2-testing/extras/mini-os/lib/math.c -@@ -191,6 +191,7 @@ __qdivrem(uint64_t uq, uint64_t vq, uint +--- xen-4.1.0-testing.orig/extras/mini-os/lib/math.c ++++ xen-4.1.0-testing/extras/mini-os/lib/math.c +@@ -187,6 +187,7 @@ __qdivrem(uint64_t uq, uint64_t vq, uint * and thus * m = 4 - n <= 2 */ @@ -25,16 +10,3 @@ tmp.uq = uq; u[0] = 0; u[1] = HHALF(tmp.ul[H]); -Index: xen-4.0.2-testing/extras/mini-os/arch/x86/mm.c -=================================================================== ---- xen-4.0.2-testing.orig/extras/mini-os/arch/x86/mm.c -+++ xen-4.0.2-testing/extras/mini-os/arch/x86/mm.c -@@ -281,7 +281,7 @@ static void build_pagetable(unsigned lon - /* - * Mark portion of the address space read only. - */ --extern void shared_info; -+extern char shared_info[PAGE_SIZE]; - static void set_readonly(void *text, void *etext) - { - unsigned long start_address = ++++++ multi-xvdp.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -5,27 +5,11 @@ loopback devices so more than one instance of bootloader can be run concurrently. -Index: xen-4.0.2-testing/tools/python/xen/util/blkif.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/util/blkif.py -+++ xen-4.0.2-testing/tools/python/xen/util/blkif.py -@@ -19,11 +19,6 @@ 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): - major = scsi_major[(ord(n[7:8]) - ord('a')) / 16] -Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py -=================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -73,7 +73,7 @@ from xen.xend.XendPSCSI import XendPSCSI +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py +@@ -74,7 +74,7 @@ from xen.xend.XendPSCSI import XendPSCSI from xen.xend.XendDSCSI import XendDSCSI, XendDSCSI_HBA MIGRATE_TIMEOUT = 30.0 @@ -34,7 +18,7 @@ xc = xen.lowlevel.xc.xc() xoptions = XendOptions.instance() -@@ -3305,33 +3305,38 @@ class XendDomainInfo: +@@ -3299,33 +3299,38 @@ 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. ++++++ network-nat-open-SuSEfirewall2-FORWARD.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,9 +1,9 @@ Open SuSEfirewall2 FORWARD rule when use xen nat -Index: xen-4.0.2-testing/tools/hotplug/Linux/network-nat +Index: xen-4.1.0-testing/tools/hotplug/Linux/network-nat =================================================================== ---- xen-4.0.2-testing.orig/tools/hotplug/Linux/network-nat -+++ xen-4.0.2-testing/tools/hotplug/Linux/network-nat +--- xen-4.1.0-testing.orig/tools/hotplug/Linux/network-nat ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/hotplug/Linux/network-nat +Index: xen-4.1.0-testing/tools/hotplug/Linux/network-nat =================================================================== ---- xen-4.0.2-testing.orig/tools/hotplug/Linux/network-nat -+++ xen-4.0.2-testing/tools/hotplug/Linux/network-nat +--- xen-4.1.0-testing.orig/tools/hotplug/Linux/network-nat ++++ xen-4.1.0-testing/tools/hotplug/Linux/network-nat @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash ++++++ pv-driver-build.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,9 +1,25 @@ -Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild -=================================================================== ---- xen-4.0.2-testing.orig/unmodified_drivers/linux-2.6/blkfront/Kbuild -+++ xen-4.0.2-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild +--- a/unmodified_drivers/linux-2.6/blkfront/Kbuild ++++ b/unmodified_drivers/linux-2.6/blkfront/Kbuild @@ -3,3 +3,4 @@ include $(M)/overrides.mk obj-m += xen-vbd.o xen-vbd-objs := blkfront.o vbd.o +xen-vbd-objs += $(patsubst %.c,%.o,$(notdir $(wildcard $(src)/vcd.c))) +--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c ++++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +@@ -123,6 +123,7 @@ unsigned long alloc_xen_mmio(unsigned lo + + #ifndef __ia64__ + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) + static uint32_t xen_cpuid_base(void) + { + uint32_t base, eax, ebx, ecx, edx; +@@ -141,6 +142,7 @@ static uint32_t xen_cpuid_base(void) + + return 0; + } ++#endif + + static int init_hypercall_stubs(void) + { ++++++ pvdrv-import-shared-info.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c +Index: xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c =================================================================== ---- xen-4.0.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/evtchn.c -+++ xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c +--- xen-4.1.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/evtchn.c ++++ xen-4.1.0-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.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +Index: xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c =================================================================== ---- xen-4.0.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c -+++ xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +--- xen-4.1.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c ++++ xen-4.1.0-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.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h +Index: xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h =================================================================== ---- xen-4.0.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h -+++ xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h +--- xen-4.1.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_platform.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_platform.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_platform.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/ide.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/ide.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/ide.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/ide.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/ide.c ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/ne2000.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/ne2000.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/ne2000.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/ne2000.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/ne2000.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/ne2000.c @@ -218,7 +218,7 @@ static int ne2000_can_receive(void *opaq NE2000State *s = opaque; @@ -11,11 +11,11 @@ return !ne2000_buffer_full(s); } -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/pc.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/pc.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/pc.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/pc.c -@@ -409,7 +409,8 @@ static void bochs_bios_write(void *opaqu +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/pc.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/pc.c +@@ -413,7 +413,8 @@ static void bochs_bios_write(void *opaqu case 0x400: case 0x401: fprintf(stderr, "BIOS panic at rombios.c, line %d\n", val); @@ -25,7 +25,7 @@ case 0x402: case 0x403: #ifdef DEBUG_BIOS -@@ -432,8 +433,9 @@ static void bochs_bios_write(void *opaqu +@@ -436,8 +437,9 @@ static void bochs_bios_write(void *opaqu /* LGPL'ed VGA BIOS messages */ case 0x501: case 0x502: ++++++ serial-split.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/misc/serial-split/Makefile +Index: xen-4.1.0-testing/tools/misc/serial-split/Makefile =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/misc/serial-split/Makefile ++++ xen-4.1.0-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.2-testing/tools/misc/serial-split/serial-split.c +Index: xen-4.1.0-testing/tools/misc/serial-split/serial-split.c =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/misc/serial-split/serial-split.c ++++ xen-4.1.0-testing/tools/misc/serial-split/serial-split.c @@ -0,0 +1,422 @@ +/* + * serial-split.c ++++++ snapshot-ioemu-delete.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c -@@ -935,6 +935,18 @@ static void xenstore_process_dm_command_ +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c +@@ -972,6 +972,18 @@ static void xenstore_process_dm_command_ } snapshot_name = xs_read(xsh, XBT_NULL, path, &len); @@ -21,11 +21,11 @@ } else if (!strncmp(command, "continue", len)) { fprintf(logfile, "dm-command: continue after state save\n"); xen_pause_requested = 0; -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/savevm.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/savevm.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/savevm.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/savevm.c -@@ -1096,6 +1096,35 @@ the_end: +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/savevm.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/savevm.c +@@ -1106,6 +1106,35 @@ the_end: return ret; } @@ -61,10 +61,10 @@ #ifndef CONFIG_DM void do_savevm(const char *name) -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-xen.h =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c @@ -103,6 +103,8 @@ int xenstore_watch_new_callback(const ch } @@ -11,7 +11,7 @@ static int pasprintf(char **buf, const char *fmt, ...) { va_list ap; -@@ -666,8 +668,33 @@ void xenstore_parse_domain_config(int hv +@@ -708,8 +710,33 @@ void xenstore_parse_domain_config(int hv fprintf(stderr, "Using file %s in read-%s mode\n", bs->filename, is_readonly ? "only" : "write"); @@ -46,7 +46,7 @@ } #endif -@@ -802,6 +829,23 @@ int xenstore_parse_disable_pf_config () +@@ -839,6 +866,23 @@ int xenstore_parse_disable_pf_config () return disable_pf; } ++++++ snapshot-ioemu-save.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/savevm.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/savevm.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/savevm.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/savevm.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/savevm.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/savevm.c @@ -28,6 +28,7 @@ #include "sysemu.h" #include "qemu-timer.h" @@ -10,7 +10,7 @@ #include "block.h" #include "audio/audio.h" #include "migration.h" -@@ -1015,6 +1016,86 @@ static int bdrv_snapshot_find(BlockDrive +@@ -1025,6 +1026,86 @@ static int bdrv_snapshot_find(BlockDrive return ret; } @@ -97,10 +97,10 @@ #ifndef CONFIG_DM void do_savevm(const char *name) -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/i386-dm/helper2.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/i386-dm/helper2.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/i386-dm/helper2.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/i386-dm/helper2.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/i386-dm/helper2.c ++++ xen-4.1.0-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; @@ -112,14 +112,14 @@ { CPUX86State *env; @@ -556,6 +559,7 @@ int main_loop(void) - int evtchn_fd = xce_handle == -1 ? -1 : xc_evtchn_fd(xce_handle); + int evtchn_fd = xce_handle == NULL ? -1 : xc_evtchn_fd(xce_handle); char *qemu_file; fd_set fds; + int ret; main_loop_prepare(); -@@ -583,11 +587,43 @@ int main_loop(void) +@@ -588,11 +592,43 @@ int main_loop(void) main_loop_wait(1); /* For the select() on events */ /* Save the device state */ @@ -167,10 +167,10 @@ /* Wait to be allowed to continue */ while (xen_pause_requested) { -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-xen.h =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h ++++ xen-4.1.0-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) @@ -187,18 +187,18 @@ /* helper2.c */ extern long time_offset; void timeoffset_get(void); -@@ -68,6 +77,7 @@ int xenstore_fd(void); +@@ -70,6 +79,7 @@ int xenstore_fd(void); void xenstore_process_event(void *opaque); void xenstore_record_dm(const char *subpath, const char *state); void xenstore_record_dm_state(const char *state); +void xenstore_record_dm_error(const char *errmsg); 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.2-testing/tools/ioemu-qemu-xen/xenstore.c + void xenstore_write_vslots(char *vslots); +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++ xen-4.1.0-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" -@@ -862,6 +863,7 @@ static void xenstore_process_dm_command_ +@@ -899,6 +900,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) { -@@ -877,7 +879,18 @@ static void xenstore_process_dm_command_ +@@ -914,7 +916,18 @@ static void xenstore_process_dm_command_ if (!strncmp(command, "save", len)) { fprintf(logfile, "dm-command: pause and save state\n"); @@ -235,8 +235,8 @@ } else if (!strncmp(command, "continue", len)) { fprintf(logfile, "dm-command: continue after state save\n"); xen_pause_requested = 0; -@@ -1010,6 +1023,13 @@ void xenstore_record_dm_state(const char - xenstore_record_dm("state", state); +@@ -1077,6 +1090,13 @@ static void xenstore_process_vcpu_set_ev + return; } +void xenstore_record_dm_error(const char *errmsg) ++++++ snapshot-without-pv-fix.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -8,10 +8,10 @@ drives_table[], otherwise the disk in qemu will just stay opened,not showing up in drives_table[]. -Index: xen-4.0.2-testing/tools/blktap/drivers/blktapctrl.c +Index: xen-4.1.0-testing/tools/blktap/drivers/blktapctrl.c =================================================================== ---- xen-4.0.2-testing.orig/tools/blktap/drivers/blktapctrl.c -+++ xen-4.0.2-testing/tools/blktap/drivers/blktapctrl.c +--- xen-4.1.0-testing.orig/tools/blktap/drivers/blktapctrl.c ++++ xen-4.1.0-testing/tools/blktap/drivers/blktapctrl.c @@ -380,7 +380,22 @@ static int write_msg(int fd, int msgtype msg->cookie = blkif->cookie; @@ -121,10 +121,10 @@ ctlfd = blktap_interface_open(); if (ctlfd < 0) { -Index: xen-4.0.2-testing/tools/blktap/lib/blkif.c +Index: xen-4.1.0-testing/tools/blktap/lib/blkif.c =================================================================== ---- xen-4.0.2-testing.orig/tools/blktap/lib/blkif.c -+++ xen-4.0.2-testing/tools/blktap/lib/blkif.c +--- xen-4.1.0-testing.orig/tools/blktap/lib/blkif.c ++++ xen-4.1.0-testing/tools/blktap/lib/blkif.c @@ -89,6 +89,11 @@ void register_new_blkif_hook(int (*fn)(b { new_blkif_hook = fn; @@ -162,10 +162,10 @@ void __init_blkif(void) { memset(blkif_hash, 0, sizeof(blkif_hash)); -Index: xen-4.0.2-testing/tools/blktap/lib/blktaplib.h +Index: xen-4.1.0-testing/tools/blktap/lib/blktaplib.h =================================================================== ---- xen-4.0.2-testing.orig/tools/blktap/lib/blktaplib.h -+++ xen-4.0.2-testing/tools/blktap/lib/blktaplib.h +--- xen-4.1.0-testing.orig/tools/blktap/lib/blktaplib.h ++++ xen-4.1.0-testing/tools/blktap/lib/blktaplib.h @@ -38,6 +38,7 @@ #include <xen/xen.h> #include <xen/io/blkif.h> @@ -197,10 +197,10 @@ /* disk driver types */ #define MAX_DISK_TYPES 20 -Index: xen-4.0.2-testing/tools/blktap/lib/xenbus.c +Index: xen-4.1.0-testing/tools/blktap/lib/xenbus.c =================================================================== ---- xen-4.0.2-testing.orig/tools/blktap/lib/xenbus.c -+++ xen-4.0.2-testing/tools/blktap/lib/xenbus.c +--- xen-4.1.0-testing.orig/tools/blktap/lib/xenbus.c ++++ xen-4.1.0-testing/tools/blktap/lib/xenbus.c @@ -318,6 +318,72 @@ static int check_image(struct xs_handle return 0; } @@ -284,10 +284,10 @@ list_add(&be->list, &belist); -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c @@ -35,6 +35,8 @@ #ifndef QEMU_TOOL #include "qemu-common.h" @@ -378,10 +378,10 @@ default: break; } -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.h -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.h ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h @@ -40,7 +40,8 @@ struct td_state { void *fd_entry; uint64_t sector_size; ++++++ snapshot-xend.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/python/xen/xend/image.py +Index: xen-4.1.0-testing/tools/python/xen/xend/image.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/image.py -+++ xen-4.0.2-testing/tools/python/xen/xend/image.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/image.py ++++ xen-4.1.0-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.2-testing/tools/python/xen/xend/server/blkif.py +Index: xen-4.1.0-testing/tools/python/xen/xend/server/blkif.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/server/blkif.py -+++ xen-4.0.2-testing/tools/python/xen/xend/server/blkif.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/blkif.py ++++ xen-4.1.0-testing/tools/python/xen/xend/server/blkif.py @@ -88,6 +88,10 @@ class BlkifController(DevController): if bootable != None: back['bootable'] = str(bootable) @@ -58,10 +58,10 @@ if security.on() == xsconstants.XS_POLICY_USE: self.do_access_control(config, uname) -Index: xen-4.0.2-testing/tools/python/xen/xend/server/SrvDomain.py +Index: xen-4.1.0-testing/tools/python/xen/xend/server/SrvDomain.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/server/SrvDomain.py -+++ xen-4.0.2-testing/tools/python/xen/xend/server/SrvDomain.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/SrvDomain.py ++++ xen-4.1.0-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]) @@ -94,7 +94,7 @@ def op_dump(self, op, req): self.acceptCommand(req) return req.threadRequest(self.do_dump, op, req) -@@ -259,7 +284,7 @@ class SrvDomain(SrvDir): +@@ -273,7 +298,7 @@ class SrvDomain(SrvDir): def render_GET(self, req): op = req.args.get('op') @@ -103,16 +103,16 @@ return self.perform(req) # -Index: xen-4.0.2-testing/tools/python/xen/xend/XendCheckpoint.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendCheckpoint.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendCheckpoint.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendCheckpoint.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendCheckpoint.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendCheckpoint.py @@ -65,7 +65,7 @@ def insert_after(list, pred, value): return --def save(fd, dominfo, network, live, dst, checkpoint=False, node=-1): -+def save(fd, dominfo, network, live, dst, checkpoint=False, node=-1, name=None, diskonly=False): +-def save(fd, dominfo, network, live, dst, checkpoint=False, node=-1,sock=None): ++def save(fd, dominfo, network, live, dst, checkpoint=False, node=-1, sock=None, name=None, diskonly=False): from xen.xend import XendDomain try: @@ -233,7 +233,7 @@ if checkpoint: dominfo.resumeDomain() -@@ -221,6 +232,71 @@ def restore(xd, fd, dominfo = None, paus +@@ -228,6 +239,71 @@ def restore(xd, fd, dominfo = None, paus if othervm is not None and othervm.domid is not None: raise VmError("Domain '%s' already exists with ID '%d'" % (domconfig["name_label"], othervm.domid)) @@ -331,22 +331,22 @@ if not paused: dominfo.unpause() -Index: xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendConfig.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendConfig.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py -@@ -242,6 +242,7 @@ XENAPI_CFG_TYPES = { +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendConfig.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendConfig.py +@@ -244,6 +244,7 @@ XENAPI_CFG_TYPES = { 'memory_sharing': int, - 'Description': str, 'pool_name' : str, + 'Description': str, + 'snapshotname': str, } # List of legacy configuration keys that have no equivalent in the -Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomain.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomain.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomain.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomain.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomain.py ++++ xen-4.1.0-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 @@ -373,7 +373,7 @@ try: shutil.move(fn, self._managed_config_path(dom_uuid)) except: -@@ -1576,6 +1582,187 @@ class XendDomain: +@@ -1585,6 +1591,187 @@ class XendDomain: else: log.debug("error: Domain is not running!") @@ -440,7 +440,7 @@ + fd = os.open(snap_file, oflags) + try: + XendCheckpoint.save(fd, dominfo, False, False, snap_file, -+ True, name=name, diskonly=diskonly) ++ True, sock=None, name=name, diskonly=diskonly) + except Exception, e: + os.close(fd) + os.unlink(snap_file) @@ -561,10 +561,10 @@ def domain_pincpu(self, domid, vcpu, cpumap): """Set which cpus vcpu can use -Index: xen-4.0.2-testing/tools/python/xen/xm/main.py +Index: xen-4.1.0-testing/tools/python/xen/xm/main.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xm/main.py -+++ xen-4.0.2-testing/tools/python/xen/xm/main.py +--- xen-4.1.0-testing.orig/tools/python/xen/xm/main.py ++++ xen-4.1.0-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>', @@ -580,7 +580,7 @@ 'shutdown' : ('<Domain> [-waRH]', 'Shutdown a domain.'), 'top' : ('', 'Monitor a host and the domains in real time.'), 'unpause' : ('<Domain>', 'Unpause a paused domain.'), -@@ -337,6 +345,9 @@ SUBCOMMAND_OPTIONS = { +@@ -344,6 +352,9 @@ SUBCOMMAND_OPTIONS = { ('-c', '--checkpoint', 'Leave domain running after creating snapshot'), ('-f', '--force', 'Force to overwrite exist file'), ), @@ -590,7 +590,7 @@ 'restore': ( ('-p', '--paused', 'Do not unpause domain after restoring it'), ), -@@ -387,6 +398,10 @@ common_commands = [ +@@ -395,6 +406,10 @@ common_commands = [ "restore", "resume", "save", @@ -601,7 +601,7 @@ "shell", "shutdown", "start", -@@ -421,6 +436,10 @@ domain_commands = [ +@@ -429,6 +444,10 @@ domain_commands = [ "restore", "resume", "save", @@ -612,7 +612,7 @@ "shutdown", "start", "suspend", -@@ -854,6 +873,62 @@ def xm_event_monitor(args): +@@ -863,6 +882,62 @@ def xm_event_monitor(args): # ######################################################################### @@ -675,7 +675,7 @@ def xm_save(args): arg_check(args, "save", 2, 4) -@@ -3743,6 +3818,10 @@ commands = { +@@ -3827,6 +3902,10 @@ commands = { "restore": xm_restore, "resume": xm_resume, "save": xm_save, @@ -686,11 +686,11 @@ "shutdown": xm_shutdown, "start": xm_start, "sysrq": xm_sysrq, -Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -507,7 +507,6 @@ class XendDomainInfo: +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py +@@ -508,7 +508,6 @@ class XendDomainInfo: self._setSchedParams() self._storeVmDetails() self._createChannels() @@ -698,7 +698,7 @@ self._storeDomDetails() self._endRestore() except: -@@ -2383,7 +2382,7 @@ class XendDomainInfo: +@@ -2368,7 +2367,7 @@ class XendDomainInfo: return self.getDeviceController(deviceClass).reconfigureDevice( devid, devconfig) @@ -707,7 +707,7 @@ """Create the devices for a vm. @raise: VmError for invalid devices -@@ -2432,7 +2431,7 @@ class XendDomainInfo: +@@ -2417,7 +2416,7 @@ class XendDomainInfo: if self.image: @@ -716,7 +716,7 @@ #if have pass-through devs, need the virtual pci slots info from qemu self.pci_device_configure_boot() -@@ -3048,7 +3047,7 @@ class XendDomainInfo: +@@ -3043,7 +3042,7 @@ class XendDomainInfo: self._introduceDomain() self.image = image.create(self, self.info) if self.image: ++++++ stdvga-cache.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/xen/arch/x86/hvm/stdvga.c +Index: xen-4.1.0-testing/xen/arch/x86/hvm/stdvga.c =================================================================== ---- xen-4.0.2-testing.orig/xen/arch/x86/hvm/stdvga.c -+++ xen-4.0.2-testing/xen/arch/x86/hvm/stdvga.c +--- xen-4.1.0-testing.orig/xen/arch/x86/hvm/stdvga.c ++++ xen-4.1.0-testing/xen/arch/x86/hvm/stdvga.c @@ -135,7 +135,10 @@ static int stdvga_outb(uint64_t addr, ui /* When in standard vga mode, emulate here all writes to the vram buffer ++++++ supported_module.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -2,10 +2,10 @@ Signed-off-by: K. Y. Srinivasan <ksrinivasan(a)novell.com> -Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/Module.supported +Index: xen-4.1.0-testing/unmodified_drivers/linux-2.6/Module.supported =================================================================== --- /dev/null -+++ xen-4.0.2-testing/unmodified_drivers/linux-2.6/Module.supported ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -11,10 +11,10 @@ tapdisk-ioemu.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -16,10 +16,10 @@ tapdisk-ioemu.c | 13 ++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c @@ -67,6 +67,7 @@ int read_fd; int write_fd; @@ -46,10 +46,10 @@ case CTLMSG_PID: memset(buf, 0x00, MSG_SIZE); -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/xenstore/Makefile +Index: xen-4.1.0-testing/tools/xenstore/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/xenstore/Makefile -+++ xen-4.0.2-testing/tools/xenstore/Makefile -@@ -61,6 +61,7 @@ $(CLIENTS_DOMU): xenstore +--- xen-4.1.0-testing.orig/tools/xenstore/Makefile ++++ xen-4.1.0-testing/tools/xenstore/Makefile +@@ -58,6 +58,7 @@ $(CLIENTS_DOMU): xenstore xenstore: xenstore_client.o $(LIBXENSTORE) $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@ @@ -10,7 +10,7 @@ xenstore-control: xenstore_control.o $(LIBXENSTORE) $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@ -@@ -111,10 +112,11 @@ endif +@@ -106,10 +107,11 @@ install: all $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR) $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR) set -e ; for c in $(CLIENTS) ; do \ ++++++ tools-kboot.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -13,10 +13,10 @@ tools/kboot/select-kernel | 59 + 9 files changed, 2111 insertions(+) -Index: xen-4.0.2-testing/buildconfigs/linux-defconfig_xenUboot_x86_32 +Index: xen-4.1.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_32 =================================================================== --- /dev/null -+++ xen-4.0.2-testing/buildconfigs/linux-defconfig_xenUboot_x86_32 ++++ xen-4.1.0-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.2-testing/buildconfigs/linux-defconfig_xenUboot_x86_64 +Index: xen-4.1.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_64 =================================================================== --- /dev/null -+++ xen-4.0.2-testing/buildconfigs/linux-defconfig_xenUboot_x86_64 ++++ xen-4.1.0-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.2-testing/buildconfigs/mk.linux-2.6-xenUboot +Index: xen-4.1.0-testing/buildconfigs/mk.linux-2.6-xenUboot =================================================================== --- /dev/null -+++ xen-4.0.2-testing/buildconfigs/mk.linux-2.6-xenUboot ++++ xen-4.1.0-testing/buildconfigs/mk.linux-2.6-xenUboot @@ -0,0 +1,2 @@ +EXTRAVERSION = xenUboot +include buildconfigs/mk.linux-2.6-xen -Index: xen-4.0.2-testing/tools/kboot/Makefile +Index: xen-4.1.0-testing/tools/kboot/Makefile =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/kboot/Makefile ++++ xen-4.1.0-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.2-testing/tools/kboot/README +Index: xen-4.1.0-testing/tools/kboot/README =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/kboot/README ++++ xen-4.1.0-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.2-testing/tools/kboot/init +Index: xen-4.1.0-testing/tools/kboot/init =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/kboot/init ++++ xen-4.1.0-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.2-testing/tools/kboot/mkinitramfs +Index: xen-4.1.0-testing/tools/kboot/mkinitramfs =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/kboot/mkinitramfs ++++ xen-4.1.0-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.2-testing/tools/kboot/select-kernel +Index: xen-4.1.0-testing/tools/kboot/select-kernel =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/kboot/select-kernel ++++ xen-4.1.0-testing/tools/kboot/select-kernel @@ -0,0 +1,59 @@ +#!/bin/sh + @@ -2127,10 +2127,10 @@ +msg "using $kernelname" +echo "$kernelname" + -Index: xen-4.0.2-testing/make-kboot +Index: xen-4.1.0-testing/make-kboot =================================================================== --- /dev/null -+++ xen-4.0.2-testing/make-kboot ++++ xen-4.1.0-testing/make-kboot @@ -0,0 +1,37 @@ +#!/bin/sh + ++++++ tools-xc_kexec.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -23,10 +23,10 @@ tools/xcutils/xc_kexec.c | 503 +++++++++++++++ 19 files changed, 4988 insertions(+), 2 deletions(-) -Index: xen-4.0.2-testing/tools/xcutils/Makefile +Index: xen-4.1.0-testing/tools/xcutils/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/xcutils/Makefile -+++ xen-4.0.2-testing/tools/xcutils/Makefile +--- xen-4.1.0-testing.orig/tools/xcutils/Makefile ++++ xen-4.1.0-testing/tools/xcutils/Makefile @@ -14,7 +14,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) @@ -34,7 +34,7 @@ -PROGRAMS = xc_restore xc_save readnotes lsevtchn +PROGRAMS = xc_restore xc_save readnotes lsevtchn xc_kexec - LDLIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) + LDLIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) @@ -27,6 +27,11 @@ build: $(PROGRAMS) $(PROGRAMS): %: %.o @@ -55,10 +55,10 @@ + make -C helper clean -include $(DEPS) -Index: xen-4.0.2-testing/tools/xcutils/helper/Makefile +Index: xen-4.1.0-testing/tools/xcutils/helper/Makefile =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/Makefile ++++ xen-4.1.0-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.2-testing/tools/xcutils/helper/console.c +Index: xen-4.1.0-testing/tools/xcutils/helper/console.c =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/console.c ++++ xen-4.1.0-testing/tools/xcutils/helper/console.c @@ -0,0 +1,69 @@ +#include <inttypes.h> + @@ -173,10 +173,10 @@ + + return printed_len; +} -Index: xen-4.0.2-testing/tools/xcutils/helper/ctype.c +Index: xen-4.1.0-testing/tools/xcutils/helper/ctype.c =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/ctype.c ++++ xen-4.1.0-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.2-testing/tools/xcutils/helper/ctype.h +Index: xen-4.1.0-testing/tools/xcutils/helper/ctype.h =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/ctype.h ++++ xen-4.1.0-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.2-testing/tools/xcutils/helper/helper.h +Index: xen-4.1.0-testing/tools/xcutils/helper/helper.h =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/helper.h ++++ xen-4.1.0-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.2-testing/tools/xcutils/helper/main.c +Index: xen-4.1.0-testing/tools/xcutils/helper/main.c =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/main.c ++++ xen-4.1.0-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.2-testing/tools/xcutils/helper/make-offsets.c +Index: xen-4.1.0-testing/tools/xcutils/helper/make-offsets.c =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/make-offsets.c ++++ xen-4.1.0-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.2-testing/tools/xcutils/helper/printk.c +Index: xen-4.1.0-testing/tools/xcutils/helper/printk.c =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/printk.c ++++ xen-4.1.0-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.2-testing/tools/xcutils/helper/string.c +Index: xen-4.1.0-testing/tools/xcutils/helper/string.c =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/string.c ++++ xen-4.1.0-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.2-testing/tools/xcutils/helper/vsprintf.c +Index: xen-4.1.0-testing/tools/xcutils/helper/vsprintf.c =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/vsprintf.c ++++ xen-4.1.0-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.2-testing/tools/xcutils/helper/x86_32/div64.h +Index: xen-4.1.0-testing/tools/xcutils/helper/x86_32/div64.h =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/x86_32/div64.h ++++ xen-4.1.0-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.2-testing/tools/xcutils/helper/x86_32/entry.S +Index: xen-4.1.0-testing/tools/xcutils/helper/x86_32/entry.S =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/x86_32/entry.S ++++ xen-4.1.0-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.2-testing/tools/xcutils/helper/x86_32/hypercall.h +Index: xen-4.1.0-testing/tools/xcutils/helper/x86_32/hypercall.h =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/x86_32/hypercall.h ++++ xen-4.1.0-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.2-testing/tools/xcutils/helper/x86_64/div64.h +Index: xen-4.1.0-testing/tools/xcutils/helper/x86_64/div64.h =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/x86_64/div64.h ++++ xen-4.1.0-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.2-testing/tools/xcutils/helper/x86_64/entry.S +Index: xen-4.1.0-testing/tools/xcutils/helper/x86_64/entry.S =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/x86_64/entry.S ++++ xen-4.1.0-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.2-testing/tools/xcutils/helper/x86_64/hypercall.h +Index: xen-4.1.0-testing/tools/xcutils/helper/x86_64/hypercall.h =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/helper/x86_64/hypercall.h ++++ xen-4.1.0-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.2-testing/tools/xcutils/kexec-syscall.h +Index: xen-4.1.0-testing/tools/xcutils/kexec-syscall.h =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/kexec-syscall.h ++++ xen-4.1.0-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.2-testing/tools/xcutils/xc_kexec.c +Index: xen-4.1.0-testing/tools/xcutils/xc_kexec.c =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/xcutils/xc_kexec.c ++++ xen-4.1.0-testing/tools/xcutils/xc_kexec.c @@ -0,0 +1,503 @@ +#include <stdio.h> +#include <stdlib.h> ++++++ udev-rules.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,17 +1,9 @@ -Index: xen-4.0.2-testing/tools/hotplug/Linux/xen-backend.rules +Index: xen-4.1.0-testing/tools/hotplug/Linux/xen-backend.rules =================================================================== ---- xen-4.0.2-testing.orig/tools/hotplug/Linux/xen-backend.rules -+++ xen-4.0.2-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" -+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" +--- xen-4.1.0-testing.orig/tools/hotplug/Linux/xen-backend.rules ++++ xen-4.1.0-testing/tools/hotplug/Linux/xen-backend.rules +@@ -14,3 +14,4 @@ KERNEL=="gntdev", NAME="xen/%k", MODE="0 + KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600" + KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m", MODE="0600" + SUBSYSTEM=="net", KERNEL=="tap*", ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap" +KERNELS=="xen", KERNEL=="xvd*", SUBSYSTEM=="block", OPTIONS+="last_rule" ++++++ usb-list.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -15,11 +15,11 @@ http://www.gossamer-threads.com/lists/xen/devel/181021?search_string=usb-li… -Index: xen-4.0.2-testing/tools/python/xen/xm/main.py +Index: xen-4.1.0-testing/tools/python/xen/xm/main.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xm/main.py -+++ xen-4.0.2-testing/tools/python/xen/xm/main.py -@@ -2545,10 +2545,22 @@ def xm_usb_list(args): +--- xen-4.1.0-testing.orig/tools/python/xen/xm/main.py ++++ xen-4.1.0-testing/tools/python/xen/xm/main.py +@@ -2629,10 +2629,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') ++++++ vif-bridge-no-iptables.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,13 +1,17 @@ -Index: xen-4.0.2-testing/tools/hotplug/Linux/vif-bridge +Index: xen-4.1.0-testing/tools/hotplug/Linux/vif-bridge =================================================================== ---- xen-4.0.2-testing.orig/tools/hotplug/Linux/vif-bridge -+++ xen-4.0.2-testing/tools/hotplug/Linux/vif-bridge -@@ -91,7 +91,7 @@ case "$command" in +--- xen-4.1.0-testing.orig/tools/hotplug/Linux/vif-bridge ++++ xen-4.1.0-testing/tools/hotplug/Linux/vif-bridge +@@ -101,9 +101,9 @@ case "$command" in ;; esac --handle_iptable -+#handle_iptable +-if [ "$type_if" = vif ]; then +- handle_iptable +-fi ++#if [ "$type_if" = vif ]; then ++# handle_iptable ++#fi - log debug "Successful vif-bridge $command for $vif, bridge $bridge." - if [ "$command" == "online" ] + log debug "Successful vif-bridge $command for $dev, bridge $bridge." + if [ "$type_if" = vif -a "$command" = "online" ] ++++++ vif-bridge.mtu.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -15,19 +15,19 @@ tools/hotplug/Linux/vif-bridge | 5 +++++ 1 file changed, 5 insertions(+) -Index: xen-4.0.2-testing/tools/hotplug/Linux/vif-bridge +Index: xen-4.1.0-testing/tools/hotplug/Linux/vif-bridge =================================================================== ---- xen-4.0.2-testing.orig/tools/hotplug/Linux/vif-bridge -+++ xen-4.0.2-testing/tools/hotplug/Linux/vif-bridge -@@ -82,6 +82,11 @@ fi - case "$command" in - online) - setup_bridge_port "$vif" +--- xen-4.1.0-testing.orig/tools/hotplug/Linux/vif-bridge ++++ xen-4.1.0-testing/tools/hotplug/Linux/vif-bridge +@@ -97,6 +97,11 @@ case "$command" in + + add) + setup_virtual_bridge_port "$dev" + mtu="`ip link show $bridge | awk '/mtu/ { print $5 }'`" + if [ -n "$mtu" ] && [ "$mtu" -gt 0 ] + then + ip link set $vif mtu $mtu || : + fi - add_to_bridge "$bridge" "$vif" + add_to_bridge "$bridge" "$dev" ;; - + esac ++++++ vif-route-ifup.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/hotplug/Linux/vif-route-ifup +Index: xen-4.1.0-testing/tools/hotplug/Linux/vif-route-ifup =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/hotplug/Linux/vif-route-ifup ++++ xen-4.1.0-testing/tools/hotplug/Linux/vif-route-ifup @@ -0,0 +1,34 @@ +#!/bin/bash +#============================================================================ @@ -37,11 +37,11 @@ +then + success +fi -Index: xen-4.0.2-testing/tools/examples/xend-config.sxp +Index: xen-4.1.0-testing/tools/examples/xend-config.sxp =================================================================== ---- xen-4.0.2-testing.orig/tools/examples/xend-config.sxp -+++ xen-4.0.2-testing/tools/examples/xend-config.sxp -@@ -184,6 +184,26 @@ +--- xen-4.1.0-testing.orig/tools/examples/xend-config.sxp ++++ xen-4.1.0-testing/tools/examples/xend-config.sxp +@@ -200,6 +200,26 @@ #(network-script network-route) #(vif-script vif-route) @@ -68,11 +68,11 @@ ## 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.2-testing/tools/hotplug/Linux/Makefile +Index: xen-4.1.0-testing/tools/hotplug/Linux/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/hotplug/Linux/Makefile -+++ xen-4.0.2-testing/tools/hotplug/Linux/Makefile -@@ -9,7 +9,7 @@ XENDOMAINS_SYSCONFIG = init.d/sysconfig. +--- xen-4.1.0-testing.orig/tools/hotplug/Linux/Makefile ++++ xen-4.1.0-testing/tools/hotplug/Linux/Makefile +@@ -11,7 +11,7 @@ XENCOMMONS_SYSCONFIG = init.d/sysconfig. # Xen script dir and scripts to go there. XEN_SCRIPTS = network-bridge vif-bridge @@ -80,4 +80,4 @@ +XEN_SCRIPTS += network-route vif-route vif-route-ifup XEN_SCRIPTS += network-nat vif-nat XEN_SCRIPTS += vif2 - XEN_SCRIPTS += block + XEN_SCRIPTS += vif-setup ++++++ x86-cpufreq-report.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,17 +1,17 @@ -Index: xen-4.0.2-testing/xen/arch/x86/platform_hypercall.c +Index: xen-4.1.0-testing/xen/arch/x86/platform_hypercall.c =================================================================== ---- xen-4.0.2-testing.orig/xen/arch/x86/platform_hypercall.c -+++ xen-4.0.2-testing/xen/arch/x86/platform_hypercall.c -@@ -21,7 +21,7 @@ - #include <xen/acpi.h> +--- xen-4.1.0-testing.orig/xen/arch/x86/platform_hypercall.c ++++ xen-4.1.0-testing/xen/arch/x86/platform_hypercall.c +@@ -22,7 +22,7 @@ + #include <xen/cpu.h> #include <asm/current.h> #include <public/platform.h> -#include <acpi/cpufreq/processor_perf.h> +#include <acpi/cpufreq/cpufreq.h> #include <asm/edd.h> #include <asm/mtrr.h> - #include "cpu/mtrr/mtrr.h" -@@ -62,6 +62,7 @@ static long cpu_down_helper(void *hdl, v + #include <asm/io_apic.h> +@@ -62,6 +62,7 @@ long cpu_down_helper(void *data); ret_t do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op) { ret_t ret = 0; @@ -19,7 +19,7 @@ struct xen_platform_op curop, *op = &curop; if ( !IS_PRIV(current->domain) ) -@@ -488,6 +489,24 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe +@@ -493,6 +494,24 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe op->u.mem_add.epfn, op->u.mem_add.pxm); break; @@ -32,10 +32,10 @@ + break; + } + -+ op->u.get_cpu_freq.freq = cpufreq_cpu_policy[v->processor] ++ op->u.get_cpu_freq.freq = per_cpu(cpufreq_cpu_policy, v->processor) + ? cpufreq_driver->get + ? cpufreq_driver->get(v->processor) -+ : cpufreq_cpu_policy[v->processor]->cur ++ : per_cpu(cpufreq_cpu_policy, v->processor)->cur + : 0; + if ( copy_field_to_guest(u_xenpf_op, op, u.get_cpu_freq.freq) ) + ret = -EFAULT; @@ -44,10 +44,10 @@ default: ret = -ENOSYS; break; -Index: xen-4.0.2-testing/xen/include/public/platform.h +Index: xen-4.1.0-testing/xen/include/public/platform.h =================================================================== ---- xen-4.0.2-testing.orig/xen/include/public/platform.h -+++ xen-4.0.2-testing/xen/include/public/platform.h +--- xen-4.1.0-testing.orig/xen/include/public/platform.h ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,32 +1,48 @@ -Index: xen-4.0.2-testing/xen/arch/x86/x86_32/entry.S +Index: xen-4.1.0-testing/xen/arch/x86/x86_32/entry.S =================================================================== ---- xen-4.0.2-testing.orig/xen/arch/x86/x86_32/entry.S -+++ xen-4.0.2-testing/xen/arch/x86/x86_32/entry.S -@@ -403,21 +403,33 @@ ring1: /* obtain ss/esp from oldss/olde +--- xen-4.1.0-testing.orig/xen/arch/x86/x86_32/entry.S ++++ xen-4.1.0-testing/xen/arch/x86/x86_32/entry.S +@@ -389,29 +389,41 @@ UNLIKELY_END(bounce_vm86_3) movl %eax,UREGS_eip+4(%esp) ret - .section __ex_table,"a" -- .long .Lft6,domain_crash_synchronous , .Lft7,domain_crash_synchronous -- .long .Lft8,domain_crash_synchronous , .Lft9,domain_crash_synchronous -- .long .Lft10,domain_crash_synchronous , .Lft11,domain_crash_synchronous -- .long .Lft12,domain_crash_synchronous , .Lft13,domain_crash_synchronous -- .long .Lft14,domain_crash_synchronous , .Lft15,domain_crash_synchronous -- .long .Lft16,domain_crash_synchronous , .Lft17,domain_crash_synchronous -- .long .Lft18,domain_crash_synchronous , .Lft19,domain_crash_synchronous -- .long .Lft20,domain_crash_synchronous , .Lft21,domain_crash_synchronous -- .long .Lft22,domain_crash_synchronous , .Lft23,domain_crash_synchronous -- .long .Lft24,domain_crash_synchronous , .Lft25,domain_crash_synchronous -+ .long .Lft6,domain_crash_synchronous , .Lft7,domain_crash_page_fault -+ .long .Lft8,domain_crash_page_fault_4 , .Lft9,domain_crash_page_fault_8 -+ .long .Lft10,domain_crash_page_fault_12, .Lft11,domain_crash_page_fault -+ .long .Lft12,domain_crash_page_fault_4 , .Lft13,domain_crash_synchronous -+ .long .Lft14,domain_crash_page_fault , .Lft15,domain_crash_page_fault_4 -+ .long .Lft16,domain_crash_page_fault_8 , .Lft17,domain_crash_page_fault -+ .long .Lft18,domain_crash_page_fault , .Lft19,domain_crash_page_fault_4 -+ .long .Lft20,domain_crash_page_fault_8 , .Lft21,domain_crash_page_fault_12 -+ .long .Lft22,domain_crash_page_fault , .Lft23,domain_crash_page_fault_4 -+ .long .Lft24,domain_crash_page_fault_8 , .Lft25,domain_crash_page_fault_12 - .previous + _ASM_EXTABLE(.Lft6, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft7, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft8, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft9, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft10, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft11, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft12, domain_crash_synchronous) ++ _ASM_EXTABLE(.Lft7, domain_crash_page_fault) ++ _ASM_EXTABLE(.Lft8, domain_crash_page_fault_4) ++ _ASM_EXTABLE(.Lft9, domain_crash_page_fault_8) ++ _ASM_EXTABLE(.Lft10, domain_crash_page_fault_12) ++ _ASM_EXTABLE(.Lft11, domain_crash_page_fault) ++ _ASM_EXTABLE(.Lft12, domain_crash_page_fault_4) + _ASM_EXTABLE(.Lft13, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft14, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft15, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft16, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft17, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft18, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft19, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft20, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft21, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft22, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft23, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft24, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft25, domain_crash_synchronous) ++ _ASM_EXTABLE(.Lft14, domain_crash_page_fault) ++ _ASM_EXTABLE(.Lft15, domain_crash_page_fault_4) ++ _ASM_EXTABLE(.Lft16, domain_crash_page_fault_8) ++ _ASM_EXTABLE(.Lft17, domain_crash_page_fault) ++ _ASM_EXTABLE(.Lft18, domain_crash_page_fault) ++ _ASM_EXTABLE(.Lft19, domain_crash_page_fault_4) ++ _ASM_EXTABLE(.Lft20, domain_crash_page_fault_8) ++ _ASM_EXTABLE(.Lft21, domain_crash_page_fault_12) ++ _ASM_EXTABLE(.Lft22, domain_crash_page_fault) ++ _ASM_EXTABLE(.Lft23, domain_crash_page_fault_4) ++ _ASM_EXTABLE(.Lft24, domain_crash_page_fault_8) ++ _ASM_EXTABLE(.Lft25, domain_crash_page_fault_12) +.section .rodata,"a" domain_crash_synchronous_string: @@ -46,27 +62,38 @@ domain_crash_synchronous: pushl $domain_crash_synchronous_string call printk -Index: xen-4.0.2-testing/xen/arch/x86/x86_64/entry.S +Index: xen-4.1.0-testing/xen/arch/x86/x86_64/entry.S =================================================================== ---- xen-4.0.2-testing.orig/xen/arch/x86/x86_64/entry.S -+++ xen-4.0.2-testing/xen/arch/x86/x86_64/entry.S -@@ -421,17 +421,30 @@ create_bounce_frame: +--- xen-4.1.0-testing.orig/xen/arch/x86/x86_64/entry.S ++++ xen-4.1.0-testing/xen/arch/x86/x86_64/entry.S +@@ -408,22 +408,35 @@ UNLIKELY_END(bounce_failsafe) + jz domain_crash_synchronous movq %rax,UREGS_rip+8(%rsp) ret - .section __ex_table,"a" -- .quad .Lft2,domain_crash_synchronous , .Lft3,domain_crash_synchronous -- .quad .Lft4,domain_crash_synchronous , .Lft5,domain_crash_synchronous -- .quad .Lft6,domain_crash_synchronous , .Lft7,domain_crash_synchronous -- .quad .Lft8,domain_crash_synchronous , .Lft9,domain_crash_synchronous -- .quad .Lft10,domain_crash_synchronous , .Lft11,domain_crash_synchronous -- .quad .Lft12,domain_crash_synchronous , .Lft13,domain_crash_synchronous -+ .quad .Lft2,domain_crash_page_fault_32, .Lft3,domain_crash_page_fault_24 -+ .quad .Lft4,domain_crash_page_fault_8 , .Lft5,domain_crash_page_fault_16 -+ .quad .Lft6,domain_crash_page_fault , .Lft7,domain_crash_page_fault -+ .quad .Lft8,domain_crash_page_fault_24, .Lft9,domain_crash_page_fault_16 -+ .quad .Lft10,domain_crash_page_fault_8 , .Lft11,domain_crash_page_fault -+ .quad .Lft12,domain_crash_page_fault_8 , .Lft13,domain_crash_page_fault - .previous +- _ASM_EXTABLE(.Lft2, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft3, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft4, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft5, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft6, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft7, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft8, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft9, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft10, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft11, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft12, domain_crash_synchronous) +- _ASM_EXTABLE(.Lft13, domain_crash_synchronous) ++ _ASM_EXTABLE(.Lft2, domain_crash_page_fault_32) ++ _ASM_EXTABLE(.Lft3, domain_crash_page_fault_24) ++ _ASM_EXTABLE(.Lft4, domain_crash_page_fault_8) ++ _ASM_EXTABLE(.Lft5, domain_crash_page_fault_16) ++ _ASM_EXTABLE(.Lft6, domain_crash_page_fault) ++ _ASM_EXTABLE(.Lft7, domain_crash_page_fault) ++ _ASM_EXTABLE(.Lft8, domain_crash_page_fault_24) ++ _ASM_EXTABLE(.Lft9, domain_crash_page_fault_16) ++ _ASM_EXTABLE(.Lft10, domain_crash_page_fault_8) ++ _ASM_EXTABLE(.Lft11, domain_crash_page_fault) ++ _ASM_EXTABLE(.Lft12, domain_crash_page_fault_8) ++ _ASM_EXTABLE(.Lft13, domain_crash_page_fault) +.section .rodata,"a" domain_crash_synchronous_string: @@ -86,4 +113,4 @@ + call show_page_walk ENTRY(domain_crash_synchronous) # Get out of the guest-save area of the stack. - GET_GUEST_REGS(%rax) + GET_CPUINFO_FIELD(CPUINFO_guest_cpu_user_regs,%rax) ++++++ x86-ioapic-ack-default.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,10 +1,10 @@ Change default IO-APIC ack mode for single IO-APIC systems to old-style. -Index: xen-4.0.2-testing/xen/arch/x86/io_apic.c +Index: xen-4.1.0-testing/xen/arch/x86/io_apic.c =================================================================== ---- xen-4.0.2-testing.orig/xen/arch/x86/io_apic.c -+++ xen-4.0.2-testing/xen/arch/x86/io_apic.c -@@ -1551,7 +1551,7 @@ static unsigned int startup_level_ioapic +--- xen-4.1.0-testing.orig/xen/arch/x86/io_apic.c ++++ xen-4.1.0-testing/xen/arch/x86/io_apic.c +@@ -1546,7 +1546,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") ) -@@ -2067,6 +2067,8 @@ void __init setup_IO_APIC(void) +@@ -2053,6 +2053,8 @@ void __init setup_IO_APIC(void) else io_apic_irqs = ~PIC_IRQS; ++++++ x86-show-page-walk-early.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,21 +1,21 @@ -Index: xen-4.0.2-testing/xen/arch/x86/mm.c +Index: xen-4.1.0-testing/xen/arch/x86/mm.c =================================================================== ---- xen-4.0.2-testing.orig/xen/arch/x86/mm.c -+++ xen-4.0.2-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); +--- xen-4.1.0-testing.orig/xen/arch/x86/mm.c ++++ xen-4.1.0-testing/xen/arch/x86/mm.c +@@ -160,6 +160,8 @@ static int get_superpage(unsigned long m + #endif + static void put_superpage(unsigned long mfn); +bool_t __read_mostly mpt_valid; + #define l1_disallow_mask(d) \ ((d != dom_io) && \ (rangeset_is_empty((d)->iomem_caps) && \ -Index: xen-4.0.2-testing/xen/arch/x86/traps.c +Index: xen-4.1.0-testing/xen/arch/x86/traps.c =================================================================== ---- xen-4.0.2-testing.orig/xen/arch/x86/traps.c -+++ xen-4.0.2-testing/xen/arch/x86/traps.c -@@ -1354,6 +1354,7 @@ asmlinkage void do_early_page_fault(stru +--- xen-4.1.0-testing.orig/xen/arch/x86/traps.c ++++ xen-4.1.0-testing/xen/arch/x86/traps.c +@@ -1343,6 +1343,7 @@ asmlinkage void __init do_early_page_fau 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,11 +23,11 @@ printk("Stack dump: "); while ( ((long)stk & ((PAGE_SIZE - 1) & ~(BYTES_PER_LONG - 1))) != 0 ) printk("%p ", _p(*stk++)); -Index: xen-4.0.2-testing/xen/arch/x86/x86_32/mm.c +Index: xen-4.1.0-testing/xen/arch/x86/x86_32/mm.c =================================================================== ---- xen-4.0.2-testing.orig/xen/arch/x86/x86_32/mm.c -+++ xen-4.0.2-testing/xen/arch/x86/x86_32/mm.c -@@ -122,6 +122,8 @@ void __init paging_init(void) +--- xen-4.1.0-testing.orig/xen/arch/x86/x86_32/mm.c ++++ xen-4.1.0-testing/xen/arch/x86/x86_32/mm.c +@@ -123,6 +123,8 @@ void __init paging_init(void) #undef CNT #undef MFN @@ -36,11 +36,11 @@ /* Create page tables for ioremap()/map_domain_page_global(). */ for ( i = 0; i < (IOREMAP_MBYTES >> (L2_PAGETABLE_SHIFT - 20)); i++ ) { -Index: xen-4.0.2-testing/xen/arch/x86/x86_32/traps.c +Index: xen-4.1.0-testing/xen/arch/x86/x86_32/traps.c =================================================================== ---- xen-4.0.2-testing.orig/xen/arch/x86/x86_32/traps.c -+++ xen-4.0.2-testing/xen/arch/x86/x86_32/traps.c -@@ -161,7 +161,8 @@ void show_page_walk(unsigned long addr) +--- xen-4.1.0-testing.orig/xen/arch/x86/x86_32/traps.c ++++ xen-4.1.0-testing/xen/arch/x86/x86_32/traps.c +@@ -164,7 +164,8 @@ void show_page_walk(unsigned long addr) l3t += (cr3 & 0xFE0UL) >> 3; l3e = l3t[l3_table_offset(addr)]; mfn = l3e_get_pfn(l3e); @@ -50,7 +50,7 @@ printk(" L3[0x%03lx] = %"PRIpte" %08lx\n", l3_table_offset(addr), l3e_get_intpte(l3e), pfn); unmap_domain_page(l3t); -@@ -172,7 +173,8 @@ void show_page_walk(unsigned long addr) +@@ -175,7 +176,8 @@ void show_page_walk(unsigned long addr) l2t = map_domain_page(mfn); l2e = l2t[l2_table_offset(addr)]; mfn = l2e_get_pfn(l2e); @@ -60,7 +60,7 @@ printk(" L2[0x%03lx] = %"PRIpte" %08lx %s\n", l2_table_offset(addr), l2e_get_intpte(l2e), pfn, (l2e_get_flags(l2e) & _PAGE_PSE) ? "(PSE)" : ""); -@@ -185,7 +187,8 @@ void show_page_walk(unsigned long addr) +@@ -188,7 +190,8 @@ void show_page_walk(unsigned long addr) l1t = map_domain_page(mfn); l1e = l1t[l1_table_offset(addr)]; mfn = l1e_get_pfn(l1e); @@ -70,11 +70,11 @@ printk(" L1[0x%03lx] = %"PRIpte" %08lx\n", l1_table_offset(addr), l1e_get_intpte(l1e), pfn); unmap_domain_page(l1t); -Index: xen-4.0.2-testing/xen/arch/x86/x86_64/mm.c +Index: xen-4.1.0-testing/xen/arch/x86/x86_64/mm.c =================================================================== ---- xen-4.0.2-testing.orig/xen/arch/x86/x86_64/mm.c -+++ xen-4.0.2-testing/xen/arch/x86/x86_64/mm.c -@@ -731,6 +731,8 @@ void __init paging_init(void) +--- xen-4.1.0-testing.orig/xen/arch/x86/x86_64/mm.c ++++ xen-4.1.0-testing/xen/arch/x86/x86_64/mm.c +@@ -749,6 +749,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.2-testing/xen/arch/x86/x86_64/traps.c +Index: xen-4.1.0-testing/xen/arch/x86/x86_64/traps.c =================================================================== ---- xen-4.0.2-testing.orig/xen/arch/x86/x86_64/traps.c -+++ xen-4.0.2-testing/xen/arch/x86/x86_64/traps.c +--- xen-4.1.0-testing.orig/xen/arch/x86/x86_64/traps.c ++++ xen-4.1.0-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,11 +127,11 @@ printk(" L1[0x%03lx] = %"PRIpte" %016lx\n", l1_table_offset(addr), l1e_get_intpte(l1e), pfn); } -Index: xen-4.0.2-testing/xen/include/asm-x86/mm.h +Index: xen-4.1.0-testing/xen/include/asm-x86/mm.h =================================================================== ---- xen-4.0.2-testing.orig/xen/include/asm-x86/mm.h -+++ xen-4.0.2-testing/xen/include/asm-x86/mm.h -@@ -443,6 +443,8 @@ TYPE_SAFE(unsigned long,mfn); +--- xen-4.1.0-testing.orig/xen/include/asm-x86/mm.h ++++ xen-4.1.0-testing/xen/include/asm-x86/mm.h +@@ -467,6 +467,8 @@ TYPE_SAFE(unsigned long,mfn); #define SHARED_M2P_ENTRY (~0UL - 1UL) #define SHARED_M2P(_e) ((_e) == SHARED_M2P_ENTRY) ++++++ xen-4.0.2-testing-src.tar.bz2 -> xen-4.1.0-testing-src.tar.bz2 ++++++ xen/xen-4.0.2-testing-src.tar.bz2 /mounts/work_src_done/STABLE/xen/xen-4.1.0-testing-src.tar.bz2 differ: char 11, line 1 ++++++ xen-api-auth.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/python/xen/xend/XendAuthSessions.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendAuthSessions.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendAuthSessions.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendAuthSessions.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendAuthSessions.py ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/xen/Makefile +Index: xen-4.1.0-testing/xen/Makefile =================================================================== ---- xen-4.0.2-testing.orig/xen/Makefile -+++ xen-4.0.2-testing/xen/Makefile +--- xen-4.1.0-testing.orig/xen/Makefile ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,39 +1,92 @@ -Index: xen-4.0.2-testing/Config.mk +Index: xen-4.1.0-testing/Config.mk =================================================================== ---- xen-4.0.2-testing.orig/Config.mk -+++ xen-4.0.2-testing/Config.mk -@@ -165,7 +165,7 @@ endif +--- xen-4.1.0-testing.orig/Config.mk ++++ xen-4.1.0-testing/Config.mk +@@ -183,7 +183,7 @@ endif # 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 ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git -CONFIG_QEMU ?= $(QEMU_REMOTE) +CONFIG_QEMU ?= ioemu-qemu-xen - QEMU_TAG := xen-4.0.2-rc2 - #QEMU_TAG ?= 6d5b7ee3acfe8cc10681d2583a38398f7470ec2a -@@ -181,9 +181,9 @@ CONFIG_OCAML_XENSTORED ?= n + QEMU_TAG := xen-4.1.0-rc8 + #QEMU_TAG ?= e073e69457b4d99b6da0b6536296e3498f7f6599 +@@ -193,7 +193,7 @@ QEMU_TAG := xen-4.1.0-rc8 # Optional components XENSTAT_XENTOP ?= y VTPM_TOOLS ?= n -LIBXENAPI_BINDINGS ?= n +LIBXENAPI_BINDINGS ?= y PYTHON_TOOLS ?= y + OCAML_TOOLS ?= y CONFIG_MINITERM ?= n - CONFIG_LOMOUNT ?= n +Index: xen-4.1.0-testing/tools/Makefile +=================================================================== +--- xen-4.1.0-testing.orig/tools/Makefile ++++ xen-4.1.0-testing/tools/Makefile +@@ -79,14 +79,16 @@ IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TAR + --interp-prefix=$(CROSS_SYS_ROOT) + endif + +-QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else echo .; fi) +-ifneq ($(QEMU_ROOT),.) +-export QEMU_ROOT +-endif ++#QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo ""; else echo .; fi) ++#ifneq ($(QEMU_ROOT),.) ++#export QEMU_ROOT ++#endif + + ioemu-dir-find: + set -ex; \ + if test -d $(CONFIG_QEMU); then \ ++ rm -f ioemu-dir; \ ++ ln -sf $(CONFIG_QEMU) ioemu-dir; \ + mkdir -p ioemu-dir; \ + else \ + if [ ! -d ioemu-remote ]; then \ +@@ -108,7 +110,7 @@ ioemu-dir-find: + $(absolutify_xen_root); \ + $(buildmakevars2shellvars); \ + cd ioemu-dir; \ +- $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS) ++ ./xen-setup $(IOEMU_CONFIGURE_CROSS) ---include $(XEN_ROOT)/.config -+#-include $(XEN_ROOT)/.config -Index: xen-4.0.2-testing/tools/libxc/Makefile + .PHONY: ioemu-dir-force-update + ioemu-dir-force-update: +Index: xen-4.1.0-testing/tools/libxc/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/libxc/Makefile -+++ xen-4.0.2-testing/tools/libxc/Makefile -@@ -174,7 +174,8 @@ xc_dom_bzimageloader.opic: CFLAGS += $(c +--- xen-4.1.0-testing.orig/tools/libxc/Makefile ++++ xen-4.1.0-testing/tools/libxc/Makefile +@@ -195,7 +195,7 @@ xc_dom_bzimageloader.opic: CFLAGS += $(c - libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l) + libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(call zlib-options,l) libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so -- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) $(call zlib-options,l) -+ +- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -lxenctrl $(PTHREAD_LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -lxenctrl $(PTHREAD_LIBS) $(call zlib-options,l) + + xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so + $(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) -lxenctrl +Index: xen-4.1.0-testing/tools/firmware/etherboot/Makefile +=================================================================== +--- xen-4.1.0-testing.orig/tools/firmware/etherboot/Makefile ++++ xen-4.1.0-testing/tools/firmware/etherboot/Makefile +@@ -35,11 +35,13 @@ eb-roms.h: Config + mv -f $@.new $@ - -include $(DEPS) + $T: +- if ! wget -O _$T $(IPXE_TARBALL_URL); then \ +- $(GIT) clone $(IPXE_GIT_URL) $D.git; \ +- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \ +- $(IPXE_GIT_TAG) | gzip >../_$T); \ +- rm -rf $D.git; \ ++ if test -f /usr/bin/wget; then \ ++ if ! wget -O _$T $(IPXE_TARBALL_URL); then \ ++ $(GIT) clone $(IPXE_GIT_URL) $D.git; \ ++ (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \ ++ $(IPXE_GIT_TAG) | gzip >../_$T); \ ++ rm -rf $D.git; \ ++ fi \ + fi + mv _$T $T ++++++ xen-destdir.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/docs/Makefile +Index: xen-4.1.0-testing/docs/Makefile =================================================================== ---- xen-4.0.2-testing.orig/docs/Makefile -+++ xen-4.0.2-testing/docs/Makefile +--- xen-4.1.0-testing.orig/docs/Makefile ++++ xen-4.1.0-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.2-testing/tools/security/Makefile +Index: xen-4.1.0-testing/tools/security/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/security/Makefile -+++ xen-4.0.2-testing/tools/security/Makefile +--- xen-4.1.0-testing.orig/tools/security/Makefile ++++ xen-4.1.0-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.2-testing/tools/pygrub/Makefile +Index: xen-4.1.0-testing/tools/pygrub/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/pygrub/Makefile -+++ xen-4.0.2-testing/tools/pygrub/Makefile +--- xen-4.1.0-testing.orig/tools/pygrub/Makefile ++++ xen-4.1.0-testing/tools/pygrub/Makefile @@ -11,7 +11,7 @@ build: .PHONY: install install: all @@ -50,11 +50,11 @@ $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(BINDIR)/pygrub $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot -Index: xen-4.0.2-testing/tools/python/Makefile +Index: xen-4.1.0-testing/tools/python/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/python/Makefile -+++ xen-4.0.2-testing/tools/python/Makefile -@@ -60,7 +60,7 @@ refresh-po: $(POTFILE) +--- xen-4.1.0-testing.orig/tools/python/Makefile ++++ xen-4.1.0-testing/tools/python/Makefile +@@ -65,7 +65,7 @@ refresh-po: $(POTFILE) .PHONY: install install: install-messages install-dtd CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \ @@ -63,19 +63,19 @@ install-dtd: all $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/xen -Index: xen-4.0.2-testing/tools/xenstore/Makefile +Index: xen-4.1.0-testing/tools/xenstore/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/xenstore/Makefile -+++ xen-4.0.2-testing/tools/xenstore/Makefile +--- xen-4.1.0-testing.orig/tools/xenstore/Makefile ++++ xen-4.1.0-testing/tools/xenstore/Makefile @@ -10,6 +10,7 @@ CFLAGS += $(CFLAGS_libxenctrl) CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod - CLIENTS += xenstore-write xenstore-ls + CLIENTS += xenstore-write xenstore-ls xenstore-watch +CLIENTS_DOMU := $(patsubst xenstore-%,domu-xenstore-%,$(CLIENTS)) XENSTORED_OBJS = xenstored_core.o xenstored_watch.o xenstored_domain.o xenstored_transaction.o xs_lib.o talloc.o utils.o tdb.o hashtable.o -@@ -35,7 +36,7 @@ endif +@@ -32,7 +33,7 @@ ALL_TARGETS = libxenstore.so libxenstore all: $(ALL_TARGETS) .PHONY: clients @@ -84,7 +84,7 @@ ifeq ($(CONFIG_SunOS),y) xenstored_probes.h: xenstored_probes.d -@@ -55,6 +56,9 @@ xenstored: $(XENSTORED_OBJS) +@@ -52,6 +53,9 @@ xenstored: $(XENSTORED_OBJS) $(CLIENTS): xenstore ln -f xenstore $@ @@ -94,7 +94,7 @@ xenstore: xenstore_client.o $(LIBXENSTORE) $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@ -@@ -82,7 +86,7 @@ clean: +@@ -79,7 +83,7 @@ clean: rm -f *.a *.o *.opic *.so* xenstored_probes.h rm -f xenstored xs_random xs_stress xs_crashme rm -f xs_tdb_dump xenstore-control @@ -103,15 +103,15 @@ $(RM) $(DEPS) .PHONY: TAGS -@@ -100,6 +104,7 @@ ifneq ($(CONFIG_OCAML_XENSTORED),y) - $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored - $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR) - endif -+ $(INSTALL_DIR) $(DESTDIR)/bin +@@ -95,6 +99,7 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(BINDIR) $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) -@@ -108,6 +113,9 @@ endif ++ $(INSTALL_DIR) $(DESTDIR)/bin + $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored + $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored + $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR) +@@ -103,6 +108,9 @@ install: all set -e ; for c in $(CLIENTS) ; do \ ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \ done @@ -121,11 +121,11 @@ $(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.2-testing/tools/hotplug/Linux/Makefile +Index: xen-4.1.0-testing/tools/hotplug/Linux/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/hotplug/Linux/Makefile -+++ xen-4.0.2-testing/tools/hotplug/Linux/Makefile -@@ -38,18 +38,6 @@ endif +--- xen-4.1.0-testing.orig/tools/hotplug/Linux/Makefile ++++ xen-4.1.0-testing/tools/hotplug/Linux/Makefile +@@ -41,18 +41,6 @@ endif UDEV_RULES_DIR = $(CONFIG_DIR)/udev UDEV_RULES = xen-backend.rules xend.rules @@ -144,34 +144,26 @@ .PHONY: all all: -@@ -57,16 +45,16 @@ all: +@@ -60,18 +48,18 @@ all: build: .PHONY: install -install: all install-initd install-scripts $(HOTPLUGS) +install: all install-initd install-scripts install-udev + # See docs/misc/distro_mapping.txt for INITD_DIR location .PHONY: install-initd install-initd: - [ -d $(DESTDIR)$(CONFIG_DIR)/init.d ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/init.d -- [ -d $(DESTDIR)$(CONFIG_DIR)/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/sysconfig + [ -d $(DESTDIR)$(INITD_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) +- [ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) + [ -d $(DESTDIR)/var/adm/fillup-templates ] || $(INSTALL_DIR) $(DESTDIR)/var/adm/fillup-templates/ - $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d -- $(INSTALL_PROG) $(XEND_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xend -+ $(INSTALL_PROG) $(XEND_SYSCONFIG) $(DESTDIR)/var/adm/fillup-templates/ - $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d -- $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xendomains + $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(INITD_DIR) + $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(INITD_DIR) +- $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xendomains + $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/var/adm/fillup-templates/ + $(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(INITD_DIR) +- $(INSTALL_PROG) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xencommons ++ $(INSTALL_PROG) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)/var/adm/fillup-templates/ + $(INSTALL_PROG) init.d/xen-watchdog $(DESTDIR)$(INITD_DIR) .PHONY: install-scripts - install-scripts: -@@ -96,8 +84,7 @@ install-udev: - $(INSTALL_DIR) $(DESTDIR)$(UDEV_RULES_DIR)/rules.d - set -e; for i in $(UDEV_RULES); \ - do \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(UDEV_RULES_DIR); \ -- ln -sf ../$$i $(DESTDIR)$(UDEV_RULES_DIR)/rules.d; \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(UDEV_RULES_DIR)/rules.d; \ - done - - .PHONY: clean ++++++ xen-disable-qemu-monitor.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -5,10 +5,10 @@ commands that can read/write dom0's state. -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/monitor.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/monitor.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/monitor.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/monitor.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/monitor.c ++++ xen-4.1.0-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-domUloader.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,44 +1,7 @@ -Index: xen-4.0.2-testing/tools/python/xen/util/blkif.py +Index: xen-4.1.0-testing/tools/python/xen/xend/server/DevController.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/util/blkif.py -+++ xen-4.0.2-testing/tools/python/xen/util/blkif.py -@@ -71,8 +71,8 @@ def blkdev_segment(name): - 'type' : 'Disk' } - return val - --def _parse_uname(uname): -- fn = taptype = None -+def parse_uname(uname): -+ fn = typ = taptype = None - if uname.find(":") != -1: - (typ, fn) = uname.split(":", 1) - -@@ -88,15 +88,18 @@ def _parse_uname(uname): - - if typ in ("tap", "tap2"): - (taptype, fn) = fn.split(":", 1) -- return (fn, taptype) -+ if taptype in ("tapdisk", "ioemu"): -+ (taptype, fn) = fn.split(":", 1) -+ return (fn, (typ, taptype)) -+ return (fn, (typ,taptype)) - - def blkdev_uname_to_file(uname): - """Take a blkdev uname and return the corresponding filename.""" -- return _parse_uname(uname)[0] -+ return parse_uname(uname)[0] - - def blkdev_uname_to_taptype(uname): - """Take a blkdev uname and return the blktap type.""" -- return _parse_uname(uname)[1] -+ return parse_uname(uname)[1] - - def mount_mode(name): - mode = None -Index: xen-4.0.2-testing/tools/python/xen/xend/server/DevController.py -=================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/server/DevController.py -+++ xen-4.0.2-testing/tools/python/xen/xend/server/DevController.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/DevController.py ++++ xen-4.1.0-testing/tools/python/xen/xend/server/DevController.py @@ -592,6 +592,31 @@ class DevController: return (Missing, None) @@ -71,10 +34,10 @@ def backendPath(self, backdom, devid): """Construct backend path given the backend domain and device id. -Index: xen-4.0.2-testing/tools/python/xen/xend/XendBootloader.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendBootloader.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendBootloader.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendBootloader.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendBootloader.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendBootloader.py @@ -12,7 +12,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # @@ -112,20 +75,11 @@ log.error(msg) raise VmError(msg) -Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -37,7 +37,7 @@ from types import StringTypes - - import xen.lowlevel.xc - from xen.util import asserts, auxbin --from xen.util.blkif import blkdev_uname_to_file, blkdev_uname_to_taptype -+from xen.util.blkif import parse_uname - import xen.util.xsm.xsm as security - from xen.util import xsconstants - from xen.util import mkdir -@@ -2346,6 +2346,10 @@ class XendDomainInfo: +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py +@@ -2332,6 +2332,10 @@ class XendDomainInfo: deviceClass, config = self.info['devices'].get(dev_uuid) self._waitForDevice(deviceClass, config['devid']) @@ -136,37 +90,7 @@ def _waitForDevice_destroy(self, deviceClass, devid, backpath): return self.getDeviceController(deviceClass).waitForDevice_destroy( devid, backpath) -@@ -3234,7 +3238,7 @@ class XendDomainInfo: - devtype = devinfo[0] - disk = devinfo[1]['uname'] - -- fn = blkdev_uname_to_file(disk) -+ (fn, types) = parse_uname(disk) - - # If this is a drbd volume, check if we need to activate it - if disk.find(":") != -1: -@@ -3245,9 +3249,18 @@ class XendDomainInfo: - if state == 'Secondary': - os.system('/sbin/drbdadm primary ' + diskname) - -- taptype = blkdev_uname_to_taptype(disk) -- mounted = devtype in ['tap', 'tap2'] and taptype != 'aio' and taptype != 'sync' and not os.stat(fn).st_rdev - mounted_vbd_uuid = 0 -+ def _shouldMount(types): -+ if types[0] in ('file', 'phy'): -+ return False -+ if types[0] in ('tap', 'tap2'): -+ if types[1] in ('aio', 'sync'): -+ return False -+ else: -+ return True -+ return os.access('/etc/xen/scripts/block-%s' % types[0], os.X_OK) -+ -+ mounted = _shouldMount(types) - if mounted: - # 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 -@@ -3264,7 +3277,8 @@ class XendDomainInfo: +@@ -3277,7 +3281,8 @@ class XendDomainInfo: from xen.xend import XendDomain dom0 = XendDomain.instance().privilegedDomain() mounted_vbd_uuid = dom0.create_vbd(vbd, disk); @@ -176,7 +100,7 @@ fn = BOOTLOADER_LOOPBACK_DEVICE try: -@@ -3274,10 +3288,10 @@ class XendDomainInfo: +@@ -3287,10 +3292,10 @@ class XendDomainInfo: if mounted: log.info("Unmounting %s from %s." % (fn, BOOTLOADER_LOOPBACK_DEVICE)) ++++++ xen-fixme-doc.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/docs/man/xmdomain.cfg.pod.5 +Index: xen-4.1.0-testing/docs/man/xmdomain.cfg.pod.5 =================================================================== ---- xen-4.0.2-testing.orig/docs/man/xmdomain.cfg.pod.5 -+++ xen-4.0.2-testing/docs/man/xmdomain.cfg.pod.5 +--- xen-4.1.0-testing.orig/docs/man/xmdomain.cfg.pod.5 ++++ xen-4.1.0-testing/docs/man/xmdomain.cfg.pod.5 @@ -335,16 +335,10 @@ at hda1, which is the root filesystem. =item I<NFS Root> @@ -19,11 +19,11 @@ =back =head1 SEE ALSO -Index: xen-4.0.2-testing/docs/man/xm.pod.1 +Index: xen-4.1.0-testing/docs/man/xm.pod.1 =================================================================== ---- xen-4.0.2-testing.orig/docs/man/xm.pod.1 -+++ xen-4.0.2-testing/docs/man/xm.pod.1 -@@ -297,7 +297,8 @@ scheduling by the Xen hypervisor. +--- xen-4.1.0-testing.orig/docs/man/xm.pod.1 ++++ xen-4.1.0-testing/docs/man/xm.pod.1 +@@ -295,7 +295,8 @@ scheduling by the Xen hypervisor. =item B<s - shutdown> @@ -33,7 +33,7 @@ =item B<c - crashed> -@@ -310,8 +311,6 @@ restart on crash. See L<xmdomain.cfg> f +@@ -308,8 +309,6 @@ restart on crash. See L<xmdomain.cfg> f The domain is in process of dying, but hasn't completely shutdown or crashed. @@ -42,7 +42,7 @@ =back B<NOTES> -@@ -735,8 +734,6 @@ Xen ships with a number of domain schedu +@@ -733,8 +732,6 @@ Xen ships with a number of domain schedu time with the B<sched=> parameter on the Xen command line. By default B<credit> is used for scheduling. @@ -51,7 +51,7 @@ =over 4 =item B<sched-credit> [ B<-d> I<domain-id> [ B<-w>[B<=>I<WEIGHT>] | B<-c>[B<=>I<CAP>] ] ] -@@ -786,8 +783,6 @@ The normal EDF scheduling usage in nanos +@@ -784,8 +781,6 @@ The normal EDF scheduling usage in nanos The normal EDF scheduling usage in nanoseconds @@ -60,7 +60,7 @@ =item I<latency-hint> Scaled period if domain is doing heavy I/O. -@@ -937,9 +932,6 @@ the default setting in xend-config.sxp f +@@ -935,9 +930,6 @@ the default setting in xend-config.sxp f Passes the specified IP Address to the adapter on creation. @@ -70,7 +70,7 @@ =item B<mac=>I<macaddr> The MAC address that the domain will see on its Ethernet device. If -@@ -965,9 +957,6 @@ Removes the network device from the doma +@@ -963,9 +955,6 @@ Removes the network device from the doma I<devid> is the virtual interface device number within the domain (i.e. the 3 in vif22.3). @@ -80,7 +80,7 @@ =item B<network-list> [B<-l>|B<--long>]> I<domain-id> List virtual network interfaces for a domain. The returned output is -@@ -990,9 +979,6 @@ formatted as a list or as an S-Expressio +@@ -988,9 +977,6 @@ formatted as a list or as an S-Expressio The Virtual Network interfaces for Xen. ++++++ xen-hvm-default-bridge.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/net.h +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/net.h =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/net.h -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/net.h +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/net.h ++++ xen-4.1.0-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.2-testing/tools/ioemu-qemu-xen/net.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/net.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/net.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/net.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/net.c ++++ xen-4.1.0-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.2-testing/tools/python/xen/xend/image.py +Index: xen-4.1.0-testing/tools/python/xen/xend/image.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/image.py -+++ xen-4.0.2-testing/tools/python/xen/xend/image.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/image.py ++++ xen-4.1.0-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.2-testing/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux @@ -1,36 +1,22 @@ #!/bin/sh @@ -103,4 +103,4 @@ + exit 0 fi - # We have to change mac address of tap device to not change bridge mac + ifconfig $1 0.0.0.0 up ++++++ xen-hvm-default-pae.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,9 +1,9 @@ PAE must be on for 64-on-64 to work at all. -Index: xen-4.0.2-testing/tools/python/xen/xend/image.py +Index: xen-4.1.0-testing/tools/python/xen/xend/image.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/image.py -+++ xen-4.0.2-testing/tools/python/xen/xend/image.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/image.py ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_platform.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_platform.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_platform.c +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,16 +1,14 @@ -Index: xen-4.0.2-testing/tools/python/xen/xend/XendNode.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendNode.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendNode.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendNode.py -@@ -916,15 +916,39 @@ class XendNode: +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendNode.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendNode.py +@@ -949,11 +949,35 @@ class XendNode: info['cpu_mhz'] = info['cpu_khz'] / 1000 - # physinfo is in KiB, need it in MiB - info['total_memory'] = info['total_memory'] / 1024 - info['free_memory'] = info['free_memory'] / 1024 -- info['node_to_cpu'] = self.format_node_to_cpu(info) -- info['node_to_memory'] = \ + configured_floor = xendoptions().get_dom0_min_mem() * 1024 + from xen.xend import balloon + try: @@ -24,17 +22,13 @@ + extra_mem = dom0_mem - dom0_min_mem + info['free_memory'] = info['free_memory'] + info['scrub_memory'] + info['max_free_memory'] = info['free_memory'] + extra_mem -+ + info['free_cpus'] = len(XendCPUPool.unbound_cpus()) + + # Convert KiB to MiB, rounding down to be conservative + info['total_memory'] = info['total_memory'] / 1024 + info['free_memory'] = info['free_memory'] / 1024 + info['max_free_memory'] = info['max_free_memory'] / 1024 -+ info['node_to_cpu'] = self.format_node_to_cpu(info) -+ info['node_to_memory'] = \ - self.format_node_to_memory(info, 'node_to_memory') - info['node_to_dma32_mem'] = \ - self.format_node_to_memory(info, 'node_to_dma32_mem') - ++ + # FIXME: These are hard-coded to be the inverse of the getXenMemory + # functions in image.py. Find a cleaner way. + info['max_para_memory'] = info['max_free_memory'] - 4 @@ -47,20 +41,20 @@ ITEM_ORDER = ['nr_cpus', 'nr_nodes', 'cores_per_socket', -@@ -934,6 +958,9 @@ class XendNode: - 'virt_caps', +@@ -964,6 +988,9 @@ class XendNode: 'total_memory', 'free_memory', + 'free_cpus', + 'max_free_memory', + 'max_para_memory', + 'max_hvm_memory', - 'node_to_cpu', - 'node_to_memory', - 'node_to_dma32_mem', -Index: xen-4.0.2-testing/tools/python/xen/xend/balloon.py + ] + + if show_numa != 0: +Index: xen-4.1.0-testing/tools/python/xen/xend/balloon.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/balloon.py -+++ xen-4.0.2-testing/tools/python/xen/xend/balloon.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/balloon.py ++++ xen-4.1.0-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,11 +88,11 @@ 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.2-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -1473,6 +1473,27 @@ class XendDomainInfo: +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py +@@ -1459,6 +1459,27 @@ class XendDomainInfo: pci_conf = self.info['devices'][dev_uuid][1] return map(pci_dict_to_bdf_str, pci_conf['devs']) @@ -126,11 +120,11 @@ def setMemoryTarget(self, target): """Set the memory target of this domain. @param target: In MiB. -Index: xen-4.0.2-testing/tools/python/xen/xend/server/SrvDomain.py +Index: xen-4.1.0-testing/tools/python/xen/xend/server/SrvDomain.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/server/SrvDomain.py -+++ xen-4.0.2-testing/tools/python/xen/xend/server/SrvDomain.py -@@ -173,7 +173,7 @@ class SrvDomain(SrvDir): +--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/SrvDomain.py ++++ xen-4.1.0-testing/tools/python/xen/xend/server/SrvDomain.py +@@ -187,7 +187,7 @@ class SrvDomain(SrvDir): def op_mem_target_set(self, _, req): ++++++ xen-minimum-restart-time.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,9 +1,9 @@ References: bnc#661298 -Index: xen-4.0.2-testing/tools/python/xen/xend/XendConstants.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendConstants.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendConstants.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendConstants.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendConstants.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendConstants.py @@ -92,7 +92,7 @@ DOM_STATES_OLD = [ SHUTDOWN_TIMEOUT = (60.0 * 5) ++++++ xen-no-dummy-nfs-ip.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/python/xen/xm/create.py +Index: xen-4.1.0-testing/tools/python/xen/xm/create.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xm/create.py -+++ xen-4.0.2-testing/tools/python/xen/xm/create.py -@@ -1331,9 +1331,8 @@ def preprocess_access_control(vals): +--- xen-4.1.0-testing.orig/tools/python/xen/xm/create.py ++++ xen-4.1.0-testing/tools/python/xen/xm/create.py +@@ -1337,9 +1337,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.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/python/xen/xm/create.py +Index: xen-4.1.0-testing/tools/python/xen/xm/create.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xm/create.py -+++ xen-4.0.2-testing/tools/python/xen/xm/create.py +--- xen-4.1.0-testing.orig/tools/python/xen/xm/create.py ++++ xen-4.1.0-testing/tools/python/xen/xm/create.py @@ -73,7 +73,7 @@ gopts.opt('quiet', short='q', use="Quiet.") @@ -11,11 +11,11 @@ use="Search path for configuration scripts. " "The value of PATH is a colon-separated directory list.") -Index: xen-4.0.2-testing/docs/man/xm.pod.1 +Index: xen-4.1.0-testing/docs/man/xm.pod.1 =================================================================== ---- xen-4.0.2-testing.orig/docs/man/xm.pod.1 -+++ xen-4.0.2-testing/docs/man/xm.pod.1 -@@ -77,7 +77,7 @@ in the config file. See L<xmdomain.cfg> +--- xen-4.1.0-testing.orig/docs/man/xm.pod.1 ++++ xen-4.1.0-testing/docs/man/xm.pod.1 +@@ -75,7 +75,7 @@ in the config file. See L<xmdomain.cfg> format, and possible options used in either the configfile or for I<vars>. I<configfile> can either be an absolute path to a file, or a relative @@ -24,7 +24,7 @@ Create will return B<as soon> as the domain is started. This B<does not> mean the guest OS in the domain has actually booted, or is -@@ -158,7 +158,7 @@ B<EXAMPLES> +@@ -156,7 +156,7 @@ B<EXAMPLES> xm create Fedora4 @@ -33,10 +33,10 @@ soon as it is run. =item I<without config file> -Index: xen-4.0.2-testing/docs/man/xmdomain.cfg.pod.5 +Index: xen-4.1.0-testing/docs/man/xmdomain.cfg.pod.5 =================================================================== ---- xen-4.0.2-testing.orig/docs/man/xmdomain.cfg.pod.5 -+++ xen-4.0.2-testing/docs/man/xmdomain.cfg.pod.5 +--- xen-4.1.0-testing.orig/docs/man/xmdomain.cfg.pod.5 ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c +Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c =================================================================== ---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c -+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c -@@ -399,7 +399,7 @@ void xenstore_parse_domain_config(int hv +--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c +@@ -449,7 +449,7 @@ void xenstore_parse_domain_config(int hv char *buf = NULL; char *fpath = NULL, *bpath = NULL, *btype = NULL, *dev = NULL, *params = NULL, *drv = NULL; @@ -11,7 +11,7 @@ unsigned int len, num, hd_index, pci_devid = 0; BlockDriverState *bs; BlockDriver *format; -@@ -491,12 +491,7 @@ void xenstore_parse_domain_config(int hv +@@ -533,12 +533,7 @@ void xenstore_parse_domain_config(int hv continue; free(danger_type); danger_type = xs_read(xsh, XBT_NULL, danger_buf, &len); @@ -25,7 +25,7 @@ /* read the name of the device */ if (pasprintf(&buf, "%s/type", bpath) == -1) continue; -@@ -504,6 +499,35 @@ void xenstore_parse_domain_config(int hv +@@ -546,6 +541,35 @@ void xenstore_parse_domain_config(int hv drv = xs_read(xsh, XBT_NULL, buf, &len); if (drv == NULL) continue; @@ -59,5 +59,5 @@ + } + /* Obtain blktap sub-type prefix */ - if (!strcmp(drv, "tap") && params[0]) { + if ((!strcmp(drv, "tap") || !strcmp(drv, "qdisk")) && params[0]) { char *offset = strchr(params, ':'); ++++++ xen-rpmoptflags.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/blktap/drivers/Makefile +Index: xen-4.1.0-testing/tools/blktap/drivers/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/blktap/drivers/Makefile -+++ xen-4.0.2-testing/tools/blktap/drivers/Makefile +--- xen-4.1.0-testing.orig/tools/blktap/drivers/Makefile ++++ xen-4.1.0-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.2-testing/Config.mk +Index: xen-4.1.0-testing/Config.mk =================================================================== ---- xen-4.0.2-testing.orig/Config.mk -+++ xen-4.0.2-testing/Config.mk +--- xen-4.1.0-testing.orig/Config.mk ++++ xen-4.1.0-testing/Config.mk @@ -14,7 +14,7 @@ SHELL ?= /bin/sh # Tools to run on system hosting the build ++++++ xen-utils-0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-utils-0.1/Makefile new/xen-utils-0.1/Makefile --- old/xen-utils-0.1/Makefile 2010-08-31 23:14:58.000000000 +0200 +++ new/xen-utils-0.1/Makefile 2011-03-21 18:25:15.000000000 +0100 @@ -22,7 +22,7 @@ CFLAGS += -Werror -Wall endif -LIBS += -lxenstore -lxenctrl -lxenguest +LIBS += -L../xenstore -L../libxc -lxenstore -lxenctrl -lxenguest PROGRAMS = xen-list xen-destroy SRCS = xen-list.c xen-destroy.c xen-utils.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-utils-0.1/xen-destroy.c new/xen-utils-0.1/xen-destroy.c --- old/xen-utils-0.1/xen-destroy.c 2010-08-30 19:55:56.000000000 +0200 +++ new/xen-utils-0.1/xen-destroy.c 2011-03-15 16:56:20.000000000 +0100 @@ -244,8 +244,13 @@ int destroy_domain(char *domname) { - int domid, rcode, ret, xc_handle, i, DMid, status; - unsigned int len; + int domid, rcode, ret, i, DMid, status; +#ifdef XENCTRL_HAS_XC_INTERFACE + xc_interface *xc_handle = NULL; +#else + int xc_handle = 0; +#endif + unsigned int len; char *s; char path[256]; struct xs_handle *xsh = NULL; @@ -268,8 +273,13 @@ } +#ifdef XENCTRL_HAS_XC_INTERFACE + xc_handle = xc_interface_open(NULL, NULL, 0); + if (xc_handle == NULL) { +#else xc_handle = xc_interface_open(); - if (xc_handle < 0) { + if (xc_handle < 0) { +#endif perror("Couldn't open xc handle."); rcode = 1; goto out; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-utils-0.1/xen-utils.c new/xen-utils-0.1/xen-utils.c --- old/xen-utils-0.1/xen-utils.c 2010-08-30 19:55:56.000000000 +0200 +++ new/xen-utils-0.1/xen-utils.c 2011-03-15 16:55:10.000000000 +0100 @@ -50,12 +50,21 @@ char *path; char *s; - if (asprintf(&path, "/local/domain/%u/name", domid) < 0) + if (asprintf(&path, "/local/domain/%u/vm", domid) < 0) return NULL; s = xs_read(xsh, XBT_NULL, path, &len); free(path); + + if (asprintf(&path, "%s/name", s) < 0) { + free(s); + return NULL; + } + free(s); + s = xs_read(xsh, XBT_NULL, path, &len); + free(path); + return s; } @@ -79,11 +88,13 @@ const char *vncport, int compact) { + unsigned long dommem = (dominfo.nr_pages * (XC_PAGE_SIZE / 1024UL)) / 1024UL; + if (compact) { printf("%-40s %5d %5lu %5d %c%c%c%c%c %8.1f %s\n", name, dominfo.domid, - (unsigned long) (dominfo.nr_pages / 1024), + dommem, dominfo.nr_online_vcpus, dominfo.running ? 'r' : '-', dominfo.blocked ? 'b' : '-', @@ -95,7 +106,7 @@ } else { printf("Name: %s\n", name); printf("ID: %d\n", dominfo.domid); - printf("Mem: %lu\n", (unsigned long) (dominfo.nr_pages / 1024)); + printf("Mem: %lu\n", dommem); printf("VCPUs: %d\n", dominfo.nr_online_vcpus); printf("State: %c%c%c%c%c\n", dominfo.running ? 'r' : '-', @@ -114,7 +125,11 @@ xc_dominfo_t *info = NULL; uint32_t first_dom = 0; int max_doms = 1024, nr_doms, i; - int xc_handle = 0; +#ifdef XENCTRL_HAS_XC_INTERFACE + xc_interface *xc_handle; +#else + int xc_handle; +#endif struct xs_handle *xsh = NULL; char *domname, *vncport; @@ -123,8 +138,13 @@ return 1; } +#ifdef XENCTRL_HAS_XC_INTERFACE + xc_handle = xc_interface_open(NULL, NULL, 0); + if (xc_handle == NULL) { +#else xc_handle = xc_interface_open(); - if (xc_handle < 0) { + if (xc_handle < 0) { +#endif perror("Unable to open libxc handle."); goto out; } @@ -151,6 +171,8 @@ printf("Name ID Mem VCPUs\tState\tTime(s)\tVnc-port\n"); for (i = 0; i < nr_doms; i++) { domname = domid_to_domname(xsh, info[i].domid); + if (domname == NULL) + continue; vncport = get_vncport(xsh, info[i].domid); print_dom(info[i], domname, vncport, 1); free(domname); ++++++ xen-warnings.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/misc/miniterm/miniterm.c +Index: xen-4.1.0-testing/tools/misc/miniterm/miniterm.c =================================================================== ---- xen-4.0.2-testing.orig/tools/misc/miniterm/miniterm.c -+++ xen-4.0.2-testing/tools/misc/miniterm/miniterm.c +--- xen-4.1.0-testing.orig/tools/misc/miniterm/miniterm.c ++++ xen-4.1.0-testing/tools/misc/miniterm/miniterm.c @@ -157,7 +157,7 @@ int main(int argc, char **argv) case 0: close(1); /* stdout not needed */ @@ -35,11 +35,11 @@ break; } -Index: xen-4.0.2-testing/tools/libxc/xc_dom_elfloader.c +Index: xen-4.1.0-testing/tools/libxc/xc_dom_elfloader.c =================================================================== ---- xen-4.0.2-testing.orig/tools/libxc/xc_dom_elfloader.c -+++ xen-4.0.2-testing/tools/libxc/xc_dom_elfloader.c -@@ -193,8 +193,9 @@ static int xc_dom_load_elf_symtab(struct +--- xen-4.1.0-testing.orig/tools/libxc/xc_dom_elfloader.c ++++ xen-4.1.0-testing/tools/libxc/xc_dom_elfloader.c +@@ -228,8 +228,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.2-testing/tools/xenstore/Makefile +Index: xen-4.1.0-testing/tools/xenstore/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/xenstore/Makefile -+++ xen-4.0.2-testing/tools/xenstore/Makefile +--- xen-4.1.0-testing.orig/tools/xenstore/Makefile ++++ xen-4.1.0-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.2-testing/tools/xenstore/xenstored_core.c +Index: xen-4.1.0-testing/tools/xenstore/xenstored_core.c =================================================================== ---- xen-4.0.2-testing.orig/tools/xenstore/xenstored_core.c -+++ xen-4.0.2-testing/tools/xenstore/xenstored_core.c +--- xen-4.1.0-testing.orig/tools/xenstore/xenstored_core.c ++++ xen-4.1.0-testing/tools/xenstore/xenstored_core.c @@ -77,8 +77,8 @@ static void check_store(void); int quota_nb_entry_per_domain = 1000; @@ -91,11 +91,11 @@ break; case 'T': tracefile = optarg; -Index: xen-4.0.2-testing/tools/xenstore/xenstored_domain.c +Index: xen-4.1.0-testing/tools/xenstore/xenstored_domain.c =================================================================== ---- xen-4.0.2-testing.orig/tools/xenstore/xenstored_domain.c -+++ xen-4.0.2-testing/tools/xenstore/xenstored_domain.c -@@ -212,7 +212,7 @@ void handle_event(void) +--- xen-4.1.0-testing.orig/tools/xenstore/xenstored_domain.c ++++ xen-4.1.0-testing/tools/xenstore/xenstored_domain.c +@@ -213,7 +213,7 @@ void handle_event(void) { evtchn_port_t port; @@ -104,7 +104,7 @@ barf_perror("Failed to read from event fd"); if (port == virq_port) -@@ -561,7 +561,7 @@ static int dom0_init(void) +@@ -562,7 +562,7 @@ static int dom0_init(void) struct domain *dom0; port = xenbus_evtchn(); @@ -113,10 +113,10 @@ return -1; dom0 = new_domain(NULL, 0, port); -Index: xen-4.0.2-testing/tools/xenstore/xenstored_transaction.c +Index: xen-4.1.0-testing/tools/xenstore/xenstored_transaction.c =================================================================== ---- xen-4.0.2-testing.orig/tools/xenstore/xenstored_transaction.c -+++ xen-4.0.2-testing/tools/xenstore/xenstored_transaction.c +--- xen-4.1.0-testing.orig/tools/xenstore/xenstored_transaction.c ++++ xen-4.1.0-testing/tools/xenstore/xenstored_transaction.c @@ -82,7 +82,7 @@ struct transaction struct list_head changed_domains; }; @@ -126,11 +126,11 @@ static unsigned int generation; /* Return tdb context to use for this connection. */ -Index: xen-4.0.2-testing/tools/xenstore/xenstore_client.c +Index: xen-4.1.0-testing/tools/xenstore/xenstore_client.c =================================================================== ---- xen-4.0.2-testing.orig/tools/xenstore/xenstore_client.c -+++ xen-4.0.2-testing/tools/xenstore/xenstore_client.c -@@ -251,7 +251,7 @@ do_chmod(char *path, struct xs_permissio +--- xen-4.1.0-testing.orig/tools/xenstore/xenstore_client.c ++++ xen-4.1.0-testing/tools/xenstore/xenstore_client.c +@@ -255,7 +255,7 @@ do_chmod(char *path, struct xs_permissio char **xsval = xs_directory(xsh, xth, path, &xsval_n); if (xsval) { @@ -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.2-testing/tools/libxen/src/xen_common.c +Index: xen-4.1.0-testing/tools/libxen/src/xen_common.c =================================================================== ---- xen-4.0.2-testing.orig/tools/libxen/src/xen_common.c -+++ xen-4.0.2-testing/tools/libxen/src/xen_common.c +--- xen-4.1.0-testing.orig/tools/libxen/src/xen_common.c ++++ xen-4.1.0-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.2-testing/tools/blktap2/drivers/block-remus.c +Index: xen-4.1.0-testing/tools/blktap2/drivers/block-remus.c =================================================================== ---- xen-4.0.2-testing.orig/tools/blktap2/drivers/block-remus.c -+++ xen-4.0.2-testing/tools/blktap2/drivers/block-remus.c +--- xen-4.1.0-testing.orig/tools/blktap2/drivers/block-remus.c ++++ xen-4.1.0-testing/tools/blktap2/drivers/block-remus.c @@ -1579,7 +1579,7 @@ static int tdremus_open(td_driver_t *dri td_flag_t flags) { @@ -174,10 +174,10 @@ RPRINTF("opening %s\n", name); -Index: xen-4.0.2-testing/tools/blktap/lib/blktaplib.h +Index: xen-4.1.0-testing/tools/blktap/lib/blktaplib.h =================================================================== ---- xen-4.0.2-testing.orig/tools/blktap/lib/blktaplib.h -+++ xen-4.0.2-testing/tools/blktap/lib/blktaplib.h +--- xen-4.1.0-testing.orig/tools/blktap/lib/blktaplib.h ++++ xen-4.1.0-testing/tools/blktap/lib/blktaplib.h @@ -196,6 +196,7 @@ typedef struct msg_pid { } msg_pid_t; @@ -186,11 +186,11 @@ #define WRITE 1 /*Control Messages between manager and tapdev*/ -Index: xen-4.0.2-testing/tools/blktap2/include/blktaplib.h +Index: xen-4.1.0-testing/tools/blktap2/include/blktaplib.h =================================================================== ---- xen-4.0.2-testing.orig/tools/blktap2/include/blktaplib.h -+++ xen-4.0.2-testing/tools/blktap2/include/blktaplib.h -@@ -198,6 +198,7 @@ typedef struct msg_lock { +--- xen-4.1.0-testing.orig/tools/blktap2/include/blktaplib.h ++++ xen-4.1.0-testing/tools/blktap2/include/blktaplib.h +@@ -190,6 +190,7 @@ typedef struct msg_lock { } msg_lock_t; #define READ 0 ++++++ xen-xm-top-needs-root.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100 @@ -1,11 +1,11 @@ From: Charles Coffing <ccoffing(a)novell.com> Upstream: no -Index: xen-4.0.2-testing/tools/python/xen/xm/main.py +Index: xen-4.1.0-testing/tools/python/xen/xm/main.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xm/main.py -+++ xen-4.0.2-testing/tools/python/xen/xm/main.py -@@ -2054,6 +2054,10 @@ def xm_debug_keys(args): +--- xen-4.1.0-testing.orig/tools/python/xen/xm/main.py ++++ xen-4.1.0-testing/tools/python/xen/xm/main.py +@@ -2201,6 +2201,10 @@ def xm_debug_keys(args): def xm_top(args): arg_check(args, "top", 0) ++++++ xen-xmexample-vti.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/examples/Makefile +Index: xen-4.1.0-testing/tools/examples/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/examples/Makefile -+++ xen-4.0.2-testing/tools/examples/Makefile +--- xen-4.1.0-testing.orig/tools/examples/Makefile ++++ xen-4.1.0-testing/tools/examples/Makefile @@ -18,7 +18,6 @@ XEN_CONFIGS += xmexample.hvm XEN_CONFIGS += xmexample.hvm-stubdom XEN_CONFIGS += xmexample.pv-grub @@ -9,4 +9,4 @@ -XEN_CONFIGS += xmexample.vti XEN_CONFIGS += xend-pci-quirks.sxp XEN_CONFIGS += xend-pci-permissive.sxp - + XEN_CONFIGS += xl.conf ++++++ xen-xmexample.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100 @@ -1,9 +1,9 @@ Change various example paths in the config files to match SUSE. -Index: xen-4.0.2-testing/tools/examples/xmexample1 +Index: xen-4.1.0-testing/tools/examples/xmexample1 =================================================================== ---- xen-4.0.2-testing.orig/tools/examples/xmexample1 -+++ xen-4.0.2-testing/tools/examples/xmexample1 +--- xen-4.1.0-testing.orig/tools/examples/xmexample1 ++++ xen-4.1.0-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.2-testing/tools/examples/xmexample2 +Index: xen-4.1.0-testing/tools/examples/xmexample2 =================================================================== ---- xen-4.0.2-testing.orig/tools/examples/xmexample2 -+++ xen-4.0.2-testing/tools/examples/xmexample2 +--- xen-4.1.0-testing.orig/tools/examples/xmexample2 ++++ xen-4.1.0-testing/tools/examples/xmexample2 @@ -35,11 +35,13 @@ xm_vars.var('vmid', xm_vars.check() @@ -86,10 +86,10 @@ #---------------------------------------------------------------------------- # Configure the behaviour when a domain exits. There are three 'reasons' -Index: xen-4.0.2-testing/tools/examples/xmexample3 +Index: xen-4.1.0-testing/tools/examples/xmexample3 =================================================================== ---- xen-4.0.2-testing.orig/tools/examples/xmexample3 -+++ xen-4.0.2-testing/tools/examples/xmexample3 +--- xen-4.1.0-testing.orig/tools/examples/xmexample3 ++++ xen-4.1.0-testing/tools/examples/xmexample3 @@ -35,11 +35,13 @@ xm_vars.var('vmid', xm_vars.check() @@ -108,10 +108,10 @@ # The domain build function. Default is 'linux'. #builder='linux' -Index: xen-4.0.2-testing/tools/examples/xmexample.hvm +Index: xen-4.1.0-testing/tools/examples/xmexample.hvm =================================================================== ---- xen-4.0.2-testing.orig/tools/examples/xmexample.hvm -+++ xen-4.0.2-testing/tools/examples/xmexample.hvm +--- xen-4.1.0-testing.orig/tools/examples/xmexample.hvm ++++ xen-4.1.0-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. @@ -121,10 +121,10 @@ #---------------------------------------------------------------------------- # Configure the behaviour when a domain exits. There are three 'reasons' -Index: xen-4.0.2-testing/docs/man/xmdomain.cfg.pod.5 +Index: xen-4.1.0-testing/docs/man/xmdomain.cfg.pod.5 =================================================================== ---- xen-4.0.2-testing.orig/docs/man/xmdomain.cfg.pod.5 -+++ xen-4.0.2-testing/docs/man/xmdomain.cfg.pod.5 +--- xen-4.1.0-testing.orig/docs/man/xmdomain.cfg.pod.5 ++++ xen-4.1.0-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 @@ -160,11 +160,11 @@ at hda1, which is the root filesystem. =item I<NFS Root> -Index: xen-4.0.2-testing/docs/man/xm.pod.1 +Index: xen-4.1.0-testing/docs/man/xm.pod.1 =================================================================== ---- xen-4.0.2-testing.orig/docs/man/xm.pod.1 -+++ xen-4.0.2-testing/docs/man/xm.pod.1 -@@ -163,8 +163,8 @@ soon as it is run. +--- xen-4.1.0-testing.orig/docs/man/xm.pod.1 ++++ xen-4.1.0-testing/docs/man/xm.pod.1 +@@ -161,8 +161,8 @@ soon as it is run. =item I<without config file> ++++++ xenapi-console-protocol.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -3925,6 +3925,14 @@ class XendDomainInfo: +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py +@@ -3934,6 +3934,14 @@ class XendDomainInfo: if not config.has_key('backend'): config['backend'] = "00000000-0000-0000-0000-000000000000" ++++++ xenconsole-no-multiple-connections.patch ++++++ Index: xen-4.1.0-testing/tools/console/client/main.c =================================================================== --- xen-4.1.0-testing.orig/tools/console/client/main.c +++ xen-4.1.0-testing/tools/console/client/main.c @@ -96,6 +96,7 @@ static int get_pty_fd(struct xs_handle * * Assumes there is already a watch set in the store for this path. */ { struct timeval tv; + struct flock lock; fd_set watch_fdset; int xs_fd = xs_fileno(xs), pty_fd = -1; int start, now; @@ -122,6 +123,12 @@ static int get_pty_fd(struct xs_handle * if (pty_fd == -1) err(errno, "Could not open tty `%s'", pty_path); + memset(&lock, 0, sizeof(lock)); + lock.l_type = F_WRLCK; + lock.l_whence = SEEK_SET; + if (fcntl(pty_fd, F_SETLK, &lock) != 0) + err(errno, "Could not lock tty '%s'", + pty_path); free(pty_path); } } ++++++ xend-config.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains +Index: xen-4.1.0-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains =================================================================== ---- xen-4.0.2-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xendomains -+++ xen-4.0.2-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains +--- xen-4.1.0-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xendomains ++++ xen-4.1.0-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.2-testing/tools/examples/xend-config.sxp +Index: xen-4.1.0-testing/tools/examples/xend-config.sxp =================================================================== ---- xen-4.0.2-testing.orig/tools/examples/xend-config.sxp -+++ xen-4.0.2-testing/tools/examples/xend-config.sxp +--- xen-4.1.0-testing.orig/tools/examples/xend-config.sxp ++++ xen-4.1.0-testing/tools/examples/xend-config.sxp @@ -58,11 +58,12 @@ @@ -46,17 +46,7 @@ #(xend-relocation-ssl-server no) #(xend-udev-event-server no) -@@ -145,7 +146,8 @@ - # - # (network-script 'network-bridge netdev=eth1') - # --# The bridge is named xenbr0, by default. To rename the bridge, use -+# The bridge takes on the ethernet device name by default. To rename the -+# bridge, use - # - # (network-script 'network-bridge bridge=<name>') - # -@@ -154,7 +156,12 @@ +@@ -170,7 +171,12 @@ # two fake interfaces per guest domain. To do things like this, write # yourself a wrapper script, and call network-bridge from it, as appropriate. # @@ -70,7 +60,7 @@ # The script used to control virtual interfaces. This can be overridden on a # per-vif basis when creating a domain or a configuring a new vif. The -@@ -186,7 +193,7 @@ +@@ -203,7 +209,7 @@ # dom0-min-mem is the lowest permissible memory level (in MB) for dom0. # This is a minimum both for auto-ballooning (as enabled by # enable-dom0-ballooning below) and for xm mem-set when applied to dom0. ++++++ xend-core-dump-loc.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -2317,7 +2317,7 @@ class XendDomainInfo: +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py +@@ -2303,7 +2303,7 @@ class XendDomainInfo: # To prohibit directory traversal based_name = os.path.basename(self.info['name_label']) ++++++ xend-devid-or-name.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100 @@ -11,11 +11,11 @@ Signed-off-by: Jim Fehlig <jfehlig(a)novell.com> -Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -1218,6 +1218,9 @@ class XendDomainInfo: +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py +@@ -1203,6 +1203,9 @@ class XendDomainInfo: except ValueError: pass devid = dev_control.convertToDeviceNumber(dev) ++++++ xend-domain-lock.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/examples/xend-config.sxp +Index: xen-4.1.0-testing/tools/examples/xend-config.sxp =================================================================== ---- xen-4.0.2-testing.orig/tools/examples/xend-config.sxp -+++ xen-4.0.2-testing/tools/examples/xend-config.sxp -@@ -305,6 +305,65 @@ +--- xen-4.1.0-testing.orig/tools/examples/xend-config.sxp ++++ xen-4.1.0-testing/tools/examples/xend-config.sxp +@@ -321,6 +321,65 @@ # device assignment could really work properly even after we do this. #(pci-passthrough-strict-check yes) @@ -68,123 +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.2-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendOptions.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -32,11 +32,12 @@ import re - import copy - import os - import stat -+import shutil - import traceback - from types import StringTypes - - import xen.lowlevel.xc --from xen.util import asserts, auxbin -+from xen.util import asserts, auxbin, mkdir - from xen.util.blkif import parse_uname - import xen.util.xsm.xsm as security - from xen.util import xsconstants -@@ -469,6 +470,7 @@ class XendDomainInfo: - - if self._stateGet() in (XEN_API_VM_POWER_STATE_HALTED, XEN_API_VM_POWER_STATE_SUSPENDED, XEN_API_VM_POWER_STATE_CRASHED): - try: -+ self.acquire_running_lock(); - XendTask.log_progress(0, 30, self._constructDomain) - XendTask.log_progress(31, 60, self._initDomain) - -@@ -2989,6 +2991,11 @@ class XendDomainInfo: - - self._stateSet(DOM_STATE_HALTED) - self.domid = None # Do not push into _stateSet()! -+ -+ try: -+ self.release_running_lock() -+ except: -+ log.exception("Failed to release domain lock.") - finally: - self.refresh_shutdown_lock.release() - -@@ -4497,6 +4504,74 @@ class XendDomainInfo: - def has_device(self, dev_class, dev_uuid): - return (dev_uuid in self.info['%s_refs' % dev_class.lower()]) - -+ # Return name of host contained in lock file. -+ def get_lock_host(self, path): -+ fin = os.popen(xoptions.get_xend_domain_lock_utility() + \ -+ ' -s ' + path, 'r') -+ hostname = "unknown" -+ -+ try: -+ tokens = fin.readline().split() -+ for token in tokens: -+ item = token.split('=') -+ if item[0] == 'host': -+ hostname = item[1] -+ return hostname -+ finally: -+ fin.close() -+ -+ # Acquire a lock for the domain. No-op if domain locking is turned off. -+ def acquire_running_lock(self): -+ if not xoptions.get_xend_domain_lock(): -+ return -+ -+ log.debug("Acquiring lock for domain %s" % self.info['name_label']) -+ path = xoptions.get_xend_domain_lock_path() -+ path = os.path.join(path, self.get_uuid()) -+ -+ try: -+ if not os.path.exists(path): -+ mkdir.parents(path, stat.S_IRWXU) -+ except: -+ log.exception("%s could not be created." % path) -+ raise XendError("%s could not be created." % path) -+ -+ status = os.system('%s -l -p %s -n %s -i %s %s' % \ -+ (xoptions.get_xend_domain_lock_utility(), \ -+ XendNode.instance().get_name(), \ -+ self.info['name_label'], \ -+ self.info['uuid'], \ -+ path)) -+ if status != 0: -+ log.debug("Failed to aqcuire lock: status = %d" % status) -+ raise XendError("The VM is locked and appears to be running on host %s." % self.get_lock_host(path)) -+ -+ # Release lock for domain. No-op if domain locking is turned off. -+ def release_running_lock(self, name = None): -+ if not xoptions.get_xend_domain_lock(): -+ return -+ -+ dom_name = self.info['name_label'] -+ if name: -+ dom_name = name -+ log.debug("Releasing lock for domain %s" % dom_name) -+ -+ path = xoptions.get_xend_domain_lock_path() -+ path = os.path.join(path, self.get_uuid()) -+ status = os.system('%s -u -p %s -n %s -i %s %s' % \ -+ (xoptions.get_xend_domain_lock_utility(), \ -+ XendNode.instance().get_name(), \ -+ dom_name, \ -+ self.info['uuid'], \ -+ path)) -+ if status != 0: -+ log.exception("Failed to release lock: status = %s" % status) -+ try: -+ if len(os.listdir(path)) == 0: -+ shutil.rmtree(path) -+ except: -+ log.exception("Failed to remove unmanaged directory %s." % path) -+ - def __str__(self): - return '<domain id=%s name=%s memory=%s state=%s>' % \ - (str(self.domid), self.info['name_label'], -Index: xen-4.0.2-testing/tools/python/xen/xend/XendOptions.py -=================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendOptions.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendOptions.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendOptions.py ++++ xen-4.1.0-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 +115,10 @@ def get_vnc_tls(self): return self.get_config_string('vnc-tls', self.xend_vnc_tls) -Index: xen-4.0.2-testing/tools/python/xen/xend/XendCheckpoint.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendCheckpoint.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendCheckpoint.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendCheckpoint.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendCheckpoint.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendCheckpoint.py @@ -133,6 +133,8 @@ def save(fd, dominfo, network, live, dst dominfo.shutdown('suspend') dominfo.waitForSuspend() @@ -249,11 +136,11 @@ return dominfo except Exception, exn: dominfo.destroy() -Index: xen-4.0.2-testing/tools/hotplug/Linux/Makefile +Index: xen-4.1.0-testing/tools/hotplug/Linux/Makefile =================================================================== ---- xen-4.0.2-testing.orig/tools/hotplug/Linux/Makefile -+++ xen-4.0.2-testing/tools/hotplug/Linux/Makefile -@@ -19,6 +19,7 @@ XEN_SCRIPTS += vtpm vtpm-delete +--- xen-4.1.0-testing.orig/tools/hotplug/Linux/Makefile ++++ xen-4.1.0-testing/tools/hotplug/Linux/Makefile +@@ -22,6 +22,7 @@ XEN_SCRIPTS += vtpm vtpm-delete XEN_SCRIPTS += xen-hotplug-cleanup XEN_SCRIPTS += external-device-migrate XEN_SCRIPTS += vscsi @@ -261,10 +148,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.2-testing/tools/hotplug/Linux/domain-lock +Index: xen-4.1.0-testing/tools/hotplug/Linux/domain-lock =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/hotplug/Linux/domain-lock ++++ xen-4.1.0-testing/tools/hotplug/Linux/domain-lock @@ -0,0 +1,83 @@ +#!/bin/bash + @@ -349,10 +236,10 @@ + get_status $vm_path + ;; +esac -Index: xen-4.0.2-testing/tools/hotplug/Linux/vm-monitor +Index: xen-4.1.0-testing/tools/hotplug/Linux/vm-monitor =================================================================== --- /dev/null -+++ xen-4.0.2-testing/tools/hotplug/Linux/vm-monitor ++++ xen-4.1.0-testing/tools/hotplug/Linux/vm-monitor @@ -0,0 +1,41 @@ +#!/bin/bash + ++++++ xend-sysconfig.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100 @@ -1,14 +1,14 @@ -Index: xen-4.0.2-testing/tools/hotplug/Linux/init.d/sysconfig.xend +Index: xen-4.1.0-testing/tools/hotplug/Linux/init.d/sysconfig.xencommons =================================================================== ---- xen-4.0.2-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xend -+++ xen-4.0.2-testing/tools/hotplug/Linux/init.d/sysconfig.xend -@@ -1,11 +1,27 @@ +--- xen-4.1.0-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xencommons ++++ xen-4.1.0-testing/tools/hotplug/Linux/init.d/sysconfig.xencommons +@@ -1,11 +1,31 @@ +## Path: System/Virtualization +## Type: string(none,guest,hv,all) +## Default: "" +# - # Log xenconsoled messages (cf xm dmesg) --#XENCONSOLED_TRACE=[none|guest|hv|all] + # Log xenconsoled messages (cf xl dmesg) + #XENCONSOLED_TRACE=[none|guest|hv|all] +XENCONSOLED_TRACE="" +## Path: System/Virtualization @@ -16,7 +16,7 @@ +## Default: "" +# # Log xenstored messages --#XENSTORED_TRACE=[yes|on|1] + #XENSTORED_TRACE=[yes|on|1] +XENSTORED_TRACE="" +## Path: System/Virtualization @@ -24,7 +24,7 @@ +## Default: "" +# # Running xenstored on XENSTORED_ROOTDIR --#XENSTORED_ROOTDIR=/var/lib/xenstored + #XENSTORED_ROOTDIR=/var/lib/xenstored +XENSTORED_ROOTDIR="" +## Path: System/Virtualization @@ -32,5 +32,5 @@ +## Default: "" +# # Running xenbackendd in debug mode --#XENBACKENDD_DEBUG=[yes|on|1] + #XENBACKENDD_DEBUG=[yes|on|1] +XENBACKENDD_DEBUG="" ++++++ xenpaging.autostart_delay.patch ++++++ Subject: xenpaging: add dynamic startup delay for xenpaging This is a debug helper. Since the xenpaging support is still fragile, run xenpaging at different stages in the bootprocess. Different delays will trigger more bugs. This implementation starts without delay for 5 reboots, then increments the delay by 0.1 seconds It uses xenstore for presistant storage of delay values TODO: find the correct place to remove the xenstore directory when the guest is shutdown or crashed Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- tools/python/xen/xend/image.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) Index: xen-4.0.2-testing/tools/python/xen/xend/image.py =================================================================== --- xen-4.0.2-testing.orig/tools/python/xen/xend/image.py +++ xen-4.0.2-testing/tools/python/xen/xend/image.py @@ -123,6 +123,19 @@ class ImageHandler: self.device_model = vmConfig['platform'].get('device_model') self.xenpaging = vmConfig['platform'].get('xenpaging') + if self.xenpaging is not "0": + self.xenpaging_delay = xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay" % self.vm.info['name_label']) + if self.xenpaging_delay == None: + log.warn("XXX creating /local/domain/0/xenpaging/%s" % self.vm.info['name_label']) + xstransact.Mkdir("/local/domain/0/xenpaging/%s" % self.vm.info['name_label']) + xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay', '0.0')) + xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_inc', '0.1')) + xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_use', '5')) + xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_used', '0')) + self.xenpaging_delay = float(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay" % self.vm.info['name_label'])) + self.xenpaging_delay_inc = float(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay_inc" % self.vm.info['name_label'])) + self.xenpaging_delay_use = int(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay_use" % self.vm.info['name_label'])) + self.xenpaging_delay_used = int(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay_used" % self.vm.info['name_label'])) self.display = vmConfig['platform'].get('display') self.xauthority = vmConfig['platform'].get('xauthority') @@ -399,6 +412,17 @@ class ImageHandler: return if self.xenpaging_pid: return + if self.xenpaging_delay_used < self.xenpaging_delay_use: + self.xenpaging_delay_used += 1 + else: + self.xenpaging_delay_used = 0 + self.xenpaging_delay += self.xenpaging_delay_inc + log.info("delay_used %s" % self.xenpaging_delay_used) + log.info("delay_use %s" % self.xenpaging_delay_use) + log.info("delay %s" % self.xenpaging_delay) + log.info("delay_inc %s" % self.xenpaging_delay_inc) + xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay', self.xenpaging_delay)) + xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_used', self.xenpaging_delay_used)) xenpaging_bin = auxbin.pathTo("xenpaging") args = [xenpaging_bin] args = args + ([ "%d" % self.vm.getDomid()]) @@ -427,6 +451,9 @@ class ImageHandler: except: log.warn("chdir %s failed" % xenpaging_dir) try: + if self.xenpaging_delay != 0.0: + log.info("delaying xenpaging startup %s seconds ..." % self.xenpaging_delay) + time.sleep(self.xenpaging_delay) log.info("starting %s" % args) os.execve(xenpaging_bin, args, env) except Exception, e: @@ -442,10 +469,16 @@ class ImageHandler: self.xenpaging_pid = xenpaging_pid os.close(null) os.close(logfd) + if self.xenpaging_delay == 0.0: + log.warn("waiting for xenpaging ...") + time.sleep(22) + log.warn("waiting for xenpaging done.") def destroyXenPaging(self): if self.xenpaging == "0": return + # FIXME find correct place for guest shutdown or crash + #xstransact.Remove("/local/domain/0/xenpaging/%s" % self.vm.info['name_label']) if self.xenpaging_pid: try: os.kill(self.xenpaging_pid, signal.SIGHUP) ++++++ xentrace.dynamic_sized_tbuf.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100 @@ -2,11 +2,11 @@ xen/common/trace.c | 215 ++++++++++++++++++++--------------------------------- 1 file changed, 83 insertions(+), 132 deletions(-) -Index: xen-4.0.2-testing/xen/common/trace.c +Index: xen-4.1.0-testing/xen/common/trace.c =================================================================== ---- xen-4.0.2-testing.orig/xen/common/trace.c -+++ xen-4.0.2-testing/xen/common/trace.c -@@ -41,14 +41,14 @@ CHECK_t_buf; +--- xen-4.1.0-testing.orig/xen/common/trace.c ++++ xen-4.1.0-testing/xen/common/trace.c +@@ -42,14 +42,14 @@ CHECK_t_buf; #define compat_t_rec t_rec #endif @@ -25,7 +25,7 @@ static DEFINE_PER_CPU_READ_MOSTLY(struct t_buf *, t_bufs); static DEFINE_PER_CPU_READ_MOSTLY(unsigned char *, t_data); static DEFINE_PER_CPU_READ_MOSTLY(spinlock_t, t_lock); -@@ -84,20 +84,30 @@ static void calc_tinfo_first_offset(void +@@ -85,20 +85,30 @@ static void calc_tinfo_first_offset(void } /** @@ -65,7 +65,7 @@ } /** -@@ -110,47 +120,28 @@ static int check_tbuf_size(u32 pages) +@@ -111,47 +121,28 @@ static int check_tbuf_size(u32 pages) * This function may also be called later when enabling trace buffers * via the SET_SIZE hypercall. */ @@ -92,7 +92,7 @@ + if ( pages == 0 ) return -EINVAL; - } -- + - /* t_info size is fixed for now. Currently this works great, so there - * seems to be no need to make it dynamic. */ - t_info = alloc_xenheap_pages(get_order_from_pages(T_INFO_PAGES), 0); @@ -106,7 +106,7 @@ - for ( i = 0; i < T_INFO_PAGES; i++ ) - share_xen_page_with_privileged_guests( - virt_to_page(t_info) + i, XENSHARE_readonly); - +- - t_info_mfn_list = (uint32_t *)t_info; - offset = t_info_first_offset; + /* Calculate offset in u32 of first mfn */ @@ -125,7 +125,7 @@ /* * First, allocate buffers for all of the cpus. If any -@@ -158,27 +149,29 @@ static int alloc_trace_bufs(void) +@@ -159,27 +150,29 @@ static int alloc_trace_bufs(void) */ for_each_online_cpu(cpu) { @@ -164,16 +164,17 @@ /* * Now share the pages to xentrace can map them, and write them in -@@ -187,91 +180,72 @@ static int alloc_trace_bufs(void) +@@ -188,89 +181,74 @@ static int alloc_trace_bufs(void) for_each_online_cpu(cpu) { /* Share pages so that xentrace can map them. */ - char *rawbuf; + +- if ( (rawbuf = (char *)per_cpu(t_bufs, cpu)) ) + void *rawbuf = per_cpu(t_bufs, cpu); + struct page_info *p = virt_to_page(rawbuf); + uint32_t mfn = virt_to_mfn(rawbuf); - -- if ( (rawbuf = (char *)per_cpu(t_bufs, cpu)) ) ++ + for ( i = 0; i < pages; i++ ) { - struct page_info *p = virt_to_page(rawbuf); @@ -206,12 +207,13 @@ - data_size = (opt_tbuf_size * PAGE_SIZE - sizeof(struct t_buf)); + data_size = (pages * PAGE_SIZE - sizeof(struct t_buf)); t_buf_highwater = data_size >> 1; /* 50% high water */ + + opt_tbuf_size = pages; + + printk("Xen trace buffers: initialised\n"); + wmb(); /* above must be visible before tb_init_done flag set */ + tb_init_done = 1; - ++ return 0; + out_dealloc: @@ -257,8 +259,6 @@ */ - int ret = 0; - -- -- - if ( opt_tbuf_size != 0 ) + if ( opt_tbuf_size && pages != opt_tbuf_size ) { @@ -287,7 +287,29 @@ } int trace_will_trace_event(u32 event) -@@ -309,36 +283,13 @@ int trace_will_trace_event(u32 event) +@@ -299,21 +277,6 @@ int trace_will_trace_event(u32 event) + return 1; + } + +-static int cpu_callback( +- struct notifier_block *nfb, unsigned long action, void *hcpu) +-{ +- unsigned int cpu = (unsigned long)hcpu; +- +- if ( action == CPU_UP_PREPARE ) +- spin_lock_init(&per_cpu(t_lock, cpu)); +- +- return NOTIFY_DONE; +-} +- +-static struct notifier_block cpu_nfb = { +- .notifier_call = cpu_callback +-}; +- + /** + * init_trace_bufs - performs initialization of the per-cpu trace buffers. + * +@@ -323,37 +286,13 @@ static struct notifier_block cpu_nfb = { */ void __init init_trace_bufs(void) { @@ -297,8 +319,9 @@ - calc_tinfo_first_offset(); - - /* Per-cpu t_lock initialisation. */ -- for ( i = 0; i < NR_CPUS; i++ ) +- for_each_online_cpu ( i ) - spin_lock_init(&per_cpu(t_lock, i)); +- register_cpu_notifier(&cpu_nfb); - - if ( opt_tbuf_size == 0 ) + if ( opt_tbuf_size && alloc_trace_bufs(opt_tbuf_size) ) @@ -329,7 +352,7 @@ } /** -@@ -357,7 +308,7 @@ int tb_control(xen_sysctl_tbuf_op_t *tbc +@@ -372,7 +311,7 @@ int tb_control(xen_sysctl_tbuf_op_t *tbc case XEN_SYSCTL_TBUFOP_get_info: tbc->evt_mask = tb_event_mask; tbc->buffer_mfn = t_info ? virt_to_mfn(t_info) : 0; ++++++ xm-create-xflag.patch ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/python/xen/xm/create.py +Index: xen-4.1.0-testing/tools/python/xen/xm/create.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xm/create.py -+++ xen-4.0.2-testing/tools/python/xen/xm/create.py +--- xen-4.1.0-testing.orig/tools/python/xen/xm/create.py ++++ xen-4.1.0-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 -@@ -1522,7 +1522,7 @@ def main(argv): +@@ -1528,7 +1528,7 @@ def main(argv): except IOError, exn: raise OptionError("Cannot read file %s: %s" % (config, exn[1])) @@ -20,19 +20,23 @@ from xen.xm.xenapi_create import sxp2xml sxp2xml_inst = sxp2xml() doc = sxp2xml_inst.convert_sxp_to_xml(config, transient=True) -@@ -1530,7 +1530,7 @@ def main(argv): +@@ -1536,9 +1536,9 @@ def main(argv): if opts.vals.dryrun and not opts.is_xml: SXPPrettyPrint.prettyprint(config) - if opts.vals.xmldryrun and serverType == SERVER_XEN_API: +- from xml.dom.ext import PrettyPrint as XMLPrettyPrint +- XMLPrettyPrint(doc) + if opts.vals.xmldryrun: - from xml.dom.ext import PrettyPrint as XMLPrettyPrint - XMLPrettyPrint(doc) ++ xml_as_string = doc.toprettyxml() ++ print("%s" % xml_as_string) -Index: xen-4.0.2-testing/tools/python/xen/xend/XendAPIConstants.py + if opts.vals.dryrun or opts.vals.xmldryrun: + return +Index: xen-4.1.0-testing/tools/python/xen/xend/XendAPIConstants.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendAPIConstants.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendAPIConstants.py +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendAPIConstants.py ++++ xen-4.1.0-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.DG628O/_old 2011-03-24 10:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-4.0.2-testing/tools/python/xen/xend/XendAPI.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendAPI.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendAPI.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendAPI.py -@@ -1923,10 +1923,10 @@ class XendAPI(object): +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendAPI.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendAPI.py +@@ -1959,10 +1959,10 @@ class XendAPI(object): bool(live), port, node, ssl, bool(chs)) return xen_api_success_void() @@ -15,20 +15,20 @@ return xen_api_success_void() def VM_restore(self, _, src, paused): -Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomain.py +Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomain.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomain.py -+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomain.py -@@ -1496,7 +1496,7 @@ class XendDomain: - pass - sock.close() +--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomain.py ++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomain.py +@@ -1505,7 +1505,7 @@ class XendDomain: + pass + sock.close() - def domain_save(self, domid, dst, checkpoint=False): + def domain_save(self, domid, dst, checkpoint=False, force=False): """Start saving a domain to file. @param domid: Domain ID or Name -@@ -1512,6 +1512,9 @@ class XendDomain: +@@ -1521,6 +1521,9 @@ class XendDomain: if not dominfo: raise XendInvalidDomain(str(domid)) @@ -38,11 +38,11 @@ if dominfo.getDomid() == DOM0_ID: raise XendError("Cannot save privileged domain %s" % str(domid)) if dominfo._stateGet() != DOM_STATE_RUNNING: -Index: xen-4.0.2-testing/tools/python/xen/xm/main.py +Index: xen-4.1.0-testing/tools/python/xen/xm/main.py =================================================================== ---- xen-4.0.2-testing.orig/tools/python/xen/xm/main.py -+++ xen-4.0.2-testing/tools/python/xen/xm/main.py -@@ -120,7 +120,7 @@ SUBCOMMAND_HELP = { +--- xen-4.1.0-testing.orig/tools/python/xen/xm/main.py ++++ xen-4.1.0-testing/tools/python/xen/xm/main.py +@@ -121,7 +121,7 @@ SUBCOMMAND_HELP = { 'reset' : ('<Domain>', 'Reset a domain.'), 'restore' : ('<CheckpointFile> [-p]', 'Restore a domain from a saved state.'), @@ -51,7 +51,7 @@ 'Save a domain state to restore later.'), 'shutdown' : ('<Domain> [-waRH]', 'Shutdown a domain.'), 'top' : ('', 'Monitor a host and the domains in real time.'), -@@ -316,6 +316,7 @@ SUBCOMMAND_OPTIONS = { +@@ -342,6 +342,7 @@ SUBCOMMAND_OPTIONS = { ), 'save': ( ('-c', '--checkpoint', 'Leave domain running after creating snapshot'), @@ -59,7 +59,7 @@ ), 'restore': ( ('-p', '--paused', 'Do not unpause domain after restoring it'), -@@ -820,18 +821,21 @@ def xm_event_monitor(args): +@@ -864,18 +865,21 @@ def xm_event_monitor(args): def xm_save(args): @@ -83,7 +83,7 @@ if len(params) != 2: err("Wrong number of parameters") -@@ -845,9 +849,9 @@ def xm_save(args): +@@ -889,9 +893,9 @@ def xm_save(args): sys.exit(1) if serverType == SERVER_XEN_API: ++++++ xm-test-cleanup.diff ++++++ --- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.0.2-testing/tools/xm-test/tests/save/01_save_basic_pos.py +Index: xen-4.1.0-testing/tools/xm-test/tests/save/01_save_basic_pos.py =================================================================== ---- xen-4.0.2-testing.orig/tools/xm-test/tests/save/01_save_basic_pos.py -+++ xen-4.0.2-testing/tools/xm-test/tests/save/01_save_basic_pos.py +--- xen-4.1.0-testing.orig/tools/xm-test/tests/save/01_save_basic_pos.py ++++ xen-4.1.0-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 yast2-ldap-client for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package yast2-ldap-client for openSUSE:Factory checked in at Thu Mar 24 09:49:37 CET 2011. -------- --- yast2-ldap-client/yast2-ldap-client.changes 2011-03-18 15:31:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-ldap-client/yast2-ldap-client.changes 2011-03-23 12:15:47.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Mar 23 12:13:16 CET 2011 - jsuchome(a)suse.cz + +- aborting in Stage::cont does not abort installation (bnc#678650) +- 2.21.4 + +------------------------------------------------------------------- +Wed Mar 23 08:45:31 CET 2011 - jsuchome(a)suse.cz + +- remove 'ldap' from nsswitch.conf when sssd is configured + (bnc#681818) +- remove ldap and ldap-account_only PAM modules when sssd is set +- 2.21.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ldap-client-2.21.2.tar.bz2 New: ---- yast2-ldap-client-2.21.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-client.spec ++++++ --- /var/tmp/diff_new_pack.cYUe3N/_old 2011-03-24 09:46:34.000000000 +0100 +++ /var/tmp/diff_new_pack.cYUe3N/_new 2011-03-24 09:46:34.000000000 +0100 @@ -19,11 +19,11 @@ Name: yast2-ldap-client -Version: 2.21.2 +Version: 2.21.4 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-client-2.21.2.tar.bz2 +Source0: yast2-ldap-client-2.21.4.tar.bz2 Prefix: /usr @@ -58,7 +58,7 @@ OpenLDAP server will be used for user authentication. %prep -%setup -n yast2-ldap-client-2.21.2 +%setup -n yast2-ldap-client-2.21.4 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-ldap-client-2.21.2.tar.bz2 -> yast2-ldap-client-2.21.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.21.2/VERSION new/yast2-ldap-client-2.21.4/VERSION --- old/yast2-ldap-client-2.21.2/VERSION 2011-03-18 15:30:01.000000000 +0100 +++ new/yast2-ldap-client-2.21.4/VERSION 2011-03-23 12:13:49.000000000 +0100 @@ -1 +1 @@ -2.21.2 +2.21.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.21.2/src/Ldap.ycp new/yast2-ldap-client-2.21.4/src/Ldap.ycp --- old/yast2-ldap-client-2.21.2/src/Ldap.ycp 2011-03-17 09:14:41.000000000 +0100 +++ new/yast2-ldap-client-2.21.4/src/Ldap.ycp 2011-03-23 08:47:37.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <kukuk(a)suse.de> * Anas Nashif <nashif(a)suse.de> * - * $Id: Ldap.ycp 63583 2011-03-17 08:14:40Z jsuchome $ + * $Id: Ldap.ycp 63626 2011-03-23 07:47:34Z jsuchome $ */ { @@ -2648,15 +2648,36 @@ { Pam::Add ("sss"); // Add "sss" to the passwd and group databases in nsswitch.conf - Nsswitch::WriteDb ("passwd", (list<string>) - union (nsswitch["passwd"]:[], ["sss"])); - Nsswitch::WriteDb ("group", (list<string>) - union (nsswitch["group"]:[], ["sss"])); + + foreach (string db, [ "passwd", "group" ], { + // replace 'ldap' with sss + nsswitch [db] = filter ( + string v, nsswitch[db]:[], ``(v != "ldap")); + nsswitch [db] = union (nsswitch[db]:[], ["sss"]); + Nsswitch::WriteDb (db, nsswitch[db]:["sss"]); + + // remove 'ldap' from _compat entries + string new_db = db+"_compat"; + nsswitch [new_db] = filter ( + string v, nsswitch[new_db]:[], ``(v != "ldap")); + Nsswitch::WriteDb (new_db, nsswitch[new_db]:[]); + }); + // remove ldap entries from ldap-only db's + foreach (string db, ["services" ,"netgroup", "aliases" ], { + list<string> db_l = (list<string>) filter ( + string v, Nsswitch::ReadDb (db), ``(v != "ldap")); + if (db_l == []) + db_l = ["files"]; + Nsswitch::WriteDb (db, db_l); + }); + if (Pam::Enabled("krb5")) { y2milestone ("configuring 'sss', so 'krb5' will be removed"); + Pam::Remove ("ldap-account_only"); Pam::Remove ("krb5"); } + Pam::Remove ("ldap"); } else { @@ -2705,7 +2726,6 @@ } else if (!oes) // ldap is not used { - //TODO: first check, if nss needs to be updated... foreach (string db, [ "passwd", "group" ], ``{ string new_db = db+"_compat"; nsswitch [db] = filter ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.21.2/src/ldap.ycp new/yast2-ldap-client-2.21.4/src/ldap.ycp --- old/yast2-ldap-client-2.21.2/src/ldap.ycp 2011-03-18 15:29:07.000000000 +0100 +++ new/yast2-ldap-client-2.21.4/src/ldap.ycp 2011-03-18 15:30:17.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <kukuk(a)suse.de> * Anas Nashif <nashif(a)suse.de> * - * $Id: ldap.ycp 47528 2008-05-14 13:14:51Z jsuchome $ + * $Id: ldap.ycp 63596 2011-03-18 14:30:16Z jsuchome $ */ /*** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.21.2/src/ui.ycp new/yast2-ldap-client-2.21.4/src/ui.ycp --- old/yast2-ldap-client-2.21.2/src/ui.ycp 2011-02-04 15:19:58.000000000 +0100 +++ new/yast2-ldap-client-2.21.4/src/ui.ycp 2011-03-23 11:41:00.000000000 +0100 @@ -44,15 +44,7 @@ */ define symbol ReallyAbort () ``{ - boolean ret = true; - if (!Stage::cont () || contains (WFM::Args (), "from_users")) - { - ret = Modified() ? Popup::ReallyAbort (true) : true; - } - else - { - ret = Popup::ConfirmAbort (`incomplete); - } + boolean ret = (Modified() || Stage::cont ()) ? Popup::ReallyAbort (true) : true; if ( ret ) return `abort; else return `back; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libgadu for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package libgadu for openSUSE:Factory checked in at Thu Mar 24 09:45:30 CET 2011. -------- --- libgadu/libgadu.changes 2010-10-09 14:10:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/libgadu/libgadu.changes 2011-03-18 17:37:17.000000000 +0100 @@ -1,0 +2,21 @@ +Fri Mar 18 16:36:38 UTC 2011 - fisiu(a)opensuse.org + +- Update to version 1.10.1: + + improved direct connections + + improved connections over proxy server + + some minor changes + +------------------------------------------------------------------- +Fri Feb 18 16:11:55 UTC 2011 - fisiu(a)opensuse.org + +- Update to version 1.10.0: + + ssl connections restored + + typing notifications + + multilogin support + + buddies' info enhancement + + support for additional xml events + + initial file transfer over server + + partial import of new-api branch +- Spec cleanup. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libgadu-1.9.1.tar.gz New: ---- libgadu-1.10.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgadu.spec ++++++ --- /var/tmp/diff_new_pack.Q7SH4Z/_old 2011-03-24 09:43:50.000000000 +0100 +++ /var/tmp/diff_new_pack.Q7SH4Z/_new 2011-03-24 09:43:50.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libgadu (Version 1.9.1) +# spec file for package libgadu # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,20 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define soname 3 Name: libgadu -Summary: Library for Handling of Gadu-Gadu Instant Messaging -Version: 1.9.1 +Version: 1.10.1 Release: 1 License: LGPLv2.1+ -Group: System/Libraries +Summary: Library for Handling of Gadu-Gadu Instant Messaging Url: http://toxygen.net/libgadu/ +Group: System/Libraries Source: http://toxygen.net/%{name}/files/%{name}-%{version}.tar.gz -BuildRequires: openssl-devel +BuildRequires: doxygen BuildRequires: pkg-config +BuildRequires: pkgconfig(openssl) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -38,9 +38,9 @@ %package -n %{name}%{soname} -Group: System/Libraries -Summary: Library for Handling of Gadu-Gadu Instant Messaging License: LGPLv2.1+ +Summary: Library for Handling of Gadu-Gadu Instant Messaging +Group: System/Libraries Provides: %{name} = %{version} Obsoletes: %{name} < %{version} @@ -49,9 +49,9 @@ instant messenger Gadu-Gadu. %package devel -Group: Development/Libraries/C and C++ -Summary: Library for Handling of Gadu-Gadu Instant Messaging License: LGPLv2.1+ +Summary: Library for Handling of Gadu-Gadu Instant Messaging +Group: Development/Libraries/C and C++ Requires: %{name}%{soname} = %{version} Requires: glibc-devel @@ -66,14 +66,17 @@ %configure\ --disable-static\ --with-pthread -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -%makeinstall +%make_install +# remove installdox from html dir +rm -f docs/html/installdox +# rm -f %{buildroot}%{_libdir}/*.la %clean -rm -rf $RPM_BUILD_ROOT +%{?buildroot:rm -rf %{buildroot}} %post -n %{name}%{soname} -p /sbin/ldconfig @@ -86,6 +89,7 @@ %files devel %defattr(-,root,root) +%doc docs/html %{_includedir}/*.h %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc ++++++ libgadu-1.9.1.tar.gz -> libgadu-1.10.1.tar.gz ++++++ ++++ 13508 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 libaio for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package libaio for openSUSE:Factory checked in at Thu Mar 24 09:43:33 CET 2011. -------- --- libaio/libaio.changes 2010-02-12 10:57:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/libaio/libaio.changes 2011-03-15 14:50:09.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 15 13:44:15 UTC 2011 - jengelh(a)medozas.de + +- Update to libaio 0.3.109 +* add ARM architecture support (grabbed from Debian arches tree) +* replace check of __i386__ with __LP64__ in test harness +- refreshed patches + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libaio-0.3.107.tar.bz2 New: ---- libaio-0.3.109.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libaio.spec ++++++ --- /var/tmp/diff_new_pack.NJgFCs/_old 2011-03-24 09:42:50.000000000 +0100 +++ /var/tmp/diff_new_pack.NJgFCs/_new 2011-03-24 09:42:50.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libaio (Version 0.3.107) +# spec file for package libaio # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -27,9 +27,10 @@ Obsoletes: libaio-64bit %endif # -Version: 0.3.107 -Release: 2 +Version: 0.3.109 +Release: 1 Summary: Linux-Native Asynchronous I/O Access Library +Url: http://kernel.org/pub/linux/libs/aio/ Source: libaio-%{version}.tar.bz2 Source2: baselibs.conf Patch2: libaio-optflags.diff @@ -78,7 +79,7 @@ %endif %build -%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %install make install prefix=%{buildroot}/usr libdir=%{buildroot}/%{_lib} ++++++ 00_arches.patch ++++++ --- /var/tmp/diff_new_pack.NJgFCs/_old 2011-03-24 09:42:50.000000000 +0100 +++ /var/tmp/diff_new_pack.NJgFCs/_new 2011-03-24 09:42:50.000000000 +0100 @@ -1,16 +1,72 @@ --- harness/main.c | 8 + - src/libaio.h | 34 +++++++ - src/syscall-arm.h | 116 ++++++++++++++++++++++++++ + src/libaio.h | 24 +++++ src/syscall-m68k.h | 78 +++++++++++++++++ src/syscall-mips.h | 223 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/syscall-parisc.h | 146 +++++++++++++++++++++++++++++++++ src/syscall-sparc.h | 130 +++++++++++++++++++++++++++++ - src/syscall.h | 10 ++ - 8 files changed, 744 insertions(+), 1 deletion(-) + src/syscall.h | 8 + + 7 files changed, 617 insertions(+) +Index: libaio-0.3.109/harness/main.c +=================================================================== +--- libaio-0.3.109.orig/harness/main.c ++++ libaio-0.3.109/harness/main.c +@@ -12,7 +12,15 @@ + #include <libaio.h> + + #if __LP64__ == 0 ++#if defined(__i386__) || defined(__pwoerpc__) || defined(__mips__) + #define KERNEL_RW_POINTER ((void *)0xc0010000) ++#elif defined(__arm__) || defined(__m68k__) || defined(__s390__) ++#define KERNEL_RW_POINTER ((void *)0x00010000) ++#elif defined(__hppa__) ++#define KERNEL_RW_POINTER ((void *)0x10100000) ++#elif defined(__sparc__) ++#define KERNEL_RW_POINTER ((void *)0xf0010000) ++#endif + #else + //#warning Not really sure where kernel memory is. Guessing. + #define KERNEL_RW_POINTER ((void *)0xffffffff81000000) +Index: libaio-0.3.109/src/libaio.h +=================================================================== +--- libaio-0.3.109.orig/src/libaio.h ++++ libaio-0.3.109/src/libaio.h +@@ -83,6 +83,30 @@ typedef enum io_iocb_cmd { + #define PADDEDptr(x, y) x; unsigned y + #define PADDEDul(x, y) unsigned long x; unsigned y + # endif ++#elif defined(__m68k__) /* big endian, 32 bits */ ++#define PADDED(x, y) unsigned y; x ++#define PADDEDptr(x, y) unsigned y; x ++#define PADDEDul(x, y) unsigned y; unsigned long x ++#elif defined(__sparc__) /* big endian, 32 bits */ ++#define PADDED(x, y) unsigned y; x ++#define PADDEDptr(x, y) unsigned y; x ++#define PADDEDul(x, y) unsigned y; unsigned long x ++#elif defined(__hppa__) /* big endian, 32 bits */ ++#define PADDED(x, y) unsigned y; x ++#define PADDEDptr(x, y) unsigned y; x ++#define PADDEDul(x, y) unsigned y; unsigned long x ++#elif defined(__mips__) ++# if defined (__MIPSEB__) /* big endian, 32 bits */ ++#define PADDED(x, y) unsigned y; x ++#define PADDEDptr(x, y) unsigned y; x ++#define PADDEDul(x, y) unsigned y; unsigned long x ++# elif defined(__MIPSEL__) /* little endian, 32 bits */ ++#define PADDED(x, y) x; unsigned y ++#define PADDEDptr(x, y) x; unsigned y ++#define PADDEDul(x, y) unsigned long x; unsigned y ++# else ++# error "neither mipseb nor mipsel?" ++# endif + #else + #error endian? + #endif +Index: libaio-0.3.109/src/syscall-m68k.h +=================================================================== --- /dev/null -+++ b/src/syscall-m68k.h ++++ libaio-0.3.109/src/syscall-m68k.h @@ -0,0 +1,78 @@ +#define __NR_io_setup 241 +#define __NR_io_destroy 242 @@ -90,160 +146,10 @@ +return (type) __res; \ +} + +Index: libaio-0.3.109/src/syscall-mips.h +=================================================================== --- /dev/null -+++ b/src/syscall-sparc.h -@@ -0,0 +1,130 @@ -+/* $Id: unistd.h,v 1.74 2002/02/08 03:57:18 davem Exp $ */ -+ -+/* -+ * System calls under the Sparc. -+ * -+ * Don't be scared by the ugly clobbers, it is the only way I can -+ * think of right now to force the arguments into fixed registers -+ * before the trap into the system call with gcc 'asm' statements. -+ * -+ * Copyright (C) 1995 David S. Miller (davem(a)caip.rutgers.edu) -+ * -+ * SunOS compatibility based upon preliminary work which is: -+ * -+ * Copyright (C) 1995 Adrian M. Rodriguez (adrian(a)remus.rutgers.edu) -+ */ -+ -+ -+#define __NR_io_setup 268 -+#define __NR_io_destroy 269 -+#define __NR_io_submit 270 -+#define __NR_io_cancel 271 -+#define __NR_io_getevents 272 -+ -+ -+#define io_syscall1(type,fname,sname,type1,arg1) \ -+type fname(type1 arg1) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res >= 0) \ -+ return (type) __res; \ -+return -1; \ -+} -+ -+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ -+type fname(type1 arg1,type2 arg2) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res >= 0) \ -+ return (type) __res; \ -+return -1; \ -+} -+ -+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ -+type fname(type1 arg1,type2 arg2,type3 arg3) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+return -1; \ -+} -+ -+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ -+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+register long __o3 __asm__ ("o3") = (long)(arg4); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+return -1; \ -+} -+ -+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ -+ type5,arg5) \ -+type fname(type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ -+{ \ -+long __res; \ -+register long __g1 __asm__ ("g1") = __NR_##sname; \ -+register long __o0 __asm__ ("o0") = (long)(arg1); \ -+register long __o1 __asm__ ("o1") = (long)(arg2); \ -+register long __o2 __asm__ ("o2") = (long)(arg3); \ -+register long __o3 __asm__ ("o3") = (long)(arg4); \ -+register long __o4 __asm__ ("o4") = (long)(arg5); \ -+__asm__ __volatile__ ("t 0x10\n\t" \ -+ "bcc 1f\n\t" \ -+ "mov %%o0, %0\n\t" \ -+ "sub %%g0, %%o0, %0\n\t" \ -+ "1:\n\t" \ -+ : "=r" (__res), "=&r" (__o0) \ -+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__g1) \ -+ : "cc"); \ -+if (__res < -255 || __res>=0) \ -+ return (type) __res; \ -+return -1; \ -+} -+ ---- a/src/syscall.h -+++ b/src/syscall.h -@@ -22,6 +22,16 @@ - #include "syscall-s390.h" - #elif defined(__alpha__) - #include "syscall-alpha.h" -+#elif defined(__arm__) -+#include "syscall-arm.h" -+#elif defined(__m68k__) -+#include "syscall-m68k.h" -+#elif defined(__sparc__) -+#include "syscall-sparc.h" -+#elif defined(__hppa__) -+#include "syscall-parisc.h" -+#elif defined(__mips__) -+#include "syscall-mips.h" - #else - #error "add syscall-arch.h" - #endif ---- /dev/null -+++ b/src/syscall-mips.h ++++ libaio-0.3.109/src/syscall-mips.h @@ -0,0 +1,223 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -468,51 +374,10 @@ + +#endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */ + ---- a/src/libaio.h -+++ b/src/libaio.h -@@ -73,6 +73,40 @@ typedef enum io_iocb_cmd { - #define PADDED(x, y) unsigned y; x - #define PADDEDptr(x, y) unsigned y; x - #define PADDEDul(x, y) unsigned y; unsigned long x -+#elif defined(__arm__) -+# if defined (__ARMEB__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+# else /* little endian, 32 bits */ -+#define PADDED(x, y) x; unsigned y -+#define PADDEDptr(x, y) x; unsigned y -+#define PADDEDul(x, y) unsigned long x; unsigned y -+# endif -+#elif defined(__m68k__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+#elif defined(__sparc__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+#elif defined(__hppa__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+#elif defined(__mips__) -+# if defined (__MIPSEB__) /* big endian, 32 bits */ -+#define PADDED(x, y) unsigned y; x -+#define PADDEDptr(x, y) unsigned y; x -+#define PADDEDul(x, y) unsigned y; unsigned long x -+# elif defined(__MIPSEL__) /* little endian, 32 bits */ -+#define PADDED(x, y) x; unsigned y -+#define PADDEDptr(x, y) x; unsigned y -+#define PADDEDul(x, y) unsigned long x; unsigned y -+# else -+# error "neither mipseb nor mipsel?" -+# endif - #else - #error endian? - #endif +Index: libaio-0.3.109/src/syscall-parisc.h +=================================================================== --- /dev/null -+++ b/src/syscall-parisc.h ++++ libaio-0.3.109/src/syscall-parisc.h @@ -0,0 +1,146 @@ +/* + * Linux system call numbers. @@ -660,140 +525,157 @@ + return K_INLINE_SYSCALL(sname, 5, arg1, arg2, arg3, arg4, arg5); \ +} + +Index: libaio-0.3.109/src/syscall-sparc.h +=================================================================== --- /dev/null -+++ b/src/syscall-arm.h -@@ -0,0 +1,116 @@ ++++ libaio-0.3.109/src/syscall-sparc.h +@@ -0,0 +1,130 @@ ++/* $Id: unistd.h,v 1.74 2002/02/08 03:57:18 davem Exp $ */ ++ +/* -+ * linux/include/asm-arm/unistd.h ++ * System calls under the Sparc. + * -+ * Copyright (C) 2001-2005 Russell King ++ * Don't be scared by the ugly clobbers, it is the only way I can ++ * think of right now to force the arguments into fixed registers ++ * before the trap into the system call with gcc 'asm' statements. ++ * ++ * Copyright (C) 1995 David S. Miller (davem(a)caip.rutgers.edu) + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. ++ * SunOS compatibility based upon preliminary work which is: + * -+ * Please forward _all_ changes to this file to rmk(a)arm.linux.org.uk, -+ * no matter what the change is. Thanks! ++ * Copyright (C) 1995 Adrian M. Rodriguez (adrian(a)remus.rutgers.edu) + */ + -+#define __NR_OABI_SYSCALL_BASE 0x900000 + -+#if defined(__thumb__) || defined(__ARM_EABI__) -+#define __NR_SYSCALL_BASE 0 -+#else -+#define __NR_SYSCALL_BASE __NR_OABI_SYSCALL_BASE -+#endif ++#define __NR_io_setup 268 ++#define __NR_io_destroy 269 ++#define __NR_io_submit 270 ++#define __NR_io_cancel 271 ++#define __NR_io_getevents 272 + -+#define __NR_io_setup (__NR_SYSCALL_BASE+243) -+#define __NR_io_destroy (__NR_SYSCALL_BASE+244) -+#define __NR_io_getevents (__NR_SYSCALL_BASE+245) -+#define __NR_io_submit (__NR_SYSCALL_BASE+246) -+#define __NR_io_cancel (__NR_SYSCALL_BASE+247) -+ -+#define __sys2(x) #x -+#define __sys1(x) __sys2(x) -+ -+#if defined(__thumb__) || defined(__ARM_EABI__) -+#define __SYS_REG(name) register long __sysreg __asm__("r7") = __NR_##name; -+#define __SYS_REG_LIST(regs...) "r" (__sysreg) , ##regs -+#define __syscall(name) "swi\t0" -+#else -+#define __SYS_REG(name) -+#define __SYS_REG_LIST(regs...) regs -+#define __syscall(name) "swi\t" __sys1(__NR_##name) "" -+#endif + -+#define io_syscall1(type,fname,sname,type1,arg1) \ -+type fname(type1 arg1) { \ -+ __SYS_REG(sname) \ -+ register long __r0 __asm__("r0") = (long)arg1; \ -+ register long __res_r0 __asm__("r0"); \ -+ __asm__ __volatile__ ( \ -+ __syscall(sname) \ -+ : "=r" (__res_r0) \ -+ : __SYS_REG_LIST( "0" (__r0) ) \ -+ : "memory" ); \ -+ return (type) __res_r0; \ ++#define io_syscall1(type,fname,sname,type1,arg1) \ ++type fname(type1 arg1) \ ++{ \ ++long __res; \ ++register long __g1 __asm__ ("g1") = __NR_##sname; \ ++register long __o0 __asm__ ("o0") = (long)(arg1); \ ++__asm__ __volatile__ ("t 0x10\n\t" \ ++ "bcc 1f\n\t" \ ++ "mov %%o0, %0\n\t" \ ++ "sub %%g0, %%o0, %0\n\t" \ ++ "1:\n\t" \ ++ : "=r" (__res), "=&r" (__o0) \ ++ : "1" (__o0), "r" (__g1) \ ++ : "cc"); \ ++if (__res < -255 || __res >= 0) \ ++ return (type) __res; \ ++return -1; \ +} + -+#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ -+type fname(type1 arg1,type2 arg2) { \ -+ __SYS_REG(sname) \ -+ register long __r0 __asm__("r0") = (long)arg1; \ -+ register long __r1 __asm__("r1") = (long)arg2; \ -+ register long __res_r0 __asm__("r0"); \ -+ __asm__ __volatile__ ( \ -+ __syscall(sname) \ -+ : "=r" (__res_r0) \ -+ : __SYS_REG_LIST( "0" (__r0), "r" (__r1) ) \ -+ : "memory" ); \ -+ return (type) __res_r0; \ ++#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ ++type fname(type1 arg1,type2 arg2) \ ++{ \ ++long __res; \ ++register long __g1 __asm__ ("g1") = __NR_##sname; \ ++register long __o0 __asm__ ("o0") = (long)(arg1); \ ++register long __o1 __asm__ ("o1") = (long)(arg2); \ ++__asm__ __volatile__ ("t 0x10\n\t" \ ++ "bcc 1f\n\t" \ ++ "mov %%o0, %0\n\t" \ ++ "sub %%g0, %%o0, %0\n\t" \ ++ "1:\n\t" \ ++ : "=r" (__res), "=&r" (__o0) \ ++ : "1" (__o0), "r" (__o1), "r" (__g1) \ ++ : "cc"); \ ++if (__res < -255 || __res >= 0) \ ++ return (type) __res; \ ++return -1; \ +} + -+#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ -+type fname(type1 arg1,type2 arg2,type3 arg3) { \ -+ __SYS_REG(sname) \ -+ register long __r0 __asm__("r0") = (long)arg1; \ -+ register long __r1 __asm__("r1") = (long)arg2; \ -+ register long __r2 __asm__("r2") = (long)arg3; \ -+ register long __res_r0 __asm__("r0"); \ -+ __asm__ __volatile__ ( \ -+ __syscall(sname) \ -+ : "=r" (__res_r0) \ -+ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2) ) \ -+ : "memory" ); \ -+ return (type) __res_r0; \ -+} -+ -+#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4)\ -+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \ -+ __SYS_REG(sname) \ -+ register long __r0 __asm__("r0") = (long)arg1; \ -+ register long __r1 __asm__("r1") = (long)arg2; \ -+ register long __r2 __asm__("r2") = (long)arg3; \ -+ register long __r3 __asm__("r3") = (long)arg4; \ -+ register long __res_r0 __asm__("r0"); \ -+ __asm__ __volatile__ ( \ -+ __syscall(sname) \ -+ : "=r" (__res_r0) \ -+ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), "r" (__r3) ) \ -+ : "memory" ); \ -+ return (type) __res_r0; \ -+} -+ -+#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \ -+type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) {\ -+ __SYS_REG(sname) \ -+ register long __r0 __asm__("r0") = (long)arg1; \ -+ register long __r1 __asm__("r1") = (long)arg2; \ -+ register long __r2 __asm__("r2") = (long)arg3; \ -+ register long __r3 __asm__("r3") = (long)arg4; \ -+ register long __r4 __asm__("r4") = (long)arg5; \ -+ register long __res_r0 __asm__("r0"); \ -+ __asm__ __volatile__ ( \ -+ __syscall(sname) \ -+ : "=r" (__res_r0) \ -+ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \ -+ "r" (__r3), "r" (__r4) ) \ -+ : "memory" ); \ -+ return (type) __res_r0; \ -+} -+ ---- a/harness/main.c -+++ b/harness/main.c -@@ -11,8 +11,14 @@ - - #include <libaio.h> - --#if defined(__i386__) -+#if defined(__i386__) || defined(__powerpc__) || defined(__mips__) - #define KERNEL_RW_POINTER ((void *)0xc0010000) -+#elif defined(__arm__) || defined(__m68k__) || defined(__s390__) -+#define KERNEL_RW_POINTER ((void *)0x00010000) ++#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ ++type fname(type1 arg1,type2 arg2,type3 arg3) \ ++{ \ ++long __res; \ ++register long __g1 __asm__ ("g1") = __NR_##sname; \ ++register long __o0 __asm__ ("o0") = (long)(arg1); \ ++register long __o1 __asm__ ("o1") = (long)(arg2); \ ++register long __o2 __asm__ ("o2") = (long)(arg3); \ ++__asm__ __volatile__ ("t 0x10\n\t" \ ++ "bcc 1f\n\t" \ ++ "mov %%o0, %0\n\t" \ ++ "sub %%g0, %%o0, %0\n\t" \ ++ "1:\n\t" \ ++ : "=r" (__res), "=&r" (__o0) \ ++ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1) \ ++ : "cc"); \ ++if (__res < -255 || __res>=0) \ ++ return (type) __res; \ ++return -1; \ ++} ++ ++#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ ++type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ ++{ \ ++long __res; \ ++register long __g1 __asm__ ("g1") = __NR_##sname; \ ++register long __o0 __asm__ ("o0") = (long)(arg1); \ ++register long __o1 __asm__ ("o1") = (long)(arg2); \ ++register long __o2 __asm__ ("o2") = (long)(arg3); \ ++register long __o3 __asm__ ("o3") = (long)(arg4); \ ++__asm__ __volatile__ ("t 0x10\n\t" \ ++ "bcc 1f\n\t" \ ++ "mov %%o0, %0\n\t" \ ++ "sub %%g0, %%o0, %0\n\t" \ ++ "1:\n\t" \ ++ : "=r" (__res), "=&r" (__o0) \ ++ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__g1) \ ++ : "cc"); \ ++if (__res < -255 || __res>=0) \ ++ return (type) __res; \ ++return -1; \ ++} ++ ++#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ ++ type5,arg5) \ ++type fname(type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ ++{ \ ++long __res; \ ++register long __g1 __asm__ ("g1") = __NR_##sname; \ ++register long __o0 __asm__ ("o0") = (long)(arg1); \ ++register long __o1 __asm__ ("o1") = (long)(arg2); \ ++register long __o2 __asm__ ("o2") = (long)(arg3); \ ++register long __o3 __asm__ ("o3") = (long)(arg4); \ ++register long __o4 __asm__ ("o4") = (long)(arg5); \ ++__asm__ __volatile__ ("t 0x10\n\t" \ ++ "bcc 1f\n\t" \ ++ "mov %%o0, %0\n\t" \ ++ "sub %%g0, %%o0, %0\n\t" \ ++ "1:\n\t" \ ++ : "=r" (__res), "=&r" (__o0) \ ++ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__g1) \ ++ : "cc"); \ ++if (__res < -255 || __res>=0) \ ++ return (type) __res; \ ++return -1; \ ++} ++ +Index: libaio-0.3.109/src/syscall.h +=================================================================== +--- libaio-0.3.109.orig/src/syscall.h ++++ libaio-0.3.109/src/syscall.h +@@ -24,6 +24,14 @@ + #include "syscall-alpha.h" + #elif defined(__arm__) + #include "syscall-arm.h" ++#elif defined(__m68k__) ++#include "syscall-m68k.h" ++#elif defined(__sparc__) ++#include "syscall-sparc.h" +#elif defined(__hppa__) -+#define KERNEL_RW_POINTER ((void *)0x10100000) -+#elif defined(__sparc__) && !defined(__arch64__) -+#define KERNEL_RW_POINTER ((void *)0xf0010000) ++#include "syscall-parisc.h" ++#elif defined(__mips__) ++#include "syscall-mips.h" #else - //#warning Not really sure where kernel memory is. Guessing. - #define KERNEL_RW_POINTER ((void *)0xffffffffc0010000) + #error "add syscall-arch.h" + #endif ++++++ 00_arches_sh.patch ++++++ --- /var/tmp/diff_new_pack.NJgFCs/_old 2011-03-24 09:42:50.000000000 +0100 +++ /var/tmp/diff_new_pack.NJgFCs/_new 2011-03-24 09:42:50.000000000 +0100 @@ -6,23 +6,30 @@ <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=535288> -diff --git a/harness/main.c b/harness/main.c -index f472da7..01fbb87 100644 ---- a/harness/main.c -+++ b/harness/main.c -@@ -13,7 +13,7 @@ - - #if defined(__i386__) || defined(__powerpc__) || defined(__mips__) +--- + harness/main.c | 2 - + src/libaio.h | 10 +++++++ + src/syscall-sh.h | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/syscall.h | 2 + + 4 files changed, 91 insertions(+), 1 deletion(-) + +Index: libaio-0.3.109/harness/main.c +=================================================================== +--- libaio-0.3.109.orig/harness/main.c ++++ libaio-0.3.109/harness/main.c +@@ -14,7 +14,7 @@ + #if __LP64__ == 0 + #if defined(__i386__) || defined(__pwoerpc__) || defined(__mips__) #define KERNEL_RW_POINTER ((void *)0xc0010000) -#elif defined(__arm__) || defined(__m68k__) || defined(__s390__) +#elif defined(__arm__) || defined(__m68k__) || defined(__s390__) || defined(__sh__) #define KERNEL_RW_POINTER ((void *)0x00010000) #elif defined(__hppa__) #define KERNEL_RW_POINTER ((void *)0x10100000) -diff --git a/src/libaio.h b/src/libaio.h -index 68e22ac..d306084 100644 ---- a/src/libaio.h -+++ b/src/libaio.h +Index: libaio-0.3.109/src/libaio.h +=================================================================== +--- libaio-0.3.109.orig/src/libaio.h ++++ libaio-0.3.109/src/libaio.h @@ -107,6 +107,16 @@ typedef enum io_iocb_cmd { # else # error "neither mipseb nor mipsel?" @@ -40,11 +47,10 @@ #else #error endian? #endif -diff --git a/src/syscall-sh.h b/src/syscall-sh.h -new file mode 100644 -index 0000000..9945ec6 +Index: libaio-0.3.109/src/syscall-sh.h +=================================================================== --- /dev/null -+++ b/src/syscall-sh.h ++++ libaio-0.3.109/src/syscall-sh.h @@ -0,0 +1,78 @@ +/* Copy from ./arch/sh/include/asm/unistd_32.h */ +#define __NR_io_setup 245 @@ -124,10 +130,10 @@ + : "memory" ); \ + return (type) __sc0;\ +} -diff --git a/src/syscall.h b/src/syscall.h -index b957bbe..ea0435e 100644 ---- a/src/syscall.h -+++ b/src/syscall.h +Index: libaio-0.3.109/src/syscall.h +=================================================================== +--- libaio-0.3.109.orig/src/syscall.h ++++ libaio-0.3.109/src/syscall.h @@ -32,6 +32,8 @@ #include "syscall-parisc.h" #elif defined(__mips__) @@ -137,6 +143,3 @@ #else #error "add syscall-arch.h" #endif --- -1.6.3.1 - ++++++ 02_libdevdir.patch ++++++ --- /var/tmp/diff_new_pack.NJgFCs/_old 2011-03-24 09:42:50.000000000 +0100 +++ /var/tmp/diff_new_pack.NJgFCs/_new 2011-03-24 09:42:50.000000000 +0100 @@ -3,10 +3,10 @@ src/Makefile | 12 +++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) -Index: libaio-0.3.107/Makefile +Index: libaio-0.3.109/Makefile =================================================================== ---- libaio-0.3.107.orig/Makefile -+++ libaio-0.3.107/Makefile +--- libaio-0.3.109.orig/Makefile ++++ libaio-0.3.109/Makefile @@ -5,9 +5,11 @@ RELEASE=$(shell awk '/Release:/ { print CVSTAG = $(NAME)_$(subst .,-,$(VERSION))_$(subst .,-,$(RELEASE)) RPMBUILD=$(shell `which rpmbuild >&/dev/null` && echo "rpmbuild" || echo "rpm") @@ -17,9 +17,9 @@ libdir=$(prefix)/lib +libdevdir=$(prefix)/lib - default: all - -@@ -15,7 +17,12 @@ all: + pkgname := libaio + ver := $(shell cat .version) +@@ -23,7 +25,12 @@ all: @$(MAKE) -C src install: @@ -33,10 +33,10 @@ check: @$(MAKE) -C harness check -Index: libaio-0.3.107/src/Makefile +Index: libaio-0.3.109/src/Makefile =================================================================== ---- libaio-0.3.107.orig/src/Makefile -+++ libaio-0.3.107/src/Makefile +--- libaio-0.3.109.orig/src/Makefile ++++ libaio-0.3.109/src/Makefile @@ -1,6 +1,8 @@ +DESTDIR= prefix=/usr ++++++ libaio-0.3.107.tar.bz2 -> libaio-0.3.109.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libaio-0.3.107/.version new/libaio-0.3.109/.version --- old/libaio-0.3.107/.version 1970-01-01 01:00:00.000000000 +0100 +++ new/libaio-0.3.109/.version 2009-10-09 20:17:02.000000000 +0200 @@ -0,0 +1 @@ +0.3.109 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libaio-0.3.107/Makefile new/libaio-0.3.109/Makefile --- old/libaio-0.3.107/Makefile 2008-01-09 21:49:12.000000000 +0100 +++ new/libaio-0.3.109/Makefile 2009-10-09 20:17:02.000000000 +0200 @@ -9,6 +9,14 @@ includedir=$(prefix)/include libdir=$(prefix)/lib +pkgname := libaio +ver := $(shell cat .version) + +version_dirty := $(strip $(shell git diff | lsdiff | grep ".version")) +dirty := $(strip $(shell git whatchanged ${pkgname}-${ver}... 2>/dev/null)) +new_changes := $(strip $(shell git diff 2>/dev/null)) +tag_valid := $(strip $(shell git tag -l ${pkgname}-${ver})) + default: all all: @@ -27,21 +35,37 @@ @$(MAKE) -C src clean @$(MAKE) -C harness clean -tag-archive: - @cvs -Q tag -F $(CVSTAG) - -create-archive: tag-archive - @rm -rf /tmp/$(NAME) - @cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(NAME) || echo GRRRrrrrr -- ignore [export aborted] - @mv /tmp/$(NAME) /tmp/$(NAME)-$(VERSION) - @cd /tmp; tar czSpf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION) - @rm -rf /tmp/$(NAME)-$(VERSION) - @cp /tmp/$(NAME)-$(VERSION).tar.gz . - @rm -f /tmp/$(NAME)-$(VERSION).tar.gz - @echo " " - @echo "The final archive is ./$(NAME)-$(VERSION).tar.gz." +tag: tag-checks + git tag ${pkgname}-${ver} -archive: clean tag-archive create-archive +archive: uptodate + @echo "Creating archive from version ${pkgname}-${ver}:" + git archive --format=tar --prefix=${pkgname}-${ver}/ \ + ${pkgname}-${ver} | gzip > ${pkgname}-${ver}.tar.gz +tag-checks: +ifneq (${version_dirty},) + @echo "Error: .version is not committed to the repository." + @exit 1 +endif +ifneq (${new_changes},) + @echo "Error: there are changes in this checkout that have not been" + @echo "committed to the repository." + @exit 1 +endif + +uptodate: tag-checks +ifneq (${dirty},) + @echo -n "Error: this branch contains changes that are not part of tag " + @echo "${pkgname}-${ver}." + @echo -n "Try running git-whatchanged ${pkgname}-${ver}... to see " + @echo "the changes." + @exit 1 +endif +ifeq (${tag_valid},) + @echo "Error: tag ${pkgname}-${ver} does not exist. Run 'make tag'" + @echo "and try again." + @exit 1 +endif -srpm: create-archive +srpm: archive $(RPMBUILD) --define "_sourcedir `pwd`" --define "_srcrpmdir `pwd`" --nodeps -bs $(SPECFILE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libaio-0.3.107/harness/main.c new/libaio-0.3.109/harness/main.c --- old/libaio-0.3.107/harness/main.c 2008-01-09 21:49:12.000000000 +0100 +++ new/libaio-0.3.109/harness/main.c 2009-10-09 20:17:02.000000000 +0200 @@ -11,11 +11,11 @@ #include <libaio.h> -#if defined(__i386__) +#if __LP64__ == 0 #define KERNEL_RW_POINTER ((void *)0xc0010000) #else //#warning Not really sure where kernel memory is. Guessing. -#define KERNEL_RW_POINTER ((void *)0xffffffffc0010000) +#define KERNEL_RW_POINTER ((void *)0xffffffff81000000) #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libaio-0.3.107/libaio.spec new/libaio-0.3.109/libaio.spec --- old/libaio-0.3.107/libaio.spec 2008-01-09 21:49:12.000000000 +0100 +++ new/libaio-0.3.109/libaio.spec 2009-10-09 20:17:02.000000000 +0200 @@ -1,13 +1,13 @@ Name: libaio -Version: 0.3.107 +Version: 0.3.109 Release: 1 Summary: Linux-native asynchronous I/O access library -Copyright: LGPL +License: LGPL Group: System Environment/Libraries Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root # Fix ExclusiveArch as we implement this functionality on more architectures -ExclusiveArch: i386 x86_64 ia64 s390 s390x ppc ppc64 ppc64pseries ppc64iseries alpha alphaev6 +ExclusiveArch: i386 x86_64 ia64 s390 s390x ppc ppc64 ppc64pseries ppc64iseries alpha alphaev6 %{arm} %description The Linux-native asynchronous I/O facility ("async I/O", or "aio") has a @@ -59,6 +59,11 @@ %attr(0644,root,root) %{_libdir}/libaio.a %changelog +* Tue Jun 9 2009 Jeff Moyer <jmoyer(a)redhat.com> - 0.3.108-1 +- add ARM architecture support (grabbed from Debian arches tree) +- replace check of __i386__ with __LP64__ in test harness (Jeff Moyer) +- change the .spec's copyright tag to license + * Wed Jan 9 2008 Jeff Moyer <jmoyer(a)redhat.com> - 0.3.107-1 - Fix the test harness (Rusty Russell) - Add eventfd support (Rusty Russell) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libaio-0.3.107/src/libaio.h new/libaio-0.3.109/src/libaio.h --- old/libaio-0.3.107/src/libaio.h 2008-01-09 21:49:12.000000000 +0100 +++ new/libaio-0.3.109/src/libaio.h 2009-10-09 20:17:02.000000000 +0200 @@ -73,6 +73,16 @@ #define PADDED(x, y) unsigned y; x #define PADDEDptr(x, y) unsigned y; x #define PADDEDul(x, y) unsigned y; unsigned long x +#elif defined(__arm__) +# if defined (__ARMEB__) /* big endian, 32 bits */ +#define PADDED(x, y) unsigned y; x +#define PADDEDptr(x, y) unsigned y; x +#define PADDEDul(x, y) unsigned y; unsigned long x +# else /* little endian, 32 bits */ +#define PADDED(x, y) x; unsigned y +#define PADDEDptr(x, y) x; unsigned y +#define PADDEDul(x, y) unsigned long x; unsigned y +# endif #else #error endian? #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libaio-0.3.107/src/syscall-arm.h new/libaio-0.3.109/src/syscall-arm.h --- old/libaio-0.3.107/src/syscall-arm.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libaio-0.3.109/src/syscall-arm.h 2009-10-09 20:17:02.000000000 +0200 @@ -0,0 +1,116 @@ +/* + * linux/include/asm-arm/unistd.h + * + * Copyright (C) 2001-2005 Russell King + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Please forward _all_ changes to this file to rmk(a)arm.linux.org.uk, + * no matter what the change is. Thanks! + */ + +#define __NR_OABI_SYSCALL_BASE 0x900000 + +#if defined(__thumb__) || defined(__ARM_EABI__) +#define __NR_SYSCALL_BASE 0 +#else +#define __NR_SYSCALL_BASE __NR_OABI_SYSCALL_BASE +#endif + +#define __NR_io_setup (__NR_SYSCALL_BASE+243) +#define __NR_io_destroy (__NR_SYSCALL_BASE+244) +#define __NR_io_getevents (__NR_SYSCALL_BASE+245) +#define __NR_io_submit (__NR_SYSCALL_BASE+246) +#define __NR_io_cancel (__NR_SYSCALL_BASE+247) + +#define __sys2(x) #x +#define __sys1(x) __sys2(x) + +#if defined(__thumb__) || defined(__ARM_EABI__) +#define __SYS_REG(name) register long __sysreg __asm__("r7") = __NR_##name; +#define __SYS_REG_LIST(regs...) "r" (__sysreg) , ##regs +#define __syscall(name) "swi\t0" +#else +#define __SYS_REG(name) +#define __SYS_REG_LIST(regs...) regs +#define __syscall(name) "swi\t" __sys1(__NR_##name) "" +#endif + +#define io_syscall1(type,fname,sname,type1,arg1) \ +type fname(type1 arg1) { \ + __SYS_REG(sname) \ + register long __r0 __asm__("r0") = (long)arg1; \ + register long __res_r0 __asm__("r0"); \ + __asm__ __volatile__ ( \ + __syscall(sname) \ + : "=r" (__res_r0) \ + : __SYS_REG_LIST( "0" (__r0) ) \ + : "memory" ); \ + return (type) __res_r0; \ +} + +#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ +type fname(type1 arg1,type2 arg2) { \ + __SYS_REG(sname) \ + register long __r0 __asm__("r0") = (long)arg1; \ + register long __r1 __asm__("r1") = (long)arg2; \ + register long __res_r0 __asm__("r0"); \ + __asm__ __volatile__ ( \ + __syscall(sname) \ + : "=r" (__res_r0) \ + : __SYS_REG_LIST( "0" (__r0), "r" (__r1) ) \ + : "memory" ); \ + return (type) __res_r0; \ +} + +#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ +type fname(type1 arg1,type2 arg2,type3 arg3) { \ + __SYS_REG(sname) \ + register long __r0 __asm__("r0") = (long)arg1; \ + register long __r1 __asm__("r1") = (long)arg2; \ + register long __r2 __asm__("r2") = (long)arg3; \ + register long __res_r0 __asm__("r0"); \ + __asm__ __volatile__ ( \ + __syscall(sname) \ + : "=r" (__res_r0) \ + : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2) ) \ + : "memory" ); \ + return (type) __res_r0; \ +} + +#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4)\ +type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \ + __SYS_REG(sname) \ + register long __r0 __asm__("r0") = (long)arg1; \ + register long __r1 __asm__("r1") = (long)arg2; \ + register long __r2 __asm__("r2") = (long)arg3; \ + register long __r3 __asm__("r3") = (long)arg4; \ + register long __res_r0 __asm__("r0"); \ + __asm__ __volatile__ ( \ + __syscall(sname) \ + : "=r" (__res_r0) \ + : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), "r" (__r3) ) \ + : "memory" ); \ + return (type) __res_r0; \ +} + +#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \ +type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) {\ + __SYS_REG(sname) \ + register long __r0 __asm__("r0") = (long)arg1; \ + register long __r1 __asm__("r1") = (long)arg2; \ + register long __r2 __asm__("r2") = (long)arg3; \ + register long __r3 __asm__("r3") = (long)arg4; \ + register long __r4 __asm__("r4") = (long)arg5; \ + register long __res_r0 __asm__("r0"); \ + __asm__ __volatile__ ( \ + __syscall(sname) \ + : "=r" (__res_r0) \ + : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \ + "r" (__r3), "r" (__r4) ) \ + : "memory" ); \ + return (type) __res_r0; \ +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libaio-0.3.107/src/syscall.h new/libaio-0.3.109/src/syscall.h --- old/libaio-0.3.107/src/syscall.h 2005-04-01 22:31:32.000000000 +0200 +++ new/libaio-0.3.109/src/syscall.h 2009-10-09 20:17:02.000000000 +0200 @@ -22,6 +22,8 @@ #include "syscall-s390.h" #elif defined(__alpha__) #include "syscall-alpha.h" +#elif defined(__arm__) +#include "syscall-arm.h" #else #error "add syscall-arch.h" #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sudo for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package sudo for openSUSE:Factory checked in at Thu Mar 24 09:42:32 CET 2011. -------- --- sudo/sudo.changes 2011-01-28 12:22:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/sudo/sudo.changes 2011-03-21 12:56:21.000000000 +0100 @@ -1,0 +2,38 @@ +Thu Mar 17 10:24:49 UTC 2011 - puzel(a)novell.com + +- update to sudo-1.8.0 + * Sudo has been refactored to use a modular framework that can + support third-party policy and I/O logging plugins. + * Defaults settings that are tied to a user, host or command may + now include the negation operator. For example: + Defaults:!millert lecture + will match any user but millert. + * The default PATH environment variable, used when no PATH + variable exists, now includes /usr/sbin and /sbin. + * Support for logging I/O for the command being run. + * Sudo will now use the Linux audit system. + + See /usr/share/doc/packages/sudo/NEWS for full list +- new configure script flags: enable-warnings, with-linux-audit, + docdir, with-sendmail +- BuildRequires += audit-devel +- BuildRequires -= postfix +- PreReq += permissions +- add sudo-dont-ignore-LDFLAGS.patch +- drop sudo-1.7.1-defaults.diff (insults disabled in sudoers) +- drop sudo-1.7.1-__P.diff (no more __P in sudo sources) +- drop sudo-1.7.1-strip.diff (sudo no longer strips binaries) +- drop sudo-CVE-2011-0010.patch (in upstream) +- drop sudo-1.7.1-secure_path.diff (sudo now adds /sbin and + /usr/sbin to $PATH if it is empty) +- drop sudo-1.7.1-pam_rhost.diff (fixed in upstream) +- sudo-1.7.1-sudoers.diff renamed to sudo-sudoers.patch +- sudo-1.7.1-env.diff renamed to sudoers2ldif-env.patch +- do not package *.pod files +- use %verifyscript +- timestamp directory moved from /var/run/sudo to /var/lib/sudo +- better commented default /etc/sudoers +- packaged /etc/sudoers.d directory +- new sudo-devel subpackage +- cleaned specfile + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sudo-1.7.1-__P.diff sudo-1.7.1-defaults.diff sudo-1.7.1-env.diff sudo-1.7.1-pam_rhost.diff sudo-1.7.1-secure_path.diff sudo-1.7.1-strip.diff sudo-1.7.1-sudoers.diff sudo-1.7.2p7.tar.gz sudo-CVE-2011-0010.patch New: ---- sudo-1.8.0.tar.bz2 sudo-dont-ignore-LDFLAGS.patch sudo-sudoers.patch sudoers2ldif-env.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sudo.spec ++++++ --- /var/tmp/diff_new_pack.8N9sGK/_old 2011-03-24 09:37:31.000000000 +0100 +++ /var/tmp/diff_new_pack.8N9sGK/_new 2011-03-24 09:37:31.000000000 +0100 @@ -15,30 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: sudo -BuildRequires: openldap2-devel pam-devel postfix -BuildRequires: libselinux-devel -PreReq: coreutils -Version: 1.7.2p7 -Release: 5 -Group: System/Base +Version: 1.8.0 +Release: 1 License: BSD3c(or similar) -Url: http://www.sudo.ws/ Summary: Execute some commands as root -Source0: http://sudo.ws/sudo/dist/%{name}-%{version}.tar.gz -Source1: %{name}.pamd +Url: http://www.sudo.ws/ +Group: System/Base +Source0: http://sudo.ws/sudo/dist/%{name}-%{version}.tar.bz2 +Source1: sudo.pamd Source2: README.SUSE -Patch1: %{name}-1.7.1-defaults.diff -Patch2: %{name}-1.7.1-sudoers.diff -Patch3: %{name}-1.7.1-__P.diff -Patch4: %{name}-1.7.1-strip.diff -Patch5: %{name}-1.7.1-secure_path.diff -Patch6: %{name}-1.7.1-env.diff -Patch7: %{name}-1.7.1-pam_rhost.diff -Patch8: sudo-CVE-2011-0010.patch +Patch1: sudoers2ldif-env.patch +Patch2: sudo-dont-ignore-LDFLAGS.patch +Patch3: sudo-sudoers.patch +BuildRequires: audit-devel +BuildRequires: libselinux-devel +BuildRequires: openldap2-devel +BuildRequires: pam-devel +PreReq: coreutils +PreReq: permissions BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,25 +47,19 @@ given time N (where N is defined at installation and is set to 5 minutes by default). +%package devel +License: BSD3c(or similar) +Summary: Header files needed for sudo plugin development +Group: Development/Libraries/C and C++ - -Authors: --------- - Jeff Nieusma <nieusma(a)rootgroup.com> - David Hieb <davehieb(a)rootgroup.com> - Ian McCloghrie <ian(a)ucsd.edu> +%description devel +These header files are needed for building of sudo plugins. %prep %setup -q -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 -%patch6 -%patch7 -%patch8 -p1 -cp %{SOURCE2} . +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %ifarch s390 s390x %sparc @@ -76,56 +67,79 @@ %else F_PIE=-fpie %endif -export CFLAGS="$RPM_OPT_FLAGS -Wall $F_PIE -DLDAP_DEPRECATED" +export CFLAGS="%{optflags} -Wall $F_PIE -DLDAP_DEPRECATED" export LDFLAGS="-pie" %configure \ --libexecdir=%{_libexecdir}/sudo \ + --docdir=%{_docdir}/%{name} \ --with-noexec=%{_libexecdir}/sudo/sudo_noexec.so \ + --with-pam \ + --with-ldap \ --with-selinux \ + --with-linux-audit \ --with-logfac=auth \ --with-insults \ --with-all-insults \ --with-ignore-dot \ --with-tty-tickets \ --enable-shell-sets-home \ + --enable-warnings \ + --with-sendmail=%{_sbindir}/sendmail \ --with-sudoers-mode=0440 \ - --with-pam \ - --with-ldap \ --with-env-editor \ --without-secure-path \ --with-passprompt='%%p\x27s password:' make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -install -d -m 700 $RPM_BUILD_ROOT%{_localstatedir}/run/sudo -install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/sudo -install -m 755 sudoers2ldif $RPM_BUILD_ROOT%{_sbindir}/sudoers2ldif -rm -f $RPM_BUILD_ROOT%{_bindir}/sudoedit -ln -sf %{_bindir}/sudo $RPM_BUILD_ROOT%{_bindir}/sudoedit -install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema -install -m 644 schema.OpenLDAP $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/sudo.schema +%make_install +install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/sudo +mv %{buildroot}%{_docdir}/%{name}/sudoers2ldif %{buildroot}%{_sbindir} +rm -f %{buildroot}%{_bindir}/sudoedit +ln -sf %{_bindir}/sudo %{buildroot}%{_bindir}/sudoedit +install -d -m 755 %{buildroot}%{_sysconfdir}/openldap/schema +install -m 644 doc/schema.OpenLDAP %{buildroot}%{_sysconfdir}/openldap/schema/sudo.schema +install -m 644 %{SOURCE2} %{buildroot}%{_docdir}/%{name}/ +rm -f %{buildroot}%{_docdir}/%{name}/sample.pam +rm -f %{buildroot}%{_docdir}/%{name}/sample.syslog.conf +rm -f %{buildroot}%{_docdir}/%{name}/schema.OpenLDAP +rm -f %{buildroot}%{_libexecdir}/%{name}/sudoers.la %post chmod 0440 %{_sysconfdir}/sudoers +%if 0%{?suse_version} <= 1130 +%run_permissions +%else +%set_permissions /usr/bin/sudo +%endif + +%verifyscript +%verify_permissions -e /usr/bin/sudo %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) -%doc HISTORY LICENSE PORTING README README.LDAP README.SUSE TROUBLESHOOTING UPGRADE WHATSNEW *.pod +%doc %{_docdir}/%{name} %doc %{_mandir}/man?/* %config(noreplace) %attr(0440,root,root) %{_sysconfdir}/sudoers +%dir %{_sysconfdir}/sudoers.d %config %{_sysconfdir}/pam.d/sudo %attr(4755,root,root) %{_bindir}/sudo %dir %{_sysconfdir}/openldap %dir %{_sysconfdir}/openldap/schema %attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/sudo.schema %{_bindir}/sudoedit -%{_sbindir}/* +%{_bindir}/sudoreplay +%{_sbindir}/visudo +%attr(0755,root,root) %{_sbindir}/sudoers2ldif %{_libexecdir}/sudo -%{_localstatedir}/run/sudo +%attr(0700,root,root) %dir %ghost %{_localstatedir}/lib/sudo + +%files devel +%defattr(-,root,root) +%{_includedir}/sudo_plugin.h %changelog ++++++ sudo-1.7.2p7.tar.gz -> sudo-1.8.0.tar.bz2 ++++++ ++++ 249323 lines of diff (skipped) ++++++ sudo-dont-ignore-LDFLAGS.patch ++++++ Index: sudo-1.8.0/plugins/sudoers/Makefile.in =================================================================== --- sudo-1.8.0.orig/plugins/sudoers/Makefile.in +++ sudo-1.8.0/plugins/sudoers/Makefile.in @@ -55,7 +55,7 @@ CPPFLAGS = -I$(incdir) -I$(top_builddir) CFLAGS = @CFLAGS@ # Flags to pass to the link stage -LDFLAGS = +LDFLAGS = @LDFLAGS@ SUDOERS_LDFLAGS = @SUDOERS_LDFLAGS@ # Where to install things... ++++++ sudo-sudoers.patch ++++++ Index: sudo-1.8.0/plugins/sudoers/sudoers.in =================================================================== --- sudo-1.8.0.orig/plugins/sudoers/sudoers.in +++ sudo-1.8.0/plugins/sudoers/sudoers.in @@ -31,37 +31,36 @@ ## ## Defaults specification ## -## You may wish to keep some of the following environment variables -## when running commands via sudo. -## -## Locale settings -# Defaults env_keep += "LANG LANGUAGE LINGUAS LC_* _XKB_CHARSET" -## -## Run X applications through sudo; HOME is used to find the -## .Xauthority file. Note that other programs use HOME to find -## configuration files and this may lead to privilege escalation! -# Defaults env_keep += "HOME" -## -## X11 resource path settings -# Defaults env_keep += "XAPPLRESDIR XFILESEARCHPATH XUSERFILESEARCHPATH" -## -## Desktop path settings -# Defaults env_keep += "QTDIR KDEDIR" -## -## Allow sudo-run commands to inherit the callers' ConsoleKit session -# Defaults env_keep += "XDG_SESSION_COOKIE" -## -## Uncomment to enable special input methods. Care should be taken as -## this may allow users to subvert the command being run via sudo. -# Defaults env_keep += "XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER" +## Prevent environment variables from influencing programs in an +## unexpected or harmful way (CVE-2005-2959, CVE-2005-4158, CVE-2006-0151) +Defaults always_set_home +Defaults env_reset +## Change env_reset to !env_reset in previous line to keep all environment variables +## Following list will no longer be necessary after this change + +Defaults env_keep = "LANG LC_ADDRESS LC_CTYPE LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME LC_ALL LANGUAGE LINGUAS XDG_SESSION_COOKIE" +## Comment out the preceding line and uncomment the following one if you need +## to use special input methods. This may allow users to compromise the root +## account if they are allowed to run commands without authentication. +#Defaults env_keep = "LANG LC_ADDRESS LC_CTYPE LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME LC_ALL LANGUAGE LINGUAS XDG_SESSION_COOKIE XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER" + +## Do not insult users when they enter an incorrect password. +Defaults !insults + ## ## Uncomment to enable logging of a command's output, except for ## sudoreplay and reboot. Use sudoreplay to play back logged sessions. # Defaults log_output # Defaults!/usr/bin/sudoreplay !log_output -# Defaults!/usr/local/bin/sudoreplay !log_output # Defaults!/sbin/reboot !log_output +## In the default (unconfigured) configuration, sudo asks for the root password. +## This allows use of an ordinary user account for administration of a freshly +## installed system. When configuring sudo, delete the two +## following lines: +Defaults targetpw # ask for the password of the target user i.e. root +ALL ALL=(ALL) ALL # WARNING! Only use this together with 'Defaults targetpw'! + ## ## Runas alias specification ## @@ -77,14 +76,6 @@ root ALL=(ALL) ALL ## Same thing without a password # %wheel ALL=(ALL) NOPASSWD: ALL -## Uncomment to allow members of group sudo to execute any command -# %sudo ALL=(ALL) ALL - -## Uncomment to allow any user to run sudo if they know the password -## of the user they are running the command as (root by default). -# Defaults targetpw # Ask for the password of the target user -# ALL ALL=(ALL) ALL # WARNING: only use this together with 'Defaults targetpw' - ## Read drop-in files from @sysconfdir@/sudoers.d ## (the '#' here does not indicate a comment) #includedir @sysconfdir@/sudoers.d ++++++ sudoers2ldif-env.patch ++++++ Index: sudo-1.8.0/plugins/sudoers/sudoers2ldif =================================================================== --- sudo-1.8.0.orig/plugins/sudoers/sudoers2ldif +++ sudo-1.8.0/plugins/sudoers/sudoers2ldif @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl use strict; # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 iproute2 for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package iproute2 for openSUSE:Factory checked in at Thu Mar 24 09:37:09 CET 2011. -------- --- iproute2/iproute2.changes 2011-01-12 17:03:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/iproute2/iproute2.changes 2011-03-23 19:59:21.000000000 +0100 @@ -1,0 +2,21 @@ +Wed Mar 23 18:57:20 UTC 2011 - bphilips(a)novell.com + +Remove unneeded patches: +* iproute2-warnings.diff bnc#34714 + Warnings no longer exist +* iproute2-iptunnel-fclose.diff + Process is dying no need to close file pointers +* iproute2-ss-pclose.diff + Process is dying no need to close file pointers +* iproute2-flushcheckuid.diff + Fixed upstream +* iproute2-skbedit-memset.diff + Fixed upstream 46a6573259f46f86eb0048a2c805b24ff4183fa6 + +------------------------------------------------------------------- +Tue Mar 22 08:57:44 CET 2011 - ms(a)suse.de + +- Update to 2.6.38, fix for options process with ipt (bnc #679172) +- tidy up the package, spec file names, patch names, etc + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- iproute2-2.6.29-1-HZ.diff iproute2-2.6.29-1-flushcheckuid.diff iproute2-2.6.29-1-iptunnel-fclose.diff iproute2-2.6.29-1-libdir-1.diff iproute2-2.6.29-1-memleak.diff iproute2-2.6.29-1-pdfdoc.diff iproute2-2.6.29-1-skbedit-memset.diff iproute2-2.6.29-1-ss-pclose.diff iproute2-2.6.29-1-warnings.diff iproute2-2.6.37-rtt-metrics-units.diff iproute2-2.6.37.tar.bz2 New: ---- iproute2-2.6.38.tar.bz2 iproute2-HZ.diff iproute2-libdir-1.diff iproute2-memleak.diff iproute2-pdfdoc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iproute2.spec ++++++ --- /var/tmp/diff_new_pack.JeKh2A/_old 2011-03-24 09:35:29.000000000 +0100 +++ /var/tmp/diff_new_pack.JeKh2A/_new 2011-03-24 09:35:29.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package iproute2 (Version 2.6.37) +# spec file for package iproute2 # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,22 +24,16 @@ License: GPLv2+ Group: Productivity/Networking/Routing Provides: iproute -Version: 2.6.37 +Version: 2.6.38 Release: 1 -%define rversion 2.6.37 +%define rversion 2.6.38 Summary: Advanced Routing -Url: http://developer.osdl.org/dev/iproute2/ +Url: http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2 Source0: %name-%rversion.tar.bz2 -Patch0: %name-2.6.29-1-libdir-1.diff -Patch1: %name-2.6.29-1-HZ.diff -Patch2: %name-2.6.29-1-pdfdoc.diff -Patch5: %name-2.6.29-1-flushcheckuid.diff -Patch7: %name-2.6.29-1-warnings.diff -Patch8: %name-2.6.29-1-skbedit-memset.diff -Patch9: %name-2.6.29-1-iptunnel-fclose.diff -Patch10: %name-2.6.29-1-ss-pclose.diff -Patch13: %name-2.6.29-1-memleak.diff -Patch14: %name-2.6.37-rtt-metrics-units.diff +Patch0: %name-libdir-1.diff +Patch1: %name-HZ.diff +Patch2: %name-pdfdoc.diff +Patch3: %name-memleak.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -79,13 +73,7 @@ %patch0 %patch1 %patch2 -%patch5 -%patch7 -%patch8 -%patch9 -%patch10 -%patch13 -%patch14 -p1 +%patch3 find . -name *.orig -print0 | xargs -r0 rm -v %build ++++++ iproute2-2.6.37.tar.bz2 -> iproute2-2.6.38.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iproute2-2.6.37/include/SNAPSHOT.h new/iproute2-2.6.38/include/SNAPSHOT.h --- old/iproute2-2.6.37/include/SNAPSHOT.h 2011-01-07 18:54:30.000000000 +0100 +++ new/iproute2-2.6.38/include/SNAPSHOT.h 2011-03-17 18:05:47.000000000 +0100 @@ -1 +1 @@ -static const char SNAPSHOT[] = "110107"; +static const char SNAPSHOT[] = "110317"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iproute2-2.6.37/include/linux/if_ether.h new/iproute2-2.6.38/include/linux/if_ether.h --- old/iproute2-2.6.37/include/linux/if_ether.h 2011-01-07 18:54:30.000000000 +0100 +++ new/iproute2-2.6.38/include/linux/if_ether.h 2011-03-17 18:05:47.000000000 +0100 @@ -72,6 +72,7 @@ #define ETH_P_MPLS_UC 0x8847 /* MPLS Unicast traffic */ #define ETH_P_MPLS_MC 0x8848 /* MPLS Multicast traffic */ #define ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */ +#define ETH_P_LINK_CTL 0x886c /* HPNA, wlan link local tunnel */ #define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport * over Ethernet */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iproute2-2.6.37/include/linux/if_link.h new/iproute2-2.6.38/include/linux/if_link.h --- old/iproute2-2.6.37/include/linux/if_link.h 2011-01-07 18:54:30.000000000 +0100 +++ new/iproute2-2.6.38/include/linux/if_link.h 2011-03-17 18:05:47.000000000 +0100 @@ -80,6 +80,24 @@ __u8 port; }; +/* + * IFLA_AF_SPEC + * Contains nested attributes for address family specific attributes. + * Each address family may create a attribute with the address family + * number as type and create its own attribute structure in it. + * + * Example: + * [IFLA_AF_SPEC] = { + * [AF_INET] = { + * [IFLA_INET_CONF] = ..., + * }, + * [AF_INET6] = { + * [IFLA_INET6_FLAGS] = ..., + * [IFLA_INET6_CONF] = ..., + * } + * } + */ + enum { IFLA_UNSPEC, IFLA_ADDRESS, @@ -116,6 +134,7 @@ IFLA_STATS64, IFLA_VF_PORTS, IFLA_PORT_SELF, + IFLA_AF_SPEC, __IFLA_MAX }; @@ -126,6 +145,14 @@ #define IFLA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg)))) #define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg)) +enum { + IFLA_INET_UNSPEC, + IFLA_INET_CONF, + __IFLA_INET_MAX, +}; + +#define IFLA_INET_MAX (__IFLA_INET_MAX - 1) + /* ifi_flags. IFF_* flags. @@ -230,6 +257,7 @@ MACVLAN_MODE_PRIVATE = 1, /* don't talk to other macvlans */ MACVLAN_MODE_VEPA = 2, /* talk to other ports through ext bridge */ MACVLAN_MODE_BRIDGE = 4, /* talk to bridge ports directly */ + MACVLAN_MODE_PASSTHRU = 8,/* take over the underlying device */ }; /* SR-IOV virtual function management section */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iproute2-2.6.37/include/linux/netfilter.h new/iproute2-2.6.38/include/linux/netfilter.h --- old/iproute2-2.6.37/include/linux/netfilter.h 2011-01-07 18:54:30.000000000 +0100 +++ new/iproute2-2.6.38/include/linux/netfilter.h 2011-03-17 18:05:47.000000000 +0100 @@ -23,6 +23,8 @@ #define NF_QUEUE_NR(x) ((((x) << NF_VERDICT_BITS) & NF_VERDICT_QMASK) | NF_QUEUE) +#define NF_DROP_ERR(x) (((-x) << NF_VERDICT_BITS) | NF_DROP) + /* only for userspace compatibility */ /* Generic cache responses from hook functions. <= 0x2000 is used for protocol-flags. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iproute2-2.6.37/include/linux/xfrm.h new/iproute2-2.6.38/include/linux/xfrm.h --- old/iproute2-2.6.37/include/linux/xfrm.h 2011-01-07 18:54:30.000000000 +0100 +++ new/iproute2-2.6.38/include/linux/xfrm.h 2011-03-17 18:05:47.000000000 +0100 @@ -283,6 +283,7 @@ XFRMA_KMADDRESS, /* struct xfrm_user_kmaddress */ XFRMA_ALG_AUTH_TRUNC, /* struct xfrm_algo_auth */ XFRMA_MARK, /* struct xfrm_mark */ + XFRMA_TFCPAD, /* __u32 */ __XFRMA_MAX #define XFRMA_MAX (__XFRMA_MAX - 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iproute2-2.6.37/include/utils.h new/iproute2-2.6.38/include/utils.h --- old/iproute2-2.6.37/include/utils.h 2011-01-07 18:54:30.000000000 +0100 +++ new/iproute2-2.6.38/include/utils.h 2011-03-17 18:05:47.000000000 +0100 @@ -79,7 +79,7 @@ extern int get_integer(int *val, const char *arg, int base); extern int get_unsigned(unsigned *val, const char *arg, int base); -extern int get_jiffies(unsigned *val, const char *arg, int base, int *raw); +extern int get_time_rtt(unsigned *val, const char *arg, int *raw); #define get_byte get_u8 #define get_ushort get_u16 #define get_short get_s16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iproute2-2.6.37/ip/iplink_macvlan.c new/iproute2-2.6.38/ip/iplink_macvlan.c --- old/iproute2-2.6.37/ip/iplink_macvlan.c 2011-01-07 18:54:30.000000000 +0100 +++ new/iproute2-2.6.38/ip/iplink_macvlan.c 2011-03-17 18:05:47.000000000 +0100 @@ -23,14 +23,14 @@ static void explain(void) { fprintf(stderr, - "Usage: ... macvlan mode { private | vepa | bridge }\n" + "Usage: ... macvlan mode { private | vepa | bridge | passthru }\n" ); } static int mode_arg(void) { fprintf(stderr, "Error: argument of \"mode\" must be \"private\", " - "\"vepa\" or \"bridge\"\n"); + "\"vepa\", \"bridge\" or \"passthru\" \n"); return -1; } @@ -48,6 +48,8 @@ mode = MACVLAN_MODE_VEPA; else if (strcmp(*argv, "bridge") == 0) mode = MACVLAN_MODE_BRIDGE; + else if (strcmp(*argv, "passthru") == 0) + mode = MACVLAN_MODE_PASSTHRU; else return mode_arg(); @@ -82,6 +84,7 @@ mode == MACVLAN_MODE_PRIVATE ? "private" : mode == MACVLAN_MODE_VEPA ? "vepa" : mode == MACVLAN_MODE_BRIDGE ? "bridge" + : mode == MACVLAN_MODE_PASSTHRU ? "passthru" : "unknown"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iproute2-2.6.37/ip/iplink_macvtap.c new/iproute2-2.6.38/ip/iplink_macvtap.c --- old/iproute2-2.6.37/ip/iplink_macvtap.c 2011-01-07 18:54:30.000000000 +0100 +++ new/iproute2-2.6.38/ip/iplink_macvtap.c 2011-03-17 18:05:47.000000000 +0100 @@ -20,14 +20,14 @@ static void explain(void) { fprintf(stderr, - "Usage: ... macvtap mode { private | vepa | bridge }\n" + "Usage: ... macvtap mode { private | vepa | bridge | passthru }\n" ); } static int mode_arg(void) { fprintf(stderr, "Error: argument of \"mode\" must be \"private\", " - "\"vepa\" or \"bridge\"\n"); + "\"vepa\", \"bridge\" or \"passthru\" \n"); return -1; } @@ -45,6 +45,8 @@ mode = MACVLAN_MODE_VEPA; else if (strcmp(*argv, "bridge") == 0) mode = MACVLAN_MODE_BRIDGE; + else if (strcmp(*argv, "passthru") == 0) + mode = MACVLAN_MODE_PASSTHRU; else return mode_arg(); @@ -79,6 +81,7 @@ mode == MACVLAN_MODE_PRIVATE ? "private" : mode == MACVLAN_MODE_VEPA ? "vepa" : mode == MACVLAN_MODE_BRIDGE ? "bridge" + : mode == MACVLAN_MODE_PASSTHRU ? "passthru" : "unknown"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iproute2-2.6.37/ip/iproute.c new/iproute2-2.6.38/ip/iproute.c --- old/iproute2-2.6.37/ip/iproute.c 2011-01-07 18:54:30.000000000 +0100 +++ new/iproute2-2.6.38/ip/iproute.c 2011-03-17 18:05:47.000000000 +0100 @@ -85,7 +85,7 @@ fprintf(stderr, "MP_ALGO := { rr | drr | random | wrandom }\n"); fprintf(stderr, "NHFLAGS := [ onlink | pervasive ]\n"); fprintf(stderr, "RTPROTO := [ kernel | boot | static | NUMBER ]\n"); - fprintf(stderr, "TIME := NUMBER[s|ms|us|ns|j]\n"); + fprintf(stderr, "TIME := NUMBER[s|ms]\n"); exit(-1); } @@ -526,8 +526,6 @@ if (mxrta[i] == NULL) continue; - if (!hz) - hz = get_user_hz(); if (i < sizeof(mx_names)/sizeof(char*) && mx_names[i]) fprintf(fp, " %s", mx_names[i]); @@ -549,18 +547,15 @@ case RTAX_RTT: case RTAX_RTTVAR: case RTAX_RTO_MIN: - val *= 1000; if (i == RTAX_RTT) val /= 8; else if (i == RTAX_RTTVAR) val /= 4; - if (val >= hz) - fprintf(fp, " %llums", - (unsigned long long) val / hz); + if (val >= 1000) + fprintf(fp, " %gs", val/1e3); else - fprintf(fp, " %.2fms", - (double)val / hz); + fprintf(fp, " %ums", val); } } } @@ -840,7 +835,7 @@ mxlock |= (1<<RTAX_RTT); NEXT_ARG(); } - if (get_jiffies(&rtt, *argv, 0, &raw)) + if (get_time_rtt(&rtt, *argv, &raw)) invarg("\"rtt\" value is invalid\n", *argv); rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTT, (raw) ? rtt : rtt * 8); @@ -848,7 +843,7 @@ unsigned rto_min; NEXT_ARG(); mxlock |= (1<<RTAX_RTO_MIN); - if (get_jiffies(&rto_min, *argv, 0, &raw)) + if (get_time_rtt(&rto_min, *argv, &raw)) invarg("\"rto_min\" value is invalid\n", *argv); rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTO_MIN, @@ -900,7 +895,7 @@ mxlock |= (1<<RTAX_RTTVAR); NEXT_ARG(); } - if (get_jiffies(&win, *argv, 0, &raw)) + if (get_time_rtt(&win, *argv, &raw)) invarg("\"rttvar\" value is invalid\n", *argv); rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTTVAR, (raw) ? win : win * 4); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iproute2-2.6.37/ip/ipxfrm.c new/iproute2-2.6.38/ip/ipxfrm.c --- old/iproute2-2.6.37/ip/ipxfrm.c 2011-01-07 18:54:30.000000000 +0100 +++ new/iproute2-2.6.38/ip/ipxfrm.c 2011-03-17 18:05:47.000000000 +0100 @@ -155,6 +155,7 @@ static const struct typeent algo_types[]= { { "enc", XFRMA_ALG_CRYPT }, { "auth", XFRMA_ALG_AUTH }, { "comp", XFRMA_ALG_COMP }, { "aead", XFRMA_ALG_AEAD }, + { "auth-trunc", XFRMA_ALG_AUTH_TRUNC }, { NULL, -1 } }; @@ -570,6 +571,25 @@ fprintf(fp, "%s", _SL_); } +static void xfrm_auth_trunc_print(struct xfrm_algo_auth *algo, int len, + FILE *fp, const char *prefix) +{ + struct { + struct xfrm_algo algo; + char key[algo->alg_key_len / 8]; + } base; + + memcpy(base.algo.alg_name, algo->alg_name, sizeof(base.algo.alg_name)); + base.algo.alg_key_len = algo->alg_key_len; + memcpy(base.algo.alg_key, algo->alg_key, algo->alg_key_len / 8); + + __xfrm_algo_print(&base.algo, XFRMA_ALG_AUTH_TRUNC, len, fp, prefix, 0); + + fprintf(fp, " %d", algo->alg_trunc_len); + + fprintf(fp, "%s", _SL_); +} + static void xfrm_tmpl_print(struct xfrm_user_tmpl *tmpls, int len, __u16 family, FILE *fp, const char *prefix) { @@ -677,12 +697,18 @@ fprintf(fp, "\tmark %d/0x%x\n", m->v, m->m); } - if (tb[XFRMA_ALG_AUTH]) { + if (tb[XFRMA_ALG_AUTH] && !tb[XFRMA_ALG_AUTH_TRUNC]) { struct rtattr *rta = tb[XFRMA_ALG_AUTH]; xfrm_algo_print((struct xfrm_algo *) RTA_DATA(rta), XFRMA_ALG_AUTH, RTA_PAYLOAD(rta), fp, prefix); } + if (tb[XFRMA_ALG_AUTH_TRUNC]) { + struct rtattr *rta = tb[XFRMA_ALG_AUTH_TRUNC]; + xfrm_auth_trunc_print((struct xfrm_algo_auth *) RTA_DATA(rta), + RTA_PAYLOAD(rta), fp, prefix); + } + if (tb[XFRMA_ALG_AEAD]) { struct rtattr *rta = tb[XFRMA_ALG_AEAD]; xfrm_aead_print((struct xfrm_algo_aead *)RTA_DATA(rta), @@ -850,6 +876,20 @@ xfrm_lifetime_print(&xsinfo->lft, &xsinfo->curlft, fp, buf); xfrm_stats_print(&xsinfo->stats, fp, buf); } + + if (tb[XFRMA_SEC_CTX]) { + struct xfrm_user_sec_ctx *sctx; + + fprintf(fp, "\tsecurity context "); + + if (RTA_PAYLOAD(tb[XFRMA_SEC_CTX]) < sizeof(*sctx)) + fprintf(fp, "(ERROR truncated)"); + + sctx = (struct xfrm_user_sec_ctx *)RTA_DATA(tb[XFRMA_SEC_CTX]); + + fprintf(fp, "%s %s", (char *)(sctx + 1), _SL_); + } + } void xfrm_policy_info_print(struct xfrm_userpolicy_info *xpinfo, @@ -862,6 +902,20 @@ xfrm_selector_print(&xpinfo->sel, preferred_family, fp, title); + if (tb[XFRMA_SEC_CTX]) { + struct xfrm_user_sec_ctx *sctx; + + fprintf(fp, "\tsecurity context "); + + if (RTA_PAYLOAD(tb[XFRMA_SEC_CTX]) < sizeof(*sctx)) + fprintf(fp, "(ERROR truncated)"); + + sctx = (struct xfrm_user_sec_ctx *)RTA_DATA(tb[XFRMA_SEC_CTX]); + + fprintf(fp, "%s ", (char *)(sctx + 1)); + fprintf(fp, "%s", _SL_); + } + if (prefix) STRBUF_CAT(buf, prefix); STRBUF_CAT(buf, "\t"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iproute2-2.6.37/ip/xfrm.h new/iproute2-2.6.38/ip/xfrm.h --- old/iproute2-2.6.37/ip/xfrm.h 2011-01-07 18:54:30.000000000 +0100 +++ new/iproute2-2.6.38/ip/xfrm.h 2011-03-17 18:05:47.000000000 +0100 @@ -154,5 +154,6 @@ int xfrm_selector_parse(struct xfrm_selector *sel, int *argcp, char ***argvp); int xfrm_lifetime_cfg_parse(struct xfrm_lifetime_cfg *lft, int *argcp, char ***argvp); - +int xfrm_sctx_parse(char *ctxstr, char *context, + struct xfrm_user_sec_ctx *sctx); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iproute2-2.6.37/ip/xfrm_policy.c new/iproute2-2.6.38/ip/xfrm_policy.c --- old/iproute2-2.6.37/ip/xfrm_policy.c 2011-01-07 18:54:30.000000000 +0100 +++ new/iproute2-2.6.38/ip/xfrm_policy.c 2011-03-17 18:05:47.000000000 +0100 @@ -48,14 +48,15 @@ #define NLMSG_BUF_SIZE 4096 #define RTA_BUF_SIZE 2048 #define XFRM_TMPLS_BUF_SIZE 1024 +#define CTX_BUF_SIZE 256 static void usage(void) __attribute__((noreturn)); static void usage(void) { - fprintf(stderr, "Usage: ip xfrm policy { add | update } dir DIR SELECTOR [ index INDEX ] [ ptype PTYPE ]\n"); + fprintf(stderr, "Usage: ip xfrm policy { add | update } dir DIR SELECTOR [ ctx SEC_CTX ][ index INDEX ] [ ptype PTYPE ]\n"); fprintf(stderr, " [ action ACTION ] [ priority PRIORITY ] [ flag FLAG-LIST ] [ LIMIT-LIST ] [ TMPL-LIST ] [mark MARK [mask MASK]]\n"); - fprintf(stderr, "Usage: ip xfrm policy { delete | get } dir DIR [ SELECTOR | index INDEX ] [ ptype PTYPE ] [mark MARK [mask MASK]]\n"); + fprintf(stderr, "Usage: ip xfrm policy { delete | get } dir DIR [ SELECTOR | index INDEX ] [ ctx SEC_CTX ][ ptype PTYPE ] [mark MARK [mask MASK]]\n"); fprintf(stderr, "Usage: ip xfrm policy { deleteall | list } [ dir DIR ] [ SELECTOR ]\n"); fprintf(stderr, " [ index INDEX ] [ action ACTION ] [ priority PRIORITY ] [ flag FLAG-LIST ]\n"); fprintf(stderr, "Usage: ip xfrm policy flush [ ptype PTYPE ]\n"); @@ -222,6 +223,23 @@ return 0; } +int xfrm_sctx_parse(char *ctxstr, char *s, + struct xfrm_user_sec_ctx *sctx) +{ + int slen; + + slen = strlen(s) + 1; + + sctx->exttype = XFRMA_SEC_CTX; + sctx->ctx_doi = 1; + sctx->ctx_alg = 1; + sctx->ctx_len = slen; + sctx->len = sizeof(struct xfrm_user_sec_ctx) + slen; + memcpy(ctxstr, s, slen); + + return 0; +} + static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv) { struct rtnl_handle rth; @@ -233,14 +251,20 @@ char *dirp = NULL; char *selp = NULL; char *ptypep = NULL; + char *sctxp = NULL; struct xfrm_userpolicy_type upt; char tmpls_buf[XFRM_TMPLS_BUF_SIZE]; int tmpls_len = 0; struct xfrm_mark mark = {0, 0}; + struct { + struct xfrm_user_sec_ctx sctx; + char str[CTX_BUF_SIZE]; + } ctx; memset(&req, 0, sizeof(req)); memset(&upt, 0, sizeof(upt)); memset(&tmpls_buf, 0, sizeof(tmpls_buf)); + memset(&ctx, 0, sizeof(ctx)); req.n.nlmsg_len = NLMSG_LENGTH(sizeof(req.xpinfo)); req.n.nlmsg_flags = NLM_F_REQUEST|flags; @@ -260,6 +284,15 @@ NEXT_ARG(); xfrm_policy_dir_parse(&req.xpinfo.dir, &argc, &argv); + } else if (strcmp(*argv, "ctx") == 0) { + char *context; + + if (sctxp) + duparg("ctx", *argv); + sctxp = *argv; + NEXT_ARG(); + context = *argv; + xfrm_sctx_parse((char *)&ctx.str, context, &ctx.sctx); } else if (strcmp(*argv, "mark") == 0) { xfrm_parse_mark(&mark, &argc, &argv); } else if (strcmp(*argv, "index") == 0) { @@ -347,6 +380,10 @@ } } + if (sctxp) { + addattr_l(&req.n, sizeof(req), XFRMA_SEC_CTX, + (void *)&ctx, ctx.sctx.len); + } if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0) exit(1); @@ -528,11 +565,18 @@ char *selp = NULL; char *indexp = NULL; char *ptypep = NULL; + char *sctxp = NULL; struct xfrm_userpolicy_type upt; struct xfrm_mark mark = {0, 0}; + struct { + struct xfrm_user_sec_ctx sctx; + char str[CTX_BUF_SIZE]; + } ctx; + memset(&req, 0, sizeof(req)); memset(&upt, 0, sizeof(upt)); + memset(&ctx, 0, sizeof(ctx)); req.n.nlmsg_len = NLMSG_LENGTH(sizeof(req.xpid)); req.n.nlmsg_flags = NLM_F_REQUEST; @@ -547,6 +591,15 @@ NEXT_ARG(); xfrm_policy_dir_parse(&req.xpid.dir, &argc, &argv); + } else if (strcmp(*argv, "ctx") == 0) { + char *context; + + if (sctxp) + duparg("ctx", *argv); + sctxp = *argv; + NEXT_ARG(); + context = *argv; + xfrm_sctx_parse((char *)&ctx.str, context, &ctx.sctx); } else if (strcmp(*argv, "mark") == 0) { xfrm_parse_mark(&mark, &argc, &argv); } else if (strcmp(*argv, "index") == 0) { @@ -610,6 +663,11 @@ } } + if (sctxp) { + addattr_l(&req.n, sizeof(req), XFRMA_SEC_CTX, + (void *)&ctx, ctx.sctx.len); + } + if (rtnl_talk(&rth, &req.n, 0, 0, res_nlbuf, NULL, NULL) < 0) exit(2); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iproute2-2.6.37/ip/xfrm_state.c new/iproute2-2.6.38/ip/xfrm_state.c --- old/iproute2-2.6.37/ip/xfrm_state.c 2011-01-07 18:54:30.000000000 +0100 +++ new/iproute2-2.6.38/ip/xfrm_state.c 2011-03-17 18:05:47.000000000 +0100 @@ -50,12 +50,13 @@ #define NLMSG_BUF_SIZE 4096 #define RTA_BUF_SIZE 2048 #define XFRM_ALGO_KEY_BUF_SIZE 512 +#define CTX_BUF_SIZE 256 static void usage(void) __attribute__((noreturn)); static void usage(void) { - fprintf(stderr, "Usage: ip xfrm state { add | update } ID [ XFRM_OPT ] [ mode MODE ]\n"); + fprintf(stderr, "Usage: ip xfrm state { add | update } ID [ XFRM_OPT ] [ ctx SEC_CTX ] [ mode MODE ]\n"); fprintf(stderr, " [ reqid REQID ] [ seq SEQ ] [ replay-window SIZE ] [ flag FLAG-LIST ]\n"); fprintf(stderr, " [ encap ENCAP ] [ sel SELECTOR ] [ replay-seq SEQ ]\n"); fprintf(stderr, " [ replay-oseq SEQ ] [ LIMIT-LIST ]\n"); @@ -90,11 +91,12 @@ fprintf(stderr, "ALGO-LIST := [ ALGO-LIST ] | [ ALGO ]\n"); fprintf(stderr, "ALGO := ALGO_TYPE ALGO_NAME ALGO_KEY " - "[ ALGO_ICV_LEN ]\n"); + "[ ALGO_ICV_LEN | ALGO_TRUNC_LEN ]\n"); fprintf(stderr, "ALGO_TYPE := [ "); fprintf(stderr, "%s | ", strxf_algotype(XFRMA_ALG_AEAD)); fprintf(stderr, "%s | ", strxf_algotype(XFRMA_ALG_CRYPT)); fprintf(stderr, "%s | ", strxf_algotype(XFRMA_ALG_AUTH)); + fprintf(stderr, "%s | ", strxf_algotype(XFRMA_ALG_AUTH_TRUNC)); fprintf(stderr, "%s ", strxf_algotype(XFRMA_ALG_COMP)); fprintf(stderr, "]\n"); @@ -246,10 +248,16 @@ char *aalgop = NULL; char *calgop = NULL; char *coap = NULL; + char *sctxp = NULL; struct xfrm_mark mark = {0, 0}; + struct { + struct xfrm_user_sec_ctx sctx; + char str[CTX_BUF_SIZE]; + } ctx; memset(&req, 0, sizeof(req)); memset(&replay, 0, sizeof(replay)); + memset(&ctx, 0, sizeof(ctx)); req.n.nlmsg_len = NLMSG_LENGTH(sizeof(req.xsinfo)); req.n.nlmsg_flags = NLM_F_REQUEST|flags; @@ -333,6 +341,19 @@ addattr_l(&req.n, sizeof(req.buf), XFRMA_COADDR, (void *)&xcoa, sizeof(xcoa)); + } else if (strcmp(*argv, "ctx") == 0) { + char *context; + + if (sctxp) + duparg("ctx", *argv); + sctxp = *argv; + + NEXT_ARG(); + context = *argv; + + xfrm_sctx_parse((char *)&ctx.str, context, &ctx.sctx); + addattr_l(&req.n, sizeof(req.buf), XFRMA_SEC_CTX, + (void *)&ctx, ctx.sctx.len); } else { /* try to assume ALGO */ int type = xfrm_algotype_getbyname(*argv); @@ -340,6 +361,7 @@ case XFRMA_ALG_AEAD: case XFRMA_ALG_CRYPT: case XFRMA_ALG_AUTH: + case XFRMA_ALG_AUTH_TRUNC: case XFRMA_ALG_COMP: { /* ALGO */ @@ -347,11 +369,12 @@ union { struct xfrm_algo alg; struct xfrm_algo_aead aead; + struct xfrm_algo_auth auth; } u; char buf[XFRM_ALGO_KEY_BUF_SIZE]; } alg = {}; int len; - __u32 icvlen; + __u32 icvlen, trunclen; char *name; char *key; char *buf; @@ -368,6 +391,7 @@ ealgop = *argv; break; case XFRMA_ALG_AUTH: + case XFRMA_ALG_AUTH_TRUNC: if (aalgop) duparg("ALGOTYPE", *argv); aalgop = *argv; @@ -395,21 +419,33 @@ buf = alg.u.alg.alg_key; len = sizeof(alg.u.alg); - if (type != XFRMA_ALG_AEAD) - goto parse_algo; + switch (type) { + case XFRMA_ALG_AEAD: + if (!NEXT_ARG_OK()) + missarg("ALGOICVLEN"); + NEXT_ARG(); + if (get_u32(&icvlen, *argv, 0)) + invarg("\"aead\" ICV length is invalid", + *argv); + alg.u.aead.alg_icv_len = icvlen; - if (!NEXT_ARG_OK()) - missarg("ALGOICVLEN"); - NEXT_ARG(); - if (get_u32(&icvlen, *argv, 0)) - invarg("\"aead\" ICV length is invalid", - *argv); - alg.u.aead.alg_icv_len = icvlen; + buf = alg.u.aead.alg_key; + len = sizeof(alg.u.aead); + break; + case XFRMA_ALG_AUTH_TRUNC: + if (!NEXT_ARG_OK()) + missarg("ALGOTRUNCLEN"); + NEXT_ARG(); + if (get_u32(&trunclen, *argv, 0)) + invarg("\"auth\" trunc length is invalid", + *argv); + alg.u.auth.alg_trunc_len = trunclen; - buf = alg.u.aead.alg_key; - len = sizeof(alg.u.aead); + buf = alg.u.auth.alg_key; + len = sizeof(alg.u.auth); + break; + } -parse_algo: xfrm_algo_parse((void *)&alg, type, name, key, buf, sizeof(alg.buf)); len += alg.u.alg.alg_key_len; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iproute2-2.6.37/lib/utils.c new/iproute2-2.6.38/lib/utils.c --- old/iproute2-2.6.37/lib/utils.c 2011-01-07 18:54:30.000000000 +0100 +++ new/iproute2-2.6.38/lib/utils.c 2011-03-17 18:05:47.000000000 +0100 @@ -93,14 +93,13 @@ } /* - * get_jiffies is "translated" from a similar routine "get_time" in - * tc_util.c. we don't use the exact same routine because tc passes - * microseconds to the kernel and the callers of get_jiffies want - * to pass jiffies, and have a different assumption for the units of - * a "raw" number. + * get_time_rtt is "translated" from a similar routine "get_time" in + * tc_util.c. We don't use the exact same routine because tc passes + * microseconds to the kernel and the callers of get_time_rtt want to + * pass milliseconds (standard unit for rtt values since 2.6.27), and + * have a different assumption for the units of a "raw" number. */ - -int get_jiffies(unsigned *jiffies, const char *arg, int base, int *raw) +int get_time_rtt(unsigned *val, const char *arg, int *raw) { double t; unsigned long res; @@ -112,35 +111,22 @@ return -1; } else { - res = strtoul(arg,&p,base); + res = strtoul(arg, &p, 0); if (res > UINT_MAX) return -1; t = (double)res; } if (p == arg) return -1; - - if (__iproute2_hz_internal == 0) - __iproute2_hz_internal = __get_hz(); - *raw = 1; if (*p) { *raw = 0; if (strcasecmp(p, "s") == 0 || strcasecmp(p, "sec")==0 || strcasecmp(p, "secs")==0) - t *= __iproute2_hz_internal; + t *= 1000; else if (strcasecmp(p, "ms") == 0 || strcasecmp(p, "msec")==0 || strcasecmp(p, "msecs") == 0) - t *= __iproute2_hz_internal/1000.0; - else if (strcasecmp(p, "us") == 0 || strcasecmp(p, "usec")==0 || - strcasecmp(p, "usecs") == 0) - t *= __iproute2_hz_internal/1000000.0; - else if (strcasecmp(p, "ns") == 0 || strcasecmp(p, "nsec")==0 || - strcasecmp(p, "nsecs") == 0) - t *= __iproute2_hz_internal/1000000000.0; - else if (strcasecmp(p, "j") == 0 || strcasecmp(p, "hz") == 0 || - strcasecmp(p,"jiffies") == 0) t *= 1.0; /* allow suffix, do nothing */ else return -1; @@ -148,9 +134,9 @@ /* emulate ceil() without having to bring-in -lm and always be >= 1 */ - *jiffies = t; - if (*jiffies < t) - *jiffies += 1; + *val = t; + if (*val < t) + *val += 1; return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iproute2-2.6.37/man/man8/ip.8 new/iproute2-2.6.38/man/man8/ip.8 --- old/iproute2-2.6.37/man/man8/ip.8 2011-01-07 18:54:30.000000000 +0100 +++ new/iproute2-2.6.38/man/man8/ip.8 2011-03-17 18:05:47.000000000 +0100 @@ -42,7 +42,7 @@ .RB "[ " mtu .IR MTU " ]" .br -.BR type TYPE +.BR type " TYPE" .RI "[ " ARGS " ]" .ti -8 @@ -51,7 +51,7 @@ .ti -8 .BI "ip link delete " DEVICE -.BI type TYPE +.BI type " TYPE" .RI "[ " ARGS " ]" .ti -8 @@ -391,7 +391,7 @@ .IR KEY " := { " DOTTED_QUAD " | " NUMBER " }" .ti -8 -.IR TIME " := " NUMBER "[s|ms|us|ns|j]" +.IR TIME " := " NUMBER "[s|ms]" .ti -8 .BR "ip maddr" " [ " add " | " del " ]" @@ -1616,10 +1616,7 @@ specified the units are raw values passed directly to the routing code to maintain compatibility with previous releases. Otherwise if a suffix of s, sec or secs is used to specify -seconds; ms, msec or msecs to specify milliseconds; us, usec -or usecs to specify microseconds; ns, nsec or nsecs to specify -nanoseconds; j, hz or jiffies to specify jiffies, the value is -converted to what the routing code expects. +seconds and ms, msec or msecs to specify milliseconds. .TP ++++++ iproute2-2.6.29-1-HZ.diff -> iproute2-HZ.diff ++++++ ++++++ iproute2-2.6.29-1-libdir-1.diff -> iproute2-libdir-1.diff ++++++ ++++++ iproute2-2.6.29-1-memleak.diff -> iproute2-memleak.diff ++++++ ++++++ iproute2-2.6.29-1-pdfdoc.diff -> iproute2-pdfdoc.diff ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bluez for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package bluez for openSUSE:Factory checked in at Thu Mar 24 09:20:11 CET 2011. -------- --- bluez/bluez-gstreamer.changes 2011-02-21 08:57:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/bluez/bluez-gstreamer.changes 2011-03-18 11:46:09.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Mar 18 10:23:18 UTC 2011 - seife+obs(a)b1-systems.com + +- update to bluez-4.90: + - Fix issue with setting of global mode property. + - Fix issue with handling of RequestSession responses. + - Fix issue with TP_BNEP_CTRL_BV_01_C qualification test. + - Fix issue with too short AVDTP request timeout. + - Add support for SIM Access Profile manager. + - Add support for new UUID utility functions. + - Add support for attribute server notifications. + - Add support for client characteristic configuration. + - Update support for interactive GATT utility. + +------------------------------------------------------------------- bluez.changes: same change calling whatdependson for head-i586 Old: ---- bluez-4.89.tar.bz2 New: ---- bluez-4.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-gstreamer.spec ++++++ --- /var/tmp/diff_new_pack.JHNQz9/_old 2011-03-24 09:15:59.000000000 +0100 +++ /var/tmp/diff_new_pack.JHNQz9/_new 2011-03-24 09:15:59.000000000 +0100 @@ -30,7 +30,7 @@ BuildRequires: gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel BuildRequires: readline-devel Url: http://www.bluez.org -Version: 4.89 +Version: 4.90 Release: 1 Summary: Bluetooth Sound Support Group: Productivity/Multimedia/Sound/Utilities ++++++ bluez.spec ++++++ --- /var/tmp/diff_new_pack.JHNQz9/_old 2011-03-24 09:15:59.000000000 +0100 +++ /var/tmp/diff_new_pack.JHNQz9/_new 2011-03-24 09:15:59.000000000 +0100 @@ -29,7 +29,7 @@ BuildRequires: alsa-devel libsndfile-devel pkg-config udev BuildRequires: readline-devel Url: http://www.bluez.org -Version: 4.89 +Version: 4.90 Release: 1 Summary: Bluetooth Stack for Linux Group: Hardware/Mobile ++++++ bluez-4.89.tar.bz2 -> bluez-4.90.tar.bz2 ++++++ ++++ 9691 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 libsndfile for openSUSE:Factory
by root＠hilbert.suse.de 24 Mar '11

24 Mar '11

Hello community, here is the log from the commit of package libsndfile for openSUSE:Factory checked in at Thu Mar 24 09:15:32 CET 2011. -------- --- libsndfile/libsndfile-progs.changes 2010-10-13 00:51:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/libsndfile/libsndfile-progs.changes 2011-03-23 14:06:37.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Mar 23 13:01:06 UTC 2011 - oliver.bengs(a)opensuse.org + +- Update to version 1.0.24 +- Upstream changes : + * WAV files are now written with an 18 byte u-law and A-law fmt chunk + * A document on virtual I/O functionality was added + * Two new methods were added in sndfile.hh + * A fix was made for a non-zero SSND offset values on AIFF + * Minor bug fixes and improvements were done + +------------------------------------------------------------------- --- libsndfile/libsndfile.changes 2010-10-13 00:43:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/libsndfile/libsndfile.changes 2011-03-23 14:06:38.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Mar 23 12:58:38 UTC 2011 - oliver.bengs(a)opensuse.org + +- Update to version 1.0.24 +- Upstream changes : + * WAV files are now written with an 18 byte u-law and A-law fmt chunk + * A document on virtual I/O functionality was added + * Two new methods were added in sndfile.hh + * A fix was made for a non-zero SSND offset values on AIFF + * Minor bug fixes and improvements were done + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libsndfile-1.0.23.tar.bz2 New: ---- libsndfile-1.0.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsndfile-progs.spec ++++++ --- /var/tmp/diff_new_pack.4WAMmO/_old 2011-03-24 09:15:11.000000000 +0100 +++ /var/tmp/diff_new_pack.4WAMmO/_new 2011-03-24 09:15:11.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libsndfile-progs (Version 1.0.23) +# spec file for package libsndfile-progs # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,7 +20,7 @@ Name: libsndfile-progs BuildRequires: alsa-devel flac-devel gcc-c++ libjack-devel libvorbis-devel pkgconfig sqlite-devel Summary: Example Programs for libsndfile -Version: 1.0.23 +Version: 1.0.24 Release: 1 License: LGPLv2.1+ Group: System/Libraries libsndfile.spec: same change ++++++ libsndfile-1.0.23.tar.bz2 -> libsndfile-1.0.24.tar.bz2 ++++++ ++++ 33333 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 zfs-fuse for openSUSE:11.4
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package zfs-fuse for openSUSE:11.4 checked in at Wed Mar 23 19:47:00 CET 2011. -------- --- old-versions/11.4/all/zfs-fuse/zfs-fuse.changes 2010-12-02 12:58:22.000000000 +0100 +++ 11.4/zfs-fuse/zfs-fuse.changes 2011-03-22 16:44:51.000000000 +0100 @@ -1,0 +2,19 @@ +Tue Mar 22 15:36:54 UTC 2011 - gber(a)opensuse.org + +- updated to a current snapshot of the maint-0.6.9 maintenance + branch (0.6.9_git20110322) + - use drop_caches to clear the page cache in order to prevent fs + corruption (issue #65, bnc#679173) + - fixed ZFSFUSE_BUSY_SLEEP_FACTOR typo causing overlong delays + - fixed a bad mem ref in do_mount + - fixed zfsrc parse error when no line-end on last line + (issue #64) + - do not link zfs, zpool and zdb against libssl + - gcc 4.5 compatibility + - buildsystem fixes +- dropped obsolete zfs-fuse-0.6.9-gcc-4.5-fix.patch +- added zfs-fuse-0.7.0-fix-gcc-false-warnings.patch to silence + gcc false positive warning causing a fatal error in the + post-build-checks + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/zfs-fuse Destination is old-versions/11.4/UPDATES/all/zfs-fuse calling whatdependson for 11.4-i586 Old: ---- zfs-fuse-0.6.9-gcc-4.5-fix.patch zfs-fuse-0.6.9.tar.bz2 New: ---- zfs-fuse-0.6.9-fix-gcc-false-warnings.patch zfs-fuse-0.6.9_git20110322.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zfs-fuse.spec ++++++ --- /var/tmp/diff_new_pack.6CpWF9/_old 2011-03-23 19:46:45.000000000 +0100 +++ /var/tmp/diff_new_pack.6CpWF9/_new 2011-03-23 19:46:45.000000000 +0100 @@ -18,13 +18,13 @@ Name: zfs-fuse -Version: 0.6.9 -Release: 1 +Version: 0.6.9_git20110322 +Release: 0.<RELEASE2> Summary: A port of ZFS to the FUSE framework for the Linux operating system License: CDDL 1.0 Group: System/Filesystems Url: http://zfs-fuse.net/ -Source: http://zfs-fuse.net/releases/%{version}/zfs-fuse-%{version}.tar.bz2 +Source: zfs-fuse-%{version}.tar.bz2 Source1: zfs-fuse.init Source2: sysconfig.zfs-fuse Source3: zfsrc @@ -32,7 +32,7 @@ Patch1: zfs-fuse-0.6.9-fix-buildsystem.patch Patch2: zfs-fuse-0.6.9-fix-strncat-usage.patch Patch3: zfs-fuse-0.6.9-fix-executable-stack.patch -Patch4: zfs-fuse-0.6.9-gcc-4.5-fix.patch +Patch4: zfs-fuse-0.6.9-fix-gcc-false-warnings.patch BuildRequires: fuse-devel BuildRequires: libattr-devel BuildRequires: libaio-devel @@ -54,11 +54,6 @@ mount, use and manage ZFS file systems under Linux, bringing the uncontested reliability and large feature set of ZFS to the Linux world. -Authors: --------- - <rudd-o(a)rudd-o.com> - Ricardo Correia <rcorreia(a)wizy.org> - %prep %setup -q ++++++ zfs-fuse-0.6.9-fix-buildsystem.patch ++++++ --- /var/tmp/diff_new_pack.6CpWF9/_old 2011-03-23 19:46:45.000000000 +0100 +++ /var/tmp/diff_new_pack.6CpWF9/_new 2011-03-23 19:46:45.000000000 +0100 @@ -1,16 +1,18 @@ -diff -ur zfs-fuse-0.6.9.orig/src/lib/libumem/SConscript zfs-fuse-0.6.9/src/lib/libumem/SConscript ---- zfs-fuse-0.6.9.orig/src/lib/libumem/SConscript 2010-06-04 21:03:04.000000000 +0200 -+++ zfs-fuse-0.6.9/src/lib/libumem/SConscript 2010-11-17 15:38:58.000000000 +0100 -@@ -1,5 +1,5 @@ +diff -urNp zfs-fuse-0.7.0.orig/src/lib/libumem/SConscript zfs-fuse-0.7.0/src/lib/libumem/SConscript +--- zfs-fuse-0.7.0.orig/src/lib/libumem/SConscript 2011-03-09 16:22:30.000000000 +0100 ++++ zfs-fuse-0.7.0/src/lib/libumem/SConscript 2011-03-10 12:15:14.000000000 +0100 +@@ -1,7 +1,7 @@ + import os Import('env') -Command("Makefile", [], ["cd lib/libumem && ./configure"]) +Command("Makefile", [], [env.subst("cd lib/libumem && CFLAGS=\"$CCFLAGS\" CPPFLAGS=\"$CPPFLAGS\" LDFLAGS=\"$LINKFLAGS\" ./configure").replace("-std=c99", "-std=gnu99")]) Command("libumem.a", [Glob('*.c'),'Makefile',Glob('*.h')], ["cd lib/libumem && make && rm -f libumem.a && ln -s .libs/libumem.a"]) - -diff -ur zfs-fuse-0.6.9.orig/src/lib/libzpool/vdev.c zfs-fuse-0.6.9/src/lib/libzpool/vdev.c ---- zfs-fuse-0.6.9.orig/src/lib/libzpool/vdev.c 2010-06-04 21:03:04.000000000 +0200 -+++ zfs-fuse-0.6.9/src/lib/libzpool/vdev.c 2010-11-17 15:21:45.000000000 +0100 + if os.path.isfile("Makefile") and env.GetOption('clean'): + Execute(Action(["make -C %s distclean" % (os.path.join(env.Dir("#").abspath, 'lib/libumem'))])) +diff -urNp zfs-fuse-0.7.0.orig/src/lib/libzpool/vdev.c zfs-fuse-0.7.0/src/lib/libzpool/vdev.c +--- zfs-fuse-0.7.0.orig/src/lib/libzpool/vdev.c 2011-03-09 16:22:30.000000000 +0100 ++++ zfs-fuse-0.7.0/src/lib/libzpool/vdev.c 2011-03-10 12:15:14.000000000 +0100 @@ -43,6 +43,10 @@ #include <syslog.h> #include <libintl.h> @@ -22,7 +24,7 @@ /* * Virtual device management. */ -@@ -3056,7 +3060,7 @@ +@@ -3056,7 +3060,7 @@ vdev_set_state(vdev_t *vd, boolean_t iso return; // nothing of interest here } if (strcasecmp(top->spa_name,"$import")) { @@ -31,18 +33,18 @@ syslog(LOG_WARNING,"running zfs_pool_alert for pool %s, status %s prev status %s",top->spa_name,zpool_state_to_name(state,save_state), zpool_state_to_name(save_state,state)); int ret = system(cmd); -diff -ur zfs-fuse-0.6.9.orig/src/SConstruct zfs-fuse-0.6.9/src/SConstruct ---- zfs-fuse-0.6.9.orig/src/SConstruct 2010-06-04 21:03:04.000000000 +0200 -+++ zfs-fuse-0.6.9/src/SConstruct 2010-11-17 15:24:44.000000000 +0100 -@@ -8,6 +8,7 @@ - install_dir = ARGUMENTS.get('install_dir', '/usr/local/sbin') - man_dir = ARGUMENTS.get('man_dir', '/usr/local/share/man/man8/') - cfg_dir = ARGUMENTS.get('cfg_dir', '/etc/zfs') -+libexec_dir = ARGUMENTS.get('libexec_dir', '/usr/local/lib/zfs-fuse') +diff -urNp zfs-fuse-0.7.0.orig/src/SConstruct zfs-fuse-0.7.0/src/SConstruct +--- zfs-fuse-0.7.0.orig/src/SConstruct 2011-03-09 16:22:30.000000000 +0100 ++++ zfs-fuse-0.7.0/src/SConstruct 2011-03-10 12:57:49.000000000 +0100 +@@ -22,6 +22,7 @@ def arg_get(name, default): + install_dir = arg_get('install_dir', '/usr/local/sbin') + man_dir = arg_get('man_dir', '/usr/local/share/man/man8/') + cfg_dir = arg_get('cfg_dir', '/etc/zfs') ++libexec_dir = arg_get('libexec_dir', '/usr/local/lib/zfs-fuse') env = Environment() -@@ -16,28 +17,22 @@ +@@ -30,8 +31,13 @@ osname = f.readline().strip() f.close() env.CacheDir('/tmp/.zfs-fuse.scons') @@ -57,23 +59,30 @@ env['CCFLAGS'] = Split('-pipe -Wall -std=c99 -Wno-switch -Wno-unused -Wno-missing-braces -Wno-parentheses -Wno-uninitialized -fno-strict-aliasing -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DTEXT_DOMAIN=\\"zfs-fuse\\" ') if osname == "Linux": - env.Append(CPPFLAGS = " -DLINUX_AIO") +@@ -40,25 +46,12 @@ if osname == "Linux": + debug = int(ARGUMENTS.get('debug', '0')) + optim = ARGUMENTS.get('optim', '-O2') --debug = int(ARGUMENTS.get('debug', '0')) -- -if not debug: - env.Append(LINKFLAGS = ['-s']) -- env.Append(CCFLAGS = Split('-s -O2 -DNDEBUG')) +- env.Append(CCFLAGS = Split(" ".join(["-s -DNDEBUG", optim]))); -else: - env.Append(LINKFLAGS = ['-ggdb']) - env.Append(CCFLAGS = ['-ggdb']) -# Be careful here, one of DEBUG or NDEBUG must be defined, if you undef both, you'll get unexpected results - if debug == 1: -- env.Append(CCFLAGS = Split('-O2 -DDEBUG')) +- env.Append(CCFLAGS = Split(" ".join(["-DNDEBUG", optim]))); - elif debug == 2: - env.Append(CCFLAGS = ['-DDEBUG']) - elif debug == 3: - env.Append(CCFLAGS = Split('-finstrument-functions -DDEBUG')) ++env.Append(CCFLAGS = ['-DNDEBUG']) + +-if not (('-DDEBUG' in env['CCFLAGS']) or +- ('-DNDEBUG' in env['CCFLAGS'])): +- print +- print "Misconfigured debug level: Neither DEBUG or NDEBUG appears to have been defined: %s" % env['CCFLAGS'] +- sys.exit(1) +if 'CPPFLAGS' in os.environ: + env.Append(CPPFLAGS = " "+os.environ['CPPFLAGS']) +if 'CCFLAGS' in os.environ: @@ -81,16 +90,16 @@ env['CPPPATH'] = [] -@@ -99,7 +94,7 @@ +@@ -120,7 +113,7 @@ env.Install(install_dir, 'cmd/zpool/zpoo env.Install(install_dir, 'cmd/zfs/zfs') env.Install(install_dir, 'zfs-fuse/zfs-fuse') env.Install(install_dir, 'cmd/zstreamdump/zstreamdump') -env.Install(cfg_dir, '../contrib/zfs_pool_alert') +env.Install(libexec_dir, '../contrib/zfs_pool_alert') - env.Install(man_dir, '../doc/zdb.8.gz') - env.Install(man_dir, '../doc/zfs.8.gz') -@@ -110,4 +105,4 @@ + env.Install(man_dir, '../doc/zdb.8') + env.Install(man_dir, '../doc/zfs.8') +@@ -132,4 +125,4 @@ if "tags" in sys.argv: print "updating tags..." os.system("ctags --extra=+f `find -name '*.c'` `find -name '*.h'`") ++++++ zfs-fuse-0.6.9-fix-gcc-false-warnings.patch ++++++ diff -urNp zfs-fuse-0.7.0.orig/src/lib/libumem/umem_update_thread.c zfs-fuse-0.7.0/src/lib/libumem/umem_update_thread.c --- zfs-fuse-0.7.0.orig/src/lib/libumem/umem_update_thread.c 2011-03-09 16:22:30.000000000 +0100 +++ zfs-fuse-0.7.0/src/lib/libumem/umem_update_thread.c 2011-03-10 14:03:58.000000000 +0100 @@ -41,7 +41,7 @@ extern int _cond_timedwait(cond_t *cv, mutex_t *mutex, const timespec_t *delay); /*ARGSUSED*/ -static THR_RETURN +__attribute__ ((noreturn)) static THR_RETURN THR_API umem_update_thread(void *arg) { struct timeval now; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pstoedit for openSUSE:11.2
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package pstoedit for openSUSE:11.2 checked in at Wed Mar 23 19:46:29 CET 2011. -------- --- old-versions/11.2/all/pstoedit/pstoedit.changes 2009-08-12 19:11:06.000000000 +0200 +++ /mounts/work_src_done/11.2/pstoedit/pstoedit.changes 2011-03-23 19:46:05.881224000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 7 10:54:14 CET 2010 - sweet_f_a(a)gmx.de +- fix segfault at program termination + (see Novell/Suse Bugzilla #555599 ) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.2/all/pstoedit Destination is old-versions/11.2/UPDATES/all/pstoedit calling whatdependson for 11.2-i586 New: ---- pstoedit-segfault_at_termination.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pstoedit.spec ++++++ --- /var/tmp/diff_new_pack.YyVZJF/_old 2011-03-23 19:46:19.000000000 +0100 +++ /var/tmp/diff_new_pack.YyVZJF/_new 2011-03-23 19:46:19.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package pstoedit (Version 3.50) +# spec file for package pstoedit # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -24,16 +24,17 @@ %endif # FIXME: Not yet in openSUSE: #BuildRequires: libming-devel -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Publishing/PS Requires: ghostscript_any Summary: PostScript and PDF Converter Version: 3.50 -Release: 1 +Release: 2.<RELEASE5> Url: http://www.pstoedit.net/ # URL for Source: http://prdownloads.sourceforge.net/pstoedit/pstoedit-3.50.tar.gz?download Source: %{name}-%{version}.tar.bz2 Patch1: pstoedit-no_builddir_in_la_file.patch +Patch2: pstoedit-segfault_at_termination.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -105,7 +106,7 @@ Wolfgang Glunz <wglunz34(a)pstoedit.net> %package devel -License: GPL v2 or later +License: GPLv2+ Summary: PostScript and PDF converter (development files) Group: Productivity/Publishing/PS Requires: %{name} = %{version} @@ -124,6 +125,7 @@ %prep %setup -q %patch1 +%patch2 chmod -x examples/*.ps examples/Makefile* doc/*.* copying %build ++++++ pstoedit-segfault_at_termination.patch ++++++ --- src/dynload.cpp.orig 2009-06-21 17:10:24.000000000 +0200 +++ src/dynload.cpp 2010-01-07 16:55:17.000000000 +0100 @@ -135,7 +135,8 @@ void DynLoader::close() { if (handle) { #if defined(__linux) || defined(__linux__) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__hpux) || defined(__sparc) || defined(__OS2__) || defined(_AIX) || (defined (HAVE_DLFCN_H) && (HAVE_DLFCN_H==1 ) ) - dlclose(handle); + /* disabled because deinitializing plugins seem to cause segfaults at program termination */ + /* dlclose(handle); */ #elif defined(_WIN32) (void) WINFREELIB((HINSTANCE) handle); #else ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mozilla-xulrunner192 for openSUSE:11.4
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package mozilla-xulrunner192 for openSUSE:11.4 checked in at Wed Mar 23 16:47:36 CET 2011. -------- --- old-versions/11.4/UPDATES/all/mozilla-xulrunner192/mozilla-xulrunner192.changes 2011-03-07 08:14:10.000000000 +0100 +++ 11.4/mozilla-xulrunner192/mozilla-xulrunner192.changes 2011-03-23 00:54:39.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 19 22:11:41 UTC 2011 - wr(a)rosenauer.org + +- security update to 1.9.2.16 (bnc#680771) + * MFSA 2011-11 + Update HTTPS certificate blacklist (bmo#642395) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- l10n-1.9.2.15.tar.bz2 xulrunner-source-1.9.2.15.tar.bz2 New: ---- l10n-1.9.2.16.tar.bz2 xulrunner-source-1.9.2.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner192.spec ++++++ --- /var/tmp/diff_new_pack.KhxSlm/_old 2011-03-23 16:47:26.000000000 +0100 +++ /var/tmp/diff_new_pack.KhxSlm/_new 2011-03-23 16:47:26.000000000 +0100 @@ -39,12 +39,12 @@ BuildRequires: wireless-tools %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 1.9.2.15 +Version: 1.9.2.16 Release: 0.<RELEASE2> -%define releasedate 2011030300 -%define version_internal 1.9.2.15 +%define releasedate 2011031900 +%define version_internal 1.9.2.16 %define apiversion 1.9.2 -%define uaweight 192150 +%define uaweight 192160 Summary: Mozilla Runtime Environment 1.9.2 Url: http://www.mozilla.org Group: Productivity/Other ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.KhxSlm/_old 2011-03-23 16:47:26.000000000 +0100 +++ /var/tmp/diff_new_pack.KhxSlm/_new 2011-03-23 16:47:26.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_6_15_RELEASE" -VERSION="1.9.2.15" +RELEASE_TAG="FIREFOX_3_6_16_RELEASE" +VERSION="1.9.2.16" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla ++++++ l10n-1.9.2.15.tar.bz2 -> l10n-1.9.2.16.tar.bz2 ++++++ old-versions/11.4/UPDATES/all/mozilla-xulrunner192/l10n-1.9.2.15.tar.bz2 11.4/mozilla-xulrunner192/l10n-1.9.2.16.tar.bz2 differ: char 11, line 1 ++++++ xulrunner-source-1.9.2.15.tar.bz2 -> xulrunner-source-1.9.2.16.tar.bz2 ++++++ old-versions/11.4/UPDATES/all/mozilla-xulrunner192/xulrunner-source-1.9.2.15.tar.bz2 11.4/mozilla-xulrunner192/xulrunner-source-1.9.2.16.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 seamonkey for openSUSE:11.4
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package seamonkey for openSUSE:11.4 checked in at Wed Mar 23 16:47:08 CET 2011. -------- --- old-versions/11.4/UPDATES/all/seamonkey/seamonkey.changes 2011-03-02 08:30:32.000000000 +0100 +++ 11.4/seamonkey/seamonkey.changes 2011-03-23 07:45:39.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 23 06:32:52 UTC 2011 - wr(a)rosenauer.org + +- security update to version 2.0.13 (bnc#680771) + * MFSA 2011-11 (bmo#642395) + Update HTTPS certificate blacklist + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- l10n-2.0.12.tar.bz2 seamonkey-2.0.12-source.tar.bz2 New: ---- l10n-2.0.13.tar.bz2 seamonkey-2.0.13-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seamonkey.spec ++++++ --- /var/tmp/diff_new_pack.gx84dK/_old 2011-03-23 16:46:53.000000000 +0100 +++ /var/tmp/diff_new_pack.gx84dK/_new 2011-03-23 16:46:53.000000000 +0100 @@ -29,7 +29,7 @@ %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Provides: web_browser -Version: 2.0.12 +Version: 2.0.13 Release: 0.<RELEASE2> Summary: The successor of the Mozilla Application Suite Url: http://www.mozilla.org/projects/seamonkey @@ -62,7 +62,7 @@ Obsoletes: seamonkey-mail <= 2.0 Provides: seamonkey-spellchecker = %{version} Obsoletes: seamonkey-spellchecker <= 2.0 -%define releasedate 2011012100 +%define releasedate 2011032000 %define progname %{name} %define prefix /usr %define progdir %_libdir/%{progname} ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.gx84dK/_old 2011-03-23 16:46:53.000000000 +0100 +++ /var/tmp/diff_new_pack.gx84dK/_new 2011-03-23 16:46:53.000000000 +0100 @@ -1,8 +1,8 @@ #!/bin/bash BRANCH="releases/comm-1.9.1" -RELEASE_TAG="SEAMONKEY_2_0_12_RELEASE" -VERSION="2.0.12" +RELEASE_TAG="SEAMONKEY_2_0_13_RELEASE" +VERSION="2.0.13" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH seamonkey ++++++ l10n-2.0.12.tar.bz2 -> l10n-2.0.13.tar.bz2 ++++++ old-versions/11.4/UPDATES/all/seamonkey/l10n-2.0.12.tar.bz2 11.4/seamonkey/l10n-2.0.13.tar.bz2 differ: char 11, line 1 ++++++ seamonkey-2.0.12-source.tar.bz2 -> seamonkey-2.0.13-source.tar.bz2 ++++++ old-versions/11.4/UPDATES/all/seamonkey/seamonkey-2.0.12-source.tar.bz2 11.4/seamonkey/seamonkey-2.0.13-source.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 mozilla-xulrunner191 for openSUSE:11.3
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package mozilla-xulrunner191 for openSUSE:11.3 checked in at Wed Mar 23 16:46:24 CET 2011. -------- --- old-versions/11.3/UPDATES/all/mozilla-xulrunner191/mozilla-xulrunner191.changes 2011-03-02 08:41:36.000000000 +0100 +++ 11.3/mozilla-xulrunner191/mozilla-xulrunner191.changes 2011-03-23 01:11:18.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 19 22:17:36 UTC 2011 - wr(a)rosenauer.org + +- security update to 1.9.1.18 (bnc#680771) + * MFSA 2011-11 (bmo#642395) + Update HTTPS certificate blacklist + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 Old: ---- l10n-1.9.1.17.tar.bz2 xulrunner-source-1.9.1.17.tar.bz2 New: ---- l10n-1.9.1.18.tar.bz2 xulrunner-source-1.9.1.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner191.spec ++++++ --- /var/tmp/diff_new_pack.yugNJc/_old 2011-03-23 16:46:09.000000000 +0100 +++ /var/tmp/diff_new_pack.yugNJc/_new 2011-03-23 16:46:09.000000000 +0100 @@ -33,7 +33,7 @@ BuildRequires: nss-shared-helper-devel %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 1.9.1.17 +Version: 1.9.1.18 Release: 0.<RELEASE2> Summary: Mozilla Runtime Environment 1.9.1 Url: http://www.mozilla.org @@ -90,10 +90,10 @@ %if %suse_version > 1110 %define has_system_cairo 1 %endif -%define releasedate 2011013000 +%define releasedate 2011031900 %define version_internal %{version} %define apiversion 1.9.1 -%define uaweight 191170 +%define uaweight 191180 ### configuration end ### %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE2} ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.yugNJc/_old 2011-03-23 16:46:09.000000000 +0100 +++ /var/tmp/diff_new_pack.yugNJc/_new 2011-03-23 16:46:09.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_5_17_RELEASE" -VERSION="1.9.1.17" +RELEASE_TAG="FIREFOX_3_5_18_RELEASE" +VERSION="1.9.1.18" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.1 mozilla ++++++ l10n-1.9.1.17.tar.bz2 -> l10n-1.9.1.18.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/mozilla-xulrunner191/l10n-1.9.1.17.tar.bz2 11.3/mozilla-xulrunner191/l10n-1.9.1.18.tar.bz2 differ: char 11, line 1 ++++++ xulrunner-source-1.9.1.17.tar.bz2 -> xulrunner-source-1.9.1.18.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/mozilla-xulrunner191/xulrunner-source-1.9.1.17.tar.bz2 11.3/mozilla-xulrunner191/xulrunner-source-1.9.1.18.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 seamonkey for openSUSE:11.3
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package seamonkey for openSUSE:11.3 checked in at Wed Mar 23 16:45:53 CET 2011. -------- --- old-versions/11.3/UPDATES/all/seamonkey/seamonkey.changes 2011-03-02 08:30:32.000000000 +0100 +++ 11.3/seamonkey/seamonkey.changes 2011-03-23 07:45:39.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 23 06:32:52 UTC 2011 - wr(a)rosenauer.org + +- security update to version 2.0.13 (bnc#680771) + * MFSA 2011-11 (bmo#642395) + Update HTTPS certificate blacklist + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 Old: ---- l10n-2.0.12.tar.bz2 seamonkey-2.0.12-source.tar.bz2 New: ---- l10n-2.0.13.tar.bz2 seamonkey-2.0.13-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seamonkey.spec ++++++ --- /var/tmp/diff_new_pack.mzlCPQ/_old 2011-03-23 16:45:43.000000000 +0100 +++ /var/tmp/diff_new_pack.mzlCPQ/_new 2011-03-23 16:45:43.000000000 +0100 @@ -29,7 +29,7 @@ %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Provides: web_browser -Version: 2.0.12 +Version: 2.0.13 Release: 0.<RELEASE2> Summary: The successor of the Mozilla Application Suite Url: http://www.mozilla.org/projects/seamonkey @@ -62,7 +62,7 @@ Obsoletes: seamonkey-mail <= 2.0 Provides: seamonkey-spellchecker = %{version} Obsoletes: seamonkey-spellchecker <= 2.0 -%define releasedate 2011012100 +%define releasedate 2011032000 %define progname %{name} %define prefix /usr %define progdir %_libdir/%{progname} ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.mzlCPQ/_old 2011-03-23 16:45:43.000000000 +0100 +++ /var/tmp/diff_new_pack.mzlCPQ/_new 2011-03-23 16:45:43.000000000 +0100 @@ -1,8 +1,8 @@ #!/bin/bash BRANCH="releases/comm-1.9.1" -RELEASE_TAG="SEAMONKEY_2_0_12_RELEASE" -VERSION="2.0.12" +RELEASE_TAG="SEAMONKEY_2_0_13_RELEASE" +VERSION="2.0.13" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH seamonkey ++++++ l10n-2.0.12.tar.bz2 -> l10n-2.0.13.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/seamonkey/l10n-2.0.12.tar.bz2 11.3/seamonkey/l10n-2.0.13.tar.bz2 differ: char 11, line 1 ++++++ seamonkey-2.0.12-source.tar.bz2 -> seamonkey-2.0.13-source.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/seamonkey/seamonkey-2.0.12-source.tar.bz2 11.3/seamonkey/seamonkey-2.0.13-source.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 MozillaFirefox for openSUSE:11.3
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:11.3 checked in at Wed Mar 23 16:45:23 CET 2011. -------- --- old-versions/11.3/UPDATES/all/MozillaFirefox/MozillaFirefox.changes 2011-03-07 08:15:39.000000000 +0100 +++ 11.3/MozillaFirefox/MozillaFirefox.changes 2011-03-23 07:21:52.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 19 22:13:40 UTC 2011 - wr(a)rosenauer.org + +- security update to 3.6.16 (bnc#680771) + * MFSA 2011-11 (bmo#642395) + Update HTTPS certificate blacklist + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 Old: ---- firefox-3.6.15-source.tar.bz2 l10n-3.6.15.tar.bz2 New: ---- firefox-3.6.16-source.tar.bz2 l10n-3.6.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.yNNqed/_old 2011-03-23 16:44:31.000000000 +0100 +++ /var/tmp/diff_new_pack.yNNqed/_new 2011-03-23 16:44:31.000000000 +0100 @@ -22,7 +22,7 @@ Name: MozillaFirefox %define xulrunner mozilla-xulrunner192 BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip -BuildRequires: %{xulrunner}-devel = 1.9.2.15 +BuildRequires: %{xulrunner}-devel = 1.9.2.16 %if %suse_version > 1020 BuildRequires: fdupes %endif @@ -32,11 +32,11 @@ BuildRequires: wireless-tools %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 3.6.15 +Version: 3.6.16 Release: 0.<RELEASE2> Provides: web_browser Provides: firefox = %{version} -%define releasedate 2011030300 +%define releasedate 2011031900 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers ++++++ firefox-3.6.15-source.tar.bz2 -> firefox-3.6.16-source.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/MozillaFirefox/firefox-3.6.15-source.tar.bz2 11.3/MozillaFirefox/firefox-3.6.16-source.tar.bz2 differ: char 11, line 1 ++++++ l10n-3.6.15.tar.bz2 -> l10n-3.6.16.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/MozillaFirefox/l10n-3.6.15.tar.bz2 11.3/MozillaFirefox/l10n-3.6.16.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 mozilla-xulrunner192 for openSUSE:11.3
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package mozilla-xulrunner192 for openSUSE:11.3 checked in at Wed Mar 23 16:44:08 CET 2011. -------- --- old-versions/11.3/UPDATES/all/mozilla-xulrunner192/mozilla-xulrunner192.changes 2011-03-07 08:14:10.000000000 +0100 +++ 11.3/mozilla-xulrunner192/mozilla-xulrunner192.changes 2011-03-23 00:54:39.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 19 22:11:41 UTC 2011 - wr(a)rosenauer.org + +- security update to 1.9.2.16 (bnc#680771) + * MFSA 2011-11 + Update HTTPS certificate blacklist (bmo#642395) + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 Old: ---- l10n-1.9.2.15.tar.bz2 xulrunner-source-1.9.2.15.tar.bz2 New: ---- l10n-1.9.2.16.tar.bz2 xulrunner-source-1.9.2.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner192.spec ++++++ --- /var/tmp/diff_new_pack.CxOPCa/_old 2011-03-23 16:43:37.000000000 +0100 +++ /var/tmp/diff_new_pack.CxOPCa/_new 2011-03-23 16:43:37.000000000 +0100 @@ -39,12 +39,12 @@ BuildRequires: wireless-tools %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 1.9.2.15 +Version: 1.9.2.16 Release: 0.<RELEASE2> -%define releasedate 2011030300 -%define version_internal 1.9.2.15 +%define releasedate 2011031900 +%define version_internal 1.9.2.16 %define apiversion 1.9.2 -%define uaweight 192150 +%define uaweight 192160 Summary: Mozilla Runtime Environment 1.9.2 Url: http://www.mozilla.org Group: Productivity/Other ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.CxOPCa/_old 2011-03-23 16:43:37.000000000 +0100 +++ /var/tmp/diff_new_pack.CxOPCa/_new 2011-03-23 16:43:37.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_6_15_RELEASE" -VERSION="1.9.2.15" +RELEASE_TAG="FIREFOX_3_6_16_RELEASE" +VERSION="1.9.2.16" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla ++++++ l10n-1.9.2.15.tar.bz2 -> l10n-1.9.2.16.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/mozilla-xulrunner192/l10n-1.9.2.15.tar.bz2 11.3/mozilla-xulrunner192/l10n-1.9.2.16.tar.bz2 differ: char 11, line 1 ++++++ xulrunner-source-1.9.2.15.tar.bz2 -> xulrunner-source-1.9.2.16.tar.bz2 ++++++ old-versions/11.3/UPDATES/all/mozilla-xulrunner192/xulrunner-source-1.9.2.15.tar.bz2 11.3/mozilla-xulrunner192/xulrunner-source-1.9.2.16.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 mozilla-xulrunner191 for openSUSE:11.2
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package mozilla-xulrunner191 for openSUSE:11.2 checked in at Wed Mar 23 16:43:03 CET 2011. -------- --- old-versions/11.2/UPDATES/all/mozilla-xulrunner191/mozilla-xulrunner191.changes 2011-03-02 08:41:36.000000000 +0100 +++ 11.2/mozilla-xulrunner191/mozilla-xulrunner191.changes 2011-03-23 01:11:18.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 19 22:17:36 UTC 2011 - wr(a)rosenauer.org + +- security update to 1.9.1.18 (bnc#680771) + * MFSA 2011-11 (bmo#642395) + Update HTTPS certificate blacklist + +------------------------------------------------------------------- calling whatdependson for 11.2-i586 Old: ---- l10n-1.9.1.17.tar.bz2 xulrunner-source-1.9.1.17.tar.bz2 New: ---- l10n-1.9.1.18.tar.bz2 xulrunner-source-1.9.1.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner191.spec ++++++ --- /var/tmp/diff_new_pack.1r408v/_old 2011-03-23 16:42:28.000000000 +0100 +++ /var/tmp/diff_new_pack.1r408v/_new 2011-03-23 16:42:28.000000000 +0100 @@ -33,7 +33,7 @@ BuildRequires: nss-shared-helper-devel %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 1.9.1.17 +Version: 1.9.1.18 Release: 0.<RELEASE2> Summary: Mozilla Runtime Environment 1.9.1 Url: http://www.mozilla.org @@ -90,10 +90,10 @@ %if %suse_version > 1110 %define has_system_cairo 1 %endif -%define releasedate 2011013000 +%define releasedate 2011031900 %define version_internal %{version} %define apiversion 1.9.1 -%define uaweight 191170 +%define uaweight 191180 ### configuration end ### %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE2} ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.1r408v/_old 2011-03-23 16:42:28.000000000 +0100 +++ /var/tmp/diff_new_pack.1r408v/_new 2011-03-23 16:42:28.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_5_17_RELEASE" -VERSION="1.9.1.17" +RELEASE_TAG="FIREFOX_3_5_18_RELEASE" +VERSION="1.9.1.18" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.1 mozilla ++++++ l10n-1.9.1.17.tar.bz2 -> l10n-1.9.1.18.tar.bz2 ++++++ old-versions/11.2/UPDATES/all/mozilla-xulrunner191/l10n-1.9.1.17.tar.bz2 11.2/mozilla-xulrunner191/l10n-1.9.1.18.tar.bz2 differ: char 11, line 1 ++++++ xulrunner-source-1.9.1.17.tar.bz2 -> xulrunner-source-1.9.1.18.tar.bz2 ++++++ old-versions/11.2/UPDATES/all/mozilla-xulrunner191/xulrunner-source-1.9.1.17.tar.bz2 11.2/mozilla-xulrunner191/xulrunner-source-1.9.1.18.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 seamonkey for openSUSE:11.2
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package seamonkey for openSUSE:11.2 checked in at Wed Mar 23 16:42:06 CET 2011. -------- --- old-versions/11.2/UPDATES/all/seamonkey/seamonkey.changes 2011-03-02 08:30:32.000000000 +0100 +++ 11.2/seamonkey/seamonkey.changes 2011-03-23 07:45:39.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 23 06:32:52 UTC 2011 - wr(a)rosenauer.org + +- security update to version 2.0.13 (bnc#680771) + * MFSA 2011-11 (bmo#642395) + Update HTTPS certificate blacklist + +------------------------------------------------------------------- calling whatdependson for 11.2-i586 Old: ---- l10n-2.0.12.tar.bz2 seamonkey-2.0.12-source.tar.bz2 New: ---- l10n-2.0.13.tar.bz2 seamonkey-2.0.13-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seamonkey.spec ++++++ --- /var/tmp/diff_new_pack.M2PiCz/_old 2011-03-23 16:41:51.000000000 +0100 +++ /var/tmp/diff_new_pack.M2PiCz/_new 2011-03-23 16:41:51.000000000 +0100 @@ -29,7 +29,7 @@ %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Provides: web_browser -Version: 2.0.12 +Version: 2.0.13 Release: 0.<RELEASE2> Summary: The successor of the Mozilla Application Suite Url: http://www.mozilla.org/projects/seamonkey @@ -62,7 +62,7 @@ Obsoletes: seamonkey-mail <= 2.0 Provides: seamonkey-spellchecker = %{version} Obsoletes: seamonkey-spellchecker <= 2.0 -%define releasedate 2011012100 +%define releasedate 2011032000 %define progname %{name} %define prefix /usr %define progdir %_libdir/%{progname} ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.M2PiCz/_old 2011-03-23 16:41:51.000000000 +0100 +++ /var/tmp/diff_new_pack.M2PiCz/_new 2011-03-23 16:41:51.000000000 +0100 @@ -1,8 +1,8 @@ #!/bin/bash BRANCH="releases/comm-1.9.1" -RELEASE_TAG="SEAMONKEY_2_0_12_RELEASE" -VERSION="2.0.12" +RELEASE_TAG="SEAMONKEY_2_0_13_RELEASE" +VERSION="2.0.13" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH seamonkey ++++++ l10n-2.0.12.tar.bz2 -> l10n-2.0.13.tar.bz2 ++++++ old-versions/11.2/UPDATES/all/seamonkey/l10n-2.0.12.tar.bz2 11.2/seamonkey/l10n-2.0.13.tar.bz2 differ: char 11, line 1 ++++++ seamonkey-2.0.12-source.tar.bz2 -> seamonkey-2.0.13-source.tar.bz2 ++++++ old-versions/11.2/UPDATES/all/seamonkey/seamonkey-2.0.12-source.tar.bz2 11.2/seamonkey/seamonkey-2.0.13-source.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 MozillaFirefox for openSUSE:11.2
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:11.2 checked in at Wed Mar 23 16:41:32 CET 2011. -------- --- old-versions/11.2/UPDATES/all/MozillaFirefox/MozillaFirefox.changes 2011-03-07 08:15:39.000000000 +0100 +++ 11.2/MozillaFirefox/MozillaFirefox.changes 2011-03-23 07:21:52.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 19 22:13:40 UTC 2011 - wr(a)rosenauer.org + +- security update to 3.6.16 (bnc#680771) + * MFSA 2011-11 (bmo#642395) + Update HTTPS certificate blacklist + +------------------------------------------------------------------- calling whatdependson for 11.2-i586 Old: ---- firefox-3.6.15-source.tar.bz2 l10n-3.6.15.tar.bz2 New: ---- firefox-3.6.16-source.tar.bz2 l10n-3.6.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.LK98VB/_old 2011-03-23 16:40:43.000000000 +0100 +++ /var/tmp/diff_new_pack.LK98VB/_new 2011-03-23 16:40:43.000000000 +0100 @@ -22,7 +22,7 @@ Name: MozillaFirefox %define xulrunner mozilla-xulrunner192 BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip -BuildRequires: %{xulrunner}-devel = 1.9.2.15 +BuildRequires: %{xulrunner}-devel = 1.9.2.16 %if %suse_version > 1020 BuildRequires: fdupes %endif @@ -32,11 +32,11 @@ BuildRequires: wireless-tools %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 3.6.15 +Version: 3.6.16 Release: 0.<RELEASE2> Provides: web_browser Provides: firefox = %{version} -%define releasedate 2011030300 +%define releasedate 2011031900 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers ++++++ firefox-3.6.15-source.tar.bz2 -> firefox-3.6.16-source.tar.bz2 ++++++ old-versions/11.2/UPDATES/all/MozillaFirefox/firefox-3.6.15-source.tar.bz2 11.2/MozillaFirefox/firefox-3.6.16-source.tar.bz2 differ: char 11, line 1 ++++++ l10n-3.6.15.tar.bz2 -> l10n-3.6.16.tar.bz2 ++++++ old-versions/11.2/UPDATES/all/MozillaFirefox/l10n-3.6.15.tar.bz2 11.2/MozillaFirefox/l10n-3.6.16.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 mozilla-xulrunner192 for openSUSE:11.2
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package mozilla-xulrunner192 for openSUSE:11.2 checked in at Wed Mar 23 16:40:11 CET 2011. -------- --- old-versions/11.2/UPDATES/all/mozilla-xulrunner192/mozilla-xulrunner192.changes 2011-03-07 08:14:10.000000000 +0100 +++ 11.2/mozilla-xulrunner192/mozilla-xulrunner192.changes 2011-03-23 00:54:39.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 19 22:11:41 UTC 2011 - wr(a)rosenauer.org + +- security update to 1.9.2.16 (bnc#680771) + * MFSA 2011-11 + Update HTTPS certificate blacklist (bmo#642395) + +------------------------------------------------------------------- calling whatdependson for 11.2-i586 Old: ---- l10n-1.9.2.15.tar.bz2 xulrunner-source-1.9.2.15.tar.bz2 New: ---- l10n-1.9.2.16.tar.bz2 xulrunner-source-1.9.2.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner192.spec ++++++ --- /var/tmp/diff_new_pack.VqPeH6/_old 2011-03-23 16:40:01.000000000 +0100 +++ /var/tmp/diff_new_pack.VqPeH6/_new 2011-03-23 16:40:01.000000000 +0100 @@ -39,12 +39,12 @@ BuildRequires: wireless-tools %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 1.9.2.15 +Version: 1.9.2.16 Release: 0.<RELEASE2> -%define releasedate 2011030300 -%define version_internal 1.9.2.15 +%define releasedate 2011031900 +%define version_internal 1.9.2.16 %define apiversion 1.9.2 -%define uaweight 192150 +%define uaweight 192160 Summary: Mozilla Runtime Environment 1.9.2 Url: http://www.mozilla.org Group: Productivity/Other ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.VqPeH6/_old 2011-03-23 16:40:01.000000000 +0100 +++ /var/tmp/diff_new_pack.VqPeH6/_new 2011-03-23 16:40:01.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_6_15_RELEASE" -VERSION="1.9.2.15" +RELEASE_TAG="FIREFOX_3_6_16_RELEASE" +VERSION="1.9.2.16" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla ++++++ l10n-1.9.2.15.tar.bz2 -> l10n-1.9.2.16.tar.bz2 ++++++ old-versions/11.2/UPDATES/all/mozilla-xulrunner192/l10n-1.9.2.15.tar.bz2 11.2/mozilla-xulrunner192/l10n-1.9.2.16.tar.bz2 differ: char 11, line 1 ++++++ xulrunner-source-1.9.2.15.tar.bz2 -> xulrunner-source-1.9.2.16.tar.bz2 ++++++ old-versions/11.2/UPDATES/all/mozilla-xulrunner192/xulrunner-source-1.9.2.15.tar.bz2 11.2/mozilla-xulrunner192/xulrunner-source-1.9.2.16.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 pulseaudio for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package pulseaudio for openSUSE:Factory checked in at Wed Mar 23 16:05:26 CET 2011. -------- --- pulseaudio/pulseaudio.changes 2011-02-17 17:55:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/pulseaudio/pulseaudio.changes 2011-03-21 14:51:53.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 21 14:51:21 CET 2011 - tiwai(a)suse.de + +- Fix handling of /etc/mplayer/mplayer.conf in setup-pulseaudio + script (bnc#681113) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pulseaudio.spec ++++++ --- /var/tmp/diff_new_pack.jReBf7/_old 2011-03-23 16:05:01.000000000 +0100 +++ /var/tmp/diff_new_pack.jReBf7/_new 2011-03-23 16:05:01.000000000 +0100 @@ -22,7 +22,7 @@ Name: pulseaudio Summary: A Networked Sound Server Version: 0.9.22 -Release: 8 +Release: 9 License: GPLv2+ ; LGPLv2.1+ Group: System/Sound Daemons Source: %{name}-%{version}.tar.bz2 ++++++ setup-pulseaudio ++++++ --- /var/tmp/diff_new_pack.jReBf7/_old 2011-03-23 16:05:01.000000000 +0100 +++ /var/tmp/diff_new_pack.jReBf7/_new 2011-03-23 16:05:01.000000000 +0100 @@ -28,6 +28,8 @@ PROFNAME=/etc/profile.d/pulseaudio.sh CPROFNAME=/etc/profile.d/pulseaudio.csh +MPLAYER_CONF=/etc/mplayer/mplayer.conf + set_variable () { if test -f $PROFNAME && grep -q "export $1"= $PROFNAME; then @@ -79,11 +81,13 @@ enable_mplayer() { echo "Enabling PulseAudio for mplayer..." - if test -f /etc/mplayer/mplayer.conf; then - if grep -q '^ao=' /etc/mplayer/mplayer.conf; then - perl -pi -e "s|^ao=.*|ao=pulse|g;" /etc/mplayer/mplayer.conf + if test -f $MPLAYER_CONF; then + if grep -q '^ao *= *pulse' $MPLAYER_CONF; then + : + elif grep -q '^ao *=' $MPLAYER_CONF; then + sed -i -e 's/^ao *= *$.*$$/ao=pulse,\1/g' $MPLAYER_CONF else - echo "ao=pulse" >> /etc/mplayer/mplayer.conf + echo "ao=pulse" >> $MPLAYER_CONF fi fi @@ -178,9 +182,10 @@ } disable_mplayer() { - if test -f /etc/mplayer/mplayer.conf; then + if test -f $MPLAYER_CONF; then echo "Disabling PulseAudio for mplayer..." - perl -pi -e "s|ao=pulse||g;" /etc/mplayer/mplayer.conf + sed -i -e 's/^ao *= *pulse,*/ao=/g' \ + -e 's/^ao *= *$/ao=alsa/g' $MPLAYER_CONF 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 compcache for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package compcache for openSUSE:Factory checked in at Wed Mar 23 16:03:35 CET 2011. -------- --- compcache/compcache.changes 2011-01-13 20:43:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/compcache/compcache.changes 2011-03-21 14:56:45.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 21 14:55:11 CET 2011 - tiwai(a)suse.de + +- Fix init script for 11.4 to work with empty $COMPCACHE_SIZE_KB + (bnc#681048) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compcache.spec ++++++ --- /var/tmp/diff_new_pack.bfKXdx/_old 2011-03-23 16:03:13.000000000 +0100 +++ /var/tmp/diff_new_pack.bfKXdx/_new 2011-03-23 16:03:13.000000000 +0100 @@ -37,7 +37,7 @@ License: GPLv2 Group: System/Kernel Version: 0.6.2 -Release: 1 +Release: 6 Summary: Compressed RAM based swap device Source0: compcache-%{version}.tar.bz2 Source1: sysconfig.compcache ++++++ boot.compcache ++++++ --- /var/tmp/diff_new_pack.bfKXdx/_old 2011-03-23 16:03:13.000000000 +0100 +++ /var/tmp/diff_new_pack.bfKXdx/_new 2011-03-23 16:03:13.000000000 +0100 @@ -45,6 +45,10 @@ return $? } +get_memsize_in_kb () { + grep MemTotal /proc/meminfo | sed 's/^.* //;s/ .*$//g' +} + rc_reset case "$1" in @@ -56,8 +60,9 @@ else if [ "$COMPCACHE_SIZE_KB" -eq 0 ]; then # 25% of RAM - COMPCACHE_SIZE_STR="$(expr $(grep MemTotal /proc/meminfo | sed 's/^.* //;s/ .*$//g') / 4096) MB" - elif [ "$COMPCACHE_SIZE_KB" -lt 1024 ]; then + COMPCACHE_SIZE_KB=$(expr $(get_memsize_in_kb) / 4) + fi + if [ "$COMPCACHE_SIZE_KB" -lt 1024 ]; then COMPCACHE_SIZE_STR="$COMPCACHE_SIZE_KB kB" else COMPCACHE_SIZE_STR="$(expr $COMPCACHE_SIZE_KB / 1024) MB" @@ -82,11 +87,7 @@ if [ -f $SIZEBLK ]; then echo $(( $COMPCACHE_DEV_SIZE_KB * 1024 )) > $SIZEBLK else - if [ "$COMPCACHE_SIZE_KB" -gt 0 ]; then - $RZSCTL_BIN $SWAPDEV -d $COMPCACHE_DEV_SIZE_KB -i - else - $RZSCTL_BIN $SWAPDEV -i - fi + $RZSCTL_BIN $SWAPDEV -d $COMPCACHE_DEV_SIZE_KB -i fi if ! is_comp_swap_on $SWAPDEV; then echo -n "Setting up $ZRAM swap device $i " ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libsatsolver for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package libsatsolver for openSUSE:Factory checked in at Wed Mar 23 16:02:48 CET 2011. -------- --- libsatsolver/libsatsolver.changes 2011-02-24 17:45:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/libsatsolver/libsatsolver.changes 2011-03-02 12:34:46.000000000 +0100 @@ -7,0 +8,12 @@ +Wed Feb 2 09:24:42 UTC 2011 - kkaempf(a)novell.com + +- Split off 'applayer' and 'bindings' as a separate package + to make the bindings more independant of libsatsolver +- 0.16.4 + +------------------------------------------------------------------- +Tue Jan 25 09:52:48 CET 2011 - ma(a)suse.de + +- Apply patch introducing armv7nhl:armv7h + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ignoreorphaned.diff satsolver-0.16.1.tar.bz2 New: ---- satsolver-0.16.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsatsolver.spec ++++++ --- /var/tmp/diff_new_pack.614Ki8/_old 2011-03-23 16:01:34.000000000 +0100 +++ /var/tmp/diff_new_pack.614Ki8/_new 2011-03-23 16:01:34.000000000 +0100 @@ -16,18 +16,13 @@ # -%if 0%{?fedora_version} -%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')} -%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')} -%endif Name: libsatsolver -Version: 0.16.1 -Release: 6 +Version: 0.16.4 +Release: 1 License: BSD3c -Url: git://git.opensuse.org/projects/zypp/sat-solver.git +Url: git://gitorious.org/opensuse/sat-solver.git Source: satsolver-%{version}.tar.bz2 -Patch: ignoreorphaned.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/C and C++ Prefix: /usr @@ -38,7 +33,7 @@ BuildRequires: libneon0.26-devel %endif %if 0%{?fedora_version} -BuildRequires: db4-devel perl-devel ruby ruby-rdoc +BuildRequires: db4-devel ruby ruby-rdoc %endif %if 0%{?suse_version} %if 0%{?suse_version} < 1030 @@ -55,19 +50,12 @@ %else BuildRequires: expat-devel %endif -BuildRequires: cmake gcc-c++ perl python-devel rpm-devel ruby-devel swig +BuildRequires: cmake gcc-c++ rpm-devel BuildRequires: zlib-devel # the testsuite uses the check framework BuildRequires: check-devel Summary: A new approach to package dependency solving -#define some macros missing on fedora -%if 0%{?fedora_version} -%{!?py_sitedir: %define py_sitedir %(%__python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%{!?py_requires: %define py_requires Requires: python} -%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')} -%endif - %description A new approach to package dependency solving @@ -131,36 +119,8 @@ %description demo Applications demoing the satsolver library. -%package -n ruby-satsolver -License: BSD3c -Summary: Ruby bindings for sat solver -Group: Development/Languages/Ruby - -%description -n ruby-satsolver -Ruby bindings for sat solver. - -%package -n python-satsolver -License: BSD3c -%py_requires -Summary: Python bindings for sat solver -Group: Development/Languages/Python - -%description -n python-satsolver -Python bindings for sat solver. - -%package -n perl-satsolver -License: BSD3c -Requires: perl = %{perl_version} -Summary: Perl bindings for sat solver -Group: Development/Languages/Perl - -%description -n perl-satsolver -Perl bindings for sat solver. - - %prep %setup -n satsolver-%{version} -%patch %build export CFLAGS="$RPM_OPT_FLAGS" @@ -170,10 +130,13 @@ %if 0%{?fedora_version} CMAKE_FLAGS="-DFEDORA=1" %endif +# Where does RHEL provide qsort_r ? +%if 0%{?rhel_version} > 0 || 0%{?centos_version} > 0 +export CFLAGS="$RPM_OPT_FLAGS -DUSE_OWN_QSORT=1" +%endif cmake $CMAKE_FLAGS \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DPYTHON_SITEDIR=%{py_sitedir} \ -DLIB=%{_lib} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_BUILD_TYPE=Release \ @@ -193,11 +156,6 @@ #pushd doc/autodoc #make install #popd -%if 0%{?suse_version} > 1020 -# create symlinks for documentation -#%fdupes -s %{buildroot}%{_docdir}/ruby-satsolver -%fdupes -s bindings/ruby/html -%endif %clean rm -rf "$RPM_BUILD_ROOT" @@ -214,7 +172,6 @@ %defattr(-,root,root) %_libdir/libsatsolver.a %_libdir/libsatsolverext.a -%_libdir/libappsatsolver.a %dir /usr/include/satsolver /usr/include/satsolver/* /usr/bin/deptestomatic @@ -229,45 +186,4 @@ #%dir %_docdir/satsolver #%_docdir/satsolver/* -%files -n ruby-satsolver -%defattr(-,root,root,-) -%if 0%{?suse_version} -%if 0%{?suse_version} < 1010 -%dir %{_libdir}/ruby/site_ruby/%{rb_ver}/%{rb_arch} -%dir %{_libdir}/ruby/site_ruby/%{rb_ver}/satsolver -%{_libdir}/ruby/site_ruby/%{rb_ver}/satsolver/*.rb -%{_libdir}/ruby/site_ruby/%{rb_ver}/satsolver.rb -%{_libdir}/ruby/site_ruby/%{rb_ver}/%{rb_arch}/satsolver.so -%else -%dir %{_libdir}/ruby/vendor_ruby/%{rb_ver}/satsolver -%{_libdir}/ruby/vendor_ruby/%{rb_ver}/satsolver/*.rb -%{_libdir}/ruby/vendor_ruby/%{rb_ver}/satsolver.rb -%{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/satsolver.so -%endif -%endif -%if 0%{?mandriva_version} -%dir %{ruby_sitelibdir}/satsolver -%{ruby_sitelibdir}/satsolver/*.rb -%{ruby_sitelibdir}/satsolver.rb -%{ruby_sitearchdir}/satsolver.so -%endif -%if 0%{?fedora_version} -%dir %{ruby_sitelib}/satsolver -%{ruby_sitelib}/satsolver.rb -%{ruby_sitelib}/satsolver/*.rb -%{ruby_sitearch}/satsolver.so -%endif -%doc bindings/ruby/html - -%files -n python-satsolver -%defattr(-,root,root,-) -#%doc swig/python/examples/*.py -%{py_sitedir}/_satsolver.so -%{py_sitedir}/satsolver.py* - -%files -n perl-satsolver -%defattr(-,root,root,-) -%{perl_vendorarch}/satsolver.so -%{perl_vendorlib}/satsolver.pm - %changelog ++++++ satsolver-0.16.1.tar.bz2 -> satsolver-0.16.4.tar.bz2 ++++++ libsatsolver/satsolver-0.16.1.tar.bz2 /mounts/work_src_done/STABLE/libsatsolver/satsolver-0.16.4.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 yast2-kerberos-client for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package yast2-kerberos-client for openSUSE:Factory checked in at Wed Mar 23 13:54:01 CET 2011. -------- --- yast2-kerberos-client/yast2-kerberos-client.changes 2011-03-16 14:53:09.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-kerberos-client/yast2-kerberos-client.changes 2011-03-23 12:36:02.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 23 12:14:24 CET 2011 - jsuchome(a)suse.cz + +- aborting in Stage::cont does not abort installation (bnc#678650) +- 2.21.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-kerberos-client-2.21.0.tar.bz2 New: ---- yast2-kerberos-client-2.21.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-kerberos-client.spec ++++++ --- /var/tmp/diff_new_pack.iWiy94/_old 2011-03-23 13:53:42.000000000 +0100 +++ /var/tmp/diff_new_pack.iWiy94/_new 2011-03-23 13:53:42.000000000 +0100 @@ -19,11 +19,11 @@ Name: yast2-kerberos-client -Version: 2.21.0 +Version: 2.21.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-kerberos-client-2.21.0.tar.bz2 +Source0: yast2-kerberos-client-2.21.1.tar.bz2 Prefix: /usr @@ -46,7 +46,7 @@ Kerberos server will be used for user authentication. %prep -%setup -n yast2-kerberos-client-2.21.0 +%setup -n yast2-kerberos-client-2.21.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-kerberos-client-2.21.0.tar.bz2 -> yast2-kerberos-client-2.21.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kerberos-client-2.21.0/VERSION new/yast2-kerberos-client-2.21.1/VERSION --- old/yast2-kerberos-client-2.21.0/VERSION 2011-03-16 14:52:14.000000000 +0100 +++ new/yast2-kerberos-client-2.21.1/VERSION 2011-03-23 12:14:37.000000000 +0100 @@ -1 +1 @@ -2.21.0 +2.21.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kerberos-client-2.21.0/src/Kerberos.ycp new/yast2-kerberos-client-2.21.1/src/Kerberos.ycp --- old/yast2-kerberos-client-2.21.0/src/Kerberos.ycp 2011-03-16 14:48:28.000000000 +0100 +++ new/yast2-kerberos-client-2.21.1/src/Kerberos.ycp 2011-03-16 14:52:36.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Data for configuration of kerberos-client, i/o functions. * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: Kerberos.ycp 63261 2011-01-24 15:21:24Z jsuchome $ + * $Id: Kerberos.ycp 63577 2011-03-16 13:52:35Z jsuchome $ * * Representation of the configuration of kerberos-client. * Input and output routines. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kerberos-client-2.21.0/src/dialogs.ycp new/yast2-kerberos-client-2.21.1/src/dialogs.ycp --- old/yast2-kerberos-client-2.21.0/src/dialogs.ycp 2011-03-16 14:49:49.000000000 +0100 +++ new/yast2-kerberos-client-2.21.1/src/dialogs.ycp 2011-03-23 12:35:12.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: dialogs.ycp 63261 2011-01-24 15:21:24Z jsuchome $ + * $Id: dialogs.ycp 63648 2011-03-23 11:35:11Z jsuchome $ */ { @@ -164,15 +164,7 @@ */ define symbol ReallyAbort () { - boolean ret = true; - if (!Stage::cont () || contains (WFM::Args (), "from_users")) - { - ret = Kerberos::Modified() ? Popup::ReallyAbort (true) : true; - } - else - { - ret = Popup::ConfirmAbort (`incomplete); - } + boolean ret = (Kerberos::Modified() || Stage::cont ()) ? Popup::ReallyAbort (true) : true; if ( ret ) return `abort; else return `back; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kerberos-client-2.21.0/src/kerberos.ycp new/yast2-kerberos-client-2.21.1/src/kerberos.ycp --- old/yast2-kerberos-client-2.21.0/src/kerberos.ycp 2010-01-28 16:11:28.000000000 +0100 +++ new/yast2-kerberos-client-2.21.1/src/kerberos.ycp 2011-03-23 12:34:51.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Main file * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: kerberos.ycp 60608 2010-01-28 15:11:03Z jsuchome $ + * $Id: kerberos.ycp 63647 2011-03-23 11:34:51Z jsuchome $ * * Main file for kerberos-client configuration. Uses all other files. */ @@ -213,7 +213,7 @@ */ define boolean KerberosWrite () { - if (!Package::InstallAll (Kerberos::required_packages)) + if (!Package::InstallAll (Kerberos::RequiredPackages ())) return false; return Kerberos::Write (); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 wdm for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package wdm for openSUSE:Factory checked in at Wed Mar 23 13:53:23 CET 2011. -------- --- wdm/wdm.changes 2008-11-21 14:40:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/wdm/wdm.changes 2011-02-15 13:54:10.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 15 13:48:00 CET 2011 - kukuk(a)suse.de + +- Get ride of SuSEconfig.wdm + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- SuSEconfig.wdm wdm-config.in New: ---- wdm-config ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wdm.spec ++++++ --- /var/tmp/diff_new_pack.qoQoF7/_old 2011-03-23 13:52:46.000000000 +0100 +++ /var/tmp/diff_new_pack.qoQoF7/_new 2011-03-23 13:52:46.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package wdm (Version 1.28) +# spec file for package wdm # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,17 +21,16 @@ Name: wdm BuildRequires: WindowMaker-devel freetype2-devel pam-devel xorg-x11 BuildRequires: libselinux-devel -License: GPL v2 or later +License: GPLv2+ Group: System/X11/Displaymanagers AutoReqProv: on Version: 1.28 -Release: 215 +Release: 225 PreReq: /etc/X11/xdm/xdm-config Source: %{name}-%{version}.tar.bz2 Source2: SUSE.png -Source3: SuSEconfig.wdm -Source4: wdm-config.in -Source5: wdmLogin +Source3: wdm-config +Source4: wdmLogin Patch2: %{name}-%{version}-pam.patch Patch3: %{name}-%{version}-WINGs.patch Patch4: %{name}-%{version}-reserve.patch @@ -77,13 +76,12 @@ mkdir -p $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/sbin/conf.d -install -m 755 %{S:3} $RPM_BUILD_ROOT/sbin/conf.d -install -m 644 %{S:4} $RPM_BUILD_ROOT/%{wdmdir} +install -m 644 %{S:3} $RPM_BUILD_ROOT/%{wdmdir} mkdir -p $RPM_BUILD_ROOT/%{wdmdir}/Defaults -install -m 644 %{S:5} $RPM_BUILD_ROOT/%{wdmdir}/Defaults +install -m 644 %{S:4} $RPM_BUILD_ROOT/%{wdmdir}/Defaults install -m 644 %{S:2} $RPM_BUILD_ROOT/%{wdmdir}/pixmaps rm $RPM_BUILD_ROOT/etc/pam.d/wdm -rm `find $RPM_BUILD_ROOT/%{wdmdir} -type f -maxdepth 1 -not -name wdm-config.in -print` +rm `find $RPM_BUILD_ROOT/%{wdmdir} -type f -maxdepth 1 -not -name wdm-config -print` %find_lang %{name} %clean @@ -102,7 +100,6 @@ %dir %{wdmdir}/Defaults %config %{wdmdir}/pixmaps/* %config %{wdmdir}/Defaults/* -%config(noreplace) %{wdmdir}/wdm-config.in -/sbin/conf.d/SuSEconfig.wdm +%config(noreplace) %{wdmdir}/wdm-config %changelog ++++++ wdm-config ++++++ ! Following part is taken from xdm-config: !============================================================================== ! ! xdm-config: Configuration of the xdm ! DisplayManager.errorLogFile: /var/log/xdm.errors DisplayManager.pidFile: /var/run/xdm.pid DisplayManager.authDir: /var/lib/xdm DisplayManager.keyFile: /etc/X11/xdm/xdm-keys DisplayManager.servers: /etc/X11/xdm/Xservers DisplayManager.accessFile: /etc/X11/xdm/Xaccess DisplayManager.willing: su nobody -c /etc/X11/xdm/Xwilling ! ! ATTENTION: `authName' should be in general MIT-MAGIC-COOKIE-1 ! For XDM-AUTHENTICATION-1 which is default for xterminals see ! manual page of xdm and the manual coming with the xterminal. ! DisplayManager.*.authName: MIT-MAGIC-COOKIE-1 DisplayManager.*.authComplain: false ! ! All displays should use authorization, but we cannot be sure ! X terminals will be configured that way, so by default ! use authorization only for local displays :0, :1, etc. ! DisplayManager._0.authorize: true DisplayManager._1.authorize: true DisplayManager._93.authorize: true ! ! The scripts handling the setup, the startup, the session its self, ! and the reset of an X session. ! DisplayManager.*.setup: /etc/X11/xdm/Xsetup DisplayManager.*.chooser: /etc/X11/xdm/RunChooser DisplayManager.*.startup: /etc/X11/xdm/Xstartup DisplayManager.*.session: /etc/X11/xdm/Xsession DisplayManager.*.reset: /etc/X11/xdm/Xreset ! DisplayManager._0.terminateServer: true DisplayManager._93.terminateServer: true ! DisplayManager*resources: /etc/X11/xdm/Xresources DisplayManager.*.terminateServer: false ! ! SECURITY: do not listen for XDMCP or Chooser requests ! Comment out this line if you want to manage X terminals with xdm ! DisplayManager.requestPort: 0 ! !============================================================================== ! ! Following part contains wdm specific options: !============================================================================== ! DisplayManager*wdmLogin: /usr/bin/wdmLogin ! ! display screen background--if not set or set to none, then the ! background is not set by wdm. ! DisplayManager*wdmBg: none DisplayManager*wdmBg: solid:RoyalBlue ! DisplayManager*wdmBg: dgradient:RoyalBlue,FireBrick,Black ! DisplayManager*wdmBg: hgradient:RoyalBlue,FireBrick,Black ! DisplayManager*wdmBg: vgradient:RoyalBlue,FireBrick,Black ! DisplayManager*wdmBg: pixmap:/usr/local/etc/wdm/pixmaps/Stars.jpg ! ! optional pixmap for logo ! DisplayManager*wdmLogo: /usr/local/etc/wdm/pixmaps/Eagle.xpm DisplayManager*wdmLogo: /etc/X11/wdm/pixmaps/SUSE.png ! ! optional help file to display in the help panel ! long lines may cause an ugly display ! DisplayManager*wdmHelpFile: /etc/motd ! ! optional default username and password (in clear text) ! which wdm should use if nothing is typed by the user. ! it's strongly suggested that wdm-config should be ! chmod 600 and owned by root if you want to use this ! feature, or else you could open a huge security hole ! in your system, letting anyone to log in as this default ! user. In any case if you want to use this feature do ! it with a very restricted account, and especially NOT ! WITH THE root ACCOUNT !!! !DisplayManager*wdmDefaultUser: nobody !DisplayManager*wdmDefaultPasswd: dumb_clear_text_passwd ! ! commands for reboot and halt ! -- be sure to edit these if the ! system is not linux. DisplayManager*wdmReboot: /sbin/shutdown -r now DisplayManager*wdmHalt: /sbin/shutdown -h now ! alternates (for Linux) ! DisplayManager*wdmReboot: /sbin/shutdown -t3 -r now ! DisplayManager*wdmHalt: /sbin/shutdown -t3 -h now ! ! true/false to require valid username/passwd to reboot,halt, or exit DisplayManager*wdmVerify: false ! true/false to require root as valid username/passwd to reboot,halt, or exit DisplayManager*wdmRoot: false ! true=enable, false=disable shake and rollup animations DisplayManager*wdmAnimations: true ! DisplayManager*wdmWm: fvwm:icewm-session:/usr/bin/startkde:twm !DisplayManager*wdmLocale: de_DE.UTF-8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 espeak for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package espeak for openSUSE:Factory checked in at Wed Mar 23 13:52:13 CET 2011. -------- --- espeak/espeak.changes 2010-04-07 22:02:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/espeak/espeak.changes 2011-03-22 07:37:59.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 22 07:34:38 CET 2011 - tiwai(a)suse.de + +- Fix full-volume reset problem with PulseAudio (bnc#679975) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- espeak-volume-full-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ espeak.spec ++++++ --- /var/tmp/diff_new_pack.awCiWI/_old 2011-03-23 13:51:58.000000000 +0100 +++ /var/tmp/diff_new_pack.awCiWI/_new 2011-03-23 13:51:58.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package espeak (Version 1.43.03) +# spec file for package espeak # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,7 +19,7 @@ Name: espeak Version: 1.43.03 -Release: 1 +Release: 7 %define _version %{version}-source License: GPLv3+ Summary: Software speech synthesizer (text-to-speech) @@ -29,6 +29,8 @@ Source1: espeak.1 # PATCH-FIX-UPSTREAM espeak-audio-runtime-detection.patch vuntz(a)opensuse.org -- Taken from Fedora Patch0: espeak-audio-runtime-detection.patch +# PATCH-FIX-SUSE espeak-volume-full-fix.diff tiwai(a)suse.de -- Fix full-volume with PulseAudio (bnc#679975) +Patch1: espeak-volume-full-fix.diff BuildRequires: gcc-c++ BuildRequires: portaudio-devel BuildRequires: pulseaudio-devel @@ -61,6 +63,7 @@ %prep %setup -q -n %{name}-%{_version} %patch0 -p1 +%patch1 -p1 # Don't use the included binary voice dictionaries; we compile these from # source %{__rm} espeak-data/*_dict ++++++ espeak-volume-full-fix.diff ++++++ --- src/wave_pulse.cpp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) --- a/src/wave_pulse.cpp +++ b/src/wave_pulse.cpp @@ -114,9 +114,6 @@ static pa_stream *stream = NULL; static pa_threaded_mainloop *mainloop = NULL; -static pa_cvolume volume; -static int volume_valid = 0; - static int do_trigger = 0; static uint64_t written = 0; static int time_offset_msec = 0; @@ -171,9 +168,6 @@ if (!i) return; - - volume = i->volume; - volume_valid = 1; } static void subscribe_cb(struct pa_context *c, enum pa_subscription_event_type t, uint32_t index, void *userdata) { @@ -514,12 +508,6 @@ if (!pa_sample_spec_valid(&ss)) return false; -/* if (!volume_valid) { */ - pa_cvolume_reset(&volume, ss.channels); - volume_valid = 1; -/* } else if (volume.channels != ss.channels) */ -/* pa_cvolume_set(&volume, ss.channels, pa_cvolume_avg(&volume)); */ - SHOW_TIME("pa_threaded_mainloop_new (call)"); if (!(mainloop = pa_threaded_mainloop_new())) { SHOW("Failed to allocate main loop\n",""); @@ -583,7 +571,7 @@ a_attr.fragsize = 0; SHOW_TIME("pa_connect_playback"); - if (pa_stream_connect_playback(stream, NULL, &a_attr, (pa_stream_flags_t)(PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE), &volume, NULL) < 0) { + if (pa_stream_connect_playback(stream, NULL, &a_attr, (pa_stream_flags_t)(PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE), NULL, NULL) < 0) { SHOW("Failed to connect stream: %s", pa_strerror(pa_context_errno(context))); goto unlock_and_fail; } @@ -630,11 +618,6 @@ pa_threaded_mainloop_wait(mainloop); } -/* if (!volume_valid) { */ -/* SHOW("pa_context_get_sink_input_info() failed: %s", pa_strerror(pa_context_errno(context))); */ -/* goto unlock_and_fail; */ -/* } */ - do_trigger = 0; written = 0; time_offset_msec = 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit satsolver-bindings for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package satsolver-bindings for openSUSE:Factory checked in at Wed Mar 23 13:52:04 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ satsolver-bindings/satsolver-bindings.changes 2011-02-01 20:09:27.000000000 +0100 @@ -0,0 +1,24 @@ +------------------------------------------------------------------- +Tue Feb 1 12:51:05 UTC 2011 - kkaempf(a)novell.com + +- Split satsolver-bindings from satsolver in order to provide + stable bindings across multiple versions of satsolver. +- Bump version to 0.42 + +------------------------------------------------------------------- +Mon Sep 6 13:50:02 UTC 2010 - dmacvicar(a)novell.com + +- ruby bindings: fix bugs regarding include path loading + (was hardcoded) and refactor the way the library path is defined + (only once in a helper) + +------------------------------------------------------------------- +Mon Sep 6 12:38:21 UTC 2010 - dmacvicar(a)novell.com + +- SLE10SP3 also has vendor_ruby + +------------------------------------------------------------------- +Wed Aug 18 14:11:08 UTC 2010 - kkaempf(a)novell.com + +- refactor ruby-satsolver, pure-Ruby extensions added +- 0.15.1 calling whatdependson for head-i586 New: ---- satsolver-bindings-0.42.0.tar.bz2 satsolver-bindings.changes satsolver-bindings.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ satsolver-bindings.spec ++++++ # # spec file for package satsolver-bindings # # Copyright (c) 2011 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: satsolver-bindings Version: 0.42.0 Release: 1 License: BSD3c Url: git://gitorious.org/opensuse/sat-solver-bindings.git Source: satsolver-bindings-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/C and C++ Summary: Placeholder for subpackages of satsolver-bindings Prefix: /usr BuildRequires: libsatsolver-devel BuildRequires: doxygen %if 0%{?mandriva_version} # force this version on mandriva BuildRequires: libneon0.26-devel %endif %if 0%{?fedora_version} BuildRequires: db4-devel perl-devel %endif %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} BuildRequires: ruby %if 0%{?fedora_version} || 0%{?rhel_version} > 500 || 0%{?centos_version} > 500 BuildRequires: ruby-rdoc %endif %endif %if 0%{?suse_version} %if 0%{?suse_version} < 1030 BuildRequires: expat %else BuildRequires: libexpat-devel %endif %if 0%{?suse_version} < 1100 BuildRequires: graphviz %endif %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif %else BuildRequires: expat-devel %endif BuildRequires: cmake gcc-c++ perl python-devel rpm-devel ruby-devel swig BuildRequires: zlib-devel # the testsuite uses the check framework BuildRequires: check-devel # add macros if not already defined %{!?py_sitedir: %define py_sitedir %(%__python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?py_requires: %define py_requires Requires: python} %{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')} %{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')} %description This is not a package but a .spec placeholder fo subpackages of satsolver-bindings. %package -n libsatsolverapp0 License: BSD3c Summary: Sat-solver application layer Group: Development/Libraries/C and C++ %description -n libsatsolverapp0 An application layer to make using satsolver easier for developers. Authors: -------- Klaus Kaempf <kkaempf(a)suse.de> %package -n libsatsolverapp0-devel License: BSD3c Summary: Sat-solver application layer Group: Development/Libraries/C and C++ Requires: %{name} = %version %description -n libsatsolverapp0-devel Development files for libsatsolverapp Authors: -------- Klaus Kaempf <kkaempf(a)suse.de> %package -n ruby-satsolver License: BSD3c Summary: Ruby bindings for sat solver Group: Development/Languages/Ruby %description -n ruby-satsolver Ruby bindings for sat solver. Authors: -------- Klaus Kaempf <kkaempf(a)suse.de> Duncan Mac-Vicar P. <dmacvicar(a)suse.de> %package -n python-satsolver License: BSD3c %py_requires Summary: Python bindings for sat solver Group: Development/Languages/Python %description -n python-satsolver Python bindings for sat solver. Authors: -------- Klaus Kaempf <kkaempf(a)suse.de> Duncan Mac-Vicar P. <dmacvicar(a)suse.de> %package -n perl-satsolver License: BSD3c Requires: perl = %{perl_version} Summary: Perl bindings for sat solver Group: Development/Languages/Perl %description -n perl-satsolver Perl bindings for sat solver. Authors: -------- Klaus Kaempf <kkaempf(a)suse.de> Duncan Mac-Vicar P. <dmacvicar(a)suse.de> Bernhard Wiedemann <bwiedemann(a)suse.de> %package -n satsolver-bindings-devel License: BSD3c Requires: swig %{name}-devel Summary: Swig input files for satsolver bindings Group: Development/Libraries/Other %description -n satsolver-bindings-devel The Swig input files for satsolver bindings allow for reuse of the bindings concept in other projects, i.e. libzypp-bindings. Authors: -------- Klaus Kaempf <kkaempf(a)suse.de> %prep %setup -n %{name}-%{version} %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$CFLAGS" CMAKE_FLAGS= %if 0%{?fedora_version} CMAKE_FLAGS="-DFEDORA=1" %endif # Hack for openSUSE 11.1, satsolver has different ruleinfo there %if 0%{?suse_version} == 1110 && 0%{?sles_version} == 0 CMAKE_FLAGS="-DSATSOLVER_VERSION=1110" %endif cmake $CMAKE_FLAGS \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DPYTHON_SITEDIR=%{py_sitedir} \ -DLIB=%{_lib} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=1 make %{?jobs:-j %jobs} # make doc_forced %if 0%{?run_testsuite} ln -s . build ctest . %endif %install make DESTDIR=$RPM_BUILD_ROOT install # we want to leave the .a file untouched export NO_BRP_STRIP_DEBUG=true #pushd doc/autodoc #make install #popd %if 0%{?suse_version} > 1020 # create symlinks for documentation #%fdupes -s %{buildroot}%{_docdir}/ruby-satsolver %fdupes -s bindings/ruby/html %endif %clean rm -rf "$RPM_BUILD_ROOT" %files -n libsatsolverapp0 %defattr(-,root,root) %doc LICENSE* README %files -n libsatsolverapp0-devel %defattr(-,root,root) %_libdir/libsatsolverapp.a %dir /usr/include/satsolver-app /usr/include/satsolver-app/* %files -n ruby-satsolver %defattr(-,root,root,-) # SUSE %if 0%{?suse_version} %if 0%{?suse_version} < 1010 %dir %{_libdir}/ruby/site_ruby/%{rb_ver}/%{rb_arch} %dir %{_libdir}/ruby/site_ruby/%{rb_ver}/satsolver %{_libdir}/ruby/site_ruby/%{rb_ver}/satsolver/*.rb %{_libdir}/ruby/site_ruby/%{rb_ver}/satsolver.rb %{_libdir}/ruby/site_ruby/%{rb_ver}/%{rb_arch}/satsolver.so %else %dir %{_libdir}/ruby/vendor_ruby/%{rb_ver}/satsolver %{_libdir}/ruby/vendor_ruby/%{rb_ver}/satsolver/*.rb %{_libdir}/ruby/vendor_ruby/%{rb_ver}/satsolver.rb %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/satsolver.so %endif %endif # Mandriva %if 0%{?mandriva_version} %dir %{ruby_sitelibdir}/satsolver %{ruby_sitelibdir}/satsolver/*.rb %{ruby_sitelibdir}/satsolver.rb %{ruby_sitearchdir}/satsolver.so %endif # Fedora/RHEL/Centos %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} %dir %{ruby_sitelib}/satsolver %{ruby_sitelib}/satsolver.rb %{ruby_sitelib}/satsolver/*.rb %{ruby_sitearch}/satsolver.so %endif # rdoc-swig doesn't work with Ruby 1.8.1 on RHEL4 %if 0%{?rhel_version} == 0 || 0%{?rhel_version} >= 500 %doc bindings/ruby/html %endif %files -n python-satsolver %defattr(-,root,root,-) #%doc swig/python/examples/*.py %{py_sitedir}/_satsolver.so %{py_sitedir}/satsolver.py* %files -n perl-satsolver %defattr(-,root,root,-) %{perl_vendorarch}/satsolver.so %{perl_vendorlib}/satsolver.pm %files -n satsolver-bindings-devel %defattr(-,root,root,-) %dir %{prefix}/share/satsolver-bindings %{prefix}/share/satsolver-bindings/*.i %{prefix}/share/satsolver-bindings/*.h %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 mc for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package mc for openSUSE:Factory checked in at Wed Mar 23 12:14:01 CET 2011. -------- --- GNOME/mc/mc.changes 2011-02-09 14:34:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/mc/mc.changes 2011-03-23 09:19:58.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 23 08:19:15 UTC 2011 - pcerny(a)novell.com + +- keep english version of help and hints in the main package + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mc.spec ++++++ --- /var/tmp/diff_new_pack.opNsax/_old 2011-03-23 12:13:50.000000000 +0100 +++ /var/tmp/diff_new_pack.opNsax/_new 2011-03-23 12:13:50.000000000 +0100 @@ -24,7 +24,7 @@ License: GPLv2+ Url: http://www.ibiblio.org/mc/ Version: 4.7.5.1 -Release: 1 +Release: 7 Source: mc-%{version}.tar.lzma Source1: x11_browser Source2: %{name}.desktop @@ -237,8 +237,8 @@ %{_datadir}/mc/mc.charsets %{_datadir}/mc/mc.lib %{_libexecdir}/mc -%exclude %{_datadir}/mc/hints/* -%exclude %{_datadir}/mc/help/* +%exclude %{_datadir}/mc/hints/mc.hint.* +%exclude %{_datadir}/mc/help/mc.hlp.* %exclude %{_sysconfdir}/mc/mc.menu.* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 whois for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package whois for openSUSE:Factory checked in at Wed Mar 23 12:13:16 CET 2011. -------- --- whois/whois.changes 2010-12-01 13:03:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/whois/whois.changes 2011-03-22 11:18:32.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Mar 22 10:15:42 UTC 2011 - puzel(a)novell.com + +- update to whois-5.0.11 + * Added the remaining IPv4 allocations. + * Added new ASN allocations. + * Updated the .co and .gm TLD servers. +- run spec-cleaner + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- whois_5.0.10.tar.bz2 New: ---- whois_5.0.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ whois.spec ++++++ --- /var/tmp/diff_new_pack.c9A7O4/_old 2011-03-23 12:12:09.000000000 +0100 +++ /var/tmp/diff_new_pack.c9A7O4/_new 2011-03-23 12:12:09.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package whois (Version 5.0.10) +# spec file for package whois # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,21 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: whois -BuildRequires: libidn-devel -License: GPLv2+ -Group: Productivity/Networking/Other -Provides: ripe-whois-tools -AutoReqProv: on -Url: http://www.linux.it/~md/software/ -Version: 5.0.10 +Version: 5.0.11 Release: 1 +License: GPLv2+ Summary: Whois Client Program +Url: http://www.linux.it/~md/software/ +Group: Productivity/Networking/Other Source: %{name}_%{version}.tar.bz2 -Patch1: %{name}-4.7.33-nb.patch +Patch1: whois-4.7.33-nb.patch +BuildRequires: libidn-devel +Provides: ripe-whois-tools BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -39,23 +37,17 @@ appropriate whois server for most queries. This package also contains mkpasswd, a simple front-end to crypt(3). - - -Authors: --------- - Marco d'Itri <md(a)linux.it> - %prep %setup -n whois-%{version} %patch1 rename no nb po/no.* %build -make all mkpasswd HAVE_LIBIDN=1 HAVE_ICONV=1 CFLAGS="$RPM_OPT_FLAGS" +make all mkpasswd HAVE_LIBIDN=1 HAVE_ICONV=1 CFLAGS="%{optflags}" %install -mkdir -p $RPM_BUILD_ROOT{/usr/bin,%{_mandir}/man1} -make BASEDIR=$RPM_BUILD_ROOT mandir=%{_mandir} prefix=/usr \ +mkdir -p %{buildroot}{/usr/bin,%{_mandir}/man1} +make BASEDIR=%{buildroot} mandir=%{_mandir} prefix=/usr \ install install-mkpasswd install-pos %find_lang %{name} ++++++ whois_5.0.10.tar.bz2 -> whois_5.0.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.10/as_del_list new/whois-5.0.11/as_del_list --- old/whois-5.0.10/as_del_list 2009-09-09 18:55:12.000000000 +0200 +++ new/whois-5.0.11/as_del_list 2011-01-10 09:07:03.000000000 +0100 @@ -65,7 +65,8 @@ 47104 52223 ripe 52224 53247 lacnic 55296 56319 apnic +56320 58367 ripe # catch all: everything else comes from ARIN -1 47103 arin +1 55295 arin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.10/config.h new/whois-5.0.11/config.h --- old/whois-5.0.10/config.h 2010-12-01 01:37:59.000000000 +0100 +++ new/whois-5.0.11/config.h 2011-01-10 09:07:28.000000000 +0100 @@ -1,5 +1,5 @@ /* Program version */ -#define VERSION "5.0.10" +#define VERSION "5.0.11" /* Configurable features */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.10/debian/changelog new/whois-5.0.11/debian/changelog --- old/whois-5.0.10/debian/changelog 2010-11-30 23:52:11.000000000 +0100 +++ new/whois-5.0.11/debian/changelog 2011-02-03 20:01:13.000000000 +0100 @@ -1,3 +1,11 @@ +whois (5.0.11) unstable; urgency=medium + + * Added the remaining IPv4 allocations. + * Added new ASN allocations. + * Updated the .co and .gm TLD servers. + + -- Marco d'Itri <md(a)linux.it> Sun, 23 Jan 2011 18:08:55 +0100 + whois (5.0.10) unstable; urgency=medium * Added new IPv4 allocations. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.10/ip_del_list new/whois-5.0.11/ip_del_list --- old/whois-5.0.10/ip_del_list 2010-11-30 23:56:38.000000000 +0100 +++ new/whois-5.0.11/ip_del_list 2011-02-03 19:59:19.000000000 +0100 @@ -16,7 +16,7 @@ 31.0.0.0/8 ripe 36.0.0.0/8 apnic 37.0.0.0/8 ripe -39.0.0.0/8 UNALLOCATED +39.0.0.0/8 apnic 41.0.0.0/8 afrinic 42.0.0.0/8 apnic 43.0.0.0/8 whois.nic.ad.jp @@ -37,15 +37,13 @@ 77.0.0.0/8 ripe 78.0.0.0/7 ripe 80.0.0.0/4 ripe # => 95.255.255.255 -96.0.0.0/6 arin # => 99.255.255.255 -100.0.0.0/8 arin 101.0.0.0/8 apnic +102.0.0.0/8 afrinic +103.0.0.0/8 apnic 105.0.0.0/8 afrinic -107.0.0.0/8 arin -108.0.0.0/8 arin +106.0.0.0/8 apnic 109.0.0.0/8 ripe 110.0.0.0/7 apnic -96.0.0.0/4 UNALLOCATED # => 112.215.255.255 112.160.0.0/11 whois.nic.or.kr 115.0.0.0/12 whois.nic.or.kr 115.16.0.0/13 whois.nic.or.kr @@ -119,12 +117,12 @@ 176.0.0.0/8 ripe 177.0.0.0/8 lacnic 178.0.0.0/8 ripe -179.0.0.0/8 UNALLOCATED +179.0.0.0/8 lacnic 180.0.0.0/8 apnic 181.0.0.0/8 lacnic 183.96.0.0/11 whois.nic.or.kr 182.0.0.0/7 apnic -185.0.0.0/8 UNALLOCATED +185.0.0.0/8 ripe 186.0.0.0/7 lacnic 188.0.0.0/8 ripe # transferred from ARIN to to RIPE 189.0.0.0/8 lacnic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.10/tld_serv_list new/whois-5.0.11/tld_serv_list --- old/whois-5.0.10/tld_serv_list 2010-10-06 17:55:46.000000000 +0200 +++ new/whois-5.0.11/tld_serv_list 2011-01-23 20:19:32.000000000 +0100 @@ -107,7 +107,7 @@ .edu.cn whois.edu.cn .cn whois.cnnic.cn .uk.co whois.uk.co -.co WEB http://www.whois.co/ +.co whois.nic.co .cr WEB http://www.nic.cr/niccr_publico/showRegistroDominiosScreen.do .cu WEB http://www.nic.cu/ .cv NONE # www.dns.cv? @@ -143,7 +143,7 @@ .gh WEB http://www.nic.gh/customer/search_c.htm .gi AFILIAS .gl whois.nic.gl -.gm whois.ripe.net # www.nic.gm +.gm WEB http://www.nic.gm/htmlpages/whois.htm .gn NONE # http://www.psg.com/dns/gn/ .gp whois.nic.gp .gq NONE # NO NIC http://www.getesa.gq/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whois-5.0.10/whois.spec new/whois-5.0.11/whois.spec --- old/whois-5.0.10/whois.spec 2010-12-01 01:38:02.000000000 +0100 +++ new/whois-5.0.11/whois.spec 2011-01-10 09:07:23.000000000 +0100 @@ -1,6 +1,6 @@ Summary: Enhanced WHOIS client Name: whois -Version: 5.0.10 +Version: 5.0.11 Release: 1 License: GPL Vendor: Marco d'Itri <md(a)linux.it> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pyalsa for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package pyalsa for openSUSE:Factory checked in at Wed Mar 23 12:11:37 CET 2011. -------- --- pyalsa/pyalsa.changes 2010-04-26 09:46:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/pyalsa/pyalsa.changes 2011-03-21 17:50:33.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:50:33 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- COPYING COPYING.LIB ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pyalsa.spec ++++++ --- /var/tmp/diff_new_pack.BIXr8A/_old 2011-03-23 12:11:30.000000000 +0100 +++ /var/tmp/diff_new_pack.BIXr8A/_new 2011-03-23 12:11:30.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package pyalsa (Version 1.0.22) +# spec file for package pyalsa # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,14 +19,15 @@ Name: pyalsa -BuildRequires: alsa-devel licenses python-devel +BuildRequires: alsa-devel python-devel Version: 1.0.22 -Release: 1 +Release: 7 License: LGPLv2.1+ ; GPLv2 Group: Development/Libraries/Python Summary: Python ALSA binding Source: pyalsa-%{version}.tar.bz2 -Requires: licenses +Source1: COPYING +Source2: COPYING.LIB BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} @@ -35,8 +36,7 @@ %prep %setup -q -ln -s %{_datadir}/doc/licenses/GPL-2.0.txt COPYING -ln -s %{_datadir}/doc/licenses/LGPL-2.1.txt COPYING.LIB +cp %{S:1} %{S:2} . %build export CFLAGS="%{optflags} -fno-strict-aliasing" ++++++ COPYING ++++++ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) 19yy <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) 19yy name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. ++++++ COPYING.LIB ++++++ GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 Copyright � 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. [This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) The modified work must itself be a software library. b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License). To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the library's name and a brief idea of what it does.> Copyright � <year> <name of author> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the library `Frob' (a library for tweaking knobs) written by James Random Hacker. <signature of Ty Coon>, 1 April 1990 Ty Coon, President of Vice That's all there is to it! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 potrace for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package potrace for openSUSE:Factory checked in at Wed Mar 23 10:28:22 CET 2011. -------- --- potrace/potrace.changes 2011-01-11 23:16:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/potrace/potrace.changes 2011-03-21 17:48:09.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:48:05 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ potrace.spec ++++++ --- /var/tmp/diff_new_pack.iFfwgm/_old 2011-03-23 10:27:42.000000000 +0100 +++ /var/tmp/diff_new_pack.iFfwgm/_new 2011-03-23 10:27:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package potrace (Version 1.9) +# spec file for package potrace # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,11 +21,10 @@ Name: potrace Summary: Utility for Tracing a Bitmap to Scalable Outline Image Version: 1.9 -Release: 1 +Release: 6 License: GPLv2+ Group: Productivity/Graphics/Convertors -BuildRequires: licenses zlib-devel -Requires: licenses +BuildRequires: zlib-devel Provides: bitmap_tracing Url: http://potrace.sourceforge.net/ Source: %{name}-%{version}.tar.bz2 @@ -56,7 +55,6 @@ %install %makeinstall -ln -sf /usr/share/doc/licenses/md5/$(md5sum COPYING | sed 's/ .*//') COPYING %clean rm -fr $RPM_BUILD_ROOT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package rfc for openSUSE:Factory checked in at Wed Mar 23 10:25:06 CET 2011. -------- --- AUTO/all/rfc/rfc.changes 2011-03-21 12:42:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/rfc/rfc.changes 2011-03-23 08:42:23.000000000 +0100 @@ -2 +2 @@ -Mon Mar 21 12:42:21 CET 2011 - autobuild(a)suse.de +Wed Mar 23 08:42:23 CET 2011 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2011-03-21 +- automated update on 2011-03-23 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfc.spec ++++++ --- /var/tmp/diff_new_pack.8b57Pf/_old 2011-03-23 10:24:57.000000000 +0100 +++ /var/tmp/diff_new_pack.8b57Pf/_new 2011-03-23 10:24:57.000000000 +0100 @@ -25,7 +25,7 @@ Summary: The RFCs (Request For Comments) Source: rfc.tgz BuildArch: noarch -Version: 2011.3.21 +Version: 2011.3.23 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 tmpwatch for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package tmpwatch for openSUSE:Factory checked in at Wed Mar 23 10:24:16 CET 2011. -------- --- tmpwatch/tmpwatch.changes 2010-10-22 18:49:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/tmpwatch/tmpwatch.changes 2011-03-21 17:50:48.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:50:48 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tmpwatch.spec ++++++ --- /var/tmp/diff_new_pack.MUTpnx/_old 2011-03-23 10:20:59.000000000 +0100 +++ /var/tmp/diff_new_pack.MUTpnx/_new 2011-03-23 10:20:59.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package tmpwatch (Version 2.10.1) +# spec file for package tmpwatch # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,15 +20,15 @@ Name: tmpwatch Version: 2.10.1 -Release: 3 +Release: 11 Url: https://fedorahosted.org/tmpwatch Source0: %{name}-%{version}.tar.bz2 Source1: tmpwatch.daily License: GPLv2 Group: Productivity/Security BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: psmisc cron licenses -BuildRequires: licenses psmisc +Requires: psmisc cron +BuildRequires: psmisc %description The tmpwatch utility recursively searches through specified directories @@ -60,7 +60,6 @@ %{__mkdir_p} %{buildroot}/etc/cron.daily %{__cp} %{SOURCE1} %{buildroot}/etc/cron.daily/tmpwatch chmod +x %{buildroot}/etc/cron.daily/tmpwatch -%{__ln_s} -f /usr/share/doc/licenses/GPL-2.0.txt COPYING %clean rm -rf %{buildroot} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openvas-administrator for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package openvas-administrator for openSUSE:Factory checked in at Wed Mar 23 10:18:24 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/openvas-administrator/openvas-administrator.changes 2011-02-23 20:28:00.000000000 +0100 @@ -0,0 +1,147 @@ +------------------------------------------------------------------- +Wed Feb 23 19:11:27 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 1.1.1 + * The build environment has been consolidated. + * The logging behaviour when started with --verbose has been improved. + * The parameter name for the user name has been changed to --username/-u. + * User name validation has been added. + +------------------------------------------------------------------- +Fri Feb 4 21:48:16 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 1.1.0 + * The default log level has been reduced to avoid logging sensitive information + during normal operation. + * If the password for the new user has not been provided as a command line + parameter, it will be requested interactively. + * OpenVAS Administrator now uses pkg-config to find required libraries. + * OpenVAS Administrator now provides a manual page for the openvasad binary. + * The installation is now compliant with Filesystem Hierarchy Standard (FHS 2.3). + +------------------------------------------------------------------- +Thu Jan 20 17:26:52 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 1.0.1 + * Fixed behaviour for ldap-based authentication for Admin role. + * Added protocol documentation for OAP (html and rnc format, + can be build with "make doc"). + * Code hardening at compile time is now the default. + * Harmonized output of "--version" with other modules. + +------------------------------------------------------------------- +Tue Dec 7 16:05:20 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 1.0.0 + * Handling of invalid commands in console mode has been made more consistent. + +------------------------------------------------------------------- +Wed Nov 24 18:13:15 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 0.99.1 + * The build environment has been improved to be more consistent across different + OpenVAS modules and to stay compatible with different openvas-libraries + versions. + * Support for logging user creation, deletion and role changes has been added. + +------------------------------------------------------------------- +Wed May 26 17:43:50 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 0.9.0 + - A large amount of code which was duplicated from openvas-manager has been to + openvas-libraries. + - The build environment has been further improved. + - Support for providing the authentication configuration via OAP has been added. + - Support for modifying user has been improved, a number of issues and + inconsistencies has been addressed. + - New command line parameters for determining the feed version and the + synchronization status and for starting a feed synchronization have been + added. + +------------------------------------------------------------------- +Mon Apr 12 21:09:55 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 0.8.0 + * Communication with synchronization scripts launched by openvas-administrator + has been improved; this should prevent synchronization processes from becoming + defunct when they are finished. + * A number of build issues discovered by Stephan Kleine has been fixed. + * Support for retrieving the version of an installed NVT collect has been added. + +------------------------------------------------------------------- +Fri Feb 5 11:51:08 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 0.7.0 + * When synchronizing with an NVT feed, the administrator now simply starts the + synchronization script in the background instead of waiting for it to finish + before continuing. + +------------------------------------------------------------------- +Tue Jan 26 18:34:16 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 0.6.0 + * When creating a user, now scan hosts to be denied or + allowed for this user can be specified. + * A user editor has been added and allows to change + the host restrictions and the password + (OAP command MODIFY_USER) + * OAP command CLIENT_GET_USERS now also provides the + host restriction information. + * The log protocol filters entries where potentially + a password may appear, so that passwords do not end + up in a log file. + * uuid's are generated for each user. + * New package build dependency to uuid library. + +------------------------------------------------------------------- +Sun Jan 24 05:14:22 UTC 2010 - bitshuffler(a)opensuse.org + +- Added %ghost entry for log file. +- Added logrotate file. +- Added init script. +- Fixed cmake arguments. + +------------------------------------------------------------------- +Wed Jan 20 12:51:39 UTC 2010 - bitshuffler(a)opensuse.org + +- Updated to 0.5.0 + * Make it possible to sort the list of users. + * Setting retrieval has been improved. + * Feed synchronization has been improved. + * Added support for modifying settings. + +------------------------------------------------------------------- +Wed Dec 23 09:16:06 UTC 2009 - felix.wolfsteller(a)intevation.de + +- Added and apply patch of Vladimir Nadvornik (built libs are + static, no need to install them) + +------------------------------------------------------------------- +Tue Dec 22 10:11:29 UTC 2009 - felix.wolfsteller(a)intevation.de + +- Marked log config file as %config + +------------------------------------------------------------------- +Tue Dec 22 09:06:52 UTC 2009 - felix.wolfsteller(a)intevation.de + +- Updated to 0.4.0 + * A bug which cause defunct administrator processes to remain after + feed synchronization has been fixed. + * Initial support for retrieving settings von configuration files + has been added. +- Adjusted to use bz2 (instead of gz) tarball + +------------------------------------------------------------------- +Thu Dec 10 21:33:57 UTC 2009 - bitshuffler(a)opensuse.org + +- Updated to 0.3.0 + * Pidfile handling has been made more robust. + * A number of possible resource leaks have been identified and fixed. + * The configuration and build process has been improved. + * Support for NVT feed synchronization has been added. + +------------------------------------------------------------------- +Tue Nov 24 21:30:31 UTC 2009 - bitshuffler(a)opensuse.org + +- Initial RPM + calling whatdependson for head-i586 New: ---- debian.changelog debian.compat debian.control debian.dirs debian.install debian.openvas-administrator.default debian.openvas-administrator.init debian.openvas-administrator.logrotate debian.rules debian.series openvas-administrator-1.1.1-out_of_source_build.patch openvas-administrator-1.1.1.tar.gz openvas-administrator.changes openvas-administrator.dsc openvas-administrator.spec openvasad.init.fedora openvasad.init.mandriva openvasad.init.suse openvasad.logrotate ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvas-administrator.spec ++++++ # # spec file for package openvas-administrator # # Copyright (c) 2011 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: openvas-administrator Version: 1.1.1 Release: 1 License: GNU GPL v2 or later Group: Productivity/Networking/Security Url: http://www.openvas.org Source0: %{name}-%{version}.tar.gz Source1: openvasad.logrotate Source2: debian.openvas-administrator.default Source3: openvasad.init.suse Source4: openvasad.init.fedora Source5: openvasad.init.mandriva Patch0: openvas-administrator-1.1.1-out_of_source_build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?mandriva_version} BuildRequires: pinentry-gtk2 %endif BuildRequires: cmake >= 2.6.0 BuildRequires: doxygen BuildRequires: glib2-devel BuildRequires: libopenvas-devel >= 3.0.0 BuildRequires: pkgconfig Requires: logrotate Summary: Administrator Module of OpenVAS %description This is the administrator module for the Open Vulnerability Assessment System (OpenVAS). It is intended to simplify the configuration and administration of an OpenVAS server both on a local installation as well as on a remote system. %prep %setup -q %patch0 %build %if 0%{?mandriva_version} %serverbuild %endif export CFLAGS="$RPM_OPT_FLAGS" %__mkdir build cd build cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DSYSCONFDIR=%{_sysconfdir} \ -DLOCALSTATEDIR=%{_localstatedir} \ -DCMAKE_BUILD_TYPE=release %__make %{?_smp_mflags} VERBOSE=1 #%__make %{?_smp_mflags} doc %install cd build %__make install DESTDIR=%{buildroot} %__install -D -m 644 %{_sourcedir}/openvasad.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/openvas-administrator %if 0%{?suse_version} %__install -D -m 744 %{_sourcedir}/openvasad.init.suse %{buildroot}%{_initrddir}/openvas-administrator %__ln_s %{_initrddir}/openvas-administrator %{buildroot}%{_sbindir}/rcopenvas-administrator %__install -D -m 644 %{_sourcedir}/debian.openvas-administrator.default %{buildroot}%{_var}/adm/fillup-templates/sysconfig.openvas-administrator %endif %if 0%{?fedora_version} || 0%{?scientificlinux_version} %__install -D -m 744 %{_sourcedir}/openvasad.init.fedora %{buildroot}%{_initrddir}/openvas-administrator %__install -D -m 644 %{_sourcedir}/debian.openvas-administrator.default %{buildroot}%{_sysconfdir}/sysconfig/openvas-administrator %endif %if 0%{?mandriva_version} %__install -D -m 744 %{_sourcedir}/openvasad.init.mandriva %{buildroot}%{_initrddir}/openvas-administrator %__install -D -m 644 %{_sourcedir}/debian.openvas-administrator.default %{buildroot}%{_sysconfdir}/sysconfig/openvas-administrator %endif %__mkdir_p %{buildroot}%{_localstatedir}/log/openvas touch %{buildroot}%{_localstatedir}/log/openvas/openvasad.log %clean test "%{buildroot}" != "/" && %__rm -rf %{buildroot} %post %if 0%{?suse_version} %fillup_and_insserv openvas-administrator %endif %if 0%{?mandriva_version} %_post_service openvas-administrator %endif %if 0%{?fedora_version} || 0%{?scientificlinux_version} # only rpm -i (not rpm {-U|-F}) if [ $1 = 1 ]; then /sbin/chkconfig --add openvas-administrator fi %endif %preun %if 0%{?suse_version} %stop_on_removal openvas-administrator %endif %if 0%{?mandriva_version} %_preun_service openvas-administrator %endif %if 0%{?fedora_version} || 0%{?scientificlinux_version} # only rpm -e (not rpm {-U|-F}) if [ $1 = 0 ]; then /sbin/service openvas-administrator stop > /dev/null 2>&1 || : /sbin/chkconfig --del openvas-administrator fi %endif %postun %if 0%{?suse_version} %restart_on_update openvas-administrator %insserv_cleanup %endif %if 0%{?fedora_version} || 0%{?scientificlinux_version} # only rpm {-U|-F} (not rpm -e) if [ $1 = 1 ]; then /sbin/service openvas-administrator condrestart fi %endif %files %defattr(-,root,root) %doc CHANGES %config(noreplace) %{_sysconfdir}/logrotate.d/openvas-administrator %dir %{_sysconfdir}/openvas %config(noreplace) %{_sysconfdir}/openvas/openvasad_log.conf %{_initrddir}/openvas-administrator %{_sbindir}/openvasad %{_mandir}/man8/openvasad.8* %{_datadir}/openvas/openvasad %dir %{_localstatedir}/log/openvas %ghost %{_localstatedir}/log/openvas/openvasad.log %if 0%{?suse_version} %{_sbindir}/rcopenvas-administrator %{_var}/adm/fillup-templates/sysconfig.openvas-administrator %else %config(noreplace) %{_sysconfdir}/sysconfig/openvas-administrator %endif %changelog ++++++ debian.changelog ++++++ openvas-administrator (1.1.1-1) UNRELEASED; urgency=low * New upstream release - The build environment has been consolidated. - The logging behaviour when started with --verbose has been improved. - The parameter name for the user name has been changed to --username/-u. - User name validation has been added. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 23 Feb 2011 20:11:02 +0100 openvas-administrator (1.1.0-1) UNRELEASED; urgency=low * New upstream release - The default log level has been reduced to avoid logging sensitive information during normal operation. - If the password for the new user has not been provided as a command line parameter, it will be requested interactively. - OpenVAS Administrator now uses pkg-config to find required libraries. - OpenVAS Administrator now provides a manual page for the openvasad binary. - The installation is now compliant with Filesystem Hierarchy Standard (FHS 2.3). -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 04 Feb 2011 22:27:59 +0100 openvas-administrator (1.0.1-1) UNRELEASED; urgency=low * New upstream release - Fixed behaviour for ldap-based authentication for Admin role. - Added protocol documentation for OAP (html and rnc format, can be build with "make doc"). - Code hardening at compile time is now the default. - Harmonized output of "--version" with other modules. -- Stephan Kleine <bitshuffler(a)opensuse.org> Thu, 20 Jan 2010 18:25:34 +0100 openvas-administrator (1.0.0-1) UNRELEASED; urgency=low * New upstream release - Handling of invalid commands in console mode has been made more consistent. -- Stephan Kleine <bitshuffler(a)opensuse.org> Tue, 07 Nov 2010 17:06:12 +0100 openvas-administrator (0.99.1-1) UNRELEASED; urgency=low * New upstream release - The build environment has been improved to be more consistent across different OpenVAS modules and to stay compatible with different openvas-libraries versions. - Support for logging user creation, deletion and role changes has been added. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 24 Nov 2010 19:11:48 +0100 openvas-administrator (0.9.0-1) UNRELEASED; urgency=low * New upstream release - A large amount of code which was duplicated from openvas-manager has been to openvas-libraries. - The build environment has been further improved. - Support for providing the authentication configuration via OAP has been added. - Support for modifying user has been improved, a number of issues and inconsistencies has been addressed. - New command line parameters for determining the feed version and the synchronization status and for starting a feed synchronization have been added. -- Stephan Kleine <bitshuffler(a)opensuse.org> Wed, 26 May 2010 19:45:26 +0200 openvas-administrator (0.8.0-1) UNRELEASED; urgency=low * New upstream release - Communication with synchronization scripts launched by openvas-administrator has been improved; this should prevent synchronization processes from becoming defunct when they are finished. - A number of build issues discovered by Stephan Kleine has been fixed. - Support for retrieving the version of an installed NVT collect has been added. -- Stephan Kleine <bitshuffler(a)opensuse.org> Mon, 12 Apr 2010 23:10:21 +0200 openvas-administrator (0.7.0-1) UNRELEASED; urgency=low * New upstream release - When synchronizing with an NVT feed, the administrator now simply starts the synchronization script in the background instead of waiting for it to finish before continuing. -- Stephan Kleine <bitshuffler(a)opensuse.org> Fri, 05 Feb 2010 11:49:53 +0100 openvas-administrator (0.6.0-1) UNRELEASED; urgency=low * New upstream release - When creating a user, now scan hosts to be denied or allowed for this user can be specified. - A user editor has been added and allows to change the host restrictions and the password (OAP command MODIFY_USER) - OAP command CLIENT_GET_USERS now also provides the host restriction information. - The log protocol filters entries where potentially a password may appear, so that passwords do not end up in a log file. - uuid's are generated for each user. - New package build dependency to uuid library. -- Stephan Kleine <bitshuffler(a)opensuse.org> Tue, 26 Jan 2010 16:24:09 +0100 openvas-administrator (0.5.0-1) UNRELEASED; urgency=low * Initial package. -- Stephan Kleine <bitshuffler(a)opensuse.org> Sat, 23 Jan 2010 10:48:16 +0100 ++++++ debian.compat ++++++ 5 ++++++ debian.control ++++++ Source: openvas-administrator Section: admin Priority: optional Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Build-Depends: debhelper (>= 7), cmake, doxygen, hardening-wrapper, libopenvas3-dev | libopenvas4-dev, pkg-config Standards-Version: 3.7.3 Homepage: http://www.openvas.org/ Package: openvas-administrator Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Administrator Module of OpenVAS This is the administrator module for the Open Vulnerability Assessment System (OpenVAS). It is intended to simplify the configuration and administration of an OpenVAS server both on a local installation as well as on a remote system. Package: openvas-administrator-dbg Section: debug Priority: extra Architecture: any Depends: ${misc:Depends}, openvas-administrator (= ${binary:Version}) Description: Administrator Module of OpenVAS (debug) This is the administrator module for the Open Vulnerability Assessment System (OpenVAS). It is intended to simplify the configuration and administration of an OpenVAS server both on a local installation as well as on a remote system. ++++++ debian.dirs ++++++ var/log/openvas ++++++ debian.install ++++++ etc/openvas usr/sbin usr/share/man/man8/openvasad.8* usr/share/openvas/openvasad ++++++ debian.openvas-administrator.default ++++++ # # The address the OpenVAS Administrator will listen on. # ADMINISTRATOR_ADDRESS=127.0.0.1 # # The port the OpenVAS Administrator will listen on. # ADMINISTRATOR_PORT=9393 # # Directory containing the OpenVAS user data # USER_DATA=/var/lib/openvas/users # # File containing the OpenVAS Scanner configuration # SCANNER_CONFIG=/etc/openvas/openvassd.conf # # Script to use for NVT feed synchronization # SYNC_SCRIPT=/usr/sbin/openvas-nvt-sync ++++++ debian.openvas-administrator.init ++++++ #!/bin/sh -e # # /etc/init.d/openvas-administrator # ### BEGIN INIT INFO # Provides: openvas-administrator # Required-Start: $remote_fs # Required-Stop: $remote_fs # Should-Start: # Should-Stop: # Default-Start: # Default-Stop: 0 6 # Short-Description: Start and stop the OpenVAS Administrator # Description: Controls the OpenVAS daemon "openvasad". ### END INIT INFO # time to wait for daemons death, in seconds # don't set it too low or you might not let openvasad die gracefully DODTIME=5 # Read config [ -r /etc/default/openvas-administrator ] && . /etc/default/openvas-administrator [ "ADMINISTRATOR_ADDRESS" ] && DAEMONOPTS="--listen="$ADMINISTRATOR_ADDRESS [ "ADMINISTRATOR_PORT" ] && DAEMONOPTS="$DAEMONOPTS --port="$ADMINISTRATOR_PORT [ "USER_DATA" ] && DAEMONOPTS="$DAEMONOPTS --users-dir="$USER_DATA [ "SCANNER_CONFIG" ] && DAEMONOPTS="$DAEMONOPTS --scanner-config-file="$SCANNER_CONFIG [ "SYNC_SCRIPT" ] && DAEMONOPTS="$DAEMONOPTS --sync-script="$SYNC_SCRIPT DAEMON=/usr/sbin/openvasad PIDFILE=/var/run/openvasad.pid NAME=openvasad LABEL="OpenVAS Administrator" test -x $DAEMON || exit 0 running() { # No pidfile, probably no daemon present # [ ! -f "$PIDFILE" ] && return 1 pid=`cat $PIDFILE` # No pid, probably no daemon present [ -z "$pid" ] && return 1 [ ! -d /proc/$pid ] && return 1 cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1` # No openvasad? [ `basename "$cmd"` != "$NAME" ] && return 1 return 0 } start_daemon() { start-stop-daemon --start --exec $DAEMON -- $DAEMONOPTS 2>&1 >/dev/null errcode=$? # If we don't sleep then running() might not see the pidfile sleep $DODTIME return $errcode } force_stop() { [ ! -e "$PIDFILE" ] && return if running ; then kill -15 $pid # Is it really dead? sleep "$DODTIME"s if running ; then kill -9 $pid sleep "$DODTIME"s if running ; then echo "Cannot kill $LABEL (pid=$pid)!" exit 1 fi fi fi rm -f $PIDFILE } case "$1" in start) echo -n "Starting $LABEL: " if start_daemon && running ; then echo "openvasad." else echo "ERROR." exit 1 fi ;; stop) echo -n "Stopping $LABEL: " if running ; then start-stop-daemon --stop --pidfile $PIDFILE --quiet --oknodo --exec $DAEMON sleep "$DODTIME"s fi if running; then force_stop fi echo "openvasad." ;; restart) echo -n "Restarting $LABEL: " if running; then start-stop-daemon --stop --pidfile $PIDFILE --quiet --oknodo --exec $DAEMON sleep "$DODTIME"s fi if running; then force_stop fi if start_daemon && running ; then echo "openvasad." else echo "ERROR." exit 1 fi ;; reload|force-reload) echo -n "Reloading $LABEL configuration files: " start-stop-daemon --stop --pidfile $PIDFILE --signal 1 --exec $DAEMON sleep "$DODTIME"s if running ; then echo "done." else echo "ERROR." exit 1 fi ;; status) echo -n "$LABEL is " if running ; then echo "running" else echo " not running." exit 1 fi ;; *) echo "Usage: /etc/init.d/openvas-administrator {start|stop|restart|reload|status}" exit 1 ;; esac exit 0 ++++++ debian.openvas-administrator.logrotate ++++++ /var/log/openvas/openvasad.log { missingok notifempty create 640 root adm daily rotate 7 compress postrotate if [ -s /var/run/openvasad.pid ]; then kill -1 `cat /var/run/openvasad.pid`; fi openvaslogs=`ls /var/log/openvas/openvasad.log.*` if [ -n "$openvaslogs" ]; then chown root:adm $openvaslogs chmod 640 $openvaslogs fi endscript } ++++++ debian.rules ++++++ #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # This file was originally written by Joey Hess and Craig Small. # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 # Enable hardening-wrapper export DEB_BUILD_HARDENING=1 config: config-stamp config-stamp: dh_testdir # Add here commands to configure the package. cmake -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc -DLOCALSTATEDIR=/var -DCMAKE_BUILD_TYPE=release . touch $@ build: build-stamp build-stamp: config-stamp dh_testdir # Add here commands to compile the package. $(MAKE) VERBOSE=1 touch $@ clean: dh_testdir dh_testroot rm -f build-stamp config.stamp # Add here commands to clean up after the build process. dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs # Add here commands to install the package into debian/tmp $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installchangelogs CHANGES dh_installdocs dh_install --sourcedir=debian/tmp dh_installdebconf dh_installlogrotate dh_installinit -n -r -u stop 20 0 6 . dh_installman --sourcedir=debian/tmp dh_link dh_strip --dbg-package=openvas-administrator-dbg dh_compress dh_fixperms dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install ++++++ debian.series ++++++ openvas-administrator-1.1.1-out_of_source_build.patch -p0 ++++++ openvas-administrator-1.1.1-out_of_source_build.patch ++++++ Index: CMakeLists.txt =================================================================== --- CMakeLists.txt.orig 2011-02-21 11:04:30.000000000 +0100 +++ CMakeLists.txt 2011-02-23 20:19:23.862970872 +0100 @@ -236,7 +236,7 @@ enable_testing () ## Install -install (FILES src/openvasad_log.conf +install (FILES ${CMAKE_BINARY_DIR}/src/openvasad_log.conf DESTINATION ${OPENVAS_SYSCONF_DIR}) install (FILES src/schema_formats/HTML/generate ++++++ openvas-administrator.dsc ++++++ Format: 1.0 Source: openvas-administrator Binary: openvas-administrator Architecture: any Version: 1.1.1-1 Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Homepage: http://www.openvas.org/ Standards-Version: 3.8.0 Build-Depends: debhelper (>= 7), cmake, doxygen, hardening-wrapper, libopenvas3-dev | libopenvas4-dev, pkg-config Files: 776ce4e1000137c9aec7863372c8c876 373800 openvas-administrator-1.1.1.orig.tar.gz 131e6720b0526ade9405eade0d9150ac 56625 openvas-administrator-1.1.1.diff.gz ++++++ openvasad.init.fedora ++++++ #!/bin/sh # # openvas-administrator This starts and stops the OpenVAS Administrator. # # chkconfig: 35 75 25 # description: This starts and stops the OpenVAS Administrator. # processname: /usr/sbin/openvasad # config: /etc/openvas/openvasad.conf # pidfile: /var/run/openvasad.pid # ### BEGIN INIT INFO # Provides: $openvas-administrator ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions EXEC="/usr/sbin/openvasad" PROG=$(basename $EXEC) # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance test -x $EXEC || { echo "$EXEC not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } # Check for existence of needed config file OPENVASAD_CONFIG=/etc/sysconfig/openvas-administrator test -r $OPENVASAD_CONFIG || { echo "$OPENVASAD_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Read config . $OPENVASAD_CONFIG [ "ADMINISTRATOR_ADDRESS" ] && PARAMS="--listen="$ADMINISTRATOR_ADDRESS [ "ADMINISTRATOR_PORT" ] && PARAMS="$PARAMS --port="$ADMINISTRATOR_PORT [ "USER_DATA" ] && PARAMS="$PARAMS --users-dir="$USER_DATA [ "SCANNER_CONFIG" ] && PARAMS="$PARAMS --scanner-config-file="$SCANNER_CONFIG [ "SYNC_SCRIPT" ] && PARAMS="$PARAMS --sync-script="$SYNC_SCRIPT LOCKFILE=/var/lock/subsys/$PROG start() { echo -n $"Starting openvas-administrator: " daemon $EXEC $PARAMS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $LOCKFILE return $RETVAL } stop() { echo -n $"Stopping openvas-administrator: " killproc $PROG RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $LOCKFILE return $RETVAL } restart() { stop start } #reload() { # echo -n $"Reloading openvasad.conf file: " # killproc $PROG -HUP # RETVAL=$? # echo # return $RETVAL #} force_reload() { restart } fdr_status() { status $PROG } case "$1" in #start|stop|restart|reload) start|stop|restart) $1 ;; force-reload) force_reload ;; status) fdr_status ;; condrestart|try-restart) [ ! -f $LOCKFILE ] || restart ;; *) #echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}" exit 2 esac ++++++ openvasad.init.mandriva ++++++ #!/bin/sh # # LSB compatible service control script; see http://www.linuxbase.org/spec/ # ### BEGIN INIT INFO # Provides: openvas-administrator # Required-Start: $syslog $remote_fs # Should-Start: $time ypbind smtp # Required-Stop: $syslog $remote_fs # Should-Stop: $time ypbind smtp # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: OpenVAS Administrator # Description: This starts and stops the OpenVAS Administrator. ### END INIT INFO # # Source function library. . /etc/rc.d/init.d/functions EXEC="/usr/sbin/openvasad" PROG=$(basename $EXEC) # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance test -x $EXEC || { echo "$EXEC not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } # Check for existence of needed config file OPENVASAD_CONFIG=/etc/sysconfig/openvas-administrator test -r $OPENVASAD_CONFIG || { echo "$OPENVASAD_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Read config . $OPENVASAD_CONFIG [ "ADMINISTRATOR_ADDRESS" ] && PARAMS="--listen="$ADMINISTRATOR_ADDRESS [ "ADMINISTRATOR_PORT" ] && PARAMS="$PARAMS --port="$ADMINISTRATOR_PORT [ "USER_DATA" ] && PARAMS="$PARAMS --users-dir="$USER_DATA [ "SCANNER_CONFIG" ] && PARAMS="$PARAMS --scanner-config-file="$SCANNER_CONFIG [ "SYNC_SCRIPT" ] && PARAMS="$PARAMS --sync-script="$SYNC_SCRIPT LOCKFILE=/var/lock/subsys/$PROG start() { echo -n $"Starting openvas-administrator: " daemon $EXEC $PARAMS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $LOCKFILE return $RETVAL } stop() { echo -n $"Stopping openvas-administrator: " killproc $PROG RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $LOCKFILE return $RETVAL } restart() { stop start } #reload() { # echo -n $"Reloading openvasad.conf file: " # killproc $PROG -HUP # RETVAL=$? # echo # return $RETVAL #} force_reload() { restart } fdr_status() { status $PROG } case "$1" in #start|stop|restart|reload) start|stop|restart) $1 ;; force-reload) force_reload ;; status) fdr_status ;; condrestart|try-restart) [ ! -f $LOCKFILE ] || restart ;; *) #echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}" exit 2 esac ++++++ openvasad.init.suse ++++++ #!/bin/sh # # /etc/init.d/openvas-administrator # and its symbolic link # /usr/sbin/rcopenvas-administrator # # LSB compatible service control script; see http://www.linuxbase.org/spec/ # ### BEGIN INIT INFO # Provides: openvas-administrator # Required-Start: $syslog $remote_fs # Should-Start: $time ypbind smtp # Required-Stop: $syslog $remote_fs # Should-Stop: $time ypbind smtp # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: OpenVAS Administrator # Description: This starts and stops the OpenVAS Administrator. ### END INIT INFO # # Note on runlevels: # 0 - halt/poweroff 6 - reboot # 1 - single user 2 - multiuser without network exported # 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) # # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance OPENVASAD_BIN=/usr/sbin/openvasad test -x $OPENVASAD_BIN || { echo "$OPENVASAD_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } # Check for existence of needed config file and read it OPENVASAD_CONFIG=/etc/sysconfig/openvas-administrator test -r $OPENVASAD_CONFIG || { echo "$OPENVASAD_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Read config . $OPENVASAD_CONFIG [ "ADMINISTRATOR_ADDRESS" ] && PARAMS="--listen="$ADMINISTRATOR_ADDRESS [ "ADMINISTRATOR_PORT" ] && PARAMS="$PARAMS --port="$ADMINISTRATOR_PORT [ "USER_DATA" ] && PARAMS="$PARAMS --users-dir="$USER_DATA [ "SCANNER_CONFIG" ] && PARAMS="$PARAMS --scanner-config-file="$SCANNER_CONFIG [ "SYNC_SCRIPT" ] && PARAMS="$PARAMS --sync-script="$SYNC_SCRIPT # Source LSB init functions # providing start_daemon, killproc, pidofproc, # log_success_msg, log_failure_msg and log_warning_msg. # This is currently not used by UnitedLinux based distributions and # not needed for init scripts for UnitedLinux only. If it is used, # the functions from rc.status should not be sourced or used. #. /lib/lsb/init-functions # 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 be verbose in local rc status and clear it afterwards # rc_status -v -r ditto and clear both the local and overall rc status # rc_status -s display "skipped" and exit with status 3 # rc_status -u display "unused" and exit with status 3 # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num> # rc_reset clear both the local and overall rc status # rc_exit exit appropriate to overall rc status # rc_active checks whether a service is activated by symlinks . /etc/rc.status # 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 - user had insufficient privileges # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signaling is not supported) are # considered a success. case "$1" in start) echo -n "Starting openvas-administrator " ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. /sbin/startproc $OPENVASAD_BIN $PARAMS # Remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down openvas-administrator " ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. /sbin/killproc -TERM $OPENVASAD_BIN # Remember status and be verbose rc_status -v ;; try-restart|condrestart) ## Do a restart only if the service was active before. ## Note: try-restart is now part of LSB (as of 1.9). ## RH has a similar command named condrestart. if test "$1" = "condrestart"; then echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" fi $0 status if test $? = 0; then $0 restart else rc_reset # Not running is not a failure. fi # 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 the service if it ## is running. echo -n "Reload service openvas-administrator " ## if it supports it: /sbin/killproc -HUP $OPENVASAD_BIN #touch /var/run/openvasad.pid rc_status -v ## Otherwise: #$0 try-restart #rc_status ;; reload) ## Like force-reload, but if daemon does not support ## signaling, do nothing (!) # If it supports signaling: echo -n "Reload service openvas-administrator " /sbin/killproc -HUP $OPENVASAD_BIN #touch /var/run/openvasad.pid rc_status -v ## Otherwise if it does not support reload: #rc_failed 3 #rc_status -v ;; status) echo -n "Checking for service openvas-administrator " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Return value is slightly different for the status command: # 0 - service up and running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running (unused) # 4 - service status unknown :-( # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. /sbin/checkproc $OPENVASAD_BIN # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. rc_status -v ;; probe) ## Optional: Probe for the necessity of a reload, print out the ## argument to this init script which is required for a reload. ## Note: probe is not (yet) part of LSB (as of 1.9) test $OPENVASAD_CONFIG -nt /var/run/openvasad.pid && echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 ;; esac rc_exit ++++++ openvasad.logrotate ++++++ /var/log/openvas/openvasad.log { daily rotate 7 compress missingok notifempty sharedscripts } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-Iterator-Util for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package perl-Iterator-Util for openSUSE:Factory checked in at Wed Mar 23 10:06:15 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Iterator-Util/perl-Iterator-Util.changes 2011-02-05 00:52:15.000000000 +0100 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Fri Feb 4 23:50:01 UTC 2011 - chris(a)computersalat.de + +- initial package 0.02 + * created by cpanspec 1.78.03 + calling whatdependson for head-i586 New: ---- Iterator-Util-0.02.tar.bz2 perl-Iterator-Util.changes perl-Iterator-Util.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Iterator-Util.spec ++++++ # # spec file for package perl-Iterator-Util # # Copyright (c) 2011 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: perl-Iterator-Util %define cpan_name Iterator-Util Summary: Essential utilities for the Iterator class Version: 0.02 Release: 1 License: GPL+ or Artistic Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Iterator-Util/ #Source: http://www.cpan.org/authors/id/R/RO/ROODE/Iterator-Util-%{version}.tar.gz Source: %{cpan_name}-%{version}.tar.bz2 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Exception::Class) >= 1.21 BuildRequires: perl(Iterator) >= 0.01 Requires: perl(Exception::Class) >= 1.21 Requires: perl(Iterator) >= 0.01 %{perl_requires} %description This module implements many useful functions for creating and manipulating iterator objects. An "iterator" is an object, represented as a code block that generates the "next value" of a sequence, and generally implemented as a closure. For further information, including a tutorial on using iterator objects, see the the Iterator manpage documentation. %prep %setup -q -n %{cpan_name}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check %{__make} test %install %perl_make_install %perl_process_packlist %perl_gen_filelist %clean %{__rm} -rf %{buildroot} %files -f %{name}.files %defattr(644,root,root,755) %doc Changes README %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 arptables for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package arptables for openSUSE:Factory checked in at Wed Mar 23 10:03:23 CET 2011. -------- --- arptables/arptables.changes 2010-05-07 14:31:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/arptables/arptables.changes 2011-03-21 17:51:41.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 21 16:51:40 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- COPYING ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arptables.spec ++++++ --- /var/tmp/diff_new_pack.QAl8Ds/_old 2011-03-23 10:03:15.000000000 +0100 +++ /var/tmp/diff_new_pack.QAl8Ds/_new 2011-03-23 10:03:15.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package arptables (Version 1.0.3.4) +# spec file for package arptables # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,7 +21,7 @@ Name: arptables Version: 1.0.3.4 -Release: 2 +Release: 8 %define oversion v0.0.3-4 License: GPLv2+ Group: Productivity/Networking/Security @@ -29,11 +29,11 @@ #Source: http://downloads.sf.net/ebtables/arptables-v0.0.3-4.tar.gz Source: %name-%oversion.tar.xz +Source1: COPYING Patch1: arptables-install.diff Patch2: arptables-warnings.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: coreutils licenses perl xz -Requires: licenses +BuildRequires: coreutils perl xz %description arptables is a user space tool used to set up and maintain thetables of @@ -54,10 +54,10 @@ %build make %{?_smp_mflags} all LIBDIR=/%{_lib} PREFIX=%_prefix COPT_FLAGS="$RPM_OPT_FLAGS -W -Wall" +cp %{S:1} . %install make install DESTDIR=%{buildroot} LIBDIR=/%{_lib} PREFIX=%_prefix MANDIR=%_mandir -ln -sf $(readlink -f /usr/share/doc/licenses/GPL-2.0.txt) COPYING %clean if [ -n "$RPM_BUILD_ROOT" ] && [ "$RPM_BUILD_ROOT" != "/" ] ; then ++++++ COPYING ++++++ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) 19yy <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) 19yy name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory checked in at Wed Mar 23 10:02:26 CET 2011. -------- --- AUTO/all/arpwatch-ethercodes/arpwatch-ethercodes.changes 2011-03-19 05:40:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/arpwatch-ethercodes/arpwatch-ethercodes.changes 2011-03-23 05:40:08.000000000 +0100 @@ -2 +2 @@ -Sat Mar 19 05:40:10 CET 2011 - autobuild(a)suse.de +Wed Mar 23 05:40:08 CET 2011 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2011-03-19 +- automated update on 2011-03-23 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ --- /var/tmp/diff_new_pack.FdF6fb/_old 2011-03-23 09:59:15.000000000 +0100 +++ /var/tmp/diff_new_pack.FdF6fb/_new 2011-03-23 09:59:15.000000000 +0100 @@ -25,7 +25,7 @@ Group: Productivity/Networking/Diagnostic AutoReqProv: on Summary: Ethercodes Data for arpwatch -Version: 2011.3.19 +Version: 2011.3.23 Release: 1 Source: http://standards.ieee.org/regauth/oui/oui.txt.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ oui.txt.bz2 ++++++ --- /var/tmp/diff_new_pack.FdF6fb/_old 2011-03-23 09:59:15.000000000 +0100 +++ /var/tmp/diff_new_pack.FdF6fb/_new 2011-03-23 09:59:15.000000000 +0100 @@ -74877,6 +74877,12 @@ 60440 UNITED STATES +00-A1-DE (hex) ShenZhen ShiHua Technology CO.,LTD +00A1DE (base 16) ShenZhen ShiHua Technology CO.,LTD + Room505,5/F��TsingYi Building,LangShan 2ed Road,High-Tech Industrial Park, + ShenZhen GuangDong 518052 + CHINA + 00-A2-DA (hex) INAT GmbH 00A2DA (base 16) INAT GmbH Ostendstr. 50A @@ -80403,6 +80409,12 @@ Seoul 135-502 KOREA, REPUBLIC OF +04-46-65 (hex) Murata Manufacturing Co., Ltd. +044665 (base 16) Murata Manufacturing Co., Ltd. + 1-10-1, Higashikotari + Nagaokakyo-shi Kyoto 617-8555 + JAPAN + 04-4F-AA (hex) Ruckus Wireless 044FAA (base 16) Ruckus Wireless 880 West Maude Ave. @@ -81710,6 +81722,12 @@ Taipei 11492 TAIWAN, REPUBLIC OF CHINA +0C-74-C2 (hex) Apple Inc +0C74C2 (base 16) Apple Inc + 1 Infinite Loop + Cupertino CA 95014 + UNITED STATES + 0C-7D-7C (hex) Kexiang Information Technology Co, Ltd. 0C7D7C (base 16) Kexiang Information Technology Co, Ltd. Room 1502, Longxi Hotel No.3788 Jiangnan Avenue. @@ -82539,6 +82557,12 @@ Charneca da Caparica 2820-486 PORTUGAL +1C-7E-E5 (hex) D-Link International +1C7EE5 (base 16) D-Link International + 1 International Business Park, #03-12, The Synergy + 609917 + SINGAPORE + 1C-83-B0 (hex) Linked IP GmbH 1C83B0 (base 16) Linked IP GmbH Kirchenstrasse 9 @@ -83163,6 +83187,12 @@ Union City CA 94587 UNITED STATES +2C-21-72 (hex) Juniper Networks +2C2172 (base 16) Juniper Networks + 1194 N Mathilda Avenue + Sunnyvale CA 94089 + UNITED STATES + 2C-27-D7 (hex) Hewlett Packard 2C27D7 (base 16) Hewlett Packard 11445 Compaq Center Drive @@ -84764,6 +84794,13 @@ Gravata� Rio Grande do Sul 94045420 BRAZIL +4C-98-EF (hex) Zeo +4C98EF (base 16) Zeo + 320 Nevada St + 4th Floor + Newton MA 02460 + UNITED STATES + 4C-9E-E4 (hex) Hanyang Navicom Co.,Ltd. 4C9EE4 (base 16) Hanyang Navicom Co.,Ltd. 713, Gwanpyeong-dong, Yusung-gu @@ -85823,6 +85860,13 @@ Phoenix AZ 85028 UNITED STATES +64-73-E2 (hex) Arbiter Systems, Inc. +6473E2 (base 16) Arbiter Systems, Inc. + 1324 Vendels Circle + Suite 121 + Paso Robles California 93446 + UNITED STATES + 64-7B-D4 (hex) Texas Instruments 647BD4 (base 16) Texas Instruments 12500 TI Boulevard @@ -88679,6 +88723,13 @@ shenzhen guangdong 518057 CHINA +98-F8-DB (hex) Marini Impianti Industriali s.r.l. +98F8DB (base 16) Marini Impianti Industriali s.r.l. + Via delle Province, 6A + (Zona Artigianale) + Cisterna di Latina 04012 + ITALY + 98-FC-11 (hex) Cisco-Linksys, LLC 98FC11 (base 16) Cisco-Linksys, LLC 131 Theroy Drive @@ -89084,6 +89135,12 @@ San Jose CA 95134 UNITED STATES +A4-13-4E (hex) Luxul Wireless +A4134E (base 16) Luxul Wireless + 357 S 670 W + Lindon UT 84042 + UNITED STATES + A4-1B-C0 (hex) Fastec Imaging Corporation A41BC0 (base 16) Fastec Imaging Corporation 17150 Via Del Campo @@ -89817,6 +89874,13 @@ Los Gatos CA 95032 UNITED STATES +B0-99-28 (hex) Fujitsu Limited +B09928 (base 16) Fujitsu Limited + Musashi-kosugi Tower Place Bldg., + 403, Kosugi-cho 1-chome, Nakahara-ku + Kawasaki Kanagawa 211-0063 + JAPAN + B0-9A-E2 (hex) STEMMER IMAGING GmbH B09AE2 (base 16) STEMMER IMAGING GmbH Gutenbergstr. 11 @@ -90232,6 +90296,12 @@ Wuhan Hubei 430074 CHINA +B8-C7-5D (hex) Apple Inc +B8C75D (base 16) Apple Inc + 1 Infinite Loop + Cupertino CA 95014 + UNITED STATES + B8-D0-6F (hex) GUANGZHOU HKUST FOK YING TUNG RESEARCH INSTITUTE B8D06F (base 16) GUANGZHOU HKUST FOK YING TUNG RESEARCH INSTITUTE Rm 403, North of Software Building,Nansha IT Park, @@ -91668,6 +91738,12 @@ Wuhan Hubei 430223 CHINA +D4-A4-25 (hex) SMAX Technology Co., Ltd. +D4A425 (base 16) SMAX Technology Co., Ltd. + 2F., No. 3, Wuquan 3rd, Wugu Dist. + New Taipei City 248 + TAIWAN, REPUBLIC OF CHINA + D4-A9-28 (hex) GreenWave Reality Inc D4A928 (base 16) GreenWave Reality Inc 39 Parker @@ -92039,6 +92115,12 @@ 138 Shatin Rural Committee Road, Shatin, N.T., HONG KONG +DC-A6-BD (hex) Beijing Lanbo Technology Co., Ltd. +DCA6BD (base 16) Beijing Lanbo Technology Co., Ltd. + Room.301.Bidg.4NO.8 Shangdi West Road, Haidian District, + Beijing City 100085 + CHINA + DC-A7-D9 (hex) Compressor Controls Corp DCA7D9 (base 16) Compressor Controls Corp 4725 121st Street @@ -92375,6 +92457,12 @@ Cupertino CA 95014 UNITED STATES +E4-12-89 (hex) topsystem Systemhaus GmbH +E41289 (base 16) topsystem Systemhaus GmbH + Monnetstra�e 24 + W�rselen NRW 52146 + GERMANY + E4-1C-4B (hex) V2 TECHNOLOGY, INC. E41C4B (base 16) V2 TECHNOLOGY, INC. 4450 Enterprise Street @@ -92531,6 +92619,12 @@ CHENNAI TAMIL NADU 600 041 INDIA +E8-04-0B (hex) Apple Inc +E8040B (base 16) Apple Inc + 1 Infinite Loop + Cupertino CA 95014 + UNITED STATES + E8-04-62 (hex) Cisco Systems E80462 (base 16) Cisco Systems 80 West Tasman Dr. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package bundle-lang-common for openSUSE:Factory checked in at Wed Mar 23 09:58:56 CET 2011. -------- --- bundle-lang-common/bundle-lang-common.changes 2011-03-10 14:23:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/bundle-lang-common/bundle-lang-common.changes 2011-03-22 15:57:48.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 22 14:57:34 UTC 2011 - coolo(a)novell.com + +- update package list + +------------------------------------------------------------------- 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.Ew29MU/_old 2011-03-23 09:52:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Ew29MU/_new 2011-03-23 09:52:27.000000000 +0100 @@ -29,7 +29,7 @@ License: MIT License (or similar) Group: System/Localization Version: 11.4 -Release: 16 +Release: 17 Summary: Translations for a Group of Programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ bundle-lang-gnome-extras.spec ++++++ --- /var/tmp/diff_new_pack.Ew29MU/_old 2011-03-23 09:52:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Ew29MU/_new 2011-03-23 09:52:27.000000000 +0100 @@ -20,7 +20,7 @@ #!BuildIgnore: gimp-unstable Name: bundle-lang-gnome-extras -BuildRequires: PolicyKit-gnome-lang accerciser-lang alarm-clock-applet-lang anjuta-extras-lang anjuta-lang aqbanking-lang arista-lang at-spi2-atk-lang atk-lang backup-manager-lang balsa-lang blueproximity-lang byzanz-lang cherrytree-lang chmsee-lang claws-mail-extra-plugins-lang claws-mail-lang comix-lang computertemp-lang conduit-lang conglomerate-lang contact-lookup-applet-lang decibel-audio-player-lang deja-dup-lang deskbar-applet-lang devhelp-lang dia-lang drapes-lang eiciel-lang ekiga-lang eog-plugins-lang epiphany-extensions-lang epiphany-lang evolution-exchange-lang evolution-plugin-rss-lang gDesklets-lang gdl-lang geany-lang geany-plugins-lang gedit-plugins-lang genius-lang gftp-common-lang ghex-lang giggle-lang gimp-gap-lang gimp-plugin-lqr-lang gitg-lang giver-lang gkrellm-lang glabels-lang glade3-lang glines-lang gnac-lang gnect-lang gnibbles-lang gnobots2-lang gnome-activity-journal-lang gnome-blog-lang gnome-color-chooser-lang gnome-color-manager-lang gnome-commander-lang gnome-desktop-lang gnome-devel-docs-lang gnome-dvb-daemon-lang gnome-gmail-notifier-lang gnome-netspeed-applet-lang gnome-netstatus-lang gnome-pilot-conduits-lang gnome-pilot-lang gnome-reset-lang gnome-search-tool-lang gnome-shell-lang gnome-subtitles-lang gnomeicu-lang gnote-lang gnotravex-lang gnotski-lang gnucash-lang gnumeric-lang gobby-lang gobby04-lang goffice-lang gok-lang goobox-lang goocanvas-lang gpa-lang gqview-lang gramps-lang gstreamer-0_10-plugins-ugly-lang gsynaptics-lang gtali-lang gtg-lang gthumb-lang gtk-vnc-lang gtk2-engines-lang gtk3-lang gtkmm2-tutorial-lang gtkpod-lang gtranslator-lang gwenhywfar-lang gwget-lang gwibber-lang inkscape-lang istanbul-lang jhbuild-lang krb5-auth-dialog-lang last-exit-lang libbtctl-lang libgda-4_0-4-lang libgda3-lang libgsasl-lang libinfinity-lang mail-notification-lang meld-lang memprof-lang mutter-lang nautilus-search-tool-lang nautilus-share-lang nautilus-terminal-lang nemiver-lang net6-lang ntfs-config-lang obby-lang pan-lang pessulus-lang pino-lang planner-lang radiotray-lang rhythmbox-lang rygel-lang sabayon-lang scrollkeeper-lang shotwell-lang simple-scan-lang sound-juicer-lang sparkleshare-lang swfdec-gnome-lang transmageddon-lang tsclient-lang twitux-lang uget-lang vboxgtk-lang vinagre-lang x-tile-lang xchat-gnome-lang zeitgeist-lang +BuildRequires: PolicyKit-gnome-lang accerciser-lang alarm-clock-applet-lang anjuta-extras-lang anjuta-lang aqbanking-lang arista-lang at-spi2-atk-lang atk-lang backup-manager-lang balsa-lang blueproximity-lang byzanz-lang cherrytree-lang chmsee-lang claws-mail-extra-plugins-lang claws-mail-lang comix-lang computertemp-lang conduit-lang conglomerate-lang contact-lookup-applet-lang decibel-audio-player-lang deja-dup-lang deskbar-applet-lang devhelp-lang dia-lang drapes-lang eiciel-lang ekiga-lang eog-plugins-lang epiphany-extensions-lang epiphany-lang evolution-exchange-lang evolution-plugin-rss-lang gDesklets-lang gdl-lang geany-lang geany-plugins-lang gedit-plugins-lang genius-lang gftp-common-lang ghex-lang giggle-lang gimp-gap-lang gimp-plugin-lqr-lang gitg-lang giver-lang gkrellm-lang glabels-lang glade3-lang glines-lang gnac-lang gnect-lang gnibbles-lang gnobots2-lang gnome-activity-journal-lang gnome-blog-lang gnome-color-chooser-lang gnome-color-manager-lang gnome-commander-lang gnome-desktop-lang gnome-devel-docs-lang gnome-dvb-daemon-lang gnome-gmail-notifier-lang gnome-netspeed-applet-lang gnome-netstatus-lang gnome-pilot-conduits-lang gnome-pilot-lang gnome-reset-lang gnome-search-tool-lang gnome-shell-lang gnome-subtitles-lang gnomeicu-lang gnotravex-lang gnotski-lang gnucash-lang gnumeric-lang gobby-lang gobby04-lang goffice-lang gok-lang goobox-lang goocanvas-lang gpa-lang gqview-lang gramps-lang gstreamer-0_10-plugins-ugly-lang gsynaptics-lang gtali-lang gtg-lang gthumb-lang gtk-vnc-lang gtk2-engines-lang gtk3-lang gtkmm2-tutorial-lang gtkpod-lang gtranslator-lang gwenhywfar-lang gwget-lang gwibber-lang inkscape-lang istanbul-lang jhbuild-lang krb5-auth-dialog-lang last-exit-lang libbtctl-lang libgda-4_0-4-lang libgda3-lang libgsasl-lang libinfinity-lang mail-notification-lang meld-lang memprof-lang mutter-lang nautilus-search-tool-lang nautilus-share-lang nautilus-terminal-lang nemiver-lang net6-lang ntfs-config-lang obby-lang pan-lang pessulus-lang pino-lang planner-lang radiotray-lang rhythmbox-lang rygel-lang sabayon-lang scrollkeeper-lang shotwell-lang simple-scan-lang sound-juicer-lang sparkleshare-lang swfdec-gnome-lang transmageddon-lang tsclient-lang twitux-lang uget-lang vboxgtk-lang vinagre-lang x-tile-lang xchat-gnome-lang zeitgeist-lang BuildRequires: fdupes #!BuildIgnore: xorg-x11-driver-input #!BuildIgnore: NetworkManager-openvpn @@ -29,7 +29,7 @@ License: MIT License (or similar) Group: System/Localization Version: 11.4 -Release: 8 +Release: 9 Summary: Translations for many GNOME programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -196,8 +196,6 @@ Provides: locale(gnome-subtitles:en) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:en) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:en) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:en) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -496,8 +494,6 @@ Provides: locale(gnome-subtitles:de) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:de) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:de) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:de) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -796,8 +792,6 @@ Provides: locale(gnome-subtitles:es) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:es) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:es) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:es) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -1096,8 +1090,6 @@ Provides: locale(gnome-subtitles:it) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:it) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:it) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:it) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -1396,8 +1388,6 @@ Provides: locale(gnome-subtitles:fr) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:fr) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:fr) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:fr) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -1696,8 +1686,6 @@ Provides: locale(gnome-subtitles:ja) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:ja) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:ja) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:ja) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -1996,8 +1984,6 @@ Provides: locale(gnome-subtitles:zh) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:zh) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:zh) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:zh) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -2296,8 +2282,6 @@ Provides: locale(gnome-subtitles:nl) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:nl) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:nl) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:nl) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -2596,8 +2580,6 @@ Provides: locale(gnome-subtitles:cs) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:cs) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:cs) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:cs) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -2970,9 +2952,6 @@ Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:pt) Provides: locale(gnomeicu:pt_BR) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:pt) -Provides: locale(gnote:pt_BR) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:pt) Provides: locale(gnotravex:pt_BR) @@ -3342,8 +3321,6 @@ Provides: locale(gnome-subtitles:pl) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:pl) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:pl) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:pl) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -3642,8 +3619,6 @@ Provides: locale(gnome-subtitles:ca) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:ca) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:ca) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:ca) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -3942,8 +3917,6 @@ Provides: locale(gnome-subtitles:ar) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:ar) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:ar) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:ar) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -4242,8 +4215,6 @@ Provides: locale(gnome-subtitles:hu) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:hu) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:hu) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:hu) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -4542,8 +4513,6 @@ Provides: locale(gnome-subtitles:ko) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:ko) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:ko) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:ko) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -4842,8 +4811,6 @@ Provides: locale(gnome-subtitles:da) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:da) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:da) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:da) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -5142,8 +5109,6 @@ Provides: locale(gnome-subtitles:sv) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:sv) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:sv) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:sv) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -5442,8 +5407,6 @@ Provides: locale(gnome-subtitles:ru) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:ru) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:ru) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:ru) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -5742,8 +5705,6 @@ Provides: locale(gnome-subtitles:fi) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:fi) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:fi) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:fi) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -6042,8 +6003,6 @@ Provides: locale(gnome-subtitles:nb) Provides: gnomeicu-lang = %(rpm -q --queryformat '%{VERSION}' gnomeicu-lang) Provides: locale(gnomeicu:nb) -Provides: gnote-lang = %(rpm -q --queryformat '%{VERSION}' gnote-lang) -Provides: locale(gnote:nb) Provides: gnotravex-lang = %(rpm -q --queryformat '%{VERSION}' gnotravex-lang) Provides: locale(gnotravex:nb) Provides: gnotski-lang = %(rpm -q --queryformat '%{VERSION}' gnotski-lang) @@ -6197,7 +6156,7 @@ %install mkdir -p $RPM_BUILD_ROOT cp %SOURCE1 . -bash %SOURCE0 PolicyKit-gnome-lang accerciser-lang alarm-clock-applet-lang anjuta-extras-lang anjuta-lang aqbanking-lang arista-lang at-spi2-atk-lang atk-lang backup-manager-lang balsa-lang blueproximity-lang byzanz-lang cherrytree-lang chmsee-lang claws-mail-extra-plugins-lang claws-mail-lang comix-lang computertemp-lang conduit-lang conglomerate-lang contact-lookup-applet-lang decibel-audio-player-lang deja-dup-lang deskbar-applet-lang devhelp-lang dia-lang drapes-lang eiciel-lang ekiga-lang eog-plugins-lang epiphany-extensions-lang epiphany-lang evolution-exchange-lang evolution-plugin-rss-lang gDesklets-lang gdl-lang geany-lang geany-plugins-lang gedit-plugins-lang genius-lang gftp-common-lang ghex-lang giggle-lang gimp-gap-lang gimp-plugin-lqr-lang gitg-lang giver-lang gkrellm-lang glabels-lang glade3-lang glines-lang gnac-lang gnect-lang gnibbles-lang gnobots2-lang gnome-activity-journal-lang gnome-blog-lang gnome-color-chooser-lang gnome-color-manager-lang gnome-commander-lang gnome-desktop-lang gnome-devel-docs-lang gnome-dvb-daemon-lang gnome-gmail-notifier-lang gnome-netspeed-applet-lang gnome-netstatus-lang gnome-pilot-conduits-lang gnome-pilot-lang gnome-reset-lang gnome-search-tool-lang gnome-shell-lang gnome-subtitles-lang gnomeicu-lang gnote-lang gnotravex-lang gnotski-lang gnucash-lang gnumeric-lang gobby-lang gobby04-lang goffice-lang gok-lang goobox-lang goocanvas-lang gpa-lang gqview-lang gramps-lang gstreamer-0_10-plugins-ugly-lang gsynaptics-lang gtali-lang gtg-lang gthumb-lang gtk-vnc-lang gtk2-engines-lang gtk3-lang gtkmm2-tutorial-lang gtkpod-lang gtranslator-lang gwenhywfar-lang gwget-lang gwibber-lang inkscape-lang istanbul-lang jhbuild-lang krb5-auth-dialog-lang last-exit-lang libbtctl-lang libgda-4_0-4-lang libgda3-lang libgsasl-lang libinfinity-lang mail-notification-lang meld-lang memprof-lang mutter-lang nautilus-search-tool-lang nautilus-share-lang nautilus-terminal-lang nemiver-lang net6-lang ntfs-config-lang obby-lang pan-lang pessulus-lang pino-lang planner-lang radiotray-lang rhythmbox-lang rygel-lang sabayon-lang scrollkeeper-lang shotwell-lang simple-scan-lang sound-juicer-lang sparkleshare-lang swfdec-gnome-lang transmageddon-lang tsclient-lang twitux-lang uget-lang vboxgtk-lang vinagre-lang x-tile-lang xchat-gnome-lang zeitgeist-lang +bash %SOURCE0 PolicyKit-gnome-lang accerciser-lang alarm-clock-applet-lang anjuta-extras-lang anjuta-lang aqbanking-lang arista-lang at-spi2-atk-lang atk-lang backup-manager-lang balsa-lang blueproximity-lang byzanz-lang cherrytree-lang chmsee-lang claws-mail-extra-plugins-lang claws-mail-lang comix-lang computertemp-lang conduit-lang conglomerate-lang contact-lookup-applet-lang decibel-audio-player-lang deja-dup-lang deskbar-applet-lang devhelp-lang dia-lang drapes-lang eiciel-lang ekiga-lang eog-plugins-lang epiphany-extensions-lang epiphany-lang evolution-exchange-lang evolution-plugin-rss-lang gDesklets-lang gdl-lang geany-lang geany-plugins-lang gedit-plugins-lang genius-lang gftp-common-lang ghex-lang giggle-lang gimp-gap-lang gimp-plugin-lqr-lang gitg-lang giver-lang gkrellm-lang glabels-lang glade3-lang glines-lang gnac-lang gnect-lang gnibbles-lang gnobots2-lang gnome-activity-journal-lang gnome-blog-lang gnome-color-chooser-lang gnome-color-manager-lang gnome-commander-lang gnome-desktop-lang gnome-devel-docs-lang gnome-dvb-daemon-lang gnome-gmail-notifier-lang gnome-netspeed-applet-lang gnome-netstatus-lang gnome-pilot-conduits-lang gnome-pilot-lang gnome-reset-lang gnome-search-tool-lang gnome-shell-lang gnome-subtitles-lang gnomeicu-lang gnotravex-lang gnotski-lang gnucash-lang gnumeric-lang gobby-lang gobby04-lang goffice-lang gok-lang goobox-lang goocanvas-lang gpa-lang gqview-lang gramps-lang gstreamer-0_10-plugins-ugly-lang gsynaptics-lang gtali-lang gtg-lang gthumb-lang gtk-vnc-lang gtk2-engines-lang gtk3-lang gtkmm2-tutorial-lang gtkpod-lang gtranslator-lang gwenhywfar-lang gwget-lang gwibber-lang inkscape-lang istanbul-lang jhbuild-lang krb5-auth-dialog-lang last-exit-lang libbtctl-lang libgda-4_0-4-lang libgda3-lang libgsasl-lang libinfinity-lang mail-notification-lang meld-lang memprof-lang mutter-lang nautilus-search-tool-lang nautilus-share-lang nautilus-terminal-lang nemiver-lang net6-lang ntfs-config-lang obby-lang pan-lang pessulus-lang pino-lang planner-lang radiotray-lang rhythmbox-lang rygel-lang sabayon-lang scrollkeeper-lang shotwell-lang simple-scan-lang sound-juicer-lang sparkleshare-lang swfdec-gnome-lang transmageddon-lang tsclient-lang twitux-lang uget-lang vboxgtk-lang vinagre-lang x-tile-lang xchat-gnome-lang zeitgeist-lang if test gnome-extras = kde; then # pretty evil hack to keep the symlinks working ++++++ bundle-lang-gnome.spec ++++++ --- /var/tmp/diff_new_pack.Ew29MU/_old 2011-03-23 09:52:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Ew29MU/_new 2011-03-23 09:52:27.000000000 +0100 @@ -29,7 +29,7 @@ License: MIT License (or similar) Group: System/Localization Version: 11.4 -Release: 8 +Release: 9 Summary: Translations for many GNOME programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ bundle-lang-kde.spec ++++++ --- /var/tmp/diff_new_pack.Ew29MU/_old 2011-03-23 09:52:28.000000000 +0100 +++ /var/tmp/diff_new_pack.Ew29MU/_new 2011-03-23 09:52:28.000000000 +0100 @@ -20,7 +20,7 @@ #!BuildIgnore: gimp-unstable Name: bundle-lang-kde -BuildRequires: NetworkManager-kde4-libs-lang amarok-lang ggz-client-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang kpackagekit-lang ktorrent-lang kwebkitpart-lang libgpod-lang +BuildRequires: NetworkManager-kde4-libs-lang amarok-lang ggz-client-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang kpackagekit-lang ktorrent-lang kwebkitpart-lang libgpod-lang libktorrent3-lang BuildRequires: fdupes #!BuildIgnore: xorg-x11-driver-input #!BuildIgnore: NetworkManager-openvpn @@ -29,7 +29,7 @@ License: MIT License (or similar) Group: System/Localization Version: 11.4 -Release: 8 +Release: 9 Summary: Translations for a group of KDE applications BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -82,6 +82,8 @@ Provides: locale(kwebkitpart:en) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:en) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:en) %description en This package groups translations for a dozen of KDE programs into @@ -124,6 +126,8 @@ Provides: locale(kwebkitpart:de) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:de) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:de) %description de This package groups translations for a dozen of KDE programs into @@ -166,6 +170,8 @@ Provides: locale(kwebkitpart:es) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:es) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:es) %description es This package groups translations for a dozen of KDE programs into @@ -208,6 +214,8 @@ Provides: locale(kwebkitpart:it) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:it) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:it) %description it This package groups translations for a dozen of KDE programs into @@ -250,6 +258,8 @@ Provides: locale(kwebkitpart:fr) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:fr) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:fr) %description fr This package groups translations for a dozen of KDE programs into @@ -292,6 +302,8 @@ Provides: locale(kwebkitpart:ja) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:ja) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:ja) %description ja This package groups translations for a dozen of KDE programs into @@ -334,6 +346,8 @@ Provides: locale(kwebkitpart:zh) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:zh) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:zh) %description zh This package groups translations for a dozen of KDE programs into @@ -376,6 +390,8 @@ Provides: locale(kwebkitpart:nl) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:nl) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:nl) %description nl This package groups translations for a dozen of KDE programs into @@ -418,6 +434,8 @@ Provides: locale(kwebkitpart:cs) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:cs) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:cs) %description cs This package groups translations for a dozen of KDE programs into @@ -470,6 +488,9 @@ Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:pt) Provides: locale(libgpod:pt_BR) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:pt) +Provides: locale(libktorrent3:pt_BR) %description pt This package groups translations for a dozen of KDE programs into @@ -512,6 +533,8 @@ Provides: locale(kwebkitpart:pl) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:pl) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:pl) %description pl This package groups translations for a dozen of KDE programs into @@ -554,6 +577,8 @@ Provides: locale(kwebkitpart:ca) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:ca) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:ca) %description ca This package groups translations for a dozen of KDE programs into @@ -596,6 +621,8 @@ Provides: locale(kwebkitpart:ar) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:ar) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:ar) %description ar This package groups translations for a dozen of KDE programs into @@ -638,6 +665,8 @@ Provides: locale(kwebkitpart:hu) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:hu) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:hu) %description hu This package groups translations for a dozen of KDE programs into @@ -680,6 +709,8 @@ Provides: locale(kwebkitpart:ko) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:ko) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:ko) %description ko This package groups translations for a dozen of KDE programs into @@ -722,6 +753,8 @@ Provides: locale(kwebkitpart:da) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:da) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:da) %description da This package groups translations for a dozen of KDE programs into @@ -764,6 +797,8 @@ Provides: locale(kwebkitpart:sv) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:sv) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:sv) %description sv This package groups translations for a dozen of KDE programs into @@ -806,6 +841,8 @@ Provides: locale(kwebkitpart:ru) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:ru) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:ru) %description ru This package groups translations for a dozen of KDE programs into @@ -848,6 +885,8 @@ Provides: locale(kwebkitpart:fi) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:fi) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:fi) %description fi This package groups translations for a dozen of KDE programs into @@ -890,6 +929,8 @@ Provides: locale(kwebkitpart:nb) Provides: libgpod-lang = %(rpm -q --queryformat '%{VERSION}' libgpod-lang) Provides: locale(libgpod:nb) +Provides: libktorrent3-lang = %(rpm -q --queryformat '%{VERSION}' libktorrent3-lang) +Provides: locale(libktorrent3:nb) %description nb This package groups translations for a dozen of KDE programs into @@ -915,7 +956,7 @@ %install mkdir -p $RPM_BUILD_ROOT cp %SOURCE1 . -bash %SOURCE0 NetworkManager-kde4-libs-lang amarok-lang ggz-client-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang kpackagekit-lang ktorrent-lang kwebkitpart-lang libgpod-lang +bash %SOURCE0 NetworkManager-kde4-libs-lang amarok-lang ggz-client-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang kpackagekit-lang ktorrent-lang kwebkitpart-lang libgpod-lang libktorrent3-lang if test kde = kde; then # pretty evil hack to keep the symlinks working ++++++ bundle-lang-other.spec ++++++ --- /var/tmp/diff_new_pack.Ew29MU/_old 2011-03-23 09:52:28.000000000 +0100 +++ /var/tmp/diff_new_pack.Ew29MU/_new 2011-03-23 09:52:28.000000000 +0100 @@ -22,7 +22,7 @@ License: MIT License (or similar) Group: System/GUI/KDE Version: 11.2 -Release: 52 +Release: 53 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.Ew29MU/_old 2011-03-23 09:52:28.000000000 +0100 +++ /var/tmp/diff_new_pack.Ew29MU/_new 2011-03-23 09:52:28.000000000 +0100 @@ -146,7 +146,6 @@ gnome-web-photo-lang gnome gnomeicu-lang gnome-extras gnomine-lang gnome -gnote-lang gnome-extras gnotravex-lang gnome-extras gnotski-lang gnome-extras gnucash-lang gnome-extras @@ -223,6 +222,7 @@ libgweather-lang gnome libinfinity-lang gnome-extras libiptcdata-lang gnome +libktorrent3-lang kde libpurple-lang gnome libslab-lang gnome libwebkitgtk2-lang gnome ++++++ update-gnome-extras.sh ++++++ --- /var/tmp/diff_new_pack.Ew29MU/_old 2011-03-23 09:52:28.000000000 +0100 +++ /var/tmp/diff_new_pack.Ew29MU/_new 2011-03-23 09:52:28.000000000 +0100 @@ -48,7 +48,7 @@ PACKAGES="pitivi-lang konqueror-plugins-lang pango-module-thai-lang" # temporaries go here -for pack in $PACKAGES pdfmod-lang NetworkManager-strongswan-lang gnome-gmail-lang gnome-shell-extensions-lang gnome-themes-standard-lang libpeas-lang yelp-xsl-lang; do +for pack in $PACKAGES gnote-lang pdfmod-lang NetworkManager-strongswan-lang gnome-gmail-lang gnome-shell-extensions-lang gnome-themes-standard-lang libpeas-lang yelp-xsl-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 deltafs for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package deltafs for openSUSE:Factory checked in at Wed Mar 23 09:51:06 CET 2011. -------- --- deltafs/deltafs.changes 2009-11-20 14:36:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/deltafs/deltafs.changes 2011-03-22 06:12:30.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 22 05:12:29 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deltafs.spec ++++++ --- /var/tmp/diff_new_pack.SQauS8/_old 2011-03-23 09:50:55.000000000 +0100 +++ /var/tmp/diff_new_pack.SQauS8/_new 2011-03-23 09:50:55.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package deltafs (Version 1.0) +# spec file for package deltafs # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,12 @@ Name: deltafs -BuildRequires: fuse-devel licenses pkg-config -Requires: fuse licenses +BuildRequires: fuse-devel pkg-config +Requires: fuse Summary: Delta Filesystem Version: 1.0 -Release: 1 -License: GPL v2 only +Release: 9 +License: GPLv2 Group: System/Filesystems Source: %{name}-%{version}.tar.bz2 Url: http://git.kernel.org/?p=linux/kernel/git/mszeredi/deltafs.git @@ -56,7 +56,6 @@ %install make DESTDIR="$RPM_BUILD_ROOT" install -ln -sf ../../licenses/md5/$(md5sum COPYING | sed 's/ .*//') COPYING %clean rm -rf $RPM_BUILD_ROOT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 fusesmb for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package fusesmb for openSUSE:Factory checked in at Wed Mar 23 09:50:33 CET 2011. -------- --- fusesmb/fusesmb.changes 2009-01-26 17:10:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/fusesmb/fusesmb.changes 2011-03-22 06:12:51.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 22 05:12:50 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fusesmb.spec ++++++ --- /var/tmp/diff_new_pack.4wQ9PS/_old 2011-03-23 09:50:17.000000000 +0100 +++ /var/tmp/diff_new_pack.4wQ9PS/_new 2011-03-23 09:50:17.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package fusesmb (Version 0.8.7) +# spec file for package fusesmb # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,12 @@ Name: fusesmb -BuildRequires: fuse-devel glib2-devel libsmbclient-devel licenses samba-client -Requires: fuse licenses +BuildRequires: fuse-devel glib2-devel libsmbclient-devel samba-client +Requires: fuse Summary: SMB for FUSE Version: 0.8.7 -Release: 102 -License: GPL v2 or later +Release: 113 +License: GPLv2+ Group: System/Filesystems Source: %{name}-%{version}.tar.bz2 Patch: search_path_fix.patch @@ -58,7 +58,6 @@ %install make DESTDIR="$RPM_BUILD_ROOT" install -ln -sf ../../licenses/md5/$(md5sum COPYING | sed 's/ .*//') COPYING %clean rm -rf $RPM_BUILD_ROOT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ndiswrapper for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package ndiswrapper for openSUSE:Factory checked in at Wed Mar 23 09:49:15 CET 2011. -------- --- ndiswrapper/ndiswrapper.changes 2010-09-13 16:17:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/ndiswrapper/ndiswrapper.changes 2011-03-22 18:49:36.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 22 17:46:48 UTC 2011 - idoenmez(a)novell.com + +- Add ndiswrapper-2.6.38.patch: patch from upstream to fix + compilation with 2.6.38 kernel + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ndiswrapper-2.6.38.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ndiswrapper.spec ++++++ --- /var/tmp/diff_new_pack.yWd8GN/_old 2011-03-23 09:48:54.000000000 +0100 +++ /var/tmp/diff_new_pack.yWd8GN/_new 2011-03-23 09:48:54.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package ndiswrapper (Version 1.56) +# spec file for package ndiswrapper # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -24,7 +24,7 @@ AutoReqProv: on Summary: Use Microsoft NDIS Network Drivers for WLAN Cards Version: 1.56 -Release: 1 +Release: 2 Requires: pciutils Requires: ndiswrapper-kmp Source0: %name-%version.tar.bz2 @@ -32,6 +32,7 @@ Source3: preamble Patch0: ndiswrapper.diff Patch1: ndiswrapper-2.6.35.patch +Patch2: ndiswrapper-2.6.38.patch Url: http://ndiswrapper.sourceforge.net License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -61,6 +62,7 @@ %setup %patch0 %patch1 +%patch2 -p2 cp %SOURCE2 . mkdir obj ++++++ ndiswrapper-2.6.38.patch ++++++ --- trunk/ndiswrapper/driver/wrapndis.c 2010/09/13 08:51:07 2727 +++ trunk/ndiswrapper/driver/wrapndis.c 2011/02/14 17:00:00 2729 @@ -13,16 +13,16 @@ * */ -#include "ndis.h" -#include "iw_ndis.h" -#include "pnp.h" -#include "loader.h" -#include "wrapndis.h" #include <linux/inetdevice.h> #include <linux/ip.h> #include <linux/tcp.h> #include <linux/udp.h> #include <linux/in.h> +#include "ndis.h" +#include "iw_ndis.h" +#include "pnp.h" +#include "loader.h" +#include "wrapndis.h" #include "wrapper.h" /* Functions callable from the NDIS driver */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 obexfs for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package obexfs for openSUSE:Factory checked in at Wed Mar 23 09:48:35 CET 2011. -------- --- obexfs/obexfs.changes 2009-03-23 17:05:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/obexfs/obexfs.changes 2011-03-22 06:13:19.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 22 05:13:18 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obexfs.spec ++++++ --- /var/tmp/diff_new_pack.rF6ZNf/_old 2011-03-23 09:47:47.000000000 +0100 +++ /var/tmp/diff_new_pack.rF6ZNf/_new 2011-03-23 09:47:47.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package obexfs (Version 0.11) +# spec file for package obexfs # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,12 @@ Name: obexfs -BuildRequires: bluez-devel fuse-devel glib2-devel libusb-devel licenses obexftp-devel openobex-devel -Requires: fuse licenses +BuildRequires: bluez-devel fuse-devel glib2-devel libusb-devel obexftp-devel openobex-devel +Requires: fuse Summary: FUSE based filesystem using ObexFTP Version: 0.11 -Release: 32 -License: GPL v2 or later +Release: 42 +License: GPLv2+ Group: System/Filesystems Source: %{name}-%{version}.tar.bz2 Url: http://openobex.triq.net/obexfs @@ -50,7 +50,6 @@ %install make DESTDIR="$RPM_BUILD_ROOT" install -ln -sf ../../licenses/md5/$(md5sum COPYING | sed 's/ .*//') COPYING %clean rm -rf $RPM_BUILD_ROOT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pcsc-cyberjack for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package pcsc-cyberjack for openSUSE:Factory checked in at Wed Mar 23 09:47:26 CET 2011. -------- --- pcsc-cyberjack/pcsc-cyberjack.changes 2010-09-07 22:41:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/pcsc-cyberjack/pcsc-cyberjack.changes 2011-03-21 17:53:25.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Mar 21 16:53:23 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- +Sat Mar 19 15:21:01 UTC 2011 - wr(a)rosenauer.org + +- add device id 500 (cyberjack rfid) to udev rules + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-cyberjack.spec ++++++ --- /var/tmp/diff_new_pack.3N6uOB/_old 2011-03-23 09:46:22.000000000 +0100 +++ /var/tmp/diff_new_pack.3N6uOB/_new 2011-03-23 09:46:22.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package pcsc-cyberjack (Version 3.3.5) +# spec file for package pcsc-cyberjack # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -25,10 +25,10 @@ BuildRequires: libusb-1_0-devel %endif %if %suse_version > 1020 -BuildRequires: libusb-devel licenses +BuildRequires: libusb-devel %endif Version: 3.3.5 -Release: 4 +Release: 5 Group: Productivity/Security License: LGPLv2.1+ Url: http://www.reiner-sct.de/support/treiber_cyberjack.php @@ -42,9 +42,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: pcsc-lite %if %suse_version > 1020 -Requires: licenses -%endif -%if %suse_version > 1020 %define ifddir %(pkg-config --variable=usbdropdir libpcsclite) %else %define ifddir %{_libdir}/readers @@ -72,9 +69,6 @@ License: LGPLv2.1+ Group: System/Libraries Summary: CT-API and tools for Reiner SCT Cyberjack USB-SmartCard Reader -%if %suse_version > 1020 -Requires: licenses -%endif # Modules: cyberjack.ko Supplements: %USBDRIVERS Supplements: modalias(usb:v0C4Bp0100d*dc*dsc*dp*ic*isc*ip*) @@ -150,15 +144,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/libctapi-cyberjack.la rm $RPM_BUILD_ROOT%{ifddir}/ifd-cyberjack.bundle/Contents/Linux/ifd-cyberjack.la mv $RPM_BUILD_ROOT%{_sysconfdir}/cyberjack.conf{.default,} -%if %suse_version > 1020 -# licenses -for FILE in COPYING COPYRIGHT.GPL COPYRIGHT.LGPL ; do - MD5SUM=$(md5sum $FILE | sed 's/ .*//') - if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE - fi -done -%endif %post -n ctapi-cyberjack -p /sbin/ldconfig ++++++ 40-cyberjack.rules ++++++ --- /var/tmp/diff_new_pack.3N6uOB/_old 2011-03-23 09:46:22.000000000 +0100 +++ /var/tmp/diff_new_pack.3N6uOB/_new 2011-03-23 09:46:22.000000000 +0100 @@ -8,5 +8,6 @@ ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0300", ENV{ID_SMARTCARD_READER}="1" ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0400", ENV{ID_SMARTCARD_READER}="1" ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0401", ENV{ID_SMARTCARD_READER}="1" +ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0500", ENV{ID_SMARTCARD_READER}="1" LABEL="cyberjack_rules_end" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sshfs for openSUSE:Factory
by root＠hilbert.suse.de 23 Mar '11

23 Mar '11

Hello community, here is the log from the commit of package sshfs for openSUSE:Factory checked in at Wed Mar 23 09:44:31 CET 2011. -------- --- sshfs/sshfs.changes 2008-10-29 12:20:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/sshfs/sshfs.changes 2011-03-22 06:14:14.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 22 05:14:13 UTC 2011 - coolo(a)novell.com + +- licenses package is about to die + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sshfs.spec ++++++ --- /var/tmp/diff_new_pack.1zCo72/_old 2011-03-23 09:44:17.000000000 +0100 +++ /var/tmp/diff_new_pack.1zCo72/_new 2011-03-23 09:44:17.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package sshfs (Version 2.2) +# spec file for package sshfs # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,12 @@ Name: sshfs -BuildRequires: fuse-devel glib2-devel licenses -Requires: fuse licenses +BuildRequires: fuse-devel glib2-devel +Requires: fuse Summary: Filesystem client based on SSH file transfer protocol Version: 2.2 -Release: 1 -License: GPL v2 or later +Release: 11 +License: GPLv2+ Group: System/Filesystems Source: %{name}-fuse-%{version}.tar.bz2 Url: http://fuse.sourceforge.net/sshfs.html @@ -54,7 +54,6 @@ %install make DESTDIR="$RPM_BUILD_ROOT" install -ln -sf ../../licenses/md5/$(md5sum COPYING | sed 's/ .*//') COPYING %clean rm -rf $RPM_BUILD_ROOT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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