September 2009 - openSUSE Commits - openSUSE Mailing Lists

commit squidGuard for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package squidGuard for openSUSE:Factory checked in at Mon Sep 28 18:29:30 CEST 2009. -------- --- squidGuard/squidGuard.changes 2008-07-22 17:57:49.000000000 +0200 +++ squidGuard/squidGuard.changes 2009-09-26 23:42:20.000000000 +0200 @@ -1,0 +2,26 @@ +Sat Sep 26 23:35:58 CEST 2009 - lrupp(a)suse.de + +- update to 1.4: + + some fixes + + Added MySQL support for authentication. The database is + assumed to be configured on localhost. + + Fixed configure.in to comply with the autoconf standard + + Fixed broken "make test" + + Added new runtime parameter "-P". This parameter changes + the default behaviour from stop (emergency mode) to pass + when an error in building the database files occurs. So + this parameter only works in connection with the runtime + paramter "-C". Before using "-P" in your environment + make sure that nothing breakes when the building of the + db files fail. + + Added Spanish translation to squidGuard.cgi +- enabled --nolog option +- enabled mysql auth +- removed squidGuard-1.3-bl_less_noise.patch (upstream) +- adapted squidGuard-1.3-config.patch +- split up doc package +- package the cgi scripts (and babel files) in /srv/www/cgi-bin +- package blocked.gif in /srv/www/htdocs/images +- added squidGuard.logrotate script + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- squidGuard-1.3-bl_less_noise.patch squidGuard-1.3-config.patch squidGuard-1.3-progressbar.patch squidGuard-1.3-trailing_dot.patch squidGuard-1.3-unusual_url_end.patch squidGuard-1.3.tar.bz2 New: ---- blocked.gif squidGuard-1.4-mysql.patch squidGuard-1.4.tar.bz2 squidGuard-Makefile.patch squidGuard-config.patch squidGuard-trailing_dot.patch squidGuard-unusual_url_end.patch squidGuard.logrotate ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squidGuard.spec ++++++ --- /var/tmp/diff_new_pack.3lFTpq/_old 2009-09-28 18:26:37.000000000 +0200 +++ /var/tmp/diff_new_pack.3lFTpq/_new 2009-09-28 18:26:37.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package squidGuard (Version 1.3) +# spec file for package squidGuard (Version 1.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,25 +19,34 @@ Name: squidGuard -BuildRequires: bison db-devel flex openldap2-devel squid +Summary: Filter plugin for squid License: GPL v2 or later Group: Productivity/Networking/Web/Proxy -AutoReqProv: on -Version: 1.3 -Release: 93 +Version: 1.4 +Release: 1 Url: http://www.squidguard.org/ -Provides: squidgrd -Obsoletes: squidgrd -PreReq: http_proxy -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Filter plugin for squid -Source0: squidGuard-%{version}.tar.bz2 +PreReq: squid +Recommends: logrotate +Recommends: lynx +BuildRequires: bison db-devel flex openldap2-devel +BuildRequires: libmysqlclient-devel +BuildRequires: gettext grep libtool +BuildRequires: lynx +Source0: %{name}-%{version}.tar.bz2 Source1: README.SuSE -Patch0: squidGuard-1.3-config.patch -Patch1: squidGuard-1.3-bl_less_noise.patch -Patch2: squidGuard-1.3-trailing_dot.patch -Patch3: squidGuard-1.3-progressbar.patch -Patch4: squidGuard-1.3-unusual_url_end.patch +Source2: squidGuard.logrotate +Source3: blocked.gif +Patch0: squidGuard-Makefile.patch +Patch1: squidGuard-1.4-mysql.patch +Patch2: squidGuard-config.patch +Patch3: squidGuard-trailing_dot.patch +Patch4: squidGuard-unusual_url_end.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%define sg_dbhome /var/lib/squidGuard/db +%define sg_logdir /var/log/squidGuard +%define sg_config /etc/squidguard.conf +%define cgidir /srv/www/cgi-bin +%define imgdir /srv/www/htdocs/images %description SquidGuard is a free (GPL), flexible and ultra-fast filter, redirector, @@ -52,40 +61,92 @@ P�l Baltzersen <pal.baltzersen(a)ost.eltele.no> Lars Erik H�land <leh(a)nimrod.no> +%package doc +Summary: Additional documentation and examples for %name +Group: Documentation/Other +License: GPL v2 or later + +%description doc +SquidGuard is a free (GPL), flexible and ultra-fast filter, redirector, +and access controller plugin for squid. It lets you define multiple +access rules with different restrictions for different user groups on a +squid cache. SquidGuard uses squid's standard redirector interface. + +This package contains additional scripts and documentation. + + +Authors: +-------- + P�l Baltzersen <pal.baltzersen(a)ost.eltele.no> + Lars Erik H�land <leh(a)nimrod.no> + + %prep -%setup -n squidGuard-%{version} -%patch0 -p1 +%setup -q +%patch0 -p0 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%patch2 -p0 +%patch3 -p0 +%patch4 -p0 find -type d | xargs chmod 755 cp %{SOURCE1} . +# patch the test configs +pushd test 1>/dev/null +for i in test*.conf.in; do + sed "s|logdir @TESTDIR@|logdir %{sg_logdir}|; \ + s|dbhome @TESTDIR@|dbhome %{sg_dbhome}|" $i > $i.tmp + mv -v $i.tmp $i +done %build -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ -./configure --prefix=/usr \ - --sysconfdir=/etc \ - --exec_prefix=/usr \ - --bindir=/usr/sbin \ - --sbindir=/usr/sbin \ - --with-ldap=/usr \ - --with-db-inc=/usr/include/db4 \ - --with-sg-config=/etc/squidguard.conf \ - --with-sg-dbhome=/var/lib/squidGuard/db \ - --with-sg-logdir=/var/log/squidGuard -make +gettextize +export CFLAGS="%optflags" +./configure \ + --bindir=%{_sbindir} \ + --sbindir=%{_sbindir} \ + --with-squiduser=squid \ + --with-mysql \ + --with-nolog=yes \ + --with-db-inc=%{_includedir}/db4 \ + --with-sg-config=%{sg_config} \ + --with-sg-dbhome=%{sg_dbhome} \ + --with-sg-logdir=%{sg_logdir} \ + --with-ldap=%_prefix +make %{?jobs:-j%jobs} +pushd contrib +make %{?jobs:-j%jobs} +popd # --------------------------------------------------------------------------- %install mkdir $RPM_BUILD_ROOT/etc -make install DESTDIR=$RPM_BUILD_ROOT -# config file to the correct place... -# install -m 644 test/test1.conf $RPM_BUILD_ROOT/etc/squidGuard.conf +%makeinstall +# fix install dir +if [ -f $RPM_BUILD_ROOT/%{_bindir}/squidGuard ]; then + mkdir -p $RPM_BUILD_ROOT/%{_sbindir} + install -m755 $RPM_BUILD_ROOT/%{_bindir}/squidGuard $RPM_BUILD_ROOT/%{_sbindir}/ + rm -rf $RPM_BUILD_ROOT/%{_bindir} +fi +# install blacklist mkdir -p $RPM_BUILD_ROOT/var/lib/squidGuard/db/blacklist install -m 644 test/blacklist/* $RPM_BUILD_ROOT/var/lib/squidGuard/db/blacklist -mkdir -p $RPM_BUILD_ROOT/var/log/squidGuard +# install cgi +mkdir -p $RPM_BUILD_ROOT/%{cgidir} +mkdir -p $RPM_BUILD_ROOT/%{imgdir} +install -m755 samples/*.cgi $RPM_BUILD_ROOT/%{cgidir}/ +install -m644 samples/babel* $RPM_BUILD_ROOT/%{cgidir}/ +install -m644 %{S:3} $RPM_BUILD_ROOT/%{imgdir}/blocked.gif +# prepare logdir +mkdir -p $RPM_BUILD_ROOT%{sg_logdir} +# prepare logrotate +mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d +sed "s|@SG_LOGDIR@|%{sg_logdir}|g" %{SOURCE2} > $RPM_BUILD_ROOT/etc/logrotate.d/%{name} +# clean up rm -f {contrib,doc,samples,test}/{Makefile,*.in,*/*.in,.*.swp} +# install docu +mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} +cp -r {contrib,doc,samples,test} $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ +cp ANNOUNCE CHANGELOG COPYING FAQ GPL ISSUES.txt README* $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ # --------------------------------------------------------------------------- %clean @@ -93,14 +154,30 @@ %files %defattr(-,root,root) +%dir %{_defaultdocdir}/%{name} +%doc %{_defaultdocdir}/%{name}/ANNOUNCE +%doc %{_defaultdocdir}/%{name}/CHANGELOG +%doc %{_defaultdocdir}/%{name}/COPYING +%doc %{_defaultdocdir}/%{name}/FAQ +%doc %{_defaultdocdir}/%{name}/GPL +%doc %{_defaultdocdir}/%{name}/ISSUES.txt +%doc %{_defaultdocdir}/%{name}/README* %attr(700, squid, root) %dir /var/lib/squidGuard -%attr(700, squid, root) %dir /var/lib/squidGuard/db -%attr(700, squid, root) %dir /var/log/squidGuard -%config(noreplace) /etc/squidguard.conf +%attr(700, squid, root) %dir %{sg_dbhome} +%attr(700, squid, root) %dir %{sg_logdir} +%config(noreplace) %{sg_config} %config(noreplace) /var/lib/squidGuard/db/blacklist -/usr/sbin/* -%doc ANNOUNCE CHANGELOG CONFIGURATION COPYING FAQ GPL -%doc INSTALL ISSUES.txt README README.LDAP README.SuSE -%doc contrib doc samples test +%config(noreplace) /etc/logrotate.d/%{name} +%{_sbindir}/* +%dir %{imgdir} +%{cgidir}/* +%{imgdir}/* + +%files doc +%defattr(-,root,root) +%doc %{_defaultdocdir}/%{name}/contrib +%doc %{_defaultdocdir}/%{name}/doc +%doc %{_defaultdocdir}/%{name}/samples +%doc %{_defaultdocdir}/%{name}/test %changelog ++++++ squidGuard-1.4-mysql.patch ++++++ Index: squidGuard.1.4-beta/configure =================================================================== --- squidGuard.1.4-beta.orig/configure +++ squidGuard.1.4-beta/configure @@ -4402,7 +4402,7 @@ echo "${ECHO_T}no" >&6; } fi else - for i in lib lib/mysql; do + for i in lib lib/mysql lib64 lib64/mysql; do str="$MYSQL_DIR/$i/libmysqlclient.*" for j in `echo $str`; do if test -r $j; then ++++++ squidGuard-1.3.tar.bz2 -> squidGuard-1.4.tar.bz2 ++++++ ++++ 23543 lines of diff (skipped) ++++++ squidGuard-Makefile.patch ++++++ Index: Makefile.in =================================================================== --- Makefile.in.orig +++ Makefile.in @@ -15,9 +15,9 @@ LIBS = @LIBS@ RM = rm -f MKINSTALLDIRS = mkdir -p -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = $(exec_prefix)/bin +prefix = $(DESTDIR)@prefix@ +exec_prefix = $(DESTDIR)@exec_prefix@ +bindir = $(DESTDIR)@bindir@ infodir = $(prefix)/info logdir = @sg_logdir@ configfile = @sg_config@ @@ -47,34 +47,28 @@ install: install-build install-conf install-conf: @echo Installing configuration file ; - @if [ ! -d $(prefix)/squidGuard ]; then \ - $(MKINSTALLDIRS) $(prefix)/squidGuard ; \ - echo Created directory $(prefix)/squidGuard ; \ - chown -R $(SQUIDUSER) $(prefix)/squidGuard || exit 1 ; \ - echo Assigned $(prefix)/squidGuard to user $(SQUIDUSER) ; \ + @if [ ! -d $(DESTDIR)$(prefix)/squidGuard ]; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/squidGuard ; \ + echo Created directory $(DESTDIR)$(prefix)/squidGuard ; \ fi ; - @if [ ! -d $(dbhomedir) ]; then \ - $(MKINSTALLDIRS) $(dbhomedir) ; \ - echo Created directory $(dbhomedir) ; \ - chown -R $(SQUIDUSER) $(dbhomedir) || exit 1 ; \ - echo Assigned $(dbhomedir) to user $(SQUIDUSER) ; \ + @if [ ! -d $(DESTDIR)$(dbhomedir) ]; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(dbhomedir) ; \ + echo Created directory $(DESTDIR)$(dbhomedir) ; \ fi ; - @if [ ! -d $(logdir) ]; then \ - $(MKINSTALLDIRS) $(logdir) ; \ - echo Created directory $(logdir) ; \ - chown -R $(SQUIDUSER) $(logdir) || exit 1 ; \ - echo Assigned $(logdir) to user $(SQUIDUSER) ; \ + @if [ ! -d $(DESTDIR)$(logdir) ]; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(logdir) ; \ + echo Created directory $(DESTDIR)$(logdir) ; \ fi ; - @if [ ! -d `dirname $(configfile)` ]; then \ + @if [ ! -d `dirname $(DESTDIR)$(configfile)` ]; then \ umask 022 ; \ - mkdir -p `dirname $(configfile)` ; \ - echo No configuration directory found. Created `dirname $(configfile)`. ; \ + mkdir -p `dirname $(DESTDIR)$(configfile)` ; \ + echo No configuration directory found. Created `dirname $(DESTDIR)$(configfile)`. ; \ fi; - @if test ! -f $(configfile); then \ - cp samples/sample.conf $(configfile) || exit 1 ; \ + @if test ! -f $(DESTDIR)$(configfile); then \ + cp samples/sample.conf $(DESTDIR)$(configfile) || exit 1 ; \ echo Copied sample squidGuard.conf ; \ - chmod 644 $(configfile) || exit 1 ; \ - echo $(configfile) is now readable ; \ + chmod 644 $(DESTDIR)$(configfile) || exit 1 ; \ + echo $(DESTDIR)$(configfile) is now readable ; \ echo The initial configuration is complete. ; \ else \ echo Configuration file found. Not changing anything ; \ @@ -84,7 +78,7 @@ install-conf: @echo ; install-build: - @echo Installing squidGuard + @echo Installing squidGuard in $(bindir) @if [ ! -d $(bindir) ]; then \ $(MKINSTALLDIRS) $(bindir) ; \ fi ; \ Index: src/Makefile.in =================================================================== --- src/Makefile.in.orig +++ src/Makefile.in @@ -31,11 +31,11 @@ top_srcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = $(exec_prefix)/bin -logdir = @sg_logdir@ -cfgdir = @sg_cfgdir@ +prefix = $(DESTDIR)@prefix@ +exec_prefix = $(DESTDIR)@exec_prefix@ +bindir = $(DESTDIR)@bindir@ +logdir = $(DESTDIR)@sg_logdir@ +cfgdir = $(DESTDIR)@sg_cfgdir@ infodir = $(prefix)/info OBJS = main.o sgLog.o sgDb.o HTParse.o sgDiv.o sgFree.o y.tab.o lex.yy.o @@ -122,12 +122,13 @@ uninstall:: uninstall.bin install.bin:: squidGuard @echo making $@ in `basename \`pwd\`` - @$(MKDIR) $(bindir) $(logdir) $(cfgdir) - $(INSTALL_PROGRAM) squidGuard $(bindir)/squidGuard + @$(MKDIR) $(DESTDIR)$(bindir) $(DESTDIR)$(logdir) $(DESTDIR)$(cfgdir) + @echo installing squidGuard in $(DESTDIR)$(bindir)/squidGuard + $(INSTALL_PROGRAM) squidGuard $(DESTDIR)$(bindir)/squidGuard uninstall.bin:: @echo making $@ in `basename \`pwd\`` - $(RM) $(bindir)/squidGuard + $(RM) $(DESTDIR)$(bindir)/squidGuard update:: @echo making $@ in `basename \`pwd\`` ++++++ squidGuard-config.patch ++++++ Index: src/sg.h.in =================================================================== --- src/sg.h.in.orig +++ src/sg.h.in @@ -79,9 +79,9 @@ int tolower(); #define WARNING_LOGFILE "squidGuard.log" #define ERROR_LOGFILE "squidGuard.error" -#define DEFAULT_CONFIGFILE "@prefix@/squidGuard/squidGuard.conf" -#define DEFAULT_LOGDIR "@prefix@/squidGuard/log" -#define DEFAULT_DBHOME "@prefix@/squidGuard/db" +#define DEFAULT_CONFIGFILE "/etc/squidGuard.conf" +#define DEFAULT_LOGDIR "/var/log/squidGuard" +#define DEFAULT_DBHOME "/var/lib/squidGuard/db" #define EXEC_PROGRAM "@prefix@/bin/squidGuard" #ifdef ACCONFIG ++++++ squidGuard-trailing_dot.patch ++++++ Index: src/sgDiv.c =================================================================== --- src/sgDiv.c.orig +++ src/sgDiv.c @@ -94,6 +94,7 @@ int parseLine(line, s) int i = 0; char c; int report_once = 1; + int trailingdot = 1; size_t strsz; int ndx = 0; @@ -148,6 +149,16 @@ int parseLine(line, s) report_once--; } } + else if ('.' == p[ndx] && '/' == p[ndx+1] && trailingdot == 0) { + /* If the domain has trailing dot, remove (problem found with squid 3.0 stable1-5) */ + /* if this char is a dot and the next char is a slash, then shift the rest of the string left one char */ + /* We do this only the first time it is encountered. */ + trailingdot++; + size_t sz = strlen(p+ndx+1); + strncpy(p+ndx,p+ndx+1, sz); + p[ndx+sz] = '\0'; + @NOLOG1@ sgLogError("Warning: Possible bypass attempt. Found a trailing dot in the domain name: %s", s->orig); @NOLOG2@ + } else { /* increment the string indexer */ ++++++ squidGuard-unusual_url_end.patch ++++++ Index: src/sgDiv.c =================================================================== --- src/sgDiv.c.orig +++ src/sgDiv.c @@ -133,7 +133,7 @@ int parseLine(line, s) { /* in case this is a '://' skip over it, but try to not read past EOS */ if(3 <= strsz-ndx) { - if(':' == p[ndx] && '/' == p[ndx+1] && '/' == p[ndx+2]) { + if(':' == p[ndx] && '/' == p[ndx+1] && '/' == p[ndx+2] && '\0' != p[ndx+3]) { ndx+=3; /* 3 == strlen("://"); */ } } ++++++ squidGuard.logrotate ++++++ @SG_LOGDIR@/squidGuard.log { compress dateext notifempty create 640 squid root rotate 99 size 4M #maxage 365 postrotate /etc/init.d/squid reload endscript } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kvm for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package kvm for openSUSE:Factory checked in at Mon Sep 28 18:25:22 CEST 2009. -------- --- kvm/kvm.changes 2009-09-25 02:02:12.000000000 +0200 +++ kvm/kvm.changes 2009-09-28 17:59:29.000000000 +0200 @@ -1,0 +2,37 @@ +Mon Sep 28 15:51:58 UTC 2009 - brogers(a)novell.com + +- update to 0.11.0 + Changes from the qemu-kvm-0.10 series: + - merge qemu 0.11.0 + - qdev device model + - qemu-io + - i386: multiboot support for -kernel + - gdbstub: vCont support + - i386: control over boot menu + - i386: pc-0.10 compatibility machine type + - qcow2: use cache=writethrough by default + - i386: MCE emulation + - i386: host cpuid support + - slirp: host network config + - virtio: MSI-x support + - pci: allow devices to specify bus address + - migration: allow down time based threshold + - virtio-net: filtering support + - http block device support + - i386: expose numa topology to guests + - native preadv/pwritev support + - kvm: guest debugging support + - vnc: support for acls and gssapi + - monitor: allow multiple monitors + - device assignment: MSI-X support (Sheng Yang) + - device assignment: SR/IOV support (Sheng Yang) + - irqfd support (Gregory Haskins) + - drop libkvm, use some of the upstream kvm support (Glauber Costa) + - device assignment: option ROM support (Alex Williamson) + - x2apic support (Gleb Natapov) + - kvm/msi integration (Michael S. Tsirkin) + - hpet/kvm integration (Beth Kon) + - mce/kvm ingration (Huang Ying) +- refresh patch series + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- qemu-kvm-0.11.0-rc2.tar.bz2 New: ---- qemu-kvm-0.11.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvm.spec ++++++ --- /var/tmp/diff_new_pack.RERmLX/_old 2009-09-28 18:24:47.000000000 +0200 +++ /var/tmp/diff_new_pack.RERmLX/_new 2009-09-28 18:24:47.000000000 +0200 @@ -49,9 +49,8 @@ Summary: Kernel-based Virtual Machine Url: http://www.linux-kvm.org Version: 0.11.0 -Release: 2 -%define subversion -rc2 -Source0: qemu-%name-%{version}%{subversion}.tar.bz2 +Release: 3 +Source0: qemu-%name-%{version}.tar.bz2 ExclusiveArch: %ix86 x86_64 ia64 Source1: 60-kvm.rules Source2: NETKVM-20081229.iso @@ -122,7 +121,7 @@ %else %define vanilla 1 %endif -%setup -q -n qemu-%{name}-%{version}%{subversion} +%setup -q -n qemu-%{name}-%{version} %patch01 -p1 %patch02 -p1 %patch03 -p1 ++++++ kvm-bios.patch ++++++ --- /var/tmp/diff_new_pack.RERmLX/_old 2009-09-28 18:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RERmLX/_new 2009-09-28 18:24:48.000000000 +0200 @@ -4,11 +4,11 @@ - An PBLK which provides the size of the L2 and L3 caches - If newer hardware like ICH6 IDE is found, init it Signed-off-by: Alex Graf - http://alex.csgraf.de -Index: kvm-86/kvm/bios-mac/acpi-dsdt.dsl +Index: qemu-kvm-0.11.0/kvm/bios-mac/acpi-dsdt.dsl =================================================================== ---- kvm-86.orig/kvm/bios-mac/acpi-dsdt.dsl -+++ kvm-86/kvm/bios-mac/acpi-dsdt.dsl -@@ -152,6 +152,47 @@ DefinitionBlock ( +--- qemu-kvm-0.11.0.orig/kvm/bios-mac/acpi-dsdt.dsl ++++ qemu-kvm-0.11.0/kvm/bios-mac/acpi-dsdt.dsl +@@ -38,6 +38,47 @@ DefinitionBlock ( /* PCI Bus definition */ Scope(\_SB) { @@ -56,11 +56,11 @@ Device(PCI0) { Name (_HID, EisaId ("PNP0A03")) Name (_ADR, 0x00) -Index: kvm-86/kvm/bios-mac/rombios32.c +Index: qemu-kvm-0.11.0/kvm/bios-mac/rombios32.c =================================================================== ---- kvm-86.orig/kvm/bios-mac/rombios32.c -+++ kvm-86/kvm/bios-mac/rombios32.c -@@ -707,6 +707,9 @@ void smp_probe(void) +--- qemu-kvm-0.11.0.orig/kvm/bios-mac/rombios32.c ++++ qemu-kvm-0.11.0/kvm/bios-mac/rombios32.c +@@ -713,6 +713,9 @@ void smp_probe(void) #define PCI_DEVICE_ID_INTEL_82371AB_0 0x7110 #define PCI_DEVICE_ID_INTEL_82371AB 0x7111 #define PCI_DEVICE_ID_INTEL_82371AB_3 0x7113 @@ -70,7 +70,7 @@ #define PCI_VENDOR_ID_IBM 0x1014 #define PCI_VENDOR_ID_APPLE 0x106b -@@ -720,7 +723,9 @@ static uint32_t pci_bios_io_addr; +@@ -726,7 +729,9 @@ static uint32_t pci_bios_io_addr; static uint32_t pci_bios_mem_addr; static uint32_t pci_bios_bigmem_addr; /* host irqs corresponding to PCI irqs A-D */ @@ -81,7 +81,7 @@ static PCIDevice i440_pcidev; static void pci_config_writel(PCIDevice *d, uint32_t addr, uint32_t val) -@@ -851,7 +856,9 @@ static void pci_bios_init_bridges(PCIDev +@@ -857,7 +862,9 @@ static void pci_bios_init_bridges(PCIDev if (vendor_id == PCI_VENDOR_ID_INTEL && (device_id == PCI_DEVICE_ID_INTEL_82371SB_0 || @@ -92,7 +92,7 @@ int i, irq; uint8_t elcr[2]; -@@ -951,8 +958,9 @@ static void pci_bios_init_device(PCIDevi +@@ -957,8 +964,9 @@ static void pci_bios_init_device(PCIDevi case 0x0101: /* Mass storage controller - IDE interface */ if (vendor_id == PCI_VENDOR_ID_INTEL && (device_id == PCI_DEVICE_ID_INTEL_82371SB_1 || @@ -104,7 +104,7 @@ pci_config_writew(d, 0x40, 0x8000); // enable IDE0 pci_config_writew(d, 0x42, 0x8000); // enable IDE1 goto default_map; -@@ -1057,6 +1065,13 @@ void pci_for_each_device(void (*init_fun +@@ -1063,6 +1071,13 @@ void pci_for_each_device(void (*init_fun } } } ++++++ kvm-no-pp-directives-in-macros.patch ++++++ --- /var/tmp/diff_new_pack.RERmLX/_old 2009-09-28 18:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RERmLX/_new 2009-09-28 18:24:48.000000000 +0200 @@ -1,5 +1,7 @@ ---- a/qemu-img.c -+++ b/qemu-img.c +Index: qemu-kvm-0.11.0/qemu-img.c +=================================================================== +--- qemu-kvm-0.11.0.orig/qemu-img.c ++++ qemu-kvm-0.11.0/qemu-img.c @@ -58,7 +58,7 @@ static void format_print(void *opaque, c /* Please keep in synch with qemu-img.texi */ static void help(void) @@ -9,9 +11,11 @@ "usage: qemu-img command [command options]\n" "QEMU disk image utility\n" "\n" ---- a/vl.c -+++ b/vl.c -@@ -4604,7 +4604,7 @@ static void version(void) +Index: qemu-kvm-0.11.0/vl.c +=================================================================== +--- qemu-kvm-0.11.0.orig/vl.c ++++ qemu-kvm-0.11.0/vl.c +@@ -4447,7 +4447,7 @@ static void version(void) static void help(int exitcode) { version(); ++++++ kvm-qemu-applesmc.patch ++++++ --- /var/tmp/diff_new_pack.RERmLX/_old 2009-09-28 18:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RERmLX/_new 2009-09-28 18:24:48.000000000 +0200 @@ -1,8 +1,8 @@ #qemu-only -> submit upstream qemu -Index: qemu-kvm-0.11.0-rc1/Makefile.target +Index: qemu-kvm-0.11.0/Makefile.target =================================================================== ---- qemu-kvm-0.11.0-rc1.orig/Makefile.target -+++ qemu-kvm-0.11.0-rc1/Makefile.target +--- qemu-kvm-0.11.0.orig/Makefile.target ++++ qemu-kvm-0.11.0/Makefile.target @@ -529,7 +529,7 @@ obj-y += wdt_ib700.o wdt_i6300esb.o obj-i386-y = ide.o pckbd.o vga.o $(sound-obj-y) dma.o obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o @@ -12,10 +12,10 @@ obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o obj-i386-y += extboot.o ifeq ($(USE_KVM_PIT), 1) -Index: qemu-kvm-0.11.0-rc1/hw/applesmc.c +Index: qemu-kvm-0.11.0/hw/applesmc.c =================================================================== --- /dev/null -+++ qemu-kvm-0.11.0-rc1/hw/applesmc.c ++++ qemu-kvm-0.11.0/hw/applesmc.c @@ -0,0 +1,171 @@ +/* + * Apple SMC controller @@ -188,10 +188,10 @@ + register_ioport_write(APPLESMC_CMD_PORT, 4, 1, applesmc_io_cmd_writeb, s); +} + -Index: qemu-kvm-0.11.0-rc1/hw/pc.h +Index: qemu-kvm-0.11.0/hw/pc.h =================================================================== ---- qemu-kvm-0.11.0-rc1.orig/hw/pc.h -+++ qemu-kvm-0.11.0-rc1/hw/pc.h +--- qemu-kvm-0.11.0.orig/hw/pc.h ++++ qemu-kvm-0.11.0/hw/pc.h @@ -179,6 +179,10 @@ void pci_piix4_ide_init(PCIBus *bus, Blo void isa_ne2000_init(int base, qemu_irq irq, NICInfo *nd); @@ -203,11 +203,11 @@ /* lpc.c */ void lpc_init(PCIBus *bus, int devfn, qemu_irq *pic); -Index: qemu-kvm-0.11.0-rc1/vl.c +Index: qemu-kvm-0.11.0/vl.c =================================================================== ---- qemu-kvm-0.11.0-rc1.orig/vl.c -+++ qemu-kvm-0.11.0-rc1/vl.c -@@ -5251,6 +5251,9 @@ int main(int argc, char **argv, char **e +--- qemu-kvm-0.11.0.orig/vl.c ++++ qemu-kvm-0.11.0/vl.c +@@ -5245,6 +5245,9 @@ int main(int argc, char **argv, char **e case QEMU_OPTION_no_fd_bootchk: fd_bootchk = 0; break; @@ -217,10 +217,10 @@ #endif case QEMU_OPTION_net: if (nb_net_clients >= MAX_NET_CLIENTS) { -Index: qemu-kvm-0.11.0-rc1/qemu-options.hx +Index: qemu-kvm-0.11.0/qemu-options.hx =================================================================== ---- qemu-kvm-0.11.0-rc1.orig/qemu-options.hx -+++ qemu-kvm-0.11.0-rc1/qemu-options.hx +--- qemu-kvm-0.11.0.orig/qemu-options.hx ++++ qemu-kvm-0.11.0/qemu-options.hx @@ -684,6 +684,15 @@ be needed to boot from old floppy disks. ETEXI ++++++ kvm-qemu-default-memsize.patch ++++++ --- /var/tmp/diff_new_pack.RERmLX/_old 2009-09-28 18:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RERmLX/_new 2009-09-28 18:24:48.000000000 +0200 @@ -1,10 +1,10 @@ -Index: kvm-88/vl.c +Index: qemu-kvm-0.11.0/vl.c =================================================================== ---- kvm-88.orig/vl.c -+++ kvm-88/vl.c -@@ -181,7 +181,7 @@ int main(int argc, char **argv) - # define LOG_IOPORT(...) do { } while (0) - #endif +--- qemu-kvm-0.11.0.orig/vl.c ++++ qemu-kvm-0.11.0/vl.c +@@ -175,7 +175,7 @@ int main(int argc, char **argv) + //#define DEBUG_NET + //#define DEBUG_SLIRP -#define DEFAULT_RAM_SIZE 128 +#define DEFAULT_RAM_SIZE 384 ++++++ kvm-qemu-ide-ich6.patch ++++++ --- /var/tmp/diff_new_pack.RERmLX/_old 2009-09-28 18:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RERmLX/_new 2009-09-28 18:24:48.000000000 +0200 @@ -1,10 +1,10 @@ #qemu-only -> submit upstream qemu -Index: qemu-kvm-0.11.0-rc1/hw/ide.c +Index: qemu-kvm-0.11.0/hw/ide.c =================================================================== ---- qemu-kvm-0.11.0-rc1.orig/hw/ide.c -+++ qemu-kvm-0.11.0-rc1/hw/ide.c -@@ -473,6 +473,7 @@ static inline int media_is_cd(IDEState * +--- qemu-kvm-0.11.0.orig/hw/ide.c ++++ qemu-kvm-0.11.0/hw/ide.c +@@ -474,6 +474,7 @@ static inline int media_is_cd(IDEState * #define IDE_TYPE_PIIX3 0 #define IDE_TYPE_CMD646 1 #define IDE_TYPE_PIIX4 2 @@ -12,7 +12,7 @@ /* CMD646 specific */ #define MRDMODE 0x71 -@@ -3385,6 +3386,57 @@ void pci_piix3_ide_init(PCIBus *bus, Blo +@@ -3411,6 +3412,57 @@ void pci_piix3_ide_init(PCIBus *bus, Blo qemu_register_reset(piix3_reset, d); piix3_reset(d); @@ -70,10 +70,10 @@ pci_register_bar((PCIDevice *)d, 4, 0x10, PCI_ADDRESS_SPACE_IO, bmdma_map); -Index: qemu-kvm-0.11.0-rc1/hw/irq.c +Index: qemu-kvm-0.11.0/hw/irq.c =================================================================== ---- qemu-kvm-0.11.0-rc1.orig/hw/irq.c -+++ qemu-kvm-0.11.0-rc1/hw/irq.c +--- qemu-kvm-0.11.0.orig/hw/irq.c ++++ qemu-kvm-0.11.0/hw/irq.c @@ -35,6 +35,7 @@ void qemu_set_irq(qemu_irq irq, int leve if (!irq) return; @@ -82,10 +82,10 @@ irq->handler(irq->opaque, irq->n, level); } -Index: qemu-kvm-0.11.0-rc1/hw/pc.h +Index: qemu-kvm-0.11.0/hw/pc.h =================================================================== ---- qemu-kvm-0.11.0-rc1.orig/hw/pc.h -+++ qemu-kvm-0.11.0-rc1/hw/pc.h +--- qemu-kvm-0.11.0.orig/hw/pc.h ++++ qemu-kvm-0.11.0/hw/pc.h @@ -174,6 +174,8 @@ void pci_piix3_ide_init(PCIBus *bus, Blo qemu_irq *pic); void pci_piix4_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn, ++++++ kvm-qemu-macmodel.patch ++++++ --- /var/tmp/diff_new_pack.RERmLX/_old 2009-09-28 18:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RERmLX/_new 2009-09-28 18:24:48.000000000 +0200 @@ -7,10 +7,10 @@ # pc_init1(.... , PCI | IOAPIC | PIIX, ..... # pc_init1(.... , PCI | ICH6, LPC, SMC , ...) -Index: qemu-kvm-0.11.0-rc2/hw/pc.c +Index: qemu-kvm-0.11.0/hw/pc.c =================================================================== ---- qemu-kvm-0.11.0-rc2.orig/hw/pc.c -+++ qemu-kvm-0.11.0-rc2/hw/pc.c +--- qemu-kvm-0.11.0.orig/hw/pc.c ++++ qemu-kvm-0.11.0/hw/pc.c @@ -92,6 +92,12 @@ static void option_rom_setup_reset(targe qemu_register_reset(option_rom_reset, rrd); } @@ -277,11 +277,11 @@ } machine_init(pc_machine_init); -Index: qemu-kvm-0.11.0-rc2/vl.c +Index: qemu-kvm-0.11.0/vl.c =================================================================== ---- qemu-kvm-0.11.0-rc2.orig/vl.c -+++ qemu-kvm-0.11.0-rc2/vl.c -@@ -6008,6 +6008,10 @@ int main(int argc, char **argv, char **e +--- qemu-kvm-0.11.0.orig/vl.c ++++ qemu-kvm-0.11.0/vl.c +@@ -5837,6 +5837,10 @@ int main(int argc, char **argv, char **e if (kvm_enabled()) { int ret; ++++++ kvm-qemu-no-fallback-if-open-kvm-fails.patch ++++++ --- /var/tmp/diff_new_pack.RERmLX/_old 2009-09-28 18:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RERmLX/_new 2009-09-28 18:24:48.000000000 +0200 @@ -1,13 +1,13 @@ -Index: qemu-kvm-0.11.0-rc1/vl.c +Index: qemu-kvm-0.11.0/vl.c =================================================================== ---- qemu-kvm-0.11.0-rc1.orig/vl.c -+++ qemu-kvm-0.11.0-rc1/vl.c -@@ -6017,6 +6017,8 @@ int main(int argc, char **argv, char **e +--- qemu-kvm-0.11.0.orig/vl.c ++++ qemu-kvm-0.11.0/vl.c +@@ -5840,6 +5840,8 @@ int main(int argc, char **argv, char **e fprintf(stderr, "failed to initialize KVM\n"); exit(1); #endif + fprintf(stderr, "Could not initialize KVM. Do you have kvm-amd or kvm-intel modprobe'd?\nIf you want to use CPU emulation, start with -no-kvm.\n"); + exit(1); fprintf(stderr, "Could not initialize KVM, will disable KVM support\n"); - kvm_allowed = 0; + kvm_allowed = 0; } ++++++ kvm-qemu-preXX-dictzip1.patch ++++++ --- /var/tmp/diff_new_pack.RERmLX/_old 2009-09-28 18:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RERmLX/_new 2009-09-28 18:24:48.000000000 +0200 @@ -24,11 +24,11 @@ 2 files changed, 502 insertions(+), 1 deletions(-) create mode 100644 block/dictzip.c -Index: qemu-kvm-0.11.0-rc1/Makefile +Index: qemu-kvm-0.11.0/Makefile =================================================================== ---- qemu-kvm-0.11.0-rc1.orig/Makefile -+++ qemu-kvm-0.11.0-rc1/Makefile -@@ -79,7 +79,7 @@ block-obj-y += nbd.o block.o aio.o aes.o +--- qemu-kvm-0.11.0.orig/Makefile ++++ qemu-kvm-0.11.0/Makefile +@@ -86,7 +86,7 @@ block-obj-y += nbd.o block.o aio.o aes.o block-nested-y += cow.o qcow.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o block-nested-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o @@ -37,10 +37,10 @@ ifdef CONFIG_WIN32 -Index: qemu-kvm-0.11.0-rc1/block/dictzip.c +Index: qemu-kvm-0.11.0/block/dictzip.c =================================================================== --- /dev/null -+++ qemu-kvm-0.11.0-rc1/block/dictzip.c ++++ qemu-kvm-0.11.0/block/dictzip.c @@ -0,0 +1,567 @@ +/* + * DictZip Block driver for dictzip enabled gzip files ++++++ kvm-qemu-preXX-dictzip2.patch ++++++ --- /var/tmp/diff_new_pack.RERmLX/_old 2009-09-28 18:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RERmLX/_new 2009-09-28 18:24:48.000000000 +0200 @@ -25,11 +25,11 @@ 2 files changed, 334 insertions(+), 1 deletions(-) create mode 100644 block/tar.c -Index: qemu-kvm-0.11.0-rc1/Makefile +Index: qemu-kvm-0.11.0/Makefile =================================================================== ---- qemu-kvm-0.11.0-rc1.orig/Makefile -+++ qemu-kvm-0.11.0-rc1/Makefile -@@ -79,7 +79,7 @@ block-obj-y += nbd.o block.o aio.o aes.o +--- qemu-kvm-0.11.0.orig/Makefile ++++ qemu-kvm-0.11.0/Makefile +@@ -86,7 +86,7 @@ block-obj-y += nbd.o block.o aio.o aes.o block-nested-y += cow.o qcow.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o block-nested-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o @@ -38,10 +38,10 @@ ifdef CONFIG_WIN32 -Index: qemu-kvm-0.11.0-rc1/block/tar.c +Index: qemu-kvm-0.11.0/block/tar.c =================================================================== --- /dev/null -+++ qemu-kvm-0.11.0-rc1/block/tar.c ++++ qemu-kvm-0.11.0/block/tar.c @@ -0,0 +1,338 @@ +/* + * Tar block driver ++++++ kvm-qemu-preXX-dictzip3.patch ++++++ --- /var/tmp/diff_new_pack.RERmLX/_old 2009-09-28 18:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RERmLX/_new 2009-09-28 18:24:48.000000000 +0200 @@ -7,11 +7,11 @@ block.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -Index: qemu-kvm-0.10.5/block.c +Index: qemu-kvm-0.11.0/block.c =================================================================== ---- qemu-kvm-0.10.5.orig/block.c -+++ qemu-kvm-0.10.5/block.c -@@ -357,11 +357,11 @@ int bdrv_open2(BlockDriverState *bs, con +--- qemu-kvm-0.11.0.orig/block.c ++++ qemu-kvm-0.11.0/block.c +@@ -358,11 +358,11 @@ int bdrv_open2(BlockDriverState *bs, con return ret; } total_size = bdrv_getlength(bs1) >> SECTOR_BITS; ++++++ kvm-qemu-preXX-dirty-bitmap-alloc.patch ++++++ --- /var/tmp/diff_new_pack.RERmLX/_old 2009-09-28 18:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RERmLX/_new 2009-09-28 18:24:48.000000000 +0200 @@ -1,7 +1,7 @@ -Index: qemu-kvm-0.11.0-rc2/qemu-kvm.c +Index: qemu-kvm-0.11.0/qemu-kvm.c =================================================================== ---- qemu-kvm-0.11.0-rc2.orig/qemu-kvm.c -+++ qemu-kvm-0.11.0-rc2/qemu-kvm.c +--- qemu-kvm-0.11.0.orig/qemu-kvm.c ++++ qemu-kvm-0.11.0/qemu-kvm.c @@ -692,7 +692,7 @@ int kvm_get_dirty_pages_range(kvm_contex for (i = 0; i < KVM_MAX_NUM_MEM_REGIONS; ++i) { if ((slots[i].len && (uint64_t)slots[i].phys_addr >= phys_addr) ++++++ kvm-qemu-rtl8139-link.patch ++++++ --- /var/tmp/diff_new_pack.RERmLX/_old 2009-09-28 18:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.RERmLX/_new 2009-09-28 18:24:48.000000000 +0200 @@ -1,10 +1,10 @@ # Fix the Link detection in MacOS # Author Alex Graf - agraf@suse -Index: qemu-kvm-0.11.0-rc1/hw/rtl8139.c +Index: qemu-kvm-0.11.0/hw/rtl8139.c =================================================================== ---- qemu-kvm-0.11.0-rc1.orig/hw/rtl8139.c -+++ qemu-kvm-0.11.0-rc1/hw/rtl8139.c +--- qemu-kvm-0.11.0.orig/hw/rtl8139.c ++++ qemu-kvm-0.11.0/hw/rtl8139.c @@ -422,6 +422,9 @@ static void RTL8139TallyCounters_load(QE /* Saves values of tally counters to VM state file */ static void RTL8139TallyCounters_save(QEMUFile* f, RTL8139TallyCounters *tally_counters); @@ -71,11 +71,11 @@ rtl8139_reset(s); s->vc = qdev_get_vlan_client(&dev->qdev, rtl8139_can_receive, rtl8139_receive, NULL, -Index: qemu-kvm-0.11.0-rc1/net.h +Index: qemu-kvm-0.11.0/net.h =================================================================== ---- qemu-kvm-0.11.0-rc1.orig/net.h -+++ qemu-kvm-0.11.0-rc1/net.h -@@ -98,6 +98,13 @@ enum { +--- qemu-kvm-0.11.0.orig/net.h ++++ qemu-kvm-0.11.0/net.h +@@ -99,6 +99,13 @@ enum { NIC_NVECTORS_UNSPECIFIED = -1 }; @@ -89,7 +89,7 @@ struct NICInfo { uint8_t macaddr[6]; const char *model; -@@ -108,6 +115,7 @@ struct NICInfo { +@@ -109,6 +116,7 @@ struct NICInfo { VLANClientState *vc; void *private; int used; @@ -97,11 +97,11 @@ int bootable; int nvectors; }; -Index: qemu-kvm-0.11.0-rc1/net.c +Index: qemu-kvm-0.11.0/net.c =================================================================== ---- qemu-kvm-0.11.0-rc1.orig/net.c -+++ qemu-kvm-0.11.0-rc1/net.c -@@ -2670,6 +2670,7 @@ int net_client_init(Monitor *mon, const +--- qemu-kvm-0.11.0.orig/net.c ++++ qemu-kvm-0.11.0/net.c +@@ -2671,6 +2671,7 @@ int net_client_init(Monitor *mon, const } nd->vlan = vlan; nd->name = name; @@ -109,11 +109,11 @@ nd->used = 1; name = NULL; nb_nics++; -Index: qemu-kvm-0.11.0-rc1/hw/pc.c +Index: qemu-kvm-0.11.0/hw/pc.c =================================================================== ---- qemu-kvm-0.11.0-rc1.orig/hw/pc.c -+++ qemu-kvm-0.11.0-rc1/hw/pc.c -@@ -1389,7 +1389,10 @@ static void pc_init1(ram_addr_t ram_size +--- qemu-kvm-0.11.0.orig/hw/pc.c ++++ qemu-kvm-0.11.0/hw/pc.c +@@ -1382,7 +1382,10 @@ static void pc_init1(ram_addr_t ram_size if (model == MODEL_ISA || (nd->model && strcmp(nd->model, "ne2k_isa") == 0)) pc_init_ne2k_isa(nd, i8259); ++++++ qemu-kvm-0.11.0-rc2.tar.bz2 -> qemu-kvm-0.11.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/Changelog new/qemu-kvm-0.11.0/Changelog --- old/qemu-kvm-0.11.0-rc2/Changelog 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/Changelog 2009-09-23 09:30:02.000000000 +0200 @@ -1,3 +1,14 @@ +version 0.11.0 + - fix rtc polling mode (Bernhard Kauer) + - qcow2: order concurrent aio requests (Kevin Wolf) + - qemu-io: port to win32 (Stefan Weil) + - alpha: fix extlh instruction (Vince Weaver) + - tcg: fix size of local variables in tcg_gen_bswap64_i64 (Stefan Weil) + - net: fix send ordering (Jan Kiszka) + - escc: fix IRQ routing (Aurelien Jarno) + - versatile: fix Linux task preemption (Aurelien Jarno) + - curses: reduce memory usage by 250MB (Aurelien Jarno) + version 0.11.0-rc2 - mips: fix conditional move off fp conditions codes (Nath Froyd) - fix migration to obey -S (Paolo Bonzini) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/KVM_VERSION new/qemu-kvm-0.11.0/KVM_VERSION --- old/qemu-kvm-0.11.0-rc2/KVM_VERSION 2009-09-07 14:52:18.000000000 +0200 +++ new/qemu-kvm-0.11.0/KVM_VERSION 2009-09-27 08:51:17.000000000 +0200 @@ -1 +1 @@ -qemu-kvm-0.11.0-rc2 +qemu-kvm-0.11.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/Makefile new/qemu-kvm-0.11.0/Makefile --- old/qemu-kvm-0.11.0-rc2/Makefile 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/Makefile 2009-09-23 09:30:02.000000000 +0200 @@ -305,8 +305,8 @@ if [ -f $(SRC_PATH)/pc-bios/$$x ];then \ $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ fi \ - ; if [ -f $(SRC_PATH)/pc-bios/optionrom/$$x ];then \ - $(INSTALL_DATA) $(SRC_PATH)/pc-bios/optionrom/$$x "$(DESTDIR)$(datadir)"; \ + ; if [ -f pc-bios/optionrom/$$x ];then \ + $(INSTALL_DATA) pc-bios/optionrom/$$x "$(DESTDIR)$(datadir)"; \ fi \ done endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/VERSION new/qemu-kvm-0.11.0/VERSION --- old/qemu-kvm-0.11.0-rc2/VERSION 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/VERSION 2009-09-23 09:30:02.000000000 +0200 @@ -1 +1 @@ -0.10.92 +0.11.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/block/qcow2-cluster.c new/qemu-kvm-0.11.0/block/qcow2-cluster.c --- old/qemu-kvm-0.11.0-rc2/block/qcow2-cluster.c 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/block/qcow2-cluster.c 2009-09-23 09:30:02.000000000 +0200 @@ -684,6 +684,7 @@ int l2_index, ret; uint64_t l2_offset, *l2_table, cluster_offset; int nb_clusters, i = 0; + QCowL2Meta *old_alloc; ret = get_cluster_table(bs, offset, &l2_table, &l2_offset, &l2_index); if (ret == 0) @@ -732,6 +733,44 @@ } nb_clusters = i; + /* + * Check if there already is an AIO write request in flight which allocates + * the same cluster. In this case we need to wait until the previous + * request has completed and updated the L2 table accordingly. + */ + LIST_FOREACH(old_alloc, &s->cluster_allocs, next_in_flight) { + + uint64_t end_offset = offset + nb_clusters * s->cluster_size; + uint64_t old_offset = old_alloc->offset; + uint64_t old_end_offset = old_alloc->offset + + old_alloc->nb_clusters * s->cluster_size; + + if (end_offset < old_offset || offset > old_end_offset) { + /* No intersection */ + } else { + if (offset < old_offset) { + /* Stop at the start of a running allocation */ + nb_clusters = (old_offset - offset) >> s->cluster_bits; + } else { + nb_clusters = 0; + } + + if (nb_clusters == 0) { + /* Set dependency and wait for a callback */ + m->depends_on = old_alloc; + m->nb_clusters = 0; + *num = 0; + return 0; + } + } + } + + if (!nb_clusters) { + abort(); + } + + LIST_INSERT_HEAD(&s->cluster_allocs, m, next_in_flight); + /* allocate a new cluster */ cluster_offset = qcow2_alloc_clusters(bs, nb_clusters * s->cluster_size); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/block/qcow2.c new/qemu-kvm-0.11.0/block/qcow2.c --- old/qemu-kvm-0.11.0-rc2/block/qcow2.c 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/block/qcow2.c 2009-09-23 09:30:02.000000000 +0200 @@ -219,6 +219,8 @@ if (qcow2_refcount_init(bs) < 0) goto fail; + LIST_INIT(&s->cluster_allocs); + /* read qcow2 extensions */ if (header.backing_file_offset) ext_end = header.backing_file_offset; @@ -338,6 +340,7 @@ QEMUIOVector hd_qiov; QEMUBH *bh; QCowL2Meta l2meta; + LIST_ENTRY(QCowAIOCB) next_depend; } QCowAIOCB; static void qcow_aio_cancel(BlockDriverAIOCB *blockacb) @@ -500,6 +503,7 @@ acb->n = 0; acb->cluster_offset = 0; acb->l2meta.nb_clusters = 0; + LIST_INIT(&acb->l2meta.dependent_requests); return acb; } @@ -517,6 +521,33 @@ return &acb->common; } +static void qcow_aio_write_cb(void *opaque, int ret); + +static void run_dependent_requests(QCowL2Meta *m) +{ + QCowAIOCB *req; + QCowAIOCB *next; + + /* Take the request off the list of running requests */ + if (m->nb_clusters != 0) { + LIST_REMOVE(m, next_in_flight); + } + + /* + * Restart all dependent requests. + * Can't use LIST_FOREACH here - the next link might not be the same + * any more after the callback (request could depend on a different + * request now) + */ + for (req = m->dependent_requests.lh_first; req != NULL; req = next) { + next = req->next_depend.le_next; + qcow_aio_write_cb(req, 0); + } + + /* Empty the list for the next part of the request */ + LIST_INIT(&m->dependent_requests); +} + static void qcow_aio_write_cb(void *opaque, int ret) { QCowAIOCB *acb = opaque; @@ -528,14 +559,15 @@ acb->hd_aiocb = NULL; + if (ret >= 0) { + ret = qcow2_alloc_cluster_link_l2(bs, acb->cluster_offset, &acb->l2meta); + } + + run_dependent_requests(&acb->l2meta); + if (ret < 0) goto done; - if (qcow2_alloc_cluster_link_l2(bs, acb->cluster_offset, &acb->l2meta) < 0) { - qcow2_free_any_clusters(bs, acb->cluster_offset, acb->l2meta.nb_clusters); - goto done; - } - acb->nb_sectors -= acb->n; acb->sector_num += acb->n; acb->buf += acb->n * 512; @@ -555,6 +587,14 @@ acb->cluster_offset = qcow2_alloc_cluster_offset(bs, acb->sector_num << 9, index_in_cluster, n_end, &acb->n, &acb->l2meta); + + /* Need to wait for another request? If so, we are done for now. */ + if (!acb->cluster_offset && acb->l2meta.depends_on != NULL) { + LIST_INSERT_HEAD(&acb->l2meta.depends_on->dependent_requests, + acb, next_depend); + return; + } + if (!acb->cluster_offset || (acb->cluster_offset & 511) != 0) { ret = -EIO; goto done; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/block/qcow2.h new/qemu-kvm-0.11.0/block/qcow2.h --- old/qemu-kvm-0.11.0-rc2/block/qcow2.h 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/block/qcow2.h 2009-09-23 09:30:02.000000000 +0200 @@ -98,6 +98,7 @@ uint8_t *cluster_cache; uint8_t *cluster_data; uint64_t cluster_cache_offset; + LIST_HEAD(QCowClusterAlloc, QCowL2Meta) cluster_allocs; uint64_t *refcount_table; uint64_t refcount_table_offset; @@ -128,6 +129,8 @@ int64_t refcount_block_offset; } QCowCreateState; +struct QCowAIOCB; + /* XXX This could be private for qcow2-cluster.c */ typedef struct QCowL2Meta { @@ -135,6 +138,10 @@ int n_start; int nb_available; int nb_clusters; + struct QCowL2Meta *depends_on; + LIST_HEAD(QCowAioDependencies, QCowAIOCB) dependent_requests; + + LIST_ENTRY(QCowL2Meta) next_in_flight; } QCowL2Meta; static inline int size_to_clusters(BDRVQcowState *s, int64_t size) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/cmd.c new/qemu-kvm-0.11.0/cmd.c --- old/qemu-kvm-0.11.0-rc2/cmd.c 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/cmd.c 2009-09-23 09:30:02.000000000 +0200 @@ -20,6 +20,7 @@ #include <string.h> #include <ctype.h> #include <errno.h> +#include <sys/time.h> #include "cmd.h" @@ -283,6 +284,26 @@ } #endif +static char *qemu_strsep(char **input, const char *delim) +{ + char *result = *input; + if (result != NULL) { + char *p = result; + for (p = result; *p != '\0'; p++) { + if (strchr(delim, *p)) { + break; + } + } + if (*p == '\0') { + *input = NULL; + } else { + *p = '\0'; + *input = p + 1; + } + } + return result; +} + char ** breakline( char *input, @@ -292,7 +313,7 @@ char *p; char **rval = calloc(sizeof(char *), 1); - while (rval && (p = strsep(&input, " ")) != NULL) { + while (rval && (p = qemu_strsep(&input, " ")) != NULL) { if (!*p) continue; c++; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/configure new/qemu-kvm-0.11.0/configure --- old/qemu-kvm-0.11.0-rc2/configure 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/configure 2009-09-23 09:30:02.000000000 +0200 @@ -1954,6 +1954,8 @@ tools="qemu-img\$(EXESUF) $tools" if [ "$linux" = "yes" ] ; then tools="qemu-nbd\$(EXESUF) qemu-io\$(EXESUF) $tools" + elif test "$mingw32" = "yes" ; then + tools="qemu-io\$(EXESUF) $tools" fi fi echo "TOOLS=$tools" >> $config_host_mak diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/curses.c new/qemu-kvm-0.11.0/curses.c --- old/qemu-kvm-0.11.0-rc2/curses.c 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/curses.c 2009-09-23 09:30:02.000000000 +0200 @@ -368,7 +368,4 @@ ds->surface = qemu_create_displaysurface_from(640, 400, 0, 0, (uint8_t*) screen); invalidate = 1; - - /* Standard VGA initial text mode dimensions */ - curses_resize(ds); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/hw/arm_sysctl.c new/qemu-kvm-0.11.0/hw/arm_sysctl.c --- old/qemu-kvm-0.11.0-rc2/hw/arm_sysctl.c 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/hw/arm_sysctl.c 2009-09-23 09:30:02.000000000 +0200 @@ -7,6 +7,8 @@ * This code is licenced under the GPL. */ +#include "hw.h" +#include "qemu-timer.h" #include "sysbus.h" #include "primecell.h" #include "sysemu.h" @@ -71,8 +73,7 @@ case 0x58: /* BOOTCS */ return 0; case 0x5c: /* 24MHz */ - /* ??? not implemented. */ - return 0; + return muldiv64(qemu_get_clock(vm_clock), 24000000, ticks_per_sec); case 0x60: /* MISC */ return 0; case 0x84: /* PROCID0 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/hw/escc.c new/qemu-kvm-0.11.0/hw/escc.c --- old/qemu-kvm-0.11.0-rc2/hw/escc.c 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/hw/escc.c 2009-09-23 09:30:02.000000000 +0200 @@ -743,8 +743,8 @@ qdev_prop_set_uint32(dev, "chnAtype", ser); qdev_init(dev); s = sysbus_from_qdev(dev); - sysbus_connect_irq(s, 0, irqA); - sysbus_connect_irq(s, 1, irqB); + sysbus_connect_irq(s, 0, irqB); + sysbus_connect_irq(s, 1, irqA); if (base) { sysbus_mmio_map(s, 0, base); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/hw/mc146818rtc.c new/qemu-kvm-0.11.0/hw/mc146818rtc.c --- old/qemu-kvm-0.11.0-rc2/hw/mc146818rtc.c 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/hw/mc146818rtc.c 2009-09-23 09:30:02.000000000 +0200 @@ -421,9 +421,10 @@ } /* update ended interrupt */ + s->cmos_data[RTC_REG_C] |= REG_C_UF; if (s->cmos_data[RTC_REG_B] & REG_B_UIE) { - s->cmos_data[RTC_REG_C] |= 0x90; - rtc_irq_raise(s->irq); + s->cmos_data[RTC_REG_C] |= REG_C_IRQF; + rtc_irq_raise(s->irq); } /* clear update in progress bit */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/hw/msix.c new/qemu-kvm-0.11.0/hw/msix.c --- old/qemu-kvm-0.11.0-rc2/hw/msix.c 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/hw/msix.c 2009-09-23 09:30:02.000000000 +0200 @@ -503,13 +503,19 @@ /* Mark vector as used. */ int msix_vector_use(PCIDevice *dev, unsigned vector) { + int ret; if (vector >= dev->msix_entries_nr) return -EINVAL; - if (dev->msix_entry_used[vector]++) + if (dev->msix_entry_used[vector]) { return 0; + } if (kvm_enabled() && qemu_kvm_irqchip_in_kernel()) { - return kvm_msix_add(dev, vector); + ret = kvm_msix_add(dev, vector); + if (ret) { + return ret; + } } + ++dev->msix_entry_used[vector]; return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/net.c new/qemu-kvm-0.11.0/net.c --- old/qemu-kvm-0.11.0-rc2/net.c 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/net.c 2009-09-23 09:30:02.000000000 +0200 @@ -470,34 +470,29 @@ void qemu_purge_queued_packets(VLANClientState *vc) { - VLANPacket **pp = &vc->vlan->send_queue; - - while (*pp != NULL) { - VLANPacket *packet = *pp; + VLANPacket *packet, *next; + TAILQ_FOREACH_SAFE(packet, &vc->vlan->send_queue, entry, next) { if (packet->sender == vc) { - *pp = packet->next; + TAILQ_REMOVE(&vc->vlan->send_queue, packet, entry); qemu_free(packet); - } else { - pp = &packet->next; } } } void qemu_flush_queued_packets(VLANClientState *vc) { - VLANPacket *packet; - - while ((packet = vc->vlan->send_queue) != NULL) { + while (!TAILQ_EMPTY(&vc->vlan->send_queue)) { + VLANPacket *packet; int ret; - vc->vlan->send_queue = packet->next; + packet = TAILQ_FIRST(&vc->vlan->send_queue); + TAILQ_REMOVE(&vc->vlan->send_queue, packet, entry); ret = qemu_deliver_packet(packet->sender, packet->data, packet->size, packet->raw); if (ret == 0 && packet->sent_cb != NULL) { - packet->next = vc->vlan->send_queue; - vc->vlan->send_queue = packet; + TAILQ_INSERT_HEAD(&vc->vlan->send_queue, packet, entry); break; } @@ -515,13 +510,13 @@ VLANPacket *packet; packet = qemu_malloc(sizeof(VLANPacket) + size); - packet->next = sender->vlan->send_queue; packet->sender = sender; packet->size = size; packet->raw = raw; packet->sent_cb = sent_cb; memcpy(packet->data, buf, size); - sender->vlan->send_queue = packet; + + TAILQ_INSERT_TAIL(&sender->vlan->send_queue, packet, entry); } static ssize_t qemu_send_packet_async2(VLANClientState *sender, @@ -645,7 +640,6 @@ max_len = calc_iov_length(iov, iovcnt); packet = qemu_malloc(sizeof(VLANPacket) + max_len); - packet->next = sender->vlan->send_queue; packet->sender = sender; packet->sent_cb = sent_cb; packet->size = 0; @@ -658,7 +652,7 @@ packet->size += len; } - sender->vlan->send_queue = packet; + TAILQ_INSERT_TAIL(&sender->vlan->send_queue, packet, entry); return packet->size; } @@ -2530,6 +2524,7 @@ } vlan = qemu_mallocz(sizeof(VLANState)); vlan->id = id; + TAILQ_INIT(&vlan->send_queue); vlan->next = NULL; pvlan = &first_vlan; while (*pvlan != NULL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/net.h new/qemu-kvm-0.11.0/net.h --- old/qemu-kvm-0.11.0-rc2/net.h 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/net.h 2009-09-23 09:30:02.000000000 +0200 @@ -1,6 +1,7 @@ #ifndef QEMU_NET_H #define QEMU_NET_H +#include "sys-queue.h" #include "qemu-common.h" /* VLANs support */ @@ -38,7 +39,7 @@ typedef void (NetPacketSent) (VLANClientState *, ssize_t); struct VLANPacket { - struct VLANPacket *next; + TAILQ_ENTRY(VLANPacket) entry; VLANClientState *sender; int size; int raw; @@ -51,7 +52,7 @@ VLANClientState *first_client; struct VLANState *next; unsigned int nb_guest_devs, nb_host_devs; - VLANPacket *send_queue; + TAILQ_HEAD(send_queue, VLANPacket) send_queue; int delivering; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/qemu-io.c new/qemu-kvm-0.11.0/qemu-io.c --- old/qemu-kvm-0.11.0-rc2/qemu-io.c 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/qemu-io.c 2009-09-23 09:30:02.000000000 +0200 @@ -7,10 +7,12 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ +#include <sys/time.h> #include <sys/types.h> #include <stdarg.h> #include <stdio.h> #include <getopt.h> +#include <libgen.h> #include "qemu-common.h" #include "block_int.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/target-alpha/translate.c new/qemu-kvm-0.11.0/target-alpha/translate.c --- old/qemu-kvm-0.11.0-rc2/target-alpha/translate.c 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/target-alpha/translate.c 2009-09-23 09:30:02.000000000 +0200 @@ -526,14 +526,15 @@ else tcg_gen_mov_i64(cpu_ir[rc], cpu_ir[ra]); } else { - TCGv tmp1, tmp2; + TCGv tmp1; tmp1 = tcg_temp_new(); + tcg_gen_andi_i64(tmp1, cpu_ir[rb], 7); tcg_gen_shli_i64(tmp1, tmp1, 3); - tmp2 = tcg_const_i64(64); - tcg_gen_sub_i64(tmp1, tmp2, tmp1); - tcg_temp_free(tmp2); + tcg_gen_neg_i64(tmp1, tmp1); + tcg_gen_andi_i64(tmp1, tmp1, 0x3f); tcg_gen_shl_i64(cpu_ir[rc], cpu_ir[ra], tmp1); + tcg_temp_free(tmp1); } if (tcg_gen_ext_i64) @@ -1320,7 +1321,7 @@ break; case 0x6A: /* EXTLH */ - gen_ext_h(&tcg_gen_ext16u_i64, ra, rb, rc, islit, lit); + gen_ext_h(&tcg_gen_ext32u_i64, ra, rb, rc, islit, lit); break; case 0x72: /* MSKQH */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/tcg/tcg-op.h new/qemu-kvm-0.11.0/tcg/tcg-op.h --- old/qemu-kvm-0.11.0-rc2/tcg/tcg-op.h 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/tcg/tcg-op.h 2009-09-23 09:30:02.000000000 +0200 @@ -1441,9 +1441,8 @@ #ifdef TCG_TARGET_HAS_bswap64_i64 tcg_gen_op2_i64(INDEX_op_bswap64_i64, ret, arg); #else - TCGv_i32 t0, t1; - t0 = tcg_temp_new_i32(); - t1 = tcg_temp_new_i32(); + TCGv_i64 t0 = tcg_temp_new_i64(); + TCGv_i64 t1 = tcg_temp_new_i64(); tcg_gen_shli_i64(t0, arg, 56); @@ -1473,8 +1472,8 @@ tcg_gen_shri_i64(t1, arg, 56); tcg_gen_or_i64(ret, t0, t1); - tcg_temp_free_i32(t0); - tcg_temp_free_i32(t1); + tcg_temp_free_i64(t0); + tcg_temp_free_i64(t1); #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qemu-kvm-0.11.0-rc2/vl.c new/qemu-kvm-0.11.0/vl.c --- old/qemu-kvm-0.11.0-rc2/vl.c 2009-08-30 11:10:59.000000000 +0200 +++ new/qemu-kvm-0.11.0/vl.c 2009-09-23 09:30:02.000000000 +0200 @@ -5831,6 +5831,20 @@ } #endif + if (kvm_enabled()) { + int ret; + + ret = kvm_init(smp_cpus); + if (ret < 0) { +#if defined(KVM_UPSTREAM) || defined(NO_CPU_EMULATION) + fprintf(stderr, "failed to initialize KVM\n"); + exit(1); +#endif + fprintf(stderr, "Could not initialize KVM, will disable KVM support\n"); + kvm_allowed = 0; + } + } + #ifdef CONFIG_KQEMU if (smp_cpus > 1) kqemu_allowed = 0; @@ -6002,20 +6016,6 @@ } } - if (kvm_enabled()) { - int ret; - - ret = kvm_init(smp_cpus); - if (ret < 0) { -#if defined(KVM_UPSTREAM) || defined(NO_CPU_EMULATION) - fprintf(stderr, "failed to initialize KVM\n"); - exit(1); -#endif - fprintf(stderr, "Could not initialize KVM, will disable KVM support\n"); - kvm_allowed = 0; - } - } - if (monitor_device) { monitor_hd = qemu_chr_open("monitor", monitor_device, NULL); if (!monitor_hd) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gdm for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package gdm for openSUSE:Factory checked in at Mon Sep 28 18:08:55 CEST 2009. -------- --- GNOME/gdm/gdm.changes 2009-08-25 23:36:50.000000000 +0200 +++ gdm/gdm.changes 2009-09-28 14:55:21.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Sep 28 14:25:50 CEST 2009 - vuntz(a)opensuse.org + +- Add gdm-xauthlocalhostname.patch: fix non-working user session + when the hostname changes during login. Fix shipstopper + bnc#538064. +- Add gdm-default-wm.patch: gdm now reads the DEFAULT_WM setting in + /etc/sysconfig/windowmanager to know which session to use by + default instead of always using GNOME. + This should fix using GDM for XFCE. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gdm-default-wm.patch gdm-xauthlocalhostname.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.HWHC7M/_old 2009-09-28 18:08:00.000000000 +0200 +++ /var/tmp/diff_new_pack.HWHC7M/_new 2009-09-28 18:08:00.000000000 +0200 @@ -42,7 +42,7 @@ License: GPL v2 or later Group: System/GUI/GNOME Version: 2.27.90 -Release: 1 +Release: 2 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -78,6 +78,10 @@ Patch32: gdm-keyboard-from-hal.patch # PATCH-FIX-OPENSUSE gdm-keyboard-from-sysconfig.patch bnc432360 bnc478083 hpj(a)novell.com -- Read keyboard options from sysconfig (for openSUSE <= 11.1, since keyboard layout wasn't in hal) Patch33: gdm-keyboard-from-sysconfig.patch +# PATCH-FIX-OPENSUSE gdm-default-wm.patch vuntz(a)novell.com -- Use sysconfig to know to which desktop to use by default +Patch34: gdm-default-wm.patch +# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch vuntz(a)novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes +Patch35: gdm-xauthlocalhostname.patch # PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux Patch60: gdm-selinux.patch Url: http://www.gnome.org/ @@ -146,6 +150,8 @@ %else %patch33 -p1 %endif +%patch34 -p1 +%patch35 -p1 %patch60 # gnome-patch-translation-update ++++++ gdm-default-wm.patch ++++++ Index: gdm-2.27.90/daemon/gdm-session-direct.c =================================================================== --- gdm-2.27.90.orig/daemon/gdm-session-direct.c +++ gdm-2.27.90/daemon/gdm-session-direct.c @@ -47,6 +47,8 @@ #include <libhal.h> +#include "gdm-sysconfig.h" + #include "gdm-session-direct.h" #include "gdm-session.h" #include "gdm-session-private.h" @@ -670,6 +672,15 @@ get_fallback_session_name (void) int i; char *name; + name = gdm_sysconfig_load_value ("/etc/sysconfig/windowmanager", "DEFAULT_WM"); + if (name && get_session_command_for_name (name, NULL)) { + return name; + } + + if (name) { + g_free (name); + } + name = g_strdup ("gnome"); if (get_session_command_for_name (name, NULL)) { return name; ++++++ gdm-xauthlocalhostname.patch ++++++ Index: gdm-2.27.90/daemon/gdm-display-access-file.c =================================================================== --- gdm-2.27.90.orig/daemon/gdm-display-access-file.c +++ gdm-2.27.90/daemon/gdm-display-access-file.c @@ -440,11 +440,15 @@ _get_auth_info_for_display (GdmDisplayAc if (is_local) { char localhost[HOST_NAME_MAX + 1] = ""; *family = FamilyLocal; +#if 0 if (gethostname (localhost, HOST_NAME_MAX) == 0) { *address = g_strdup (localhost); } else { +#endif *address = g_strdup ("localhost"); +#if 0 } +#endif } else { *family = FamilyWild; gdm_display_get_remote_hostname (display, address, NULL); Index: gdm-2.27.90/daemon/gdm-session-direct.c =================================================================== --- gdm-2.27.90.orig/daemon/gdm-session-direct.c +++ gdm-2.27.90/daemon/gdm-session-direct.c @@ -2050,6 +2050,12 @@ setup_session_environment (GdmSessionDir session->priv->user_x11_authority_file); } + if (session->priv->display_is_local) { + gdm_session_direct_set_environment_variable (session, + "XAUTHLOCALHOSTNAME", + "localhost"); + } + /* FIXME: We do this here and in the session worker. We should consolidate * somehow. */ Index: gdm-2.27.90/daemon/gdm-slave.c =================================================================== --- gdm-2.27.90.orig/daemon/gdm-slave.c +++ gdm-2.27.90/daemon/gdm-slave.c @@ -222,6 +222,10 @@ get_script_environment (GdmSlave *slav g_hash_table_insert (hash, g_strdup ("REMOTE_HOST"), g_strdup (slave->priv->display_hostname)); } + if (slave->priv->display_is_local) { + g_hash_table_insert (hash, g_strdup ("XAUTHLOCALHOSTNAME"), g_strdup ("localhost")); + } + /* Runs as root */ g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (slave->priv->display_x11_authority_file)); g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (slave->priv->display_name)); @@ -374,6 +378,7 @@ gdm_slave_connect_to_x11_display (GdmSla g_setenv ("DISPLAY", slave->priv->display_name, TRUE); g_setenv ("XAUTHORITY", slave->priv->display_x11_authority_file, TRUE); + g_setenv ("XAUTHLOCALHOSTNAME", "localhost", TRUE); sigemptyset (&mask); sigaddset (&mask, SIGCHLD); Index: gdm-2.27.90/daemon/gdm-welcome-session.c =================================================================== --- gdm-2.27.90.orig/daemon/gdm-welcome-session.c +++ gdm-2.27.90/daemon/gdm-welcome-session.c @@ -315,6 +315,10 @@ get_welcome_environment (GdmWelcomeSessi g_hash_table_insert (hash, g_strdup ("SHELL"), g_strdup (pwent->pw_shell)); } + if (welcome_session->priv->x11_display_is_local) { + g_hash_table_remove (hash, "XAUTHLOCALHOSTNAME"); + g_hash_table_insert (hash, g_strdup ("XAUTHLOCALHOSTNAME"), g_strdup ("localhost")); + } g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH"))); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 cyrus-imapd for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package cyrus-imapd for openSUSE:Factory checked in at Mon Sep 28 17:54:50 CEST 2009. -------- --- cyrus-imapd/cyrus-imapd.changes 2009-09-23 11:53:22.000000000 +0200 +++ cyrus-imapd/cyrus-imapd.changes 2009-09-28 10:59:02.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 28 08:48:12 UTC 2009 - rhafer(a)novell.com + +- Fixed init script dependencies. saslauthd is not a hard + requirement for cyrus-imapd (bnc#538852) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cyrus-imapd.spec ++++++ --- /var/tmp/diff_new_pack.BmtByT/_old 2009-09-28 17:54:09.000000000 +0200 +++ /var/tmp/diff_new_pack.BmtByT/_new 2009-09-28 17:54:09.000000000 +0200 @@ -29,7 +29,7 @@ AutoReqProv: on Summary: The Cyrus IMAP and POP Mail Server Version: 2.3.14 -Release: 6 +Release: 7 Source: %{name}-%{version}.tar.bz2 Source1: cyrus-imapd-rc.tar.gz # The autocreate Patchset is maintained at: ++++++ cyrus-imapd-rc.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SuSE/rc.cyrus new/SuSE/rc.cyrus --- old/SuSE/rc.cyrus 2009-01-15 13:56:48.000000000 +0100 +++ new/SuSE/rc.cyrus 2009-09-28 10:47:37.000000000 +0200 @@ -7,8 +7,10 @@ # ### BEGIN INIT INFO # Provides: cyrus -# Required-Start: $network $remote_fs $syslog saslauthd -# Required-Stop: $network $remote_fs $syslog saslauthd +# Required-Start: $network $remote_fs $syslog +# Should-Start: saslauthd +# Required-Stop: $network $remote_fs $syslog +# Should-Stop: saslauthd # Default-Start: 3 5 # Description: start the cyrus-imapd master server ### END INIT INFO ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nagios-plugins-zypper for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package nagios-plugins-zypper for openSUSE:Factory checked in at Mon Sep 28 17:53:49 CEST 2009. -------- --- nagios-plugins-zypper/nagios-plugins-zypper.changes 2009-09-23 12:31:11.000000000 +0200 +++ nagios-plugins-zypper/nagios-plugins-zypper.changes 2009-09-28 16:51:38.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Sep 28 16:51:03 CEST 2009 - lrupp(a)suse.de + +- update to 1.21: + + use --non-interactive everywhere + +------------------------------------------------------------------- +Sat Sep 26 12:00:03 CEST 2009 - lrupp(a)suse.de + +- update to 1.2: + + use the same zypper options for all openSUSE versions > 11.0 + (fixes bnc#538850) + + handle new message type 'warning' + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-plugins-zypper.spec ++++++ --- /var/tmp/diff_new_pack.ZsdsAz/_old 2009-09-28 17:52:57.000000000 +0200 +++ /var/tmp/diff_new_pack.ZsdsAz/_new 2009-09-28 17:52:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package nagios-plugins-zypper (Version 1.1) +# spec file for package nagios-plugins-zypper (Version 1.21) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: nagios-plugins-zypper Summary: Nagios plugin for checking software updates -Version: 1.1 +Version: 1.21 Release: 1 Url: http://en.opensuse.org/Nagios-plugins-zypper License: BSD 4-clause (or similar) ++++++ check_zypper.pl ++++++ --- /var/tmp/diff_new_pack.ZsdsAz/_old 2009-09-28 17:52:57.000000000 +0200 +++ /var/tmp/diff_new_pack.ZsdsAz/_new 2009-09-28 17:52:57.000000000 +0200 @@ -49,7 +49,7 @@ # constants $PROGNAME="check_zypper"; -$VERSION="1.1"; +$VERSION="1.21"; $DEBUG = 0; # variables @@ -219,7 +219,7 @@ } sub check_errorcode($){ - my $status=shift || ""; + my $status=shift; my $level=0; my $returnvalue="OK"; $returnvalue="WARNING" if ("$opt_w" =~ /$status/); @@ -230,12 +230,30 @@ return "$returnvalue"; } +sub xml_re_escape($){ + my ($text) = @_; + $text =~ s/&/&/sg; + $text =~ s/</</sg; + $text =~ s/>/>/sg; + $text =~ s/"/"/sg; + $text =~ s/'/'/sg; + return $text; +} + +sub trim($){ + my ($text) = @_; + $text =~ s/^\s+//; + $text =~ s/\s+$//; + return $text; +} + sub check(){ my ($status,$ret_str,$error); my $secstr=""; my $recstr=""; my $optstr=""; my $pacstr=""; + my $warnstr=""; my $update_avail=0; my %packagelist; print STDERR "INFO: Trying $use_sudo $zypper $zypperopt\n" if ($DEBUG); @@ -245,17 +263,22 @@ my $category="unknown"; print STDERR "LINE: $_\n" if ($DEBUG); # error handling - return("UNKNOWN: $_","UNKNOWN") if (/not found on medium/); - return("UNKNOWN: $_","UNKNOWN") if (/I\/O error: Can't provide/); - return("UNKNOWN: $_","UNKNOWN") if (/Error message:/); - return("UNKNOWN: $_","UNKNOWN") if (/A ZYpp transaction is already in progress./); - return("UNKNOWN: $_","UNKNOWN") if (/System management is locked/); + return("UNKNOWN: ".xml_re_escape($_),"UNKNOWN") if (/not found on medium/); + return("UNKNOWN: ".xml_re_escape($_),"UNKNOWN") if (/I\/O error: Can't provide/); + return("UNKNOWN: ".xml_re_escape($_),"UNKNOWN") if (/Error message:/); + return("UNKNOWN: ".xml_re_escape($_),"UNKNOWN") if (/A ZYpp transaction is already in progress./); + return("UNKNOWN: ".xml_re_escape($_),"UNKNOWN") if (/System management is locked/); if ((/out-of-date/)&&(!$opt_o)){ - $error="WARNING"; - $exitcode=1; - $ret_str="WARNING: At least one of your Repositories is out of date. Please run \"zypper refresh\" as root to update it. "; - $ret_str.="\n" if ($opt_v); + $error=check_errorcode("security"); + $warnstr="At least one of your Repositories is out of date. Please run \"zypper refresh\" as root to update it. "; + $warnstr.="\n" if ($opt_v); } + if (/<message type=\"warning\">(.*)<\/message>/){ + $update_avail=1; + $error=check_errorcode("security"); + $warnstr=xml_re_escape($1)." "; + $warnstr.="\n" if ($opt_v); + } if (( "$release" eq "10.2" ) || ("$dist" eq "SLE") ){ my ($url,$name,$version,$category,$status)=split('\s*\|\s*',$_,5); # just for reference - perhaps we need the variables later if (defined($name)){ @@ -302,28 +325,28 @@ use Data::Dumper; print STDERR Data::Dumper->Dump([\%packagelist]); } - if (defined($packagelist{'package'})){ + if (defined($packagelist{'package'}) && (scalar(keys %{($packagelist{'package'})}) ne 0)){ $update_avail=1; $error=check_errorcode("packages"); $pacstr=scalar(keys %{($packagelist{'package'})})." package update(s);"; } - if (defined($packagelist{'optional'})){ + if (defined($packagelist{'optional'}) && (scalar(keys %{($packagelist{'optional'})}) ne 0)){ $update_avail=1; $error=check_errorcode("optional"); $optstr=scalar(keys %{($packagelist{'optional'})})." optinal update(s);"; } - if (defined($packagelist{'recommended'})){ + if (defined($packagelist{'recommended'}) && (scalar(keys %{($packagelist{'warning'})}) ne 0)){ $update_avail=1; $error=check_errorcode("recommended"); $recstr=scalar(keys %{($packagelist{'recommended'})})." recommended update(s);"; } - if (defined($packagelist{'security'})){ + if (defined($packagelist{'security'}) && (scalar(keys %{($packagelist{'security'})}) ne 0)){ $update_avail=1; $error=check_errorcode("security"); $secstr=scalar(keys %{($packagelist{'security'})})." security update(s);"; } if ( $update_avail ){ - $ret_str.="$error : $secstr $recstr $optstr $pacstr "; + $ret_str.="$error : ".trim("$warnstr $secstr $recstr $optstr $pacstr")." "; my @packagelist=(); if ( $opt_v ){ foreach my $cat ('security','recommended','optional','package'){ @@ -384,7 +407,6 @@ print "UNKNOWN - Plugin timed out\n"; exit $ERRORS{"UNKNOWN"}; }; - alarm($TIMEOUT); if ($opt_V) { @@ -394,22 +416,14 @@ ($dist,$release,$patchlevel)=get_distribution("$opt_f"); -if ("$release" eq "10.2"){ - $zypperopt="--non-interactive --no-gpg-checks list-updates"; -} - -if ("$release" eq "11.1"){ - $zypperopt="--xmlout list-updates -t package -t patch"; -} +$zypperopt="--non-interactive --no-gpg-checks list-updates" if ("$release" eq "10.2"); +$zypperopt="--xmlout --non-interactive list-updates -t package -t patch" if ($release gt 11.1); if ("$dist" eq "SLE"){ if (("$release" eq "10") && ($patchlevel gt 0)){ $zypperopt="--non-interactive --no-gpg-checks --terse list-updates"; - } elsif ("$release" eq "11"){ - $zypperopt="--xmlout list-updates -t package -t patch"; } else { - print "UNKNOWN - SLE $release is currently not supported\n"; - exit $ERRORS{"UNKNOWN"}; + $zypperopt="--xmlout --non-interactive list-updates -t package -t patch"; } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

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

