November 2010 - openSUSE Commits - openSUSE Mailing Lists

drop dmxviewer from openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, FYI: Package dmxviewer was dropped from openSUSE:Factory at Tue Nov 2 14:37:22 CET 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=dm… Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

drop libdmxview from openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, FYI: Package libdmxview was dropped from openSUSE:Factory at Tue Nov 2 14:37:05 CET 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=li… Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

drop howto from openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, FYI: Package howto was dropped from openSUSE:Factory at Tue Nov 2 14:36:44 CET 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=ho… Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

drop macutils from openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, FYI: Package macutils was dropped from openSUSE:Factory at Tue Nov 2 14:35:58 CET 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=ma… Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

drop libxml from openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, FYI: Package libxml was dropped from openSUSE:Factory at Tue Nov 2 14:35:33 CET 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=li… Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

drop cups-drivers from openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, FYI: Package cups-drivers was dropped from openSUSE:Factory at Tue Nov 2 14:35:12 CET 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=cu… 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 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package kvm for openSUSE:Factory checked in at Tue Nov 2 14:30:03 CET 2010. -------- --- kvm/kvm.changes 2010-10-06 00:01:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/kvm/kvm.changes 2010-11-01 03:13:01.000000000 +0100 @@ -1,0 +2,24 @@ +Mon Nov 1 01:30:23 UTC 2010 - brogers(a)novell.com + +- Update to stable release 0.13.0. Includes: + - vhost-net: kernel-accelerating network backend for virtio devices + - qmp: significant improvements covering most monitor commands + - vnc: introduction of new encodings that dramatically improve bandwidth + - ivshmem: new shared memory device allowing multiple guests to share + a memory region + - mips: introduction of fulong mini-pc + - virtio-9p: introduction of a paravirtual file system passthrough + mechanism + - hpet: many enhancements + - target-s390: support for s390 usermode emulation + - QMP is still considered experimental in 0.13.0, but should be usable by + libvirt + +- SeaBios updated to 0.6.1. Includes: + - Support for virtio drives + - Add ACPI definitions for cpu hotplug support + - Support for a graphical bootsplash screen + - USB mouse support + - The PCI support for emulators is less dependent on i440 chipset + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kvm-qemu-applesmc.patch kvm-qemu-pre0.13-flush-unsafe.patch kvm-qemu-pre0.13-flush-unsafe-snapshot.patch kvm-qemu-preXX-32bit-breakpoint-crash.patch kvm-qemu-preXX-balloon-report-overflow.patch kvm-qemu-preXX-boot-option.patch kvm-qemu-preXX-curses-return-key.patch kvm-qemu-preXX-dictzip3.patch kvm-qemu-preXX-dictzip4.patch kvm-qemu-preXX-dictzip5.patch kvm-qemu-preXX-dictzip6.patch kvm-qemu-preXX-move-unsafe-to-end-of-caching-modes-in-help.patch kvm-qemu-preXX-qcow2-error-handling.patch kvm-qemu-preXX-qcow2-regression.patch kvm-qemu-preXX-qdev-ide-bios-setup.patch kvm-qemu-preXX-report-open-failure.patch kvm-qemu-preXX-rtl8139-timer.patch kvm-qemu-preXX-sdl-grab-help.patch kvm-qemu-preXX-virtio-hotplug.patch kvm-qemu-preXX-write-full.patch qemu-kvm-0.12.5.tar.bz2 seabios-0.5.1-git-9fb3f4d950744e97cc655b7d7b523d8bf101e4a0.tar.bz2 seabios-preXX-ap-start.patch seabios-preXX-enable-irq-in-spin-functions.patch New: ---- qemu-kvm-0.13.0.tar.bz2 seabios-0.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvm.spec ++++++ --- /var/tmp/diff_new_pack.nEiKBH/_old 2010-11-02 14:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.nEiKBH/_new 2010-11-02 14:29:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kvm (Version 0.12.5) +# spec file for package kvm (Version 0.13.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ %bcond_with vde -%define bios_id seabios-0.5.1-git-9fb3f4d950744e97cc655b7d7b523d8bf101e4a0 +%define bios_id seabios-0.6.1 %define pxe_rom_id gpxe-0.9.9 #%define vgabios_id vgabios-0.6c @@ -41,11 +41,12 @@ # build no Mac BIOS on others %define mac_bios 0 %endif +%define mac_patches_ported 0 %define using_buildservice 0%{?opensuse_bs} Name: kvm -BuildRequires: SDL-devel alsa alsa-devel gnutls-devel libaio-devel ncurses-devel pciutils-devel perl python texinfo +BuildRequires: SDL-devel alsa alsa-devel gnutls-devel libaio-devel libcurl-devel libpulse-devel ncurses-devel pciutils-devel perl python texinfo %ifarch %ix86 x86_64 ia64 %if %{build_fw_from_source} # needed for building vgabios: @@ -62,9 +63,6 @@ %endif %endif Requires: virt-utils -%if %suse_version >= 1100 -BuildRequires: libcurl-devel libpulse-devel -%endif %if %{with vde} BuildRequires: vde2-devel %endif @@ -76,8 +74,8 @@ Group: System/Kernel Summary: Kernel-based Virtual Machine Url: http://kvm.qumranet.com/ -Version: 0.12.5 -Release: 2 +Version: 0.13.0 +Release: 1 Source0: qemu-%{name}-%{version}.tar.bz2 Source1: 60-kvm.rules Source2: qemu-ifup @@ -98,40 +96,18 @@ Patch06: qemu-datadir.diff Patch07: kvm-qemu-default-memsize.patch Patch08: kvm-qemu-no-fallback-if-open-kvm-fails.patch -Patch09: seabios-preXX-ap-start.patch -Patch10: seabios-preXX-enable-irq-in-spin-functions.patch -Patch11: kvm-qemu-user-space-tool-name.patch +Patch09: kvm-qemu-user-space-tool-name.patch # Mac OS X patches -Patch12: kvm-qemu-lpc.patch -Patch13: kvm-qemu-applesmc.patch -Patch14: kvm-qemu-ide-ich6.patch -Patch15: kvm-qemu-macmodel.patch -Patch16: kvm-qemu-rtl8139-link.patch +Patch20: kvm-qemu-lpc.patch +Patch21: kvm-qemu-ide-ich6.patch +Patch22: kvm-qemu-macmodel.patch +Patch23: kvm-qemu-rtl8139-link.patch Patch90: kvm-bios.patch # Post-release upstream patches Patch100: kvm-qemu-preXX-dictzip1.patch Patch101: kvm-qemu-preXX-dictzip2.patch -Patch102: kvm-qemu-preXX-dictzip3.patch -Patch103: kvm-qemu-preXX-dictzip4.patch -Patch104: kvm-qemu-preXX-dictzip5.patch -Patch105: kvm-qemu-preXX-dictzip6.patch -Patch106: kvm-qemu-preXX-virtio-hotplug.patch -Patch107: kvm-qemu-preXX-write-full.patch -Patch108: kvm-qemu-preXX-qcow2-error-handling.patch -Patch109: kvm-qemu-preXX-qcow2-regression.patch -Patch110: kvm-qemu-preXX-rtl8139-timer.patch -Patch111: kvm-qemu-preXX-32bit-breakpoint-crash.patch -Patch112: kvm-qemu-preXX-curses-return-key.patch -Patch113: kvm-qemu-preXX-sdl-grab-help.patch -Patch114: kvm-qemu-preXX-qdev-ide-bios-setup.patch -Patch115: kvm-qemu-preXX-balloon-report-overflow.patch -Patch116: kvm-qemu-preXX-report-open-failure.patch -Patch117: kvm-qemu-preXX-boot-option.patch -Patch118: kvm-qemu-pre0.13-flush-unsafe.patch -Patch119: kvm-qemu-pre0.13-flush-unsafe-snapshot.patch -Patch120: kvm-qemu-preXX-move-unsafe-to-end-of-caching-modes-in-help.patch -Patch121: kvm-qemu-preXX-report-default-mac-used.patch +Patch102: kvm-qemu-preXX-report-default-mac-used.patch Patch200: kvm-studio-slirp-nooutgoing.patch Patch201: kvm-studio-vnc.patch @@ -209,41 +185,25 @@ %patch07 -p1 %patch08 -p1 %patch09 -p1 -%patch10 -p1 -%patch11 -p1 # Mac OS X guest %if %{mac_bios} -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 +%if %{mac_patches_ported} +%patch20 -p1 +%endif +%patch21 -p1 +%if %{mac_patches_ported} +%patch22 -p1 +%patch23 -p1 +%endif cp -a roms/seabios roms/seabios-mac +%if %{mac_patches_ported} %patch90 -p1 -b .bios-mac %endif +%endif # Post-release patches %patch100 -p1 %patch101 -p1 %patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 -%patch110 -p1 -%patch111 -p1 -%patch112 -p1 -%patch113 -p1 -%patch114 -p1 -%patch115 -p1 -%patch116 -p1 -%patch117 -p1 -%patch118 -p1 -%patch119 -p1 -%patch120 -p1 -%patch121 -p1 # Studio addons %patch200 -p1 @@ -262,12 +222,15 @@ %patch704 -p1 %patch705 -p1 %patch706 -p1 +%endif cp %{SOURCE11} pc-bios/ -%endif %build +echo "kvm-%{version}-%{release}" > KVM_VERSION ./configure --prefix=%{_prefix} \ + --enable-werror \ + --sysconfdir=/etc \ --audio-card-list="ac97 adlib cs4231a gus" \ %if %{build_fw_from_source} --disable-blobs \ @@ -286,17 +249,13 @@ --extra-cflags="%{optflags}" \ --disable-strip \ --disable-werror -# Aborts if curses support is not enabled: -grep "^CONFIG_CURSES=y" config-host.mak -# Patch kvm/user Makefile to accept inital CFLAGS: -# XXX why? we don't install anything from kvm/user/ -sed -i 's/CFLAGS =/CFLAGS +=/' kvm/user/Makefile -echo "CFLAGS=%optflags" >> kvm/user/config.mak -# Patch the version, so we know which revision was installed: -# sed -i "s|kvm-%{version}|kvm-%{version}-%{release}|" config-host.h -echo "%{version}-%{release}" > VERSION +echo "CFLAGS=%optflags" >> kvm/test/config.mak +sed -i 's/CFLAGS =/CFLAGS +=/' kvm/test/Makefile +sed -i 's/CFLAGS =/CFLAGS +=/' kvm/vgabios/Makefile +# NYI - there is another that needs it # userspace: -make KVM_KMOD="no" %{?jobs:-j%jobs} +make config-host.h +make %{?jobs:-j%jobs} # Firmware %ifarch %ix86 x86_64 make -C roms/seabios @@ -371,7 +330,10 @@ %attr(755,root,kvm) %{_bindir}/qemu-img-kvm %attr(755,root,kvm) %{_bindir}/kvm_stat %{_datadir}/qemu-kvm -%config /etc/udev/rules.d/60-kvm.rules +%dir %attr(0700, root, kvm) %{_sysconfdir}/qemu-kvm/ +%attr(644,root,kvm) %{_sysconfdir}/qemu-kvm/target-x86_64.conf +%config %{_sysconfdir}/qemu-kvm/target-x86_64.conf +%config %{_sysconfdir}/udev/rules.d/60-kvm.rules %_mandir/man1/qemu-kvm.1.gz %changelog ++++++ kvm-qemu-default-memsize.patch ++++++ --- /var/tmp/diff_new_pack.nEiKBH/_old 2010-11-02 14:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.nEiKBH/_new 2010-11-02 14:29:05.000000000 +0100 @@ -1,13 +1,13 @@ -Index: qemu-kvm-0.12.2/vl.c +Index: qemu-kvm-0.13.0/vl.c =================================================================== ---- qemu-kvm-0.12.2.orig/vl.c -+++ qemu-kvm-0.12.2/vl.c -@@ -173,7 +173,7 @@ int main(int argc, char **argv) +--- qemu-kvm-0.13.0.orig/vl.c ++++ qemu-kvm-0.13.0/vl.c +@@ -165,7 +165,7 @@ int main(int argc, char **argv) //#define DEBUG_NET //#define DEBUG_SLIRP -#define DEFAULT_RAM_SIZE 128 +#define DEFAULT_RAM_SIZE 512 - static const char *data_dir; - const char *bios_name = NULL; + #define MAX_VIRTIO_CONSOLES 1 + ++++++ kvm-qemu-ide-ich6.patch ++++++ --- /var/tmp/diff_new_pack.nEiKBH/_old 2010-11-02 14:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.nEiKBH/_new 2010-11-02 14:29:05.000000000 +0100 @@ -1,9 +1,9 @@ #qemu-only -> submit upstream qemu -Index: qemu-kvm-0.12.5/hw/irq.c +Index: qemu-kvm-0.13.0/hw/irq.c =================================================================== ---- qemu-kvm-0.12.5.orig/hw/irq.c -+++ qemu-kvm-0.12.5/hw/irq.c +--- qemu-kvm-0.13.0.orig/hw/irq.c ++++ qemu-kvm-0.13.0/hw/irq.c @@ -35,6 +35,7 @@ void qemu_set_irq(qemu_irq irq, int leve if (!irq) return; @@ -12,23 +12,23 @@ irq->handler(irq->opaque, irq->n, level); } -Index: qemu-kvm-0.12.5/hw/ide.h +Index: qemu-kvm-0.13.0/hw/ide.h =================================================================== ---- qemu-kvm-0.12.5.orig/hw/ide.h -+++ qemu-kvm-0.12.5/hw/ide.h -@@ -12,6 +12,7 @@ void pci_cmd646_ide_init(PCIBus *bus, Dr +--- qemu-kvm-0.13.0.orig/hw/ide.h ++++ qemu-kvm-0.13.0/hw/ide.h +@@ -13,6 +13,7 @@ void pci_cmd646_ide_init(PCIBus *bus, Dr int secondary_ide_enabled); - void pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); - void pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); + PCIDevice *pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); + PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); +void pci_ich6_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); + void vt82c686b_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); /* ide-macio.c */ - int pmac_ide_init (DriveInfo **hd_table, qemu_irq irq, -Index: qemu-kvm-0.12.5/hw/ide/piix.c +Index: qemu-kvm-0.13.0/hw/ide/piix.c =================================================================== ---- qemu-kvm-0.12.5.orig/hw/ide/piix.c -+++ qemu-kvm-0.12.5/hw/ide/piix.c -@@ -156,6 +156,29 @@ static int pci_piix4_ide_initfn(PCIDevic +--- qemu-kvm-0.13.0.orig/hw/ide/piix.c ++++ qemu-kvm-0.13.0/hw/ide/piix.c +@@ -157,6 +157,29 @@ static int pci_piix4_ide_initfn(PCIDevic return pci_piix_ide_initfn(d); } @@ -57,9 +57,9 @@ + /* hd_table must contain 4 block drivers */ /* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ - void pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) -@@ -176,6 +199,16 @@ void pci_piix4_ide_init(PCIBus *bus, Dri - pci_ide_create_devs(dev, hd_table); + PCIDevice *pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) +@@ -179,6 +202,16 @@ PCIDevice *pci_piix4_ide_init(PCIBus *bu + return dev; } +/* hd_table must contain 4 block drivers */ @@ -75,7 +75,7 @@ static PCIDeviceInfo piix_ide_info[] = { { .qdev.name = "piix3-ide", -@@ -188,6 +221,11 @@ static PCIDeviceInfo piix_ide_info[] = { +@@ -191,6 +224,11 @@ static PCIDeviceInfo piix_ide_info[] = { .qdev.no_user = 1, .init = pci_piix4_ide_initfn, },{ @@ -87,11 +87,11 @@ /* end of list */ } }; -Index: qemu-kvm-0.12.5/hw/pci_ids.h +Index: qemu-kvm-0.13.0/hw/pci_ids.h =================================================================== ---- qemu-kvm-0.12.5.orig/hw/pci_ids.h -+++ qemu-kvm-0.12.5/hw/pci_ids.h -@@ -88,6 +88,7 @@ +--- qemu-kvm-0.13.0.orig/hw/pci_ids.h ++++ qemu-kvm-0.13.0/hw/pci_ids.h +@@ -97,6 +97,7 @@ #define PCI_VENDOR_ID_INTEL 0x8086 #define PCI_DEVICE_ID_INTEL_82441 0x1237 #define PCI_DEVICE_ID_INTEL_82801AA_5 0x2415 ++++++ kvm-qemu-lpc.patch ++++++ --- /var/tmp/diff_new_pack.nEiKBH/_old 2010-11-02 14:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.nEiKBH/_new 2010-11-02 14:29:05.000000000 +0100 @@ -1,21 +1,20 @@ #qemu-only -> submit upstream qemu -Index: qemu-kvm-0.12.2/Makefile.target +Index: qemu-kvm-0.13.0/Makefile.target =================================================================== ---- qemu-kvm-0.12.2.orig/Makefile.target -+++ qemu-kvm-0.12.2/Makefile.target -@@ -206,7 +206,7 @@ obj-i386-y += pckbd.o $(sound-obj-y) dma - obj-i386-y += vga.o vga-pci.o vga-isa.o - obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o - obj-i386-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o --obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o -+obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o lpc.o - obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o - obj-i386-y += extboot.o - obj-i386-y += ne2000-isa.o -Index: qemu-kvm-0.12.2/hw/lpc.c +--- qemu-kvm-0.13.0.orig/Makefile.target ++++ qemu-kvm-0.13.0/Makefile.target +@@ -219,6 +219,7 @@ obj-i386-y += debugcon.o multiboot.o + obj-i386-y += pc_piix.o + obj-i386-y += testdev.o + obj-i386-y += acpi.o acpi_piix4.o ++obj-i386-y += lpc.o + + obj-i386-y += pcspk.o i8254.o + obj-i386-$(CONFIG_KVM_PIT) += i8254-kvm.o +Index: qemu-kvm-0.13.0/hw/lpc.c =================================================================== --- /dev/null -+++ qemu-kvm-0.12.2/hw/lpc.c ++++ qemu-kvm-0.13.0/hw/lpc.c @@ -0,0 +1,162 @@ +/* + * Low Pin Count emulation @@ -179,11 +178,11 @@ +#endif +} + -Index: qemu-kvm-0.12.2/hw/pc.h +Index: qemu-kvm-0.13.0/hw/pc.h =================================================================== ---- qemu-kvm-0.12.2.orig/hw/pc.h -+++ qemu-kvm-0.12.2/hw/pc.h -@@ -163,6 +163,9 @@ void isa_cirrus_vga_init(void); +--- qemu-kvm-0.13.0.orig/hw/pc.h ++++ qemu-kvm-0.13.0/hw/pc.h +@@ -179,6 +179,9 @@ void isa_cirrus_vga_init(void); void isa_ne2000_init(int base, int irq, NICInfo *nd); @@ -192,4 +191,4 @@ + /* extboot.c */ - void extboot_init(BlockDriverState *bs, int cmd); + void extboot_init(BlockDriverState *bs); ++++++ kvm-qemu-no-fallback-if-open-kvm-fails.patch ++++++ --- /var/tmp/diff_new_pack.nEiKBH/_old 2010-11-02 14:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.nEiKBH/_new 2010-11-02 14:29:05.000000000 +0100 @@ -1,13 +1,14 @@ -Index: qemu-kvm-0.12.5/vl.c +Index: qemu-kvm-0.13.0/vl.c =================================================================== ---- qemu-kvm-0.12.5.orig/vl.c -+++ qemu-kvm-0.12.5/vl.c -@@ -5913,6 +5913,8 @@ int main(int argc, char **argv, char **e - fprintf(stderr, "failed to initialize KVM\n"); +--- qemu-kvm-0.13.0.orig/vl.c ++++ qemu-kvm-0.13.0/vl.c +@@ -2809,6 +2809,9 @@ int main(int argc, char **argv, char **e exit(1); #endif + #ifdef CONFIG_KVM + 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; - } + #endif ++++++ kvm-qemu-preXX-dictzip1.patch ++++++ --- /var/tmp/diff_new_pack.nEiKBH/_old 2010-11-02 14:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.nEiKBH/_new 2010-11-02 14:29:05.000000000 +0100 @@ -1,7 +1,6 @@ -From 88aac575f0977fa699a6770d7ce259797f730cc1 Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Wed, 5 Aug 2009 09:49:37 +0200 -Subject: [PATCH 1/3] Add support for DictZip enabled gzip files +Subject: [PATCH 1/2] Add support for DictZip enabled gzip files DictZip is an extension to the gzip format that allows random seeks in gzip compressed files by cutting the file into pieces and storing the piece offsets @@ -18,29 +17,17 @@ Tar patch follows. Signed-off-by: Alexander Graf <agraf(a)suse.de> +Signed-off-by: Bruce Rogers <brogers(a)novell.com> --- Makefile | 2 +- block/dictzip.c | 501 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 502 insertions(+), 1 deletions(-) create mode 100644 block/dictzip.c -Index: qemu-kvm-0.12.2/Makefile -=================================================================== ---- qemu-kvm-0.12.2.orig/Makefile -+++ qemu-kvm-0.12.2/Makefile -@@ -110,7 +110,7 @@ block-obj-$(CONFIG_POSIX) += compatfd.o - - block-nested-y += cow.o qcow.o vdi.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 --block-nested-y += parallels.o nbd.o -+block-nested-y += parallels.o nbd.o dictzip.o - block-nested-$(CONFIG_WIN32) += raw-win32.o - block-nested-$(CONFIG_POSIX) += raw-posix.o - block-nested-$(CONFIG_CURL) += curl.o -Index: qemu-kvm-0.12.2/block/dictzip.c +Index: qemu-kvm-0.13.0/block/dictzip.c =================================================================== --- /dev/null -+++ qemu-kvm-0.12.2/block/dictzip.c ++++ qemu-kvm-0.13.0/block/dictzip.c @@ -0,0 +1,567 @@ +/* + * DictZip Block driver for dictzip enabled gzip files @@ -434,7 +421,7 @@ + s->cache_index = 0; + + cache->len = 0; -+ if (cache[s->cache_index].buf) ++ if (cache->buf) + qemu_free(cache->buf); + cache->start = acb->gz_start; + cache->buf = buf; @@ -595,7 +582,7 @@ + .protocol_name = "dzip", + + .instance_size = sizeof(BDRVDictZipState), -+ .bdrv_open = dictzip_open, ++ .bdrv_file_open = dictzip_open, + .bdrv_close = dictzip_close, + .bdrv_getlength = dictzip_getlength, + .bdrv_probe = dictzip_probe, @@ -609,3 +596,15 @@ +} + +block_init(dictzip_block_init); +Index: qemu-kvm-0.13.0/Makefile.objs +=================================================================== +--- qemu-kvm-0.13.0.orig/Makefile.objs ++++ qemu-kvm-0.13.0/Makefile.objs +@@ -16,6 +16,7 @@ block-obj-$(CONFIG_POSIX) += compatfd.o + block-nested-y += raw.o cow.o qcow.o vdi.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 + block-nested-y += parallels.o nbd.o blkdebug.o sheepdog.o ++block-nested-y += dictzip.o + block-nested-$(CONFIG_WIN32) += raw-win32.o + block-nested-$(CONFIG_POSIX) += raw-posix.o + block-nested-$(CONFIG_CURL) += curl.o ++++++ kvm-qemu-preXX-dictzip2.patch ++++++ --- /var/tmp/diff_new_pack.nEiKBH/_old 2010-11-02 14:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.nEiKBH/_new 2010-11-02 14:29:05.000000000 +0100 @@ -1,7 +1,6 @@ -From 728c772ee9d56404ebb475d2fcf029447cf5190a Mon Sep 17 00:00:00 2001 From: Alexander Graf <agraf(a)suse.de> Date: Wed, 5 Aug 2009 17:28:38 +0200 -Subject: [PATCH 2/3] Add tar container format +Subject: [PATCH 2/2] Add tar container format Tar is a very widely used format to store data in. Sometimes people even put virtual machine images in there. @@ -19,30 +18,18 @@ them. Signed-off-by: Alexander Graf <agraf(a)suse.de> +Signed-off-by: Bruce Rogers <brogers(a)novell.com> --- Makefile | 2 +- block/tar.c | 333 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 334 insertions(+), 1 deletions(-) create mode 100644 block/tar.c -Index: qemu-kvm-0.12.2/Makefile -=================================================================== ---- qemu-kvm-0.12.2.orig/Makefile -+++ qemu-kvm-0.12.2/Makefile -@@ -110,7 +110,7 @@ block-obj-$(CONFIG_POSIX) += compatfd.o - - block-nested-y += cow.o qcow.o vdi.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 --block-nested-y += parallels.o nbd.o dictzip.o -+block-nested-y += parallels.o nbd.o dictzip.o tar.o - block-nested-$(CONFIG_WIN32) += raw-win32.o - block-nested-$(CONFIG_POSIX) += raw-posix.o - block-nested-$(CONFIG_CURL) += curl.o -Index: qemu-kvm-0.12.2/block/tar.c +Index: qemu-kvm-0.13.0/block/tar.c =================================================================== --- /dev/null -+++ qemu-kvm-0.12.2/block/tar.c -@@ -0,0 +1,338 @@ ++++ qemu-kvm-0.13.0/block/tar.c +@@ -0,0 +1,356 @@ +/* + * Tar block driver + * @@ -102,6 +89,7 @@ + SparseCache *sparse; + int sparse_num; + uint64_t last_end; ++ char longfile[2048]; +} BDRVTarState; + +static int tar_probe(const uint8_t *buf, int buf_size, const char *filename) @@ -144,6 +132,9 @@ + retval = 1; + + dprintf("does filename %s match? %s\n", filename, retval ? "yes" : "no"); ++ ++ /* make sure we're not using this name again */ ++ filename[0] = '\0'; + return retval; +} + @@ -153,14 +144,17 @@ + char oldend = ptr[12]; + + ptr[12] = '\0'; -+ if (*ptr & 0x80) -+ retval = be64_to_cpu(*(uint64_t *)ptr); -+ else ++ if (*ptr & 0x80) { ++ /* XXX we only support files up to 64 bit length */ ++ retval = be64_to_cpu(*(uint64_t *)(ptr+4)); ++ dprintf("Convert %lx -> %#lx\n", *(uint64_t*)(ptr+4), retval); ++ } else { + retval = strtol(ptr, NULL, 8); ++ dprintf("Convert %s -> %#lx\n", ptr, retval); ++ } + + ptr[12] = oldend; + -+ dprintf("Convert %s -> %#lx\n", ptr, retval); + return retval; +} + @@ -193,6 +187,7 @@ +{ + BDRVTarState *s = bs->opaque; + char header[SECTOR_SIZE]; ++ char *real_file = header; + char *magic; + const char *fname = filename; + size_t header_offs = 0; @@ -233,7 +228,17 @@ + s->file_sec = (header_offs / SECTOR_SIZE) + 1; + + header_offs += s->file_len + SECTOR_SIZE; -+ } while(!is_target_file(bs, header)); ++ ++ if (header[OFFS_TYPE] == 'L') { ++ bdrv_pread(s->hd, header_offs - s->file_len, s->longfile, ++ sizeof(s->longfile)); ++ s->longfile[sizeof(s->longfile)-1] = '\0'; ++ } else if (s->longfile[0]) { ++ real_file = s->longfile; ++ } else { ++ real_file = header; ++ } ++ } while(!is_target_file(bs, real_file)); + + /* We found an image! */ + @@ -367,7 +372,7 @@ + .protocol_name = "tar", + + .instance_size = sizeof(BDRVTarState), -+ .bdrv_open = tar_open, ++ .bdrv_file_open = tar_open, + .bdrv_close = tar_close, + .bdrv_getlength = tar_getlength, + .bdrv_probe = tar_probe, @@ -381,3 +386,16 @@ +} + +block_init(tar_block_init); +Index: qemu-kvm-0.13.0/Makefile.objs +=================================================================== +--- qemu-kvm-0.13.0.orig/Makefile.objs ++++ qemu-kvm-0.13.0/Makefile.objs +@@ -16,7 +16,7 @@ block-obj-$(CONFIG_POSIX) += compatfd.o + block-nested-y += raw.o cow.o qcow.o vdi.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 + block-nested-y += parallels.o nbd.o blkdebug.o sheepdog.o +-block-nested-y += dictzip.o ++block-nested-y += dictzip.o tar.o + block-nested-$(CONFIG_WIN32) += raw-win32.o + block-nested-$(CONFIG_POSIX) += raw-posix.o + block-nested-$(CONFIG_CURL) += curl.o ++++++ kvm-qemu-preXX-report-default-mac-used.patch ++++++ --- /var/tmp/diff_new_pack.nEiKBH/_old 2010-11-02 14:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.nEiKBH/_new 2010-11-02 14:29:05.000000000 +0100 @@ -1,8 +1,8 @@ -Index: qemu-kvm-0.12.5/net.c +Index: qemu-kvm-0.13.0/net.c =================================================================== ---- qemu-kvm-0.12.5.orig/net.c -+++ qemu-kvm-0.12.5/net.c -@@ -172,6 +172,27 @@ void qemu_format_nic_info_str(VLANClient +--- qemu-kvm-0.13.0.orig/net.c ++++ qemu-kvm-0.13.0/net.c +@@ -173,6 +173,27 @@ void qemu_format_nic_info_str(VLANClient macaddr[3], macaddr[4], macaddr[5]); } @@ -30,7 +30,7 @@ void qemu_macaddr_default_if_unset(MACAddr *macaddr) { static int index = 0; -@@ -1329,6 +1350,7 @@ int net_init_clients(void) +@@ -1401,6 +1422,7 @@ int net_init_clients(void) if (qemu_opts_foreach(&qemu_net_opts, net_init_client, NULL, 1) == -1) { return -1; } ++++++ kvm-qemu-user-space-tool-name.patch ++++++ --- /var/tmp/diff_new_pack.nEiKBH/_old 2010-11-02 14:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.nEiKBH/_new 2010-11-02 14:29:05.000000000 +0100 @@ -1,13 +1,13 @@ -Index: qemu-kvm-0.12.5/vl.c +Index: qemu-kvm-0.13.0/vl.c =================================================================== ---- qemu-kvm-0.12.5.orig/vl.c -+++ qemu-kvm-0.12.5/vl.c -@@ -4293,7 +4293,7 @@ static void help(int exitcode) +--- qemu-kvm-0.13.0.orig/vl.c ++++ qemu-kvm-0.13.0/vl.c +@@ -1419,7 +1419,7 @@ static void help(int exitcode) + "ctrl-alt toggle mouse and keyboard grab\n" "\n" - "When using -nographic, press 'ctrl-a h' to get some help.\n" - , + "When using -nographic, press 'ctrl-a h' to get some help.\n", - "qemu", + "qemu-kvm", - DEFAULT_RAM_SIZE, - #ifndef _WIN32 - DEFAULT_NETWORK_SCRIPT, + options_help); + exit(exitcode); + } ++++++ kvm-studio-slirp-nooutgoing.patch ++++++ --- /var/tmp/diff_new_pack.nEiKBH/_old 2010-11-02 14:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.nEiKBH/_new 2010-11-02 14:29:05.000000000 +0100 @@ -1,16 +1,16 @@ -Index: qemu-kvm-0.12.5/vl.c +Index: qemu-kvm-0.13.0/vl.c =================================================================== ---- qemu-kvm-0.12.5.orig/vl.c -+++ qemu-kvm-0.12.5/vl.c -@@ -230,6 +230,7 @@ int acpi_enabled = 1; +--- qemu-kvm-0.13.0.orig/vl.c ++++ qemu-kvm-0.13.0/vl.c +@@ -210,6 +210,7 @@ const char *vnc_display; + int acpi_enabled = 1; int no_hpet = 0; - #endif int fd_bootchk = 1; +int slirp_nooutgoing = 0; int no_reboot = 0; int no_shutdown = 0; int cursor_hide = 1; -@@ -5358,6 +5359,14 @@ int main(int argc, char **argv, char **e +@@ -2235,6 +2236,14 @@ int main(int argc, char **argv, char **e case QEMU_OPTION_singlestep: singlestep = 1; break; @@ -25,10 +25,10 @@ case QEMU_OPTION_S: autostart = 0; break; -Index: qemu-kvm-0.12.5/slirp/tcp_subr.c +Index: qemu-kvm-0.13.0/slirp/tcp_subr.c =================================================================== ---- qemu-kvm-0.12.5.orig/slirp/tcp_subr.c -+++ qemu-kvm-0.12.5/slirp/tcp_subr.c +--- qemu-kvm-0.13.0.orig/slirp/tcp_subr.c ++++ qemu-kvm-0.13.0/slirp/tcp_subr.c @@ -317,6 +317,9 @@ tcp_sockclosed(struct tcpcb *tp) * nonblocking. Connect returns after the SYN is sent, and does * not wait for ACK+SYN. @@ -73,11 +73,11 @@ /* Translate connections from localhost to the real hostname */ if (so->so_faddr.s_addr == 0 || so->so_faddr.s_addr == loopback_addr.s_addr) so->so_faddr = slirp->vhost_addr; -Index: qemu-kvm-0.12.5/slirp/socket.c +Index: qemu-kvm-0.13.0/slirp/socket.c =================================================================== ---- qemu-kvm-0.12.5.orig/slirp/socket.c -+++ qemu-kvm-0.12.5/slirp/socket.c -@@ -533,6 +533,8 @@ sorecvfrom(struct socket *so) +--- qemu-kvm-0.13.0.orig/slirp/socket.c ++++ qemu-kvm-0.13.0/slirp/socket.c +@@ -529,6 +529,8 @@ sorecvfrom(struct socket *so) } /* if ping packet */ } @@ -86,7 +86,7 @@ /* * sendto() a socket */ -@@ -563,6 +565,12 @@ sosendto(struct socket *so, struct mbuf +@@ -559,6 +561,12 @@ sosendto(struct socket *so, struct mbuf DEBUG_MISC((dfd, " sendto()ing, addr.sin_port=%d, addr.sin_addr.s_addr=%.16s\n", ntohs(addr.sin_port), inet_ntoa(addr.sin_addr))); @@ -99,16 +99,18 @@ /* Don't care what port we get */ ret = sendto(so->s, m->m_data, m->m_len, 0, (struct sockaddr *)&addr, sizeof (struct sockaddr)); -Index: qemu-kvm-0.12.5/qemu-options.hx +Index: qemu-kvm-0.13.0/qemu-options.hx =================================================================== ---- qemu-kvm-0.12.5.orig/qemu-options.hx -+++ qemu-kvm-0.12.5/qemu-options.hx -@@ -1634,6 +1634,14 @@ Store the QEMU process PID in @var{file} +--- qemu-kvm-0.13.0.orig/qemu-options.hx ++++ qemu-kvm-0.13.0/qemu-options.hx +@@ -1819,6 +1819,16 @@ Store the QEMU process PID in @var{file} from a script. ETEXI +DEF("nooutgoing", HAS_ARG, QEMU_OPTION_nooutgoing, \ -+ "-nooutgoing <IP> Incoming traffic only from IP, no outgoing\n") ++ "-nooutgoing <IP>\n" \ ++ " incoming traffic only from IP, no outgoing\n", \ ++ QEMU_ARCH_ALL) +STEXI +@item -nooutgoing +Forbid userspace networking to make outgoing connections. Only accept incoming @@ -116,5 +118,5 @@ +ETEXI + DEF("singlestep", 0, QEMU_OPTION_singlestep, \ - "-singlestep always run in singlestep mode\n") + "-singlestep always run in singlestep mode\n", QEMU_ARCH_ALL) STEXI ++++++ kvm-studio-vnc.patch ++++++ --- /var/tmp/diff_new_pack.nEiKBH/_old 2010-11-02 14:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.nEiKBH/_new 2010-11-02 14:29:05.000000000 +0100 @@ -1,27 +1,26 @@ -Index: qemu-kvm-0.12.5/vnc.c +Index: qemu-kvm-0.13.0/ui/vnc.c =================================================================== ---- qemu-kvm-0.12.5.orig/vnc.c -+++ qemu-kvm-0.12.5/vnc.c +--- qemu-kvm-0.13.0.orig/ui/vnc.c ++++ qemu-kvm-0.13.0/ui/vnc.c @@ -48,6 +48,7 @@ static VncDisplay *vnc_display; /* needed for info vnc */ static DisplayChangeListener *dcl; +static int allowed_connections = 0; - static char *addr_to_string(const char *format, - struct sockaddr_storage *sa, -@@ -1044,6 +1045,8 @@ static void vnc_disconnect_start(VncStat + static int vnc_cursor_define(VncState *vs); + +@@ -1008,6 +1009,7 @@ static void vnc_disconnect_start(VncStat static void vnc_disconnect_finish(VncState *vs) { + static int num_disconnects = 0; -+ - if (vs->input.buffer) { - qemu_free(vs->input.buffer); - vs->input.buffer = NULL; -@@ -1076,10 +1079,19 @@ static void vnc_disconnect_finish(VncSta + vnc_jobs_join(vs); /* Wait encoding jobs */ - vnc_remove_timer(vs->vd); + vnc_lock_output(vs); +@@ -1045,10 +1047,19 @@ static void vnc_disconnect_finish(VncSta + qemu_mutex_destroy(&vs->output_mutex); + #endif qemu_free(vs); + + num_disconnects++; @@ -35,15 +34,15 @@ int vnc_client_io_error(VncState *vs, int ret, int last_errno) { + static int num_disconnects = 0; -+ ++ if (ret == 0 || ret == -1) { if (ret == -1) { switch (last_errno) { -@@ -2478,6 +2490,39 @@ char *vnc_display_local_addr(DisplayStat +@@ -2510,6 +2521,39 @@ char *vnc_display_local_addr(DisplayStat return vnc_socket_local_addr("%s:%s", vs->lsock); } -+static void read_file_password(DisplayState *ds, char *filename) ++static void read_file_password(DisplayState *ds, char *filename) +{ + FILE *pfile = NULL; + char *passwd = NULL; @@ -68,18 +67,18 @@ + passwd = malloc(length+1); + rc = fread(passwd, 1, length, pfile); + fclose(pfile); -+ ++ + if(rc == length && rc > 0) { + vnc_display_password(ds, passwd); + } -+ ++ + free(passwd); +} + int vnc_display_open(DisplayState *ds, const char *display) { VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display; -@@ -2507,7 +2552,36 @@ int vnc_display_open(DisplayState *ds, c +@@ -2539,7 +2583,36 @@ int vnc_display_open(DisplayState *ds, c while ((options = strchr(options, ','))) { options++; if (strncmp(options, "password", 8) == 0) { @@ -115,4 +114,4 @@ + } } else if (strncmp(options, "reverse", 7) == 0) { reverse = 1; - } else if (strncmp(options, "to=", 3) == 0) { + } else if (strncmp(options, "no-lock-key-sync", 9) == 0) { ++++++ qemu-datadir.diff ++++++ --- /var/tmp/diff_new_pack.nEiKBH/_old 2010-11-02 14:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.nEiKBH/_new 2010-11-02 14:29:05.000000000 +0100 @@ -1,26 +1,41 @@ -Index: qemu-kvm-0.12.5/configure +Index: qemu-kvm-0.13.0/configure =================================================================== ---- qemu-kvm-0.12.5.orig/configure -+++ qemu-kvm-0.12.5/configure -@@ -1975,7 +1975,7 @@ else - prefix="/usr/local" - fi - mansuffix="/share/man" -- datasuffix="/share/qemu" -+ datasuffix="/share/qemu-kvm" - docsuffix="/share/doc/qemu" - binsuffix="/bin" - fi -Index: qemu-kvm-0.12.5/vl.c +--- qemu-kvm-0.13.0.orig/configure ++++ qemu-kvm-0.13.0/configure +@@ -296,7 +296,7 @@ mingw32="no" + EXESUF="" + prefix="/usr/local" + mandir="\${prefix}/share/man" +-datadir="\${prefix}/share/qemu" ++datadir="\${prefix}/share/qemu-kvm" + docdir="\${prefix}/share/doc/qemu" + bindir="\${prefix}/bin" + sysconfdir="\${prefix}/etc" +Index: qemu-kvm-0.13.0/os-posix.c =================================================================== ---- qemu-kvm-0.12.5.orig/vl.c -+++ qemu-kvm-0.12.5/vl.c -@@ -4622,7 +4622,7 @@ static char *find_datadir(const char *ar +--- qemu-kvm-0.13.0.orig/os-posix.c ++++ qemu-kvm-0.13.0/os-posix.c +@@ -85,7 +85,7 @@ void os_setup_signal_handling(void) /* Find a likely location for support files using the location of the binary. For installed binaries this will be "$bindir/../share/qemu". When running from the build tree this will be "$bindir/../pc-bios". */ -#define SHARE_SUFFIX "/share/qemu" +#define SHARE_SUFFIX "/share/qemu-kvm" #define BUILD_SUFFIX "/pc-bios" - static char *find_datadir(const char *argv0) + char *os_find_datadir(const char *argv0) { +Index: qemu-kvm-0.13.0/Makefile +=================================================================== +--- qemu-kvm-0.13.0.orig/Makefile ++++ qemu-kvm-0.13.0/Makefile +@@ -181,8 +181,8 @@ ifdef CONFIG_POSIX + endif + + install-sysconfig: +- $(INSTALL_DIR) "$(DESTDIR)$(sysconfdir)/qemu" +- $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(sysconfdir)/qemu" ++ $(INSTALL_DIR) "$(DESTDIR)$(sysconfdir)/qemu-kvm" ++ $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(sysconfdir)/qemu-kvm" + + install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig + $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ++++++ qemu-kvm-0.12.5.tar.bz2 -> qemu-kvm-0.13.0.tar.bz2 ++++++ ++++ 206491 lines of diff (skipped) ++++++ seabios-0.5.1-git-9fb3f4d950744e97cc655b7d7b523d8bf101e4a0.tar.bz2 -> seabios-0.6.1.tar.bz2 ++++++ ++++ 15878 lines of diff (skipped) ++++++ seabios-sanitize-version.patch ++++++ --- /var/tmp/diff_new_pack.nEiKBH/_old 2010-11-02 14:29:08.000000000 +0100 +++ /var/tmp/diff_new_pack.nEiKBH/_new 2010-11-02 14:29:08.000000000 +0100 @@ -1,13 +1,13 @@ -Index: qemu-kvm-0.12.2/roms/seabios/Makefile +Index: qemu-kvm-0.13.0/roms/seabios/Makefile =================================================================== ---- qemu-kvm-0.12.2.orig/roms/seabios/Makefile -+++ qemu-kvm-0.12.2/roms/seabios/Makefile +--- qemu-kvm-0.13.0.orig/roms/seabios/Makefile ++++ qemu-kvm-0.13.0/roms/seabios/Makefile @@ -5,7 +5,7 @@ # This file may be distributed under the terms of the GNU LGPLv3 license. # Program version --VERSION=0.5.1-$(shell date +"%Y%m%d_%H%M%S")-$(shell hostname) -+VERSION=0.5.1-$(shell date +"%Y%m%d_%H%M%S") +-VERSION=0.6.1-$(shell date +"%Y%m%d_%H%M%S")-$(shell hostname) ++VERSION=0.6.1-$(shell date +"%Y%m%d_%H%M%S") # Output directory OUT=out/ ++++++ vgabios-bcc-paths.patch ++++++ --- /var/tmp/diff_new_pack.nEiKBH/_old 2010-11-02 14:29:09.000000000 +0100 +++ /var/tmp/diff_new_pack.nEiKBH/_new 2010-11-02 14:29:09.000000000 +0100 @@ -1,7 +1,7 @@ -Index: qemu-kvm-0.12.2/kvm/vgabios/Makefile +Index: qemu-kvm-0.13.0/kvm/vgabios/Makefile =================================================================== ---- qemu-kvm-0.12.2.orig/kvm/vgabios/Makefile -+++ qemu-kvm-0.12.2/kvm/vgabios/Makefile +--- qemu-kvm-0.13.0.orig/kvm/vgabios/Makefile ++++ qemu-kvm-0.13.0/kvm/vgabios/Makefile @@ -5,7 +5,7 @@ CFLAGS = -g -O2 -Wall -Wstrict-prototyp LDFLAGS = ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 lbdb for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package lbdb for openSUSE:Factory checked in at Tue Nov 2 14:28:53 CET 2010. -------- --- lbdb/lbdb.changes 2009-11-03 20:19:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/lbdb/lbdb.changes 2010-05-19 15:57:11.000000000 +0200 @@ -1,0 +2,11 @@ +Wed May 19 11:52:50 UTC 2010 - lnussel(a)suse.de + +- new version 0.37 + * Fix bashisms in m_bbdb + * Fix query shell functions to catch non-zero exit status in case they + get invoked in set -e context. + * m_evolution: support line breaks and long lines. + * Fix documentation concerning the quotes on lbdbq call +- fix path to evolution-addressbook-export + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lbdb_0.36.tar.gz New: ---- lbdb_0.37.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lbdb.spec ++++++ --- /var/tmp/diff_new_pack.i1gbU8/_old 2010-11-02 14:27:58.000000000 +0100 +++ /var/tmp/diff_new_pack.i1gbU8/_new 2010-11-02 14:27:58.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package lbdb (Version 0.36) +# spec file for package lbdb (Version 0.37) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,9 +20,9 @@ Name: lbdb Summary: Address Database for mutt -Version: 0.36 -Release: 2 -License: GPL v2 or later +Version: 0.37 +Release: 1 +License: GPLv2+ Url: http://www.spinnaker.de/lbdb/ Group: Productivity/Networking/Email/Utilities Source: http://www.spinnaker.de/debian/lbdb_%{version}.tar.gz @@ -63,7 +63,7 @@ FINGER=/usr/bin/finger ABOOK=/usr/bin/abook \ ADDR_EMAIL=/usr/bin/addr-email SH=/bin/sh \ YPCAT=/usr/bin/ypcat MAWK=/usr/bin/awk \ - EVOLUTION_ADDRESSBOOK_EXPORT='/opt/gnome/lib*/evolution/*/evolution-addressbook-export' \ + EVOLUTION_ADDRESSBOOK_EXPORT='/usr/lib/evolution/*/evolution-addressbook-export' \ ./configure --prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir} \ --mandir=%{_mandir} \ ++++++ lbdb-0.32-evolution.diff ++++++ --- /var/tmp/diff_new_pack.i1gbU8/_old 2010-11-02 14:27:58.000000000 +0100 +++ /var/tmp/diff_new_pack.i1gbU8/_new 2010-11-02 14:27:58.000000000 +0100 @@ -1,8 +1,8 @@ -Index: lbdb-0.36/m_evolution.sh.in +Index: lbdb-0.37/m_evolution.sh.in =================================================================== ---- lbdb-0.36.orig/m_evolution.sh.in -+++ lbdb-0.36/m_evolution.sh.in -@@ -27,9 +27,16 @@ +--- lbdb-0.37.orig/m_evolution.sh.in ++++ lbdb-0.37/m_evolution.sh.in +@@ -28,9 +28,16 @@ m_evolution_query () { AWK=@AWK@ @@ -18,6 +18,6 @@ + done + + if [ -x "$EVOLUTION_ADDRESSBOOK_EXPORT" ]; then - $EVOLUTION_ADDRESSBOOK_EXPORT 2>/dev/null \ - | $AWK 'BEGIN {FS=":"; RS="\r\n"; name=""} \ - /^END:VCARD/ { if ((name!="" || fileas!="") && email!="") \ + $EVOLUTION_ADDRESSBOOK_EXPORT 2>/dev/null \ + | $AWK 'BEGIN { + FS = ":" ++++++ lbdb_0.36.tar.gz -> lbdb_0.37.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/debian/changelog new/lbdb-0.37/debian/changelog --- old/lbdb-0.36/debian/changelog 2008-06-14 12:39:14.000000000 +0200 +++ new/lbdb-0.37/debian/changelog 2010-05-18 20:03:31.000000000 +0200 @@ -1,3 +1,16 @@ +lbdb (0.37) unstable; urgency=low + + * Fix bashisms in m_bbdb (Closes: #530113). + * Fix query shell functions to catch non-zero exit status in case they + get invoked in set -e context. Thanks to martin f. krafft + <madduck(a)debian.org> for providing a patch (Closes: #515076). + * m_evolution: support line breaks and long lines. Thanks to Jan Larres + <jan(a)majutsushi.net> for providing a patch (Closes: #505540). + * Fix documentation concerning the quotes on lbdbq call (Closes: #542012). + * Upgrade to Standards-Version 3.8.4 (no changes). + + -- Roland Rosenfeld <roland(a)debian.org> Tue, 18 May 2010 20:03:18 +0200 + lbdb (0.36) unstable; urgency=low * Remove duplicate "See also: mutt" from lbdbq.man (Closes: #441588). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/debian/control new/lbdb-0.37/debian/control --- old/lbdb-0.36/debian/control 2008-06-14 12:29:23.000000000 +0200 +++ new/lbdb-0.37/debian/control 2010-05-18 20:03:31.000000000 +0200 @@ -2,7 +2,7 @@ Section: mail Priority: optional Maintainer: Roland Rosenfeld <roland(a)debian.org> -Standards-Version: 3.8.0 +Standards-Version: 3.8.4 Build-Depends: debhelper (>= 5), perl, libvformat1-dev Homepage: http://www.spinnaker.de/lbdb/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/lbdbq.man.in new/lbdb-0.37/lbdbq.man.in --- old/lbdb-0.36/lbdbq.man.in 2007-09-16 10:28:33.000000000 +0200 +++ new/lbdb-0.37/lbdbq.man.in 2010-05-18 19:51:02.000000000 +0200 @@ -15,7 +15,7 @@ .\" along with this program; if not, write to the Free Software Foundation, .\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA. .\" -.\" $Id: lbdbq.man.in,v 1.48 2007-09-16 08:28:33 roland Exp $ +.\" $Id: lbdbq.man.in,v 1.49 2010-05-18 17:51:02 roland Exp $ .\" .TH LBDBQ 1 "September 2007" "Unix" "User Manuals" .SH NAME @@ -312,7 +312,7 @@ from mutt, add the following line to your .I $HOME/.muttrc: .nf - set query_command="lbdbq '%s'" + set query_command="lbdbq %s" .fi .SH OPTIONS .IP "-v | --version" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_addr_email.sh.in new/lbdb-0.37/m_addr_email.sh.in --- old/lbdb-0.36/m_addr_email.sh.in 2005-10-29 16:48:09.000000000 +0200 +++ new/lbdb-0.37/m_addr_email.sh.in 2009-06-11 12:56:22.000000000 +0200 @@ -23,7 +23,7 @@ # This is a frontend to addr-email(1) from the addressbook(1) package, # which can be found at http://red.roses.de/~clemens/addressbook/. # -# $Id: m_addr_email.sh.in,v 1.5 2005-10-29 14:48:09 roland Exp $ +# $Id: m_addr_email.sh.in,v 1.6 2009-06-11 10:56:22 roland Exp $ m_addr_email_query() { @@ -33,7 +33,7 @@ then $ADDR_EMAIL "$@" \ | sed -e 's/^$[^,]*$, $[^:]*$: $.*$$/\3 \1 \2/' \ - | grep -a '@' + | grep -a '@' || : # | sed -e 's/$.*$:[ ]$[^ ].*$$/\2 \1 addr-email/' fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_bbdb.sh.in new/lbdb-0.37/m_bbdb.sh.in --- old/lbdb-0.36/m_bbdb.sh.in 2005-10-29 16:48:09.000000000 +0200 +++ new/lbdb-0.37/m_bbdb.sh.in 2009-06-11 12:56:22.000000000 +0200 @@ -20,7 +20,7 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA. # -# $Id: m_bbdb.sh.in,v 1.7 2005-10-29 14:48:09 roland Exp $ +# $Id: m_bbdb.sh.in,v 1.9 2009-06-11 10:56:22 roland Exp $ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -39,7 +39,7 @@ GNUCLIENT=gnuclient fi fi - if [ "$GNUCLIENT" == "no" ]; then + if [ "$GNUCLIENT" = "no" ]; then GNUCLIENT= fi @@ -50,7 +50,7 @@ success=1 fi fi - if [ $success == 0 ]; then + if [ $success = 0 ]; then if [ -z "$EMACS" ] then if type emacs >/dev/null 2>&1; then @@ -64,5 +64,5 @@ --eval "$form" 2>/dev/null fi fi - fi | grep -va '^$' + fi | grep -va '^$' || : } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_evolution.sh.in new/lbdb-0.37/m_evolution.sh.in --- old/lbdb-0.36/m_evolution.sh.in 2008-06-14 12:00:12.000000000 +0200 +++ new/lbdb-0.37/m_evolution.sh.in 2009-06-11 13:03:38.000000000 +0200 @@ -4,8 +4,9 @@ # # m_evolution - Evolution Address book module for lbdb # Copyright (C) 2004 Guido Guenther <agx(a)sigxcpu.org> -# Copyright (C) 2004-2006 Roland Rosenfeld <roland(a)spinnaker.de> +# Copyright (C) 2004-2009 Roland Rosenfeld <roland(a)spinnaker.de> # Copyright (C) 2008 brian m. carlson <sandals(a)crustytoothpaste.ath.cx> +# Copyright (C) 2009 Jan Larres <jan(a)majutsushi.net> # # loosely based on m_gnomecard # @@ -30,14 +31,44 @@ EVOLUTION_ADDRESSBOOK_EXPORT=@EVOLUTION_ADDRESSBOOK_EXPORT@ if [ -x $EVOLUTION_ADDRESSBOOK_EXPORT ]; then - $EVOLUTION_ADDRESSBOOK_EXPORT 2>/dev/null \ - | $AWK 'BEGIN {FS=":"; RS="\r\n"; name=""} \ - /^END:VCARD/ { if ((name!="" || fileas!="") && email!="") \ - printf("%s\t%s\tEV:%s\n",email,name,fileas); \ - name=""; fileas=""; email=""} \ - /^FN:/ {name=$2; } \ - /^X-EVOLUTION-FILE-AS:/ {fileas=$2; gsub("\\\\", "", fileas)} \ - /^EMAIL[;:]/ {email=$2;}'\ - | grep -ia "$@" + $EVOLUTION_ADDRESSBOOK_EXPORT 2>/dev/null \ + | $AWK 'BEGIN { + FS = ":" + RS = "\r\n" + name = "" + emails = "" + last_email = 0 + } + /^END:VCARD/ { + if ((name != "" || fileas != "") && emails != "") { + sub("^#", "", emails) + split(emails, emails_arr, "#") + for (email in emails_arr) + printf("%s\t%s\tEV:%s\n",emails_arr[email],name,fileas) + } + name = ""; fileas = ""; emails = "" + } + /^FN:/ { + name = $2 + } + /^X-EVOLUTION-FILE-AS:/ { + fileas = $2 + gsub("\\\\", "", fileas) + } + # DEST-EMAIL is needed to skip addresses in list contacts + /^EMAIL[;:]/ && ! /X-EVOLUTION-DEST-EMAIL/ { + emails = emails "#" $2 + last_email = 1 + } + # only join email lines for performance reasons + /^ [^ ]/ && last_email == 1 { + cont = $1 + sub("^ ", "", cont) + emails = emails cont + } + ! /^EMAIL[;:]/ && ! /^ [^ ]/ { + last_email = 0 + }' \ + | grep -ia "$@" || : fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_fido.sh.in new/lbdb-0.37/m_fido.sh.in --- old/lbdb-0.36/m_fido.sh.in 2005-10-29 16:48:09.000000000 +0200 +++ new/lbdb-0.37/m_fido.sh.in 2009-06-11 12:56:22.000000000 +0200 @@ -2,7 +2,7 @@ # # -*-sh-*- # -# $Id: m_fido.sh.in,v 1.7 2005-10-29 14:48:09 roland Exp $ +# $Id: m_fido.sh.in,v 1.8 2009-06-11 10:56:22 roland Exp $ # # Copyright (C) 1998-2005 Roland Rosenfeld <roland(a)spinnaker.de> # @@ -26,5 +26,5 @@ m_fido_query() { test -f $m_fido_db || return - grep -ia "$@." $m_fido_db + grep -ia "$@." $m_fido_db || : } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_finger.sh.in new/lbdb-0.37/m_finger.sh.in --- old/lbdb-0.36/m_finger.sh.in 2005-10-29 16:48:09.000000000 +0200 +++ new/lbdb-0.37/m_finger.sh.in 2009-06-11 12:56:22.000000000 +0200 @@ -19,7 +19,7 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA. -# $Id: m_finger.sh.in,v 1.9 2005-10-29 14:48:09 roland Exp $ +# $Id: m_finger.sh.in,v 1.10 2009-06-11 10:56:22 roland Exp $ m_finger_query() { @@ -45,8 +45,7 @@ $FINGER $f_user$athost 2> /dev/null \ | sed -n -e "s/^Login: *$[^ ]*$[ ]*Name: $.*$$/\1@$mailhost \2 (finger)/p" \ -e "s/^Login name: *$[^ ]*$[ ]*In real life: $.*$$/\1@$mailhost \2 (finger)/p" \ - | grep -av 'In real life: ???' \ - || true + | grep -av 'In real life: ???' || : done fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_gnomecard.sh.in new/lbdb-0.37/m_gnomecard.sh.in --- old/lbdb-0.36/m_gnomecard.sh.in 2005-10-29 16:48:09.000000000 +0200 +++ new/lbdb-0.37/m_gnomecard.sh.in 2009-06-11 12:56:22.000000000 +0200 @@ -20,7 +20,7 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA. # -# $Id: m_gnomecard.sh.in,v 1.8 2005-10-29 14:48:09 roland Exp $ +# $Id: m_gnomecard.sh.in,v 1.9 2009-06-11 10:56:22 roland Exp $ # prefix=@prefix@ @@ -65,7 +65,7 @@ type=substr($1,7); \ printf ("%s\t%s\tGC:%s\n", \ email, name, type) }' \ - < $file | grep -ia "$@" + < $file | grep -ia "$@" || : fi done } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_gpg.sh.in new/lbdb-0.37/m_gpg.sh.in --- old/lbdb-0.36/m_gpg.sh.in 2005-10-29 16:48:09.000000000 +0200 +++ new/lbdb-0.37/m_gpg.sh.in 2009-06-11 12:56:22.000000000 +0200 @@ -18,7 +18,7 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA. # -# $Id: m_gpg.sh.in,v 1.25 2005-10-29 14:48:09 roland Exp $ +# $Id: m_gpg.sh.in,v 1.26 2009-06-11 10:56:22 roland Exp $ # m_gpg_query() @@ -31,7 +31,7 @@ | grep -a '^$pub\|uid$:[^re]:$[^:]*:$\{7,7\}[^<>:]* <[^<>@: ]*@[^<>@: ]*>[^<>@:]*:' \ | sed -e 's/^$[^:]*:$\{9,9\}$[^<:]*$ <$[^>:]*$>.*:.*$/\3 \2 (GnuPG)/' \ | sed -e 's/ $[^ ]\{27,27\}$[^ ]* / \1... /' \ - | grep -ia "$@" + | grep -ia "$@" || : # $GPG --list-keys --no-greeting "$@" 2>/dev/null \ # | grep -a '^$pub\|uid$ .\{25,25\} [^<>]* <[^<>@ ]*@[^<>@ ]*>' \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_inmail.sh.in new/lbdb-0.37/m_inmail.sh.in --- old/lbdb-0.36/m_inmail.sh.in 2005-10-29 16:48:09.000000000 +0200 +++ new/lbdb-0.37/m_inmail.sh.in 2009-06-11 12:56:22.000000000 +0200 @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA. # -# $Id: m_inmail.sh.in,v 1.13 2005-10-29 14:48:09 roland Exp $ +# $Id: m_inmail.sh.in,v 1.14 2009-06-11 10:56:22 roland Exp $ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -30,5 +30,5 @@ export SORT_OUTPUT $libdir/lbdb-munge test -f $m_inmail_db || return - grep -ia "$@." $m_inmail_db + grep -ia "$@." $m_inmail_db || : } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_ldap.sh.in new/lbdb-0.37/m_ldap.sh.in --- old/lbdb-0.36/m_ldap.sh.in 2005-10-29 16:48:10.000000000 +0200 +++ new/lbdb-0.37/m_ldap.sh.in 2009-06-11 12:56:22.000000000 +0200 @@ -5,7 +5,7 @@ # m_ldap - ldap module for lbdb # Copyright (C) 2001 Marc de Courville <marc(a)courville.org> # -# $Id: m_ldap.sh.in,v 1.5 2005-10-29 14:48:10 roland Exp $ +# $Id: m_ldap.sh.in,v 1.6 2009-06-11 10:56:22 roland Exp $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,9 +31,9 @@ then for NICK in $LDAP_NICKS do - $libdir/mutt_ldap_query --lbdb_output --nickname=$NICK "$@" + $libdir/mutt_ldap_query --lbdb_output --nickname=$NICK "$@" || : done else - $libdir/mutt_ldap_query --lbdb_output "$@" + $libdir/mutt_ldap_query --lbdb_output "$@" || : fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_muttalias.sh.in new/lbdb-0.37/m_muttalias.sh.in --- old/lbdb-0.36/m_muttalias.sh.in 2007-05-27 10:42:22.000000000 +0200 +++ new/lbdb-0.37/m_muttalias.sh.in 2009-06-11 12:56:22.000000000 +0200 @@ -19,7 +19,7 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA. # -# $Id: m_muttalias.sh.in,v 1.10 2007-05-27 08:42:22 roland Exp $ +# $Id: m_muttalias.sh.in,v 1.11 2009-06-11 10:56:22 roland Exp $ m_muttalias_query() { @@ -39,7 +39,7 @@ -e 's/^alias[ ][ ]*$[^ ][^ ]*$[ ][ ]*$\\\".*\\\"[^<>()]*\|[^<>()]*$<$[^<>()]*$>[^<>]*$/\3 \2 alias \1/' \ -e 's/^alias[ ][ ]*$[^ ][^ ]*$[ ][ ]*$[^<>()]*$($\\\".*\\\"[^<>()]*\|[^<>()]*$)[^()<>]*$/\2 \3 alias \1/' \ -e 's/\\\"//g' \ - | grep -va '^alias[ ][ ]*[^,][^,]*[ ][ ]*[^,]*$' + | grep -va '^alias[ ][ ]*[^,][^,]*[ ][ ]*[^,]*$' || : fi done } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_osx_addressbook.sh.in new/lbdb-0.37/m_osx_addressbook.sh.in --- old/lbdb-0.36/m_osx_addressbook.sh.in 2005-10-29 16:48:10.000000000 +0200 +++ new/lbdb-0.37/m_osx_addressbook.sh.in 2009-06-11 12:56:22.000000000 +0200 @@ -24,5 +24,5 @@ m_osx_addressbook_query() { - $libdir/ABQuery "$@" | grep -ia "$@" + $libdir/ABQuery "$@" | grep -ia "$@" || : } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_palm.sh.in new/lbdb-0.37/m_palm.sh.in --- old/lbdb-0.36/m_palm.sh.in 2005-10-29 16:48:10.000000000 +0200 +++ new/lbdb-0.37/m_palm.sh.in 2009-06-11 12:56:22.000000000 +0200 @@ -20,7 +20,7 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA. # -# $Id: m_palm.sh.in,v 1.7 2005-10-29 14:48:10 roland Exp $ +# $Id: m_palm.sh.in,v 1.8 2009-06-11 10:56:22 roland Exp $ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -30,5 +30,5 @@ { palmdatabase=${PALM_ADDRESS_DATABASE:-$HOME/.jpilot/AddressDB.pdb} test -f $palmdatabase || return - $libdir/palm_lsaddr $palmdatabase | grep -ia "$@" + $libdir/palm_lsaddr $palmdatabase | grep -ia "$@" || : } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_passwd.sh.in new/lbdb-0.37/m_passwd.sh.in --- old/lbdb-0.36/m_passwd.sh.in 2005-10-29 16:48:10.000000000 +0200 +++ new/lbdb-0.37/m_passwd.sh.in 2009-06-11 12:56:22.000000000 +0200 @@ -18,7 +18,7 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA. # -# $Id: m_passwd.sh.in,v 1.12 2005-10-29 14:48:10 roland Exp $ +# $Id: m_passwd.sh.in,v 1.13 2009-06-11 10:56:22 roland Exp $ # m_passwd_query() @@ -34,5 +34,5 @@ esac sed -e "s/^$[^:]*$:[^:]*:$[^:]*$:[^:]*:$[^:,]*$[,:].*\$/\1@$HOST \3 UID \2/" /etc/passwd \ - | grep -ia "$@" | grep -a "$IGNORESYS" + | grep -ia "$@" | grep -a "$IGNORESYS" || : } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_pgp5.sh.in new/lbdb-0.37/m_pgp5.sh.in --- old/lbdb-0.36/m_pgp5.sh.in 2005-10-29 16:48:10.000000000 +0200 +++ new/lbdb-0.37/m_pgp5.sh.in 2009-06-11 12:56:22.000000000 +0200 @@ -18,7 +18,7 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA. # -# $Id: m_pgp5.sh.in,v 1.12 2005-10-29 14:48:10 roland Exp $ +# $Id: m_pgp5.sh.in,v 1.13 2009-06-11 10:56:22 roland Exp $ # m_pgp5_query() @@ -31,6 +31,6 @@ | grep -a '^uid ...* <[^<>@:/ ]*@[^<>@ ]*>[^<>@]*$' \ | sed -e 's/^uid $.*$ <$.*$>.*$/\2 \1 (PGP5)/' \ | sed -e 's/ $[^ ]\{27,27\}$[^ ]* / \1... /' \ - | grep -ia "$@" + | grep -ia "$@" || : fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/mutt_ldap_query.pl.in new/lbdb-0.37/mutt_ldap_query.pl.in --- old/lbdb-0.36/mutt_ldap_query.pl.in 2008-06-14 12:24:46.000000000 +0200 +++ new/lbdb-0.37/mutt_ldap_query.pl.in 2010-05-18 20:10:30.000000000 +0200 @@ -3,7 +3,7 @@ # Copyright (C) 2000-2006 Marc de Courville <marc(a)courville.org> # Copyright (C) 2005-2007 Roland Rosenfeld <roland(a)spinnaker.de> # -# $Id: mutt_ldap_query.pl.in,v 1.26 2008-06-14 10:24:46 roland Exp $ +# $Id: mutt_ldap_query.pl.in,v 1.28 2010-05-18 18:10:30 roland Exp $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -67,7 +67,7 @@ # Return version string from CVS tag sub versionstring { - my $ver = ' $Name: debian_version_0_36 $ '; + my $ver = ' $Name: debian_version_0_37 $ '; $ver =~ s/Name//g; $ver =~ s/[:\$]//g; $ver =~ s/\s+//g; @@ -131,7 +131,7 @@ if ($version) { print "mutt_ldap_query version " . &versionstring() . "\n"; - print '$Id: mutt_ldap_query.pl.in,v 1.26 2008-06-14 10:24:46 roland Exp $ ' . "\n"; + print '$Id: mutt_ldap_query.pl.in,v 1.28 2010-05-18 18:10:30 roland Exp $ ' . "\n"; exit(0); } @@ -359,7 +359,7 @@ This perl script can be interfaced with mutt by defining in your .muttrc: - set query_command = "mutt_ldap_query.pl '%s'" + set query_command = "mutt_ldap_query.pl %s" Multiple requests are supported: the "Q" command of mutt accepts as argument a list of queries (e.g. "Gosse de\ Courville"). @@ -368,7 +368,7 @@ little brother database query program (http://www.spinnaker.de/lbdb/) using: - set query_command = "lbdbq '%s'" + set query_command = "lbdbq %s" and by specifying in your ~/.lbdb/lbdbrc file another method of query just adding to the METHODS variable the m_ldap module e.g.: @@ -544,6 +544,8 @@ just like this one 8-) http://www.spinnaker.de/lbdb/ +=back + =head1 AUTHORS Marc de Courville <marc(a)courville.org> and the various other contributors... that kindly sent their patches. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lbdb-0.36/m_wanderlust.sh.in new/lbdb-0.37/m_wanderlust.sh.in --- old/lbdb-0.36/m_wanderlust.sh.in 2005-10-29 16:48:10.000000000 +0200 +++ new/lbdb-0.37/m_wanderlust.sh.in 2009-06-11 12:56:22.000000000 +0200 @@ -18,7 +18,7 @@ ## along with this program; if not, write to the Free Software Foundation, ## Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,, USA. # -# $Id: m_wanderlust.sh.in,v 1.6 2005-10-29 14:48:10 roland Exp $ +# $Id: m_wanderlust.sh.in,v 1.7 2009-06-11 10:56:22 roland Exp $ m_wanderlust_query() { @@ -28,6 +28,6 @@ then grep -ia "$@" $addresses \ | sed -e 's,^$[^ ]\+$[ ]\+"$[^"]*$"[ ]\+"$[^"]\+$",\1 \3 wl \2,g' \ - | grep -a '^[^ ][^ ]* [^ ][^ ]* wl ' + | grep -a '^[^ ][^ ]* [^ ][^ ]* wl ' || : fi } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

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