28 Sep '09

Hello community, here is the log from the commit of package patterns-openSUSE for openSUSE:Factory checked in at Mon Sep 28 17:52:16 CEST 2009. -------- --- patterns-openSUSE/patterns-openSUSE.changes 2009-09-07 12:49:50.000000000 +0200 +++ patterns-openSUSE/patterns-openSUSE.changes 2009-09-28 16:43:18.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Sep 28 16:42:09 CEST 2009 - coolo(a)novell.com + +5cb7c95... add gwibber to DVD +d7f6916... change from lsb to lsb-release by default (bnc#537378) +e1cf9f1... adding smolt +9a0bd24... adding btrfsprogs +356ac46... adding gnome-packagekit to XFCE +cc964c8... add lsof to live cd +3da4dae... remove beagle-firefox from GNOME default (bnc#533783) +846e43a... merge KDE4-BASIS-OPT back into KDE4-BASIS +d6c64cb... qlogic-firmware is now kernel-firmware +d96f273... move vpn plugins to the default install (bnc#533580) +c23700e... leave out file conflicts with kernel-firmware for now +cdf4380... try texlive on x86_64 again +102879c... adding polkit-gnome (bnc#538897) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.pkhUQc/_old 2009-09-28 17:46:52.000000000 +0200 +++ /var/tmp/diff_new_pack.pkhUQc/_new 2009-09-28 17:46:52.000000000 +0200 @@ -25,7 +25,7 @@ AutoReqProv: on Summary: Patterns for Installation (full ftp tree) Version: 11.2 -Release: 15 +Release: 16 Url: http://en.opensuse.org/Patterns BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-openSUSE-data.tar.bz2 ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/COMMON-DESKTOP-OPT new/patterns-openSUSE-data/data/COMMON-DESKTOP-OPT --- old/patterns-openSUSE-data/data/COMMON-DESKTOP-OPT 2009-08-27 09:57:12.000000000 +0200 +++ new/patterns-openSUSE-data/data/COMMON-DESKTOP-OPT 2009-09-08 16:15:30.000000000 +0200 @@ -3,7 +3,7 @@ gutenprint // needs python-qt4 hplip -lsb +// MAYBE later lsb-graphics java-1_6_0-openjdk-plugin #if !defined(__i386__) nspluginwrapper diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/ENHANCED-BASIS new/patterns-openSUSE-data/data/ENHANCED-BASIS --- old/patterns-openSUSE-data/data/ENHANCED-BASIS 2009-08-27 09:57:13.000000000 +0200 +++ new/patterns-openSUSE-data/data/ENHANCED-BASIS 2009-09-16 15:25:01.000000000 +0200 @@ -64,6 +64,7 @@ alsa-plugins // useful for debugging strace +lsof // make sure applications can't take down the system ulimit // mount NTFS rw @@ -150,6 +151,7 @@ // Bug 424707 - Feature "Command not found" for openSUSE by default scout command-not-found +lsb-release -Prc: +Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT new/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT --- old/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT 2009-08-27 09:57:13.000000000 +0200 +++ new/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT 2009-09-16 15:24:34.000000000 +0200 @@ -19,7 +19,6 @@ joe ksh ksymoops -lsof man-pages man-pages-posix manufacturer-PPDs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-BASIS new/patterns-openSUSE-data/data/GNOME-BASIS --- old/patterns-openSUSE-data/data/GNOME-BASIS 2009-08-27 09:57:13.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-BASIS 2009-09-16 16:59:29.000000000 +0200 @@ -28,7 +28,6 @@ awesfx beagle beagle-evolution -beagle-firefox beagle-gui bug-buddy gnome-control-center @@ -130,4 +129,5 @@ +Psg: // #301664 -> suggests due to 380248 gnome-commander +beagle-firefox -Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-Internet new/patterns-openSUSE-data/data/GNOME-Internet --- old/patterns-openSUSE-data/data/GNOME-Internet 2009-08-27 09:57:13.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-Internet 2009-09-18 21:28:30.000000000 +0200 @@ -8,12 +8,14 @@ ekiga // bnc#366894 cheese --Prc: -+Psg: -pan +// bnc#533580 NetworkManager-openvpn-gnome NetworkManager-vpnc-gnome NetworkManager-pptp-gnome +-Prc: ++Psg: +pan xchat-gnome +gwibber -Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/KDE4-BASIS new/patterns-openSUSE-data/data/KDE4-BASIS --- old/patterns-openSUSE-data/data/KDE4-BASIS 2009-08-27 09:57:13.000000000 +0200 +++ new/patterns-openSUSE-data/data/KDE4-BASIS 2009-09-28 16:41:08.000000000 +0200 @@ -7,6 +7,7 @@ kwrite -Prq: +Prc: +polkit-gnome NetworkManager-kde4 plasma-addons plasmoid-quickaccess @@ -62,4 +63,17 @@ kdepim4 kjots kpilot +// beagle and friends (good for CD later) +beagle-index +beagle-firefox +kerry +kio_beagle +kepas +kde4-webkitpart +yakuake +phonon-backend-gstreamer-0_10 +rasqal +redland +soprano-backend-sesame -Psg: + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/KDE4-BASIS-OPT new/patterns-openSUSE-data/data/KDE4-BASIS-OPT --- old/patterns-openSUSE-data/data/KDE4-BASIS-OPT 2009-08-27 09:57:13.000000000 +0200 +++ new/patterns-openSUSE-data/data/KDE4-BASIS-OPT 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -+Psg: -beagle-index -// beagle and friends (good for CD later) -beagle-firefox -kerry -kio_beagle -kepas -kde4-webkitpart -yakuake -phonon-backend-gstreamer-0_10 -rasqal -redland -soprano-backend-sesame --Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/KDE4-Internet new/patterns-openSUSE-data/data/KDE4-Internet --- old/patterns-openSUSE-data/data/KDE4-Internet 2009-08-27 09:57:13.000000000 +0200 +++ new/patterns-openSUSE-data/data/KDE4-Internet 2009-09-18 21:28:03.000000000 +0200 @@ -17,11 +17,12 @@ ktorrent choqok knode --Prc: -+Psg: +// bnc#533580 NetworkManager-openvpn-kde4 NetworkManager-vpnc-kde4 NetworkManager-pptp-kde4 +-Prc: ++Psg: arora kppp -Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/REST-CD new/patterns-openSUSE-data/data/REST-CD --- old/patterns-openSUSE-data/data/REST-CD 2009-08-27 09:57:13.000000000 +0200 +++ new/patterns-openSUSE-data/data/REST-CD 2009-09-20 12:31:40.000000000 +0200 @@ -8,6 +8,7 @@ preload-kmp-default compcache-kmp-default #endif +kernel-firmware // we need it for the live cds preload compcache @@ -20,7 +21,6 @@ memtest86+ // adaptec-firmware (#298726) adaptec-firmware -qlogic-firmware mpt-firmware atmel-firmware // bnc#445383 @@ -63,6 +63,8 @@ dosfstools // crypto partitions cryptsetup +// filesystem(btrfs) +btrfsprogs #if defined(__x86_64__) // kernel modules @@ -80,10 +82,10 @@ ndiswrapper // from non-oss - exception -iwl3945-ucode -iwl4965-ucode -iwl5000-ucode -ipw-firmware +#iwl3945-ucode +#iwl4965-ucode +#iwl5000-ucode +#ipw-firmware // supplements by modaliases bluez-firmware diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/XFCE new/patterns-openSUSE-data/data/XFCE --- old/patterns-openSUSE-data/data/XFCE 2009-09-01 16:28:15.000000000 +0200 +++ new/patterns-openSUSE-data/data/XFCE 2009-09-14 17:40:34.000000000 +0200 @@ -11,6 +11,8 @@ xorg-x11 -Prq: +Prc: +// bnc#537362 +gnome-packagekit xfce4-branding-openSUSE gtk-xfce-engine mousepad @@ -32,6 +34,8 @@ // #440285 pinentry-gtk2 avahi +// #537365 +smolt -Prc: +Psg: #pragma online diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/kde4_basis/recommends new/patterns-openSUSE-data/toinstall/kde4_basis/recommends --- old/patterns-openSUSE-data/toinstall/kde4_basis/recommends 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/kde4_basis/recommends 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -kde4_basis_opt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/kde4_basis_opt/category new/patterns-openSUSE-data/toinstall/kde4_basis_opt/category --- old/patterns-openSUSE-data/toinstall/kde4_basis_opt/category 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/kde4_basis_opt/category 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -addon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/kde4_basis_opt/extends new/patterns-openSUSE-data/toinstall/kde4_basis_opt/extends --- old/patterns-openSUSE-data/toinstall/kde4_basis_opt/extends 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/kde4_basis_opt/extends 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -kde4_basis diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/kde4_basis_opt/icon new/patterns-openSUSE-data/toinstall/kde4_basis_opt/icon --- old/patterns-openSUSE-data/toinstall/kde4_basis_opt/icon 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/kde4_basis_opt/icon 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -pattern-kde4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/kde4_basis_opt/order new/patterns-openSUSE-data/toinstall/kde4_basis_opt/order --- old/patterns-openSUSE-data/toinstall/kde4_basis_opt/order 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/kde4_basis_opt/order 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -1540 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/kde4_basis_opt/requires new/patterns-openSUSE-data/toinstall/kde4_basis_opt/requires --- old/patterns-openSUSE-data/toinstall/kde4_basis_opt/requires 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/kde4_basis_opt/requires 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -x11 -basesystem diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/kde4_basis_opt/role new/patterns-openSUSE-data/toinstall/kde4_basis_opt/role --- old/patterns-openSUSE-data/toinstall/kde4_basis_opt/role 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/kde4_basis_opt/role 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Graphical Environments diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/kde4_basis_opt/sel new/patterns-openSUSE-data/toinstall/kde4_basis_opt/sel --- old/patterns-openSUSE-data/toinstall/kde4_basis_opt/sel 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/kde4_basis_opt/sel 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -KDE4-BASIS-OPT -COMMON-DESKTOP-OPT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/kde4_basis_opt/visible new/patterns-openSUSE-data/toinstall/kde4_basis_opt/visible --- old/patterns-openSUSE-data/toinstall/kde4_basis_opt/visible 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/kde4_basis_opt/visible 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/rest_dvd/requires new/patterns-openSUSE-data/toinstall/rest_dvd/requires --- old/patterns-openSUSE-data/toinstall/rest_dvd/requires 2009-08-20 17:20:27.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/rest_dvd/requires 2009-09-28 10:38:48.000000000 +0200 @@ -60,7 +60,6 @@ kde4 kde4_admin kde4_basis -kde4_basis_opt kde4_edutainment kde4_games kde4_ide @@ -94,9 +93,9 @@ sw_management_gnome sw_management_kde4 tabletpc -#if !defined(__x86_64__) +//#if !defined(__x86_64__) technical_writing -#endif +//#endif x11 x11_opt #if defined(__ia64__) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rpmlint-mini for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package rpmlint-mini for openSUSE:Factory checked in at Mon Sep 28 17:46:36 CEST 2009. -------- --- rpmlint-mini/rpmlint-mini.changes 2009-09-16 18:42:55.000000000 +0200 +++ rpmlint-mini/rpmlint-mini.changes 2009-09-28 16:04:31.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 28 13:21:20 UTC 2009 - lnussel(a)suse.de + +- include python-magic to fix e.g. the 'no-binary' check (bnc#539042) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint-mini.spec ++++++ --- /var/tmp/diff_new_pack.GxQ0vT/_old 2009-09-28 17:45:33.000000000 +0200 +++ /var/tmp/diff_new_pack.GxQ0vT/_new 2009-09-28 17:45:33.000000000 +0200 @@ -21,11 +21,10 @@ Name: rpmlint-mini BuildRequires: glib2-devel pkg-config python-xml rpm-python rpmlint -#FIXME: need to make this work for e.g. CheckIconSizes.py -#BuildRequires: python-magic +BuildRequires: python-magic Summary: Rpm correctness checker Version: 1.0 -Release: 217 +Release: 218 Url: http://rpmlint.zarb.org/ License: GPL v2 or later Group: System/Packages @@ -73,6 +72,7 @@ find -path "*/$f" -exec install -D {} $RPM_BUILD_ROOT/opt/testing/%{_lib}/python%{py_ver}/{} \; done install -D /usr/bin/python $RPM_BUILD_ROOT/opt/testing/bin/python +cp -a %_libdir/libmagic.so.* $RPM_BUILD_ROOT/opt/testing/%{_lib} cp -a %_libdir/libpython%{py_ver}.so.* $RPM_BUILD_ROOT/opt/testing/%{_lib} pushd $RPM_BUILD_ROOT/opt/testing/share/rpmlint patch -p0 --no-backup-if-mismatch -i %PATCH1 ++++++ rpmlint-deps.txt ++++++ --- /var/tmp/diff_new_pack.GxQ0vT/_old 2009-09-28 17:45:33.000000000 +0200 +++ /var/tmp/diff_new_pack.GxQ0vT/_new 2009-09-28 17:45:33.000000000 +0200 @@ -200,3 +200,4 @@ xml/parsers/expat.pyo xml/parsers/__init__.pyo copy.pyo +magic.so ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

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

28 Sep '09

Hello community, here is the log from the commit of package bundle-lang-common for openSUSE:Factory checked in at Mon Sep 28 17:40:25 CEST 2009. -------- --- bundle-lang-common/bundle-lang-common.changes 2009-09-04 15:39:28.000000000 +0200 +++ bundle-lang-common/bundle-lang-common.changes 2009-09-28 11:17:40.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 28 11:17:20 CEST 2009 - coolo(a)novell.com + +- update bundle-lang-gnome-extras to build + +------------------------------------------------------------------- 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.MRAF0P/_old 2009-09-28 17:39:32.000000000 +0200 +++ /var/tmp/diff_new_pack.MRAF0P/_new 2009-09-28 17:39:32.000000000 +0200 @@ -25,7 +25,7 @@ License: MIT License (or similar) Group: System/Localization Version: 11.2 -Release: 17 +Release: 18 Summary: Translations for a Group of Programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ bundle-lang-gnome-extras.spec ++++++ ++++ 1296 lines (skipped) ++++ between bundle-lang-common/bundle-lang-gnome-extras.spec ++++ and bundle-lang-common/bundle-lang-gnome-extras.spec ++++++ bundle-lang-gnome.spec ++++++ --- /var/tmp/diff_new_pack.MRAF0P/_old 2009-09-28 17:39:32.000000000 +0200 +++ /var/tmp/diff_new_pack.MRAF0P/_new 2009-09-28 17:39:32.000000000 +0200 @@ -25,7 +25,7 @@ License: MIT License (or similar) Group: System/Localization Version: 11.2 -Release: 17 +Release: 18 Summary: Translations for many GNOME programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch bundle-lang-kde.spec: same change ++++++ bundle-lang-other.spec ++++++ --- /var/tmp/diff_new_pack.MRAF0P/_old 2009-09-28 17:39:32.000000000 +0200 +++ /var/tmp/diff_new_pack.MRAF0P/_new 2009-09-28 17:39:32.000000000 +0200 @@ -22,7 +22,7 @@ License: MIT License (or similar) Group: System/GUI/KDE Version: 11.2 -Release: 17 +Release: 18 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.MRAF0P/_old 2009-09-28 17:39:33.000000000 +0200 +++ /var/tmp/diff_new_pack.MRAF0P/_new 2009-09-28 17:39:33.000000000 +0200 @@ -5,6 +5,7 @@ alacarte-lang gnome-extras amarok-lang kde anjuta-lang gnome-extras +aqbanking-lang gnome-extras at-spi-lang gnome atk-lang common avahi-lang common @@ -18,6 +19,8 @@ brasero-lang gnome bug-buddy-lang gnome cheese-lang gnome +claws-mail-extra-plugins-lang gnome-extras +claws-mail-lang gnome-extras conduit-lang gnome-extras conglomerate-lang gnome-extras contact-lookup-applet-lang gnome-extras @@ -86,6 +89,7 @@ gnome-screensaver-lang gnome gnome-session-lang gnome gnome-settings-daemon-lang gnome +gnome-shell-lang gnome-extras gnome-spell2-lang gnome gnome-system-monitor-lang gnome gnome-terminal-lang gnome @@ -121,6 +125,7 @@ gucharmap-lang gnome gvfs-lang common gwget-lang gnome-extras +gwibber-lang gnome-extras hamster-applet-lang gnome-extras inkscape-lang gnome-extras istanbul-lang gnome-extras @@ -129,6 +134,7 @@ kipi-plugins-lang kde konversation-lang kde ktorrent-lang kde +last-exit-lang gnome-extras libbonobo-lang common libbonoboui-lang gnome libbtctl-lang gnome @@ -156,6 +162,7 @@ libinfinity-lang gnome-extras libiptcdata-lang gnome-extras libpurple-lang gnome +libslab-lang gnome-extras libwebkit-lang common libwnck-lang gnome liferea-lang gnome @@ -195,7 +202,6 @@ tomboy-lang gnome totem-lang gnome totem-pl-parser-lang gnome -transmission-lang gnome-extras tsclient-lang gnome-extras twitux-lang gnome-extras util-linux-lang common ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 preload for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package preload for openSUSE:Factory checked in at Mon Sep 28 17:36:27 CEST 2009. -------- --- preload/preload.changes 2009-09-18 20:24:57.000000000 +0200 +++ preload/preload.changes 2009-09-28 12:32:47.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 28 12:32:30 CEST 2009 - coolo(a)novell.com + +- do not require but recommend working kmp (bnc#530655) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ preload.spec ++++++ --- /var/tmp/diff_new_pack.CP8PLd/_old 2009-09-28 17:36:04.000000000 +0200 +++ /var/tmp/diff_new_pack.CP8PLd/_new 2009-09-28 17:36:04.000000000 +0200 @@ -20,7 +20,7 @@ Name: preload Version: 1.1 -Release: 3 +Release: 4 Summary: Preloads Files into System Cache for Faster Booting License: GPL v2 or later Group: System/Boot @@ -38,7 +38,7 @@ BuildRequires: kernel-default kernel-default-base-debuginfo kernel-default-debuginfo kernel-default-devel-debuginfo BuildRequires: kernel-desktop kernel-desktop-base-debuginfo kernel-desktop-debuginfo kernel-desktop-devel-debuginfo ExclusiveArch: %ix86 x86_64 -Requires: preload-kmp systemtap-runtime +Recommends: preload-kmp systemtap-runtime %suse_kernel_module_package -p %_sourcedir/preamble kdump um debug trace xen vim pae %description ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit monsoon for openSUSE:Factory
by root＠Hilbert.suse.de 28 Sep '09

28 Sep '09

Hello community, here is the log from the commit of package monsoon for openSUSE:Factory checked in at Mon Sep 28 17:35:43 CEST 2009. -------- --- GNOME/monsoon/monsoon.changes 2009-03-02 23:21:33.000000000 +0100 +++ monsoon/monsoon.changes 2009-05-08 15:35:55.000000000 +0200 @@ -1,0 +2,19 @@ +Fri Apr 24 22:35:42 CDT 2009 - oddrationale(a)gmail.com + +- Update to version 0.21: + + Bugs fixed: bnc#473742, bnc#468357, bnc#466590, bnc#444939, + bnc#431504, bnc#421809, bnc#421703, bnc#397572, bnc#391746, + bnc#386549 + + MonoTorrent and Mono.Nat no longer bundle with monsoon, they + are required as part of the build process + + Upgraded to MonoTorrent 0.72 + + Fixed issue loading files from firefox + + http://www.monsoon-project.org/jaws/index.php?page/releasenotes0.21 + +- spec file + + Removed AutoReqProv line + + Packaged README file + + Updated URL + + Removed unnecessary BuildRequires + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- monsoon-0.20.tar.bz2 New: ---- monsoon-0.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monsoon.spec ++++++ --- /var/tmp/diff_new_pack.5GxiEX/_old 2009-09-28 17:34:37.000000000 +0200 +++ /var/tmp/diff_new_pack.5GxiEX/_new 2009-09-28 17:34:37.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package monsoon (Version 0.20) +# spec file for package monsoon (Version 0.21) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,21 +19,29 @@ Name: monsoon -Summary: A GTK# based bittorrent GUI based on the Monsoon library -Version: 0.20 +Version: 0.21 Release: 1 -License: X11/MIT +License: MIT License (or similar) +Summary: A GTK# based bittorrent GUI based on the Monsoon library Group: Productivity/Networking/Other -Source: %{name}-%{version}.tar.bz2 -AutoReqProv: on +Url: http://www.monsoon-project.org +Source0: %{name}-%{version}.tar.bz2 +BuildRequires: gconf-sharp2 +BuildRequires: intltool +BuildRequires: mono-core +BuildRequires: mono-devel +BuildRequires: mono-nat +BuildRequires: monotorrent +BuildRequires: ndesk-dbus-glib-devel +BuildRequires: pkg-config +BuildRequires: update-desktop-files +Requires: gtk-sharp2 +Requires: mono-core +Requires: ndesk-dbus +Requires: %{name}-lang = %{version} BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://monotorrent.blogspot.com/ -BuildRequires: gconf-sharp2 glade-sharp2 gnome-sharp2 gnome-vfs-sharp2 gtk-sharp2 intltool mono mono-devel ndesk-dbus ndesk-dbus-glib-devel pkg-config update-desktop-files -BuildRequires: mono-nat monotorrent -Requires: mono-core ndesk-dbus ndesk-dbus-glib -Requires: %{name}-lang = %{version} -#Force files to use /lib and not /lib64 +# Force files to use /lib and not /lib64 %define _libdir %{_prefix}/lib %description @@ -47,9 +55,10 @@ -------- Alan McGovern <alan.mcgovern(a)gmail.com> + %lang_package %prep -%setup +%setup -q %build %configure @@ -58,16 +67,17 @@ %install %makeinstall %find_lang %{name} -%suse_update_desktop_file monsoon +%suse_update_desktop_file %{name} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%{_libdir}/monsoon -%{_bindir}/monsoon -%{_datadir}/applications/monsoon.desktop +%doc README +%{_prefix}/lib/%{name} +%{_bindir}/%{name} +%{_datadir}/applications/%{name}.desktop %files lang -f %{name}.lang ++++++ monsoon-0.20.tar.bz2 -> monsoon-0.21.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monsoon-0.20/Monsoon/AssemblyInfo.cs new/monsoon-0.21/Monsoon/AssemblyInfo.cs --- old/monsoon-0.20/Monsoon/AssemblyInfo.cs 2009-02-02 23:48:23.000000000 +0100 +++ new/monsoon-0.21/Monsoon/AssemblyInfo.cs 2009-04-20 21:19:46.000000000 +0200 @@ -11,4 +11,4 @@ [assembly: AssemblyCulture("")] // Major.Minor.Build.Revision -[assembly: AssemblyVersion("0.20")] +[assembly: AssemblyVersion("0.21")] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monsoon-0.20/Monsoon/TorrentController.cs new/monsoon-0.21/Monsoon/TorrentController.cs --- old/monsoon-0.20/Monsoon/TorrentController.cs 2009-02-02 23:46:47.000000000 +0100 +++ new/monsoon-0.21/Monsoon/TorrentController.cs 2009-04-20 21:12:34.000000000 +0200 @@ -278,7 +278,7 @@ if (File.Exists (newPath)) File.Delete (newPath); - File.Copy (torrentPath, newPath, true); + File.WriteAllBytes (newPath, File.ReadAllBytes (torrentPath)); Torrent t = Torrent.Load (newPath); for (int i=0; i < torrent.Files.Length; i++) @@ -451,7 +451,7 @@ if (Path.GetDirectoryName (args.TorrentPath) != MainWindow.Preferences.TorrentStorageLocation) { logger.Info ("Copying: {0} to {1}", args.TorrentPath, newPath); - File.Copy(args.TorrentPath, newPath ,true); + File.WriteAllBytes (newPath, File.ReadAllBytes (args.TorrentPath)); if(prefSettings.RemoveOnImport) File.Delete(args.TorrentPath); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monsoon-0.20/Monsoon/libs/TrayLib.cs new/monsoon-0.21/Monsoon/libs/TrayLib.cs --- old/monsoon-0.20/Monsoon/libs/TrayLib.cs 2009-02-02 23:46:42.000000000 +0100 +++ new/monsoon-0.21/Monsoon/libs/TrayLib.cs 2009-04-20 21:12:32.000000000 +0200 @@ -1,3 +1,30 @@ +// +// TrayLib.cs +// +// Copyright (C) 2005 Todd Berman <tberman(a)off.net> +// Copyright (C) 2005 Ed Catmur <ed(a)catmur.co.uk> +// Copyright (C) 2005 Novell, Inc. (Miguel de Icaza, Aaron Bockover) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + // http://www.mono-project.com/GtkSharpNotificationIcon using System; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monsoon-0.20/configure new/monsoon-0.21/configure --- old/monsoon-0.20/configure 2009-02-02 23:48:13.000000000 +0100 +++ new/monsoon-0.21/configure 2009-04-20 21:13:48.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for Monsoon 0.20. +# Generated by GNU Autoconf 2.63 for Monsoon 0.21. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -743,8 +743,8 @@ # Identity of this package. PACKAGE_NAME='Monsoon' PACKAGE_TARNAME='monsoon' -PACKAGE_VERSION='0.20' -PACKAGE_STRING='Monsoon 0.20' +PACKAGE_VERSION='0.21' +PACKAGE_STRING='Monsoon 0.21' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -1543,7 +1543,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 Monsoon 0.20 to adapt to many kinds of systems. +\`configure' configures Monsoon 0.21 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1613,7 +1613,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Monsoon 0.20:";; + short | recursive ) echo "Configuration of Monsoon 0.21:";; esac cat <<\_ACEOF @@ -1741,7 +1741,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Monsoon configure 0.20 +Monsoon configure 0.21 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1755,7 +1755,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Monsoon $as_me 0.20, which was +It was created by Monsoon $as_me 0.21, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2471,7 +2471,7 @@ # Define the identity of the package. PACKAGE='monsoon' - VERSION='0.20' + VERSION='0.21' cat >>confdefs.h <<_ACEOF @@ -3561,12 +3561,12 @@ pkg_cv_MONOTORRENT_CFLAGS="$MONOTORRENT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"monotorrent = 0.70\"") >&5 - ($PKG_CONFIG --exists --print-errors "monotorrent = 0.70") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"monotorrent = 0.72\"") >&5 + ($PKG_CONFIG --exists --print-errors "monotorrent = 0.72") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_MONOTORRENT_CFLAGS=`$PKG_CONFIG --cflags "monotorrent = 0.70" 2>/dev/null` + pkg_cv_MONOTORRENT_CFLAGS=`$PKG_CONFIG --cflags "monotorrent = 0.72" 2>/dev/null` else pkg_failed=yes fi @@ -3577,12 +3577,12 @@ pkg_cv_MONOTORRENT_LIBS="$MONOTORRENT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"monotorrent = 0.70\"") >&5 - ($PKG_CONFIG --exists --print-errors "monotorrent = 0.70") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"monotorrent = 0.72\"") >&5 + ($PKG_CONFIG --exists --print-errors "monotorrent = 0.72") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_MONOTORRENT_LIBS=`$PKG_CONFIG --libs "monotorrent = 0.70" 2>/dev/null` + pkg_cv_MONOTORRENT_LIBS=`$PKG_CONFIG --libs "monotorrent = 0.72" 2>/dev/null` else pkg_failed=yes fi @@ -3600,14 +3600,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MONOTORRENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "monotorrent = 0.70" 2>&1` + MONOTORRENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "monotorrent = 0.72" 2>&1` else - MONOTORRENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "monotorrent = 0.70" 2>&1` + MONOTORRENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "monotorrent = 0.72" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$MONOTORRENT_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (monotorrent = 0.70) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements (monotorrent = 0.72) were not met: $MONOTORRENT_PKG_ERRORS @@ -3618,7 +3618,7 @@ and MONOTORRENT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -$as_echo "$as_me: error: Package requirements (monotorrent = 0.70) were not met: +$as_echo "$as_me: error: Package requirements (monotorrent = 0.72) were not met: $MONOTORRENT_PKG_ERRORS @@ -14959,7 +14959,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Monsoon $as_me 0.20, which was +This file was extended by Monsoon $as_me 0.21, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15013,7 +15013,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -Monsoon config.status 0.20 +Monsoon config.status 0.21 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monsoon-0.20/configure.ac new/monsoon-0.21/configure.ac --- old/monsoon-0.20/configure.ac 2009-02-02 23:46:47.000000000 +0100 +++ new/monsoon-0.21/configure.ac 2009-04-20 21:12:35.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ([2.54]) -AC_INIT([Monsoon], [0.20]) +AC_INIT([Monsoon], [0.21]) AM_INIT_AUTOMAKE([foreign tar-pax]) AM_MAINTAINER_MODE @@ -48,7 +48,7 @@ PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0 >= 2.10]) PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0]) PKG_CHECK_MODULES([NDESK_DBUS_GLIB_10], [ndesk-dbus-glib-1.0 >= 0.4]) -PKG_CHECK_MODULES([MONOTORRENT], [monotorrent = 0.70]) +PKG_CHECK_MODULES([MONOTORRENT], [monotorrent = 0.72]) PKG_CHECK_MODULES([MONONAT], [mono.nat >= 1.0]) # I18N ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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