02 Nov '10

Hello community, here is the log from the commit of package lsvpd for openSUSE:Factory checked in at Tue Nov 2 14:27:48 CET 2010. -------- --- lsvpd/lsvpd.changes 2009-09-03 10:15:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/lsvpd/lsvpd.changes 2010-10-31 19:03:56.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lsvpd.spec ++++++ --- /var/tmp/diff_new_pack.c2T2II/_old 2010-11-02 14:27:32.000000000 +0100 +++ /var/tmp/diff_new_pack.c2T2II/_new 2010-11-02 14:27:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package lsvpd (Version 1.6.5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,8 +29,8 @@ Url: http://sourceforge.net/projects/linux-diag/ Summary: VPD Hardware Inventory Utilities for Linux Version: 1.6.5 -Release: 35 -License: GPL v2 or later +Release: 42 +License: GPLv2+ Group: System/Monitoring BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq @@ -65,7 +65,7 @@ export CFLAGS="$RPM_OPT_FLAGS -UPCI_IDS -DPCI_IDS='\"/usr/share/pci.ids\"' -UUSB_IDS -DUSB_IDS='\"/usr/share/usb.ids\"'" export CXXFLAGS="$RPM_OPT_FLAGS -UPCI_IDS -DPCI_IDS='\"/usr/share/pci.ids\"' -UUSB_IDS -DUSB_IDS='\"/usr/share/usb.ids\"'" %configure -make %{?jobs:-j%jobs} +make %{?_smp_mflags} chmod 644 README* COPYING NEWS %clean ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mcal for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package mcal for openSUSE:Factory checked in at Tue Nov 2 14:27:12 CET 2010. -------- --- mcal/mcal.changes 2009-09-28 01:48:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/mcal/mcal.changes 2010-10-31 19:03:57.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mcal.spec ++++++ --- /var/tmp/diff_new_pack.zLWpxe/_old 2010-11-02 14:18:48.000000000 +0100 +++ /var/tmp/diff_new_pack.zLWpxe/_new 2010-11-02 14:18:48.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mcal (Version 0.7) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,12 +22,12 @@ #!BuildIgnore: flex BuildRequires: flex-old Version: 0.7 -Release: 257 +Release: 265 %define dver 0.9 %define mver 0.3 AutoReqProv: on Group: Productivity/Office/Organizers -License: GPL v2 or later +License: GPLv2+ Url: http://mcal.chek.com/ Summary: A Calendar Based on Libmcal Source0: http://download.sourceforge.net/libmcal/libmcal-%{version}.tar.gz @@ -55,7 +55,7 @@ Bob Allen <allenb(a)home-networking.org> %package -n libmcal -License: LGPL v2.1 or later +License: LGPLv2.1+ AutoReqProv: on Group: System/Libraries Summary: Modular Calendar Access Library @@ -87,15 +87,15 @@ %build export CFLAGS="$RPM_OPT_FLAGS -fPIC -Wall" mv mcal-drivers/* . -(cd mstore;%{__make} %{?jobs:-j%jobs} CFLAGS="$CFLAGS") -(cd icap;%{__make} %{?jobs:-j%jobs} CFLAGS="$CFLAGS") +(cd mstore;%{__make} %{?_smp_mflags} CFLAGS="$CFLAGS") +(cd icap;%{__make} %{?_smp_mflags} CFLAGS="$CFLAGS") ./configure \ --libdir=%{_libdir} \ --includedir=%{_includedir} \ --with-mstore \ --with-icap -%{__make} %{?jobs:-j%jobs} CFLAGS="$CFLAGS" -(cd mcal; %{__make} %{?jobs:-j%jobs} CFLAGS="$CFLAGS") +%{__make} %{?_smp_mflags} CFLAGS="$CFLAGS" +(cd mcal; %{__make} %{?_smp_mflags} CFLAGS="$CFLAGS") %install make DESTDIR=$RPM_BUILD_ROOT install ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0