November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit orca for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package orca for openSUSE:Factory checked in at Sat Nov 20 12:07:45 CET 2010. -------- --- GNOME/orca/orca.changes 2010-09-28 00:42:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/orca/orca.changes 2010-11-17 16:34:27.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Nov 16 09:36:43 CET 2010 - dimstar(a)opensuse.org + +- Update to version 2.32.1: + + Add a check for xdg python package to configure.in + + bgo#631544: Orca crashes at GDM login screen if GDM's + .local/share/orca directory does not exist. + + bgo#629586: When Orca is in learn mode and the user switches + to another application, Orca stops presenting the locusOfFocus + + bgo#628842: Orca speaks newly-focused panels in gnome-panel + using the default voice rather than the system voice + + Updated translations. +- Add python-xdg BuildRequires and Requires. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- orca-2.32.0.tar.bz2 New: ---- orca-2.32.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orca.spec ++++++ --- /var/tmp/diff_new_pack.U1gqZV/_old 2010-11-20 12:07:31.000000000 +0100 +++ /var/tmp/diff_new_pack.U1gqZV/_new 2010-11-20 12:07:31.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package orca (Version 2.32.0) +# spec file for package orca (Version 2.32.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: orca -Version: 2.32.0 +Version: 2.32.1 Release: 1 License: LGPLv2.1+ Summary: Screen reader for GNOME @@ -42,6 +42,7 @@ BuildRequires: python-gnome-devel BuildRequires: python-gtk-devel BuildRequires: python-louis +BuildRequires: python-xdg BuildRequires: update-desktop-files Requires: %{name}-lang = %{version} Requires: dbus-1-python @@ -52,6 +53,7 @@ Requires: python-gstreamer-0_10 Requires: python-gtk Requires: python-louis +Requires: python-xdg Recommends: gnome-mag Recommends: gnome-python-desktop Recommends: gnome-speech ++++++ orca-2.32.0.tar.bz2 -> orca-2.32.1.tar.bz2 ++++++ ++++ 35793 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-mag for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package gnome-mag for openSUSE:Factory checked in at Sat Nov 20 12:07:39 CET 2010. -------- --- GNOME/gnome-mag/gnome-mag.changes 2010-10-13 11:49:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-mag/gnome-mag.changes 2010-11-15 15:00:35.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 15 11:32:58 CET 2010 - dimstar(a)opensuse.org + +- Update to version 0.16.3: + + bgo#630877: Fix build with gcc 4.4.3 adding explicity -lm + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-mag-0.16.2.tar.bz2 New: ---- gnome-mag-0.16.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-mag.spec ++++++ --- /var/tmp/diff_new_pack.tMEzou/_old 2010-11-20 12:07:29.000000000 +0100 +++ /var/tmp/diff_new_pack.tMEzou/_new 2010-11-20 12:07:29.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gnome-mag (Version 0.16.2) +# spec file for package gnome-mag (Version 0.16.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -35,7 +35,7 @@ BuildRequires: update-desktop-files License: LGPLv2.1+ Group: System/GUI/GNOME -Version: 0.16.2 +Version: 0.16.3 Release: 1 Summary: GNOME Screen Magnifier Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-mag/0.13/%{name}-%{version}.tar… ++++++ gnome-mag-0.16.2.tar.bz2 -> gnome-mag-0.16.3.tar.bz2 ++++++ ++++ 11106 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-session for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package gnome-session for openSUSE:Factory checked in at Sat Nov 20 12:07:22 CET 2010. -------- --- GNOME/gnome-session/gnome-session.changes 2010-09-27 15:04:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-session/gnome-session.changes 2010-11-17 14:25:24.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 17 13:52:01 CET 2010 - dimstar(a)opensuse.org + +- Update to version 2.32.1: + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-session-2.32.0.tar.bz2 New: ---- gnome-session-2.32.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.LAxWL7/_old 2010-11-20 12:07:17.000000000 +0100 +++ /var/tmp/diff_new_pack.LAxWL7/_new 2010-11-20 12:07:17.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gnome-session (Version 2.32.0) +# spec file for package gnome-session (Version 2.32.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: gnome-session -Version: 2.32.0 +Version: 2.32.1 Release: 1 License: GPLv2+ Summary: Session Tools for the GNOME 2.x Desktop ++++++ gnome-session-2.32.0.tar.bz2 -> gnome-session-2.32.1.tar.bz2 ++++++ ++++ 3501 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gucharmap for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package gucharmap for openSUSE:Factory checked in at Sat Nov 20 12:07:11 CET 2010. -------- --- GNOME/gucharmap/gucharmap.changes 2010-09-27 08:10:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/gucharmap/gucharmap.changes 2010-11-15 13:05:58.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Nov 15 11:34:51 CET 2010 - dimstar(a)opensuse.org + +- Update to version 2.32.1: + + bgo#624929: Fix crash on searching. + + bgo#634353: Changed access key. + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gucharmap-2.32.0.tar.bz2 New: ---- gucharmap-2.32.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gucharmap.spec ++++++ --- /var/tmp/diff_new_pack.V5SXsK/_old 2010-11-20 12:07:06.000000000 +0100 +++ /var/tmp/diff_new_pack.V5SXsK/_new 2010-11-20 12:07:06.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gucharmap (Version 2.32.0) +# spec file for package gucharmap (Version 2.32.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,7 +30,7 @@ BuildRequires: update-desktop-files License: GPLv3+ ; LGPLv2.1+ Group: System/GUI/GNOME -Version: 2.32.0 +Version: 2.32.1 Release: 1 Summary: A Feature-Rich Unicode Character Map Source: %{name}-%{version}.tar.bz2 ++++++ gucharmap-2.32.0.tar.bz2 -> gucharmap-2.32.1.tar.bz2 ++++++ ++++ 8335 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-keyring for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package gnome-keyring for openSUSE:Factory checked in at Sat Nov 20 12:07:01 CET 2010. -------- --- GNOME/gnome-keyring/gnome-keyring.changes 2010-10-20 15:04:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-keyring/gnome-keyring.changes 2010-10-28 16:03:03.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Oct 28 16:01:49 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 2.32.1: + + Don't offer to save password for symmetric encryption in + gpg-agent. + + Don't try to cache password when symmetric encryption in + gpg-agent. + + Check that daemon is initialized before changing password from + pam. + + Fix login keyring password doesn't match login. + + Link correctly to gio. + + Add extra debug guard around printing of prompt io. + + Fix invalid memory access in rpc-layer. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-keyring-2.32.0.tar.bz2 New: ---- gnome-keyring-2.32.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-keyring.spec ++++++ --- /var/tmp/diff_new_pack.g2DWrG/_old 2010-11-20 12:05:44.000000000 +0100 +++ /var/tmp/diff_new_pack.g2DWrG/_new 2010-11-20 12:05:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gnome-keyring (Version 2.32.0) +# spec file for package gnome-keyring (Version 2.32.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ BuildRequires: pam-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -Version: 2.32.0 -Release: 2 +Version: 2.32.1 +Release: 1 Url: http://www.gnome.org/ Group: System/GUI/GNOME License: GPLv2+ ; LGPLv2.1+ ++++++ gnome-keyring-2.32.0.tar.bz2 -> gnome-keyring-2.32.1.tar.bz2 ++++++ ++++ 7902 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xen for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at Sat Nov 20 12:06:54 CET 2010. -------- --- xen/xen.changes 2010-11-12 18:55:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/xen/xen.changes 2010-11-19 21:15:41.000000000 +0100 @@ -1,0 +2,21 @@ +Fri Nov 19 11:48:43 CST 2010 - lidongyang(a)novell.com + +- bnc#651822 - xm snapshot-xxx scripts lead to an XP SP3 HVM domU + to chkdsk + snapshot-xend.patch + snapshot-ioemu-restore.patch + +------------------------------------------------------------------- +Wed Nov 17 15:20:02 MST 2010 - carnold(a)novell.com + +- bnc#651957 - Xen: vm-install failed to start + xenpaging.enabled.patch + +------------------------------------------------------------------- +Wed Nov 17 10:35:52 CET 2010 - ohering(a)suse.de + +- fate#310510 - fix xenpaging + xenpaging.signal_handling.patch + - unlink pagefile in signal handler + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xenpaging.enabled.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:02.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:02.000000000 +0100 @@ -70,7 +70,7 @@ BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11 %endif Version: 4.0.1_01 -Release: 3 +Release: 4 License: GPLv2+ Group: System/Kernel AutoReqProv: on @@ -297,6 +297,7 @@ Patch10027: xenpaging.p2m_mem_paging_populate_if_p2m_ram_paged.patch Patch10028: xenpaging.HVMCOPY_gfn_paged_out.patch Patch10029: xenpaging.optimize_p2m_mem_paging_populate.patch +Patch10030: xenpaging.enabled.patch Patch10040: xenpaging.doc.patch Url: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -811,6 +812,7 @@ %patch10027 -p1 %patch10028 -p1 %patch10029 -p1 +%patch10030 -p1 %patch10040 -p1 %build ++++++ bdrv_open2_flags_2.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:03.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:03.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c +++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c -@@ -237,6 +237,7 @@ static int open_disk(struct td_state *s, +@@ -235,6 +235,7 @@ static int open_disk(struct td_state *s, BlockDriver* drv; char* devname; static int devnumber = 0; @@ -10,7 +10,7 @@ int i; DPRINTF("Opening %s as blktap%d\n", path, devnumber); -@@ -259,7 +260,7 @@ static int open_disk(struct td_state *s, +@@ -257,7 +258,7 @@ static int open_disk(struct td_state *s, DPRINTF("%s driver specified\n", drv ? drv->format_name : "No"); /* Open the image */ ++++++ blktap-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:03.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:03.000000000 +0100 @@ -741,7 +741,7 @@ =================================================================== --- xen-4.0.1-testing.orig/tools/blktap/lib/blktaplib.h +++ xen-4.0.1-testing/tools/blktap/lib/blktaplib.h -@@ -225,6 +225,7 @@ typedef struct msg_pid { +@@ -224,6 +224,7 @@ typedef struct msg_pid { #define DISK_TYPE_RAM 3 #define DISK_TYPE_QCOW 4 #define DISK_TYPE_QCOW2 5 ++++++ ioemu-bdrv-open-CACHE_WB.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:03.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:03.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c +++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c -@@ -259,8 +259,11 @@ static int open_disk(struct td_state *s, +@@ -257,8 +257,11 @@ static int open_disk(struct td_state *s, drv = blktap_drivers[i].drv; DPRINTF("%s driver specified\n", drv ? drv->format_name : "No"); ++++++ ioemu-blktap-barriers.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:03.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:03.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c +++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c -@@ -360,6 +360,15 @@ static void qemu_send_responses(void* op +@@ -358,6 +358,15 @@ static void qemu_send_responses(void* op } /** @@ -18,7 +18,7 @@ * Callback function for the IO message pipe. Reads requests from the ring * and processes them (call qemu read/write functions). * -@@ -378,6 +387,7 @@ static void handle_blktap_iomsg(void* pr +@@ -376,6 +385,7 @@ static void handle_blktap_iomsg(void* pr blkif_t *blkif = s->blkif; tapdev_info_t *info = s->ring_info; int page_size = getpagesize(); @@ -26,7 +26,7 @@ struct aiocb_info *aiocb_info; -@@ -410,7 +420,7 @@ static void handle_blktap_iomsg(void* pr +@@ -408,7 +418,7 @@ static void handle_blktap_iomsg(void* pr /* Don't allow writes on readonly devices */ if ((s->flags & TD_RDONLY) && @@ -35,7 +35,7 @@ blkif->pending_list[idx].status = BLKIF_RSP_ERROR; goto send_response; } -@@ -431,7 +441,7 @@ static void handle_blktap_iomsg(void* pr +@@ -429,7 +439,7 @@ static void handle_blktap_iomsg(void* pr DPRINTF("Sector request failed:\n"); DPRINTF("%s request, idx [%d,%d] size [%llu], " "sector [%llu,%llu]\n", @@ -44,7 +44,7 @@ "WRITE" : "READ"), idx,i, (long long unsigned) -@@ -444,8 +454,14 @@ static void handle_blktap_iomsg(void* pr +@@ -442,8 +452,14 @@ static void handle_blktap_iomsg(void* pr blkif->pending_list[idx].secs_pending += nsects; @@ -60,7 +60,7 @@ case BLKIF_OP_WRITE: aiocb_info = malloc(sizeof(*aiocb_info)); -@@ -465,6 +481,10 @@ static void handle_blktap_iomsg(void* pr +@@ -463,6 +479,10 @@ static void handle_blktap_iomsg(void* pr DPRINTF("ERROR: bdrv_write() == NULL\n"); goto send_response; } ++++++ ioemu-blktap-image-format.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:03.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:03.000000000 +0100 @@ -19,7 +19,7 @@ =================================================================== --- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c +++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c -@@ -230,9 +230,10 @@ static int map_new_dev(struct td_state * +@@ -228,9 +228,10 @@ static int map_new_dev(struct td_state * return -1; } @@ -31,7 +31,7 @@ char* devname; static int devnumber = 0; int i; -@@ -242,7 +243,22 @@ static int open_disk(struct td_state *s, +@@ -240,7 +241,22 @@ static int open_disk(struct td_state *s, bs = bdrv_new(devname); free(devname); @@ -55,7 +55,7 @@ fprintf(stderr, "Could not open image file %s\n", path); return -ENOMEM; } -@@ -525,7 +541,7 @@ static void handle_blktap_ctrlmsg(void* +@@ -519,7 +535,7 @@ static void handle_blktap_ctrlmsg(void* s = state_init(); /*Open file*/ ++++++ ioemu-blktap-zero-size.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:03.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:03.000000000 +0100 @@ -16,7 +16,7 @@ =================================================================== --- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c +++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c -@@ -268,6 +268,12 @@ static int open_disk(struct td_state *s, +@@ -266,6 +266,12 @@ static int open_disk(struct td_state *s, s->size = bs->total_sectors; s->sector_size = 512; ++++++ snapshot-ioemu-restore.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:03.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:03.000000000 +0100 @@ -1,92 +1,3 @@ -Index: xen-4.0.1-testing/tools/blktap/drivers/blktapctrl.c -=================================================================== ---- xen-4.0.1-testing.orig/tools/blktap/drivers/blktapctrl.c -+++ xen-4.0.1-testing/tools/blktap/drivers/blktapctrl.c -@@ -348,6 +348,7 @@ static int write_msg(int fd, int msgtype - msg_dev = (msg_newdev_t *)(buf + sizeof(msg_hdr_t)); - msg_dev->devnum = blkif->minor; - msg_dev->domid = blkif->domid; -+ msg_dev->be_id = blkif->be_id; - - break; - -Index: xen-4.0.1-testing/tools/blktap/lib/blktaplib.h -=================================================================== ---- xen-4.0.1-testing.orig/tools/blktap/lib/blktaplib.h -+++ xen-4.0.1-testing/tools/blktap/lib/blktaplib.h -@@ -189,6 +189,7 @@ typedef struct msg_hdr { - typedef struct msg_newdev { - uint8_t devnum; - uint16_t domid; -+ uint32_t be_id; - } msg_newdev_t; - - typedef struct msg_pid { -Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c -=================================================================== ---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c -+++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c -@@ -67,6 +67,8 @@ int write_fd; - static pid_t process; - fd_list_entry_t *fd_start = NULL; - -+extern char* get_snapshot_name(int devid); -+ - static void handle_blktap_iomsg(void* private); - - struct aiocb_info { -@@ -500,6 +502,10 @@ static void handle_blktap_ctrlmsg(void* - - char buf[MSG_SIZE]; - -+#ifndef QEMU_TOOL -+ char *snapshot; -+#endif -+ - length = read(read_fd, buf, MSG_SIZE); - - if (length > 0 && length >= sizeof(msg_hdr_t)) -@@ -555,7 +561,39 @@ static void handle_blktap_ctrlmsg(void* - if (s != NULL) { - ret = ((map_new_dev(s, msg_dev->devnum) - == msg_dev->devnum ? 0: -1)); -- } -+ } -+ -+#ifndef QEMU_TOOL -+ fprintf(stderr, "Reading snapshot name for %d\n", msg_dev->be_id); -+ snapshot = get_snapshot_name(msg_dev->be_id); -+ if (snapshot) { -+ fprintf(stderr, "Using snapshot %s\n", snapshot); -+ ret = bdrv_snapshot_goto(s->bs, snapshot); -+ switch (ret) { -+ case 0: -+ /* Success */ -+ break; -+ case -ENOTSUP: -+ if (s->flags & TD_RDONLY) { -+ fprintf(stderr, "Snapshots not supported for " -+ "image format of a read-only image\n"); -+ } else { -+ fprintf(stderr, "Snapshots not supported " -+ "for this image format"); -+ ret = -1; -+ } -+ break; -+ case -ENOENT: -+ fprintf(stderr, "No such snapshot"); -+ ret = -1; -+ break; -+ default: -+ fprintf(stderr, "Could not load snapshot"); -+ ret = -1; -+ break; -+ } -+ } -+#endif - - memset(buf, 0x00, MSG_SIZE); - msglen = sizeof(msg_hdr_t); Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c =================================================================== --- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++++ snapshot-without-pv-fix.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:03.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:03.000000000 +0100 @@ -18,11 +18,11 @@ tools/ioemu-qemu-xen/hw/xen_blktap.c | 49 +++++++++++++++----- 5 files changed, 213 insertions(+), 14 deletions(-) -diff --git a/tools/blktap/drivers/blktapctrl.c b/tools/blktap/drivers/blktapctrl.c -index bcc3152..8b58e3e 100644 ---- a/tools/blktap/drivers/blktapctrl.c -+++ b/tools/blktap/drivers/blktapctrl.c -@@ -381,7 +381,22 @@ static int write_msg(int fd, int msgtype, void *ptr, void *ptr2) +Index: xen-4.0.1-testing/tools/blktap/drivers/blktapctrl.c +=================================================================== +--- xen-4.0.1-testing.orig/tools/blktap/drivers/blktapctrl.c ++++ xen-4.0.1-testing/tools/blktap/drivers/blktapctrl.c +@@ -380,7 +380,22 @@ static int write_msg(int fd, int msgtype msg->cookie = blkif->cookie; break; @@ -46,7 +46,7 @@ default: return -1; } -@@ -476,6 +491,12 @@ static int read_msg(int fd, int msgtype, void *ptr) +@@ -475,6 +490,12 @@ static int read_msg(int fd, int msgtype, DPRINTF("\tPID: [%d]\n",blkif->tappid); } break; @@ -59,7 +59,7 @@ default: DPRINTF("UNKNOWN MESSAGE TYPE RECEIVED\n"); ret = 0; -@@ -758,6 +779,63 @@ static int unmap_blktapctrl(blkif_t *blkif) +@@ -757,6 +778,63 @@ static int unmap_blktapctrl(blkif_t *blk return 0; } @@ -123,7 +123,7 @@ int open_ctrl_socket(char *devname) { int ret; -@@ -854,6 +932,7 @@ int main(int argc, char *argv[]) +@@ -853,6 +931,7 @@ int main(int argc, char *argv[]) register_new_blkif_hook(blktapctrl_new_blkif); register_new_devmap_hook(map_new_blktapctrl); register_new_unmap_hook(unmap_blktapctrl); @@ -131,11 +131,11 @@ ctlfd = blktap_interface_open(); if (ctlfd < 0) { -diff --git a/tools/blktap/lib/blkif.c b/tools/blktap/lib/blkif.c -index 9a19596..11b63dc 100644 ---- a/tools/blktap/lib/blkif.c -+++ b/tools/blktap/lib/blkif.c -@@ -89,6 +89,11 @@ void register_new_blkif_hook(int (*fn)(blkif_t *blkif)) +Index: xen-4.0.1-testing/tools/blktap/lib/blkif.c +=================================================================== +--- xen-4.0.1-testing.orig/tools/blktap/lib/blkif.c ++++ xen-4.0.1-testing/tools/blktap/lib/blkif.c +@@ -89,6 +89,11 @@ void register_new_blkif_hook(int (*fn)(b { new_blkif_hook = fn; } @@ -172,10 +172,10 @@ void __init_blkif(void) { memset(blkif_hash, 0, sizeof(blkif_hash)); -diff --git a/tools/blktap/lib/blktaplib.h b/tools/blktap/lib/blktaplib.h -index 733b924..2a6a078 100644 ---- a/tools/blktap/lib/blktaplib.h -+++ b/tools/blktap/lib/blktaplib.h +Index: xen-4.0.1-testing/tools/blktap/lib/blktaplib.h +=================================================================== +--- xen-4.0.1-testing.orig/tools/blktap/lib/blktaplib.h ++++ xen-4.0.1-testing/tools/blktap/lib/blktaplib.h @@ -38,6 +38,7 @@ #include <xen/xen.h> #include <xen/io/blkif.h> @@ -198,7 +198,7 @@ void __init_blkif(void); typedef struct busy_state { -@@ -210,6 +213,8 @@ typedef struct msg_pid { +@@ -209,6 +212,8 @@ typedef struct msg_pid { #define CTLMSG_CLOSE_RSP 8 #define CTLMSG_PID 9 #define CTLMSG_PID_RSP 10 @@ -207,11 +207,11 @@ /* disk driver types */ #define MAX_DISK_TYPES 20 -diff --git a/tools/blktap/lib/xenbus.c b/tools/blktap/lib/xenbus.c -index 53db3c8..96f75a5 100644 ---- a/tools/blktap/lib/xenbus.c -+++ b/tools/blktap/lib/xenbus.c -@@ -318,6 +318,72 @@ static int check_image(struct xs_handle *h, struct backend_info *be, +Index: xen-4.0.1-testing/tools/blktap/lib/xenbus.c +=================================================================== +--- xen-4.0.1-testing.orig/tools/blktap/lib/xenbus.c ++++ xen-4.0.1-testing/tools/blktap/lib/xenbus.c +@@ -318,6 +318,72 @@ static int check_image(struct xs_handle return 0; } @@ -284,7 +284,7 @@ static void ueblktap_setup(struct xs_handle *h, char *bepath) { struct backend_info *be; -@@ -512,6 +578,9 @@ static void ueblktap_probe(struct xs_handle *h, struct xenbus_watch *w, +@@ -512,6 +578,9 @@ static void ueblktap_probe(struct xs_han be->backpath = bepath; be->frontpath = frontend; @@ -294,11 +294,11 @@ list_add(&be->list, &belist); -diff --git a/tools/ioemu-qemu-xen/hw/xen_blktap.c b/tools/ioemu-qemu-xen/hw/xen_blktap.c -index c2236fd..c925283 100644 ---- a/tools/ioemu-qemu-xen/hw/xen_blktap.c -+++ b/tools/ioemu-qemu-xen/hw/xen_blktap.c -@@ -83,8 +83,18 @@ static void unmap_disk(struct td_state *s) +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +=================================================================== +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c +@@ -81,8 +81,18 @@ static void unmap_disk(struct td_state * { tapdev_info_t *info = s->ring_info; fd_list_entry_t *entry; @@ -317,7 +317,7 @@ if (info != NULL && info->mem > 0) munmap(info->mem, getpagesize() * BLKTAP_MMAP_REGION_SIZE); -@@ -244,18 +254,6 @@ static int open_disk(struct td_state *s, char *path, int readonly) +@@ -242,18 +252,6 @@ static int open_disk(struct td_state *s, s->info = ((s->flags & TD_RDONLY) ? VDISK_READONLY : 0); @@ -336,7 +336,7 @@ return 0; } -@@ -496,7 +494,7 @@ static void handle_blktap_ctrlmsg(void* private) +@@ -494,7 +492,7 @@ static void handle_blktap_ctrlmsg(void* msg_hdr_t *msg; msg_newdev_t *msg_dev; msg_pid_t *msg_pid; @@ -345,7 +345,7 @@ struct td_state *s = NULL; fd_list_entry_t *entry; -@@ -622,6 +620,31 @@ static void handle_blktap_ctrlmsg(void* private) +@@ -584,6 +582,31 @@ static void handle_blktap_ctrlmsg(void* len = write(write_fd, buf, msglen); break; ++++++ snapshot-xend.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:03.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:03.000000000 +0100 @@ -115,7 +115,16 @@ from xen.xend import XendDomain try: -@@ -112,52 +112,61 @@ def save(fd, dominfo, network, live, dst +@@ -78,6 +78,8 @@ def save(fd, dominfo, network, live, dst + write_exact(fd, SIGNATURE, "could not write guest state file: signature") + + sxprep = dominfo.sxpr() ++ if name: ++ sxprep.append(['snapshotname', name]) + + if node > -1: + insert_after(sxprep,'vcpus',['node', str(node)]) +@@ -112,52 +114,61 @@ def save(fd, dominfo, network, live, dst image_cfg = dominfo.info.get('image', {}) hvm = dominfo.info.is_hvm() @@ -223,7 +232,7 @@ if checkpoint: dominfo.resumeDomain() -@@ -221,6 +230,71 @@ def restore(xd, fd, dominfo = None, paus +@@ -221,6 +232,71 @@ def restore(xd, fd, dominfo = None, paus if othervm is not None and othervm.domid is not None: raise VmError("Domain '%s' already exists with ID '%d'" % (domconfig["name_label"], othervm.domid)) @@ -295,7 +304,7 @@ if dominfo: dominfo.resume() else: -@@ -329,24 +403,7 @@ def restore(xd, fd, dominfo = None, paus +@@ -329,24 +405,7 @@ def restore(xd, fd, dominfo = None, paus dominfo.completeRestore(handler.store_mfn, handler.console_mfn) ++++++ tapdisk-ioemu-shutdown-fix.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:04.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:04.000000000 +0100 @@ -27,8 +27,8 @@ +int connected_disks = 0; fd_list_entry_t *fd_start = NULL; - extern char* get_snapshot_name(int devid); -@@ -545,6 +546,7 @@ static void handle_blktap_ctrlmsg(void* + static void handle_blktap_iomsg(void* private); +@@ -539,6 +540,7 @@ static void handle_blktap_ctrlmsg(void* /* Allocate the disk structs */ s = state_init(); @@ -36,7 +36,7 @@ /*Open file*/ if (s == NULL || open_disk(s, path, msg->drivertype, msg->readonly)) { -@@ -627,7 +629,8 @@ static void handle_blktap_ctrlmsg(void* +@@ -589,7 +591,8 @@ static void handle_blktap_ctrlmsg(void* case CTLMSG_CLOSE: s = get_state(msg->cookie); if (s) unmap_disk(s); ++++++ xend-domain-lock.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:05.000000000 +0100 @@ -232,7 +232,7 @@ =================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xend/XendCheckpoint.py +++ xen-4.0.1-testing/tools/python/xen/xend/XendCheckpoint.py -@@ -131,6 +131,7 @@ def save(fd, dominfo, network, live, dst +@@ -133,6 +133,7 @@ def save(fd, dominfo, network, live, dst dominfo.shutdown('suspend') dominfo.waitForSuspend() if line in ('suspend', 'suspended'): @@ -240,7 +240,7 @@ dominfo.migrateDevices(network, dst, DEV_MIGRATE_STEP2, domain_name) log.info("Domain %d suspended.", dominfo.getDomid()) -@@ -408,6 +409,7 @@ def restore(xd, fd, dominfo = None, paus +@@ -410,6 +411,7 @@ def restore(xd, fd, dominfo = None, paus if not paused: dominfo.unpause() ++++++ xenpaging.HVMCOPY_gfn_paged_out.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:05.000000000 +0100 @@ -13,8 +13,8 @@ --- xen/arch/x86/hvm/hvm.c | 4 ++++ - xen/common/memory.c | 43 ++++++++++++++++++++++++++++++++++++++----- - 2 files changed, 42 insertions(+), 5 deletions(-) + xen/common/memory.c | 44 +++++++++++++++++++++++++++++++++++++++----- + 2 files changed, 43 insertions(+), 5 deletions(-) --- xen-4.0.1-testing.orig/xen/arch/x86/hvm/hvm.c +++ xen-4.0.1-testing/xen/arch/x86/hvm/hvm.c @@ -66,7 +66,7 @@ { struct page_info *page; unsigned long i, j; -+ unsigned long ctg_ret; ++ unsigned long cftg_ret; xen_pfn_t gpfn, mfn; struct domain *d = a->domain; @@ -75,10 +75,10 @@ } - if ( unlikely(__copy_from_guest_offset(&gpfn, a->extent_list, i, 1)) ) -+ j = __copy_from_guest_offset(&gpfn, a->extent_list, i, 1); -+ if ( unlikely(j) ) ++ cftg_ret = __copy_from_guest_offset(&gpfn, a->extent_list, i, 1); ++ if ( unlikely(cftg_ret) ) + { -+ if ( (long)j == -EAGAIN ) ++ if ( (long)cftg_ret == -EAGAIN ) + a->preempted = 1; goto out; + } @@ -90,36 +90,44 @@ /* Inform the domain of the new page's machine address. */ - if ( unlikely(__copy_to_guest_offset(a->extent_list, i, &mfn, 1)) ) -+ ctg_ret = __copy_to_guest_offset(a->extent_list, i, &mfn, 1); -+ if ( unlikely(ctg_ret) ) ++ cftg_ret = __copy_to_guest_offset(a->extent_list, i, &mfn, 1); ++ if ( unlikely(cftg_ret) ) + { + for ( j = 0; j < (1 << a->extent_order); j++ ) + set_gpfn_from_mfn(mfn + j, INVALID_M2P_ENTRY); + guest_physmap_remove_page(d, gpfn, mfn, a->extent_order); + free_domheap_pages(page, a->extent_order); -+ if ( (long)ctg_ret == -EAGAIN ) ++ if ( (long)cftg_ret == -EAGAIN ) + a->preempted = 1; goto out; + } } } } -@@ -226,8 +248,13 @@ static void decrease_reservation(struct +@@ -212,6 +234,7 @@ int guest_remove_page(struct domain *d, + static void decrease_reservation(struct memop_args *a) + { + unsigned long i, j; ++ unsigned long cfg_ret; + xen_pfn_t gmfn; + + if ( !guest_handle_subrange_okay(a->extent_list, a->nr_done, +@@ -226,8 +249,13 @@ static void decrease_reservation(struct goto out; } - if ( unlikely(__copy_from_guest_offset(&gmfn, a->extent_list, i, 1)) ) -+ j = __copy_from_guest_offset(&gmfn, a->extent_list, i, 1); -+ if ( unlikely(j) ) ++ cfg_ret = __copy_from_guest_offset(&gmfn, a->extent_list, i, 1); ++ if ( unlikely(cfg_ret) ) + { -+ if ( (long)j == -EAGAIN ) ++ if ( (long)cfg_ret == -EAGAIN ) + a->preempted = 1; goto out; + } if ( tb_init_done ) { -@@ -511,6 +538,7 @@ long do_memory_op(unsigned long cmd, XEN +@@ -511,6 +539,7 @@ long do_memory_op(unsigned long cmd, XEN int rc, op; unsigned int address_bits; unsigned long start_extent; @@ -127,7 +135,7 @@ struct xen_memory_reservation reservation; struct memop_args args; domid_t domid; -@@ -524,8 +552,13 @@ long do_memory_op(unsigned long cmd, XEN +@@ -524,8 +553,13 @@ long do_memory_op(unsigned long cmd, XEN case XENMEM_populate_physmap: start_extent = cmd >> MEMOP_EXTENT_SHIFT; ++++++ xenpaging.autostart.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:05.000000000 +0100 @@ -9,6 +9,10 @@ Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- +v2: + unlink logfile instead of truncating it. + allows hardlinking for further inspection + tools/examples/xmexample.hvm | 3 + tools/python/README.XendConfig | 1 tools/python/README.sxpcfg | 1 @@ -19,8 +23,6 @@ tools/python/xen/xm/xenapi_create.py | 1 8 files changed, 111 insertions(+) -Index: xen-4.0.1-testing/tools/examples/xmexample.hvm -=================================================================== --- xen-4.0.1-testing.orig/tools/examples/xmexample.hvm +++ xen-4.0.1-testing/tools/examples/xmexample.hvm @@ -127,6 +127,9 @@ disk = [ 'file:/var/lib/xen/images/disk. @@ -33,8 +35,6 @@ #----------------------------------------------------------------------------- # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d) # default: hard disk, cd-rom, floppy -Index: xen-4.0.1-testing/tools/python/README.XendConfig -=================================================================== --- xen-4.0.1-testing.orig/tools/python/README.XendConfig +++ xen-4.0.1-testing/tools/python/README.XendConfig @@ -120,6 +120,7 @@ otherConfig @@ -45,8 +45,6 @@ image.hvm.display image.hvm.xauthority image.hvm.vncconsole -Index: xen-4.0.1-testing/tools/python/README.sxpcfg -=================================================================== --- xen-4.0.1-testing.orig/tools/python/README.sxpcfg +++ xen-4.0.1-testing/tools/python/README.sxpcfg @@ -51,6 +51,7 @@ image @@ -57,8 +55,6 @@ - display - xauthority - vncconsole -Index: xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py -=================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConfig.py +++ xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py @@ -145,6 +145,7 @@ XENAPI_PLATFORM_CFG_TYPES = { @@ -78,8 +74,6 @@ if 'timer_mode' not in self['platform']: self['platform']['timer_mode'] = 1 if 'viridian' not in self['platform']: -Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py -=================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -2442,6 +2442,7 @@ class XendDomainInfo: @@ -102,8 +96,6 @@ else: log.debug("No device model") -Index: xen-4.0.1-testing/tools/python/xen/xend/image.py -=================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xend/image.py +++ xen-4.0.1-testing/tools/python/xen/xend/image.py @@ -122,12 +122,14 @@ class ImageHandler: @@ -217,8 +209,6 @@ def createDeviceModel(self, restore = False): if self.device_model is None: return -Index: xen-4.0.1-testing/tools/python/xen/xm/create.py -=================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xm/create.py +++ xen-4.0.1-testing/tools/python/xen/xm/create.py @@ -495,6 +495,10 @@ gopts.var('nfs_root', val="PATH", @@ -240,8 +230,6 @@ 'device_model', 'display', 'fda', 'fdb', 'gfx_passthru', 'guest_os_type', -Index: xen-4.0.1-testing/tools/python/xen/xm/xenapi_create.py -=================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xm/xenapi_create.py +++ xen-4.0.1-testing/tools/python/xen/xm/xenapi_create.py @@ -1086,6 +1086,7 @@ class sxp2xml: ++++++ xenpaging.enabled.patch ++++++ Index: xen-4.0.1-testing/tools/python/xen/xend/image.py =================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xend/image.py +++ xen-4.0.1-testing/tools/python/xen/xend/image.py @@ -123,18 +123,19 @@ class ImageHandler: self.device_model = vmConfig['platform'].get('device_model') self.xenpaging = vmConfig['platform'].get('xenpaging') - self.xenpaging_delay = xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay" % self.vm.info['name_label']) - if self.xenpaging_delay == None: - log.warn("XXX creating /local/domain/0/xenpaging/%s" % self.vm.info['name_label']) - xstransact.Mkdir("/local/domain/0/xenpaging/%s" % self.vm.info['name_label']) - xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay', '7.0')) - xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_inc', '0.1')) - xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_use', '5')) - xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_used', '0')) - self.xenpaging_delay = float(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay" % self.vm.info['name_label'])) - self.xenpaging_delay_inc = float(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay_inc" % self.vm.info['name_label'])) - self.xenpaging_delay_use = int(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay_use" % self.vm.info['name_label'])) - self.xenpaging_delay_used = int(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay_used" % self.vm.info['name_label'])) + if self.xenpaging: + self.xenpaging_delay = xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay" % self.vm.info['name_label']) + if self.xenpaging_delay == None: + log.warn("XXX creating /local/domain/0/xenpaging/%s" % self.vm.info['name_label']) + xstransact.Mkdir("/local/domain/0/xenpaging/%s" % self.vm.info['name_label']) + xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay', '7.0')) + xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_inc', '0.1')) + xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_use', '5')) + xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_used', '0')) + self.xenpaging_delay = float(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay" % self.vm.info['name_label'])) + self.xenpaging_delay_inc = float(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay_inc" % self.vm.info['name_label'])) + self.xenpaging_delay_use = int(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay_use" % self.vm.info['name_label'])) + self.xenpaging_delay_used = int(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay_used" % self.vm.info['name_label'])) self.display = vmConfig['platform'].get('display') self.xauthority = vmConfig['platform'].get('xauthority') ++++++ xenpaging.guest_remove_page.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:05.000000000 +0100 @@ -5,6 +5,9 @@ Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- +v2: + resume dropped page to unpause vcpus + tools/xenpaging/xenpaging.c | 17 +++++++--- xen/arch/x86/mm/p2m.c | 65 +++++++++++++++++++++++++++++++---------- xen/common/memory.c | 6 +++ @@ -14,7 +17,7 @@ --- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c +++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c -@@ -598,12 +598,19 @@ int main(int argc, char *argv[]) +@@ -600,12 +600,19 @@ int main(int argc, char *argv[]) goto out; } @@ -112,8 +115,8 @@ - set_gpfn_from_mfn(mfn_x(mfn), rsp.gfn); - p2m_unlock(d->arch.p2m); - } else { -- gdprintk(XENLOG_ERR, "invalid mfn %lx for gfn %lx p2mt %x\n", -- mfn_x(mfn), rsp.gfn, p2mt); +- gdprintk(XENLOG_ERR, "invalid mfn %lx for gfn %lx p2mt %x flags %lx\n", +- mfn_x(mfn), rsp.gfn, p2mt, (unsigned long)rsp.flags); + /* Fix p2m entry */ + mfn = gfn_to_mfn(d, rsp.gfn, &p2mt); + if (mfn_valid(mfn)) @@ -123,8 +126,8 @@ + set_gpfn_from_mfn(mfn_x(mfn), rsp.gfn); + p2m_unlock(d->arch.p2m); + } else { -+ gdprintk(XENLOG_ERR, "invalid mfn %lx for gfn %lx p2mt %x\n", -+ mfn_x(mfn), rsp.gfn, p2mt); ++ gdprintk(XENLOG_ERR, "invalid mfn %lx for gfn %lx p2mt %x flags %lx\n", ++ mfn_x(mfn), rsp.gfn, p2mt, (unsigned long)rsp.flags); + } } ++++++ xenpaging.machine_to_phys_mapping.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:05.000000000 +0100 @@ -26,7 +26,8 @@ Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- -v2: check wether mfn is valid +v2: + call set_gpfn_from_mfn only if mfn is valid xen/arch/x86/mm/p2m.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) @@ -54,8 +55,8 @@ + set_gpfn_from_mfn(mfn_x(mfn), rsp.gfn); + p2m_unlock(d->arch.p2m); + } else { -+ gdprintk(XENLOG_ERR, "invalid mfn %lx for gfn %lx p2mt %x\n", -+ mfn_x(mfn), rsp.gfn, p2mt); ++ gdprintk(XENLOG_ERR, "invalid mfn %lx for gfn %lx p2mt %x flags %lx\n", ++ mfn_x(mfn), rsp.gfn, p2mt, (unsigned long)rsp.flags); + } /* Unpause domain */ ++++++ xenpaging.signal_handling.patch ++++++ --- /var/tmp/diff_new_pack.HU7blU/_old 2010-11-20 12:06:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HU7blU/_new 2010-11-20 12:06:05.000000000 +0100 @@ -6,8 +6,12 @@ Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- - tools/xenpaging/xenpaging.c | 39 +++++++++++++++++++++++++++++++-------- - 1 file changed, 31 insertions(+), 8 deletions(-) +v2: + unlink pagefile in signal handler to avoid stale pagefiles if xenpaging is + stuck in some loop + + tools/xenpaging/xenpaging.c | 42 +++++++++++++++++++++++++++++++++--------- + 1 file changed, 33 insertions(+), 9 deletions(-) --- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c +++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c @@ -19,19 +23,22 @@ #include <xc_private.h> #include <xen/mem_event.h> -@@ -40,6 +41,11 @@ +@@ -40,6 +41,14 @@ #define DPRINTF(...) ((void)0) #endif ++static char filename[80]; +static int interrupted; +static void close_handler(int sig) +{ + interrupted = sig; ++ if ( filename[0] ) ++ unlink(filename); +} static void *init_page(void) { -@@ -244,7 +250,6 @@ int xenpaging_teardown(xenpaging_t *pagi +@@ -244,7 +253,6 @@ int xenpaging_teardown(xenpaging_t *pagi if ( rc != 0 ) { ERROR("Error tearing down domain paging in xen"); @@ -39,7 +46,7 @@ } /* Unbind VIRQ */ -@@ -252,7 +257,6 @@ int xenpaging_teardown(xenpaging_t *pagi +@@ -252,7 +260,6 @@ int xenpaging_teardown(xenpaging_t *pagi if ( rc != 0 ) { ERROR("Error unbinding event port"); @@ -47,7 +54,7 @@ } paging->mem_event.port = -1; -@@ -261,7 +265,6 @@ int xenpaging_teardown(xenpaging_t *pagi +@@ -261,7 +268,6 @@ int xenpaging_teardown(xenpaging_t *pagi if ( rc != 0 ) { ERROR("Error closing event channel"); @@ -55,7 +62,7 @@ } paging->mem_event.xce_handle = -1; -@@ -270,7 +273,6 @@ int xenpaging_teardown(xenpaging_t *pagi +@@ -270,7 +276,6 @@ int xenpaging_teardown(xenpaging_t *pagi if ( rc != 0 ) { ERROR("Error closing connection to xen"); @@ -63,7 +70,7 @@ } paging->xc_handle = -1; -@@ -375,7 +377,7 @@ int xenpaging_evict_page(xenpaging_t *pa +@@ -375,7 +380,7 @@ int xenpaging_evict_page(xenpaging_t *pa return ret; } @@ -72,7 +79,7 @@ { int ret; -@@ -455,6 +457,11 @@ static int evict_victim(xenpaging_t *pag +@@ -455,6 +460,11 @@ static int evict_victim(xenpaging_t *pag goto out; } @@ -84,7 +91,7 @@ ret = xc_mem_paging_nominate(paging->xc_handle, paging->mem_event.domain_id, victim->gfn); if ( ret == 0 ) -@@ -479,6 +486,7 @@ static int evict_victim(xenpaging_t *pag +@@ -479,6 +489,7 @@ static int evict_victim(xenpaging_t *pag int main(int argc, char *argv[]) { @@ -92,7 +99,15 @@ domid_t domain_id; int num_pages; xenpaging_t *paging; -@@ -513,7 +521,7 @@ int main(int argc, char *argv[]) +@@ -491,7 +502,6 @@ int main(int argc, char *argv[]) + + int open_flags = O_CREAT | O_TRUNC | O_RDWR; + mode_t open_mode = S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR | S_IWGRP | S_IWOTH; +- char filename[80]; + int fd; + + if ( argc != 3 ) +@@ -513,7 +523,7 @@ int main(int argc, char *argv[]) if ( paging == NULL ) { ERROR("Error initialising paging"); @@ -101,7 +116,7 @@ } /* Open file */ -@@ -522,9 +530,18 @@ int main(int argc, char *argv[]) +@@ -522,9 +532,18 @@ int main(int argc, char *argv[]) if ( fd < 0 ) { perror("failed to open file"); @@ -121,7 +136,7 @@ /* Evict pages */ memset(victims, 0, sizeof(xenpaging_victim_t) * num_pages); for ( i = 0; i < num_pages; i++ ) -@@ -532,6 +549,8 @@ int main(int argc, char *argv[]) +@@ -532,6 +551,8 @@ int main(int argc, char *argv[]) rc = evict_victim(paging, domain_id, &victims[i], fd, i); if ( rc == -ENOSPC ) break; @@ -130,7 +145,7 @@ if ( i % 100 == 0 ) DPRINTF("%d pages evicted\n", i); } -@@ -539,7 +558,7 @@ int main(int argc, char *argv[]) +@@ -539,7 +560,7 @@ int main(int argc, char *argv[]) DPRINTF("pages evicted\n"); /* Swap pages in and out */ @@ -139,19 +154,18 @@ { /* Wait for Xen to signal that a page needs paged in */ rc = xc_wait_for_event_or_timeout(paging->mem_event.xce_handle, 100); -@@ -630,8 +649,11 @@ int main(int argc, char *argv[]) +@@ -630,8 +651,10 @@ int main(int argc, char *argv[]) } } } + DPRINTF("xenpaging got signal %d\n", interrupted); out: -+ unlink(filename); + close(fd); free(victims); /* Tear down domain paging */ -@@ -642,6 +664,7 @@ int main(int argc, char *argv[]) +@@ -642,6 +665,7 @@ int main(int argc, char *argv[]) if ( rc == 0 ) rc = rc1; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gnome-themes for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package gnome-themes for openSUSE:Factory checked in at Sat Nov 20 12:05:36 CET 2010. -------- --- GNOME/gnome-themes/gnome-themes.changes 2010-09-28 23:50:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-themes/gnome-themes.changes 2010-11-16 10:43:29.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 16 09:28:02 CET 2010 - dimstar(a)opensuse.org + +- Update to version 2.32.1: + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-themes-2.32.0.tar.bz2 New: ---- gnome-themes-2.32.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-themes.spec ++++++ --- /var/tmp/diff_new_pack.FraFYd/_old 2010-11-20 12:05:09.000000000 +0100 +++ /var/tmp/diff_new_pack.FraFYd/_new 2010-11-20 12:05:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gnome-themes (Version 2.32.0) +# spec file for package gnome-themes (Version 2.32.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: gnome-themes -Version: 2.32.0 +Version: 2.32.1 Release: 1 License: GPLv2+ Summary: GNOME Themes @@ -75,7 +75,7 @@ %icon_theme_cache_post LargePrint %icon_theme_cache_post Mist -# No need for %%icon_theme_cache_postun in %postun since the theme won't exist anymore +# No need for %%icon_theme_cache_postun in %%postun since the theme won't exist anymore %files -f %{name}.lang %defattr(-, root, root) ++++++ gnome-themes-2.32.0.tar.bz2 -> gnome-themes-2.32.1.tar.bz2 ++++++ ++++ 55510 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-themes-2.32.0/ChangeLog new/gnome-themes-2.32.1/ChangeLog --- old/gnome-themes-2.32.0/ChangeLog 2010-09-28 22:47:56.000000000 +0200 +++ new/gnome-themes-2.32.1/ChangeLog 2010-11-15 18:00:11.000000000 +0100 @@ -1,5 +1,33 @@ # Generated by Makefile. Do not edit. +commit 94df7f770c7a5d109bc11ce83fadc5c681089d82 +Author: Carles Ferrando <carles.ferrando(a)gmail.com> +Date: Fri Oct 29 01:26:42 2010 +0100 + + Updated Catalan (Valencian) translation + + po/ca(a)valencia.po | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit a2b1f447836d9304b45ed4918fcb969ef14823da +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Tue Sep 28 22:51:22 2010 +0200 + + release: post-release bump to 2.32.1 + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit d37cd3f9be84f9caaff3bcb33e710abbfab81710 +Author: Vincent Untz <vuntz(a)gnome.org> +Date: Tue Sep 28 22:51:13 2010 +0200 + + release: 2.32.0 + + NEWS | 5 +++++ + configure.in | 2 +- + 2 files changed, 6 insertions(+), 1 deletions(-) + commit 1778b8533dacda1045fef568790aa969f547cc1d Author: Calum Benson <calum.benson(a)oracle.com> Date: Mon Aug 16 18:01:41 2010 +0100 @@ -1444,7 +1472,7 @@ 1 files changed, 132 insertions(+), 53 deletions(-) commit 561335f3b0c1d7f628e52f4762cfc728182b7aaa -Merge: 167ef97 6cddf61 +Merge: 167ef97... 6cddf61... Author: Luca Ferretti <elle.uca(a)libero.it> Date: Sat May 30 11:18:59 2009 +0200 @@ -4695,8 +4723,8 @@ ChangeLog | 7 + gtk-themes/ClearlooksClassic/gtkrc | 588 +++++++++++++++++++++--------------- gtk-themes/Glossy/gtkrc | 569 +++++++++++++++++++++-------------- - gtk-themes/Inverted/gtkrc | 519 ++++++++++++++++++++------------ - 4 files changed, 1018 insertions(+), 665 deletions(-) + gtk-themes/Inverted/gtkrc | 515 ++++++++++++++++++++------------ + 4 files changed, 1016 insertions(+), 663 deletions(-) commit 77415b5a452f47bde638d3293f1e3aba65affc7f Author: Calum Benson <calum(a)src.gnome.org> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-themes-2.32.0/INSTALL new/gnome-themes-2.32.1/INSTALL --- old/gnome-themes-2.32.0/INSTALL 2010-02-09 15:10:36.000000000 +0100 +++ new/gnome-themes-2.32.1/INSTALL 2010-11-15 17:48:46.000000000 +0100 @@ -2,15 +2,15 @@ ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +2006 Free Software Foundation, Inc. - This file is free documentation; the Free Software Foundation gives +This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should +Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. @@ -67,15 +67,12 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. - Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -88,7 +85,7 @@ Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run @@ -100,24 +97,10 @@ installed the package for one architecture, use `make distclean' before reconfiguring for another architecture. - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - Installation Names ================== - By default, `make install' installs the package's commands under +By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the option `--prefix=PREFIX'. @@ -140,7 +123,7 @@ Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -152,46 +135,14 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - Specifying the System Type ========================== - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -199,8 +150,7 @@ where SYSTEM can have one of these forms: - OS - KERNEL-OS + OS KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -218,9 +168,9 @@ Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -229,7 +179,7 @@ Defining Variables ================== - Variables not defined in a site shell script can be set in the +Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -248,19 +198,11 @@ `configure' Invocation ====================== - `configure' recognizes the following options to control how it -operates. +`configure' recognizes the following options to control how it operates. `--help' `-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. + Print a summary of the options to `configure', and exit. `--version' `-V' @@ -287,16 +229,6 @@ Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. -`--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-themes-2.32.0/NEWS new/gnome-themes-2.32.1/NEWS --- old/gnome-themes-2.32.0/NEWS 2010-09-28 22:46:05.000000000 +0200 +++ new/gnome-themes-2.32.1/NEWS 2010-11-15 17:46:45.000000000 +0100 @@ -1,3 +1,11 @@ +2.32.1 +====== + +New/updated translations: + +Carles Ferrando <carles.ferrando(a)gmail.com> + Updated Catalan (Valencian) translation + 2.32.0 ====== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-themes-2.32.0/configure.in new/gnome-themes-2.32.1/configure.in --- old/gnome-themes-2.32.0/configure.in 2010-09-28 22:46:03.000000000 +0200 +++ new/gnome-themes-2.32.1/configure.in 2010-11-15 17:42:34.000000000 +0100 @@ -1,6 +1,6 @@ AC_PREREQ(2.53) -AC_INIT([gnome-themes], [2.32.0], +AC_INIT([gnome-themes], [2.32.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-themes] AC_CONFIG_SRCDIR([icon-themes]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-themes-2.32.0/gnome-themes.spec new/gnome-themes-2.32.1/gnome-themes.spec --- old/gnome-themes-2.32.0/gnome-themes.spec 2010-09-28 22:46:39.000000000 +0200 +++ new/gnome-themes-2.32.1/gnome-themes.spec 2010-11-15 17:49:31.000000000 +0100 @@ -1,6 +1,6 @@ Summary: Themes collection for GNOME Name: gnome-themes -Version: 2.32.0 +Version: 2.32.1 Release: 0 License: GPL Group: User Interface/Desktop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-themes-2.32.0/gtk-themes/HighContrast/gtkrc new/gnome-themes-2.32.1/gtk-themes/HighContrast/gtkrc --- old/gnome-themes-2.32.0/gtk-themes/HighContrast/gtkrc 2010-09-28 22:46:41.000000000 +0200 +++ new/gnome-themes-2.32.1/gtk-themes/HighContrast/gtkrc 2010-11-15 17:49:42.000000000 +0100 @@ -6,7 +6,7 @@ # # High-contrast pixmap icons by jimmac with input from tigert. -pixmap_path "/gnome/usr/share/themes/HighContrastLargePrint/pixmaps" +pixmap_path "/tmp/build/share/themes/HighContrastLargePrint/pixmaps" #TODO: move sun-jds style downstream style "sun-jds" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-themes-2.32.0/gtk-themes/HighContrastInverse/gtkrc new/gnome-themes-2.32.1/gtk-themes/HighContrastInverse/gtkrc --- old/gnome-themes-2.32.0/gtk-themes/HighContrastInverse/gtkrc 2010-09-28 22:46:41.000000000 +0200 +++ new/gnome-themes-2.32.1/gtk-themes/HighContrastInverse/gtkrc 2010-11-15 17:49:43.000000000 +0100 @@ -9,7 +9,7 @@ #Note: we just use the LargePrint icons for now, they will be scaled #to the correct size -pixmap_path "/gnome/usr/share/themes/HighContrastLargePrintInverse/pixmaps" +pixmap_path "/tmp/build/share/themes/HighContrastLargePrintInverse/pixmaps" #TODO: move sun-jds style downstream style "sun-jds" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-themes-2.32.0/gtk-themes/HighContrastLargePrint/gtkrc new/gnome-themes-2.32.1/gtk-themes/HighContrastLargePrint/gtkrc --- old/gnome-themes-2.32.0/gtk-themes/HighContrastLargePrint/gtkrc 2010-09-28 22:46:41.000000000 +0200 +++ new/gnome-themes-2.32.1/gtk-themes/HighContrastLargePrint/gtkrc 2010-11-15 17:49:44.000000000 +0100 @@ -6,7 +6,7 @@ # # High-contrast pixmap icons by jimmac with input from tigert. -pixmap_path "/gnome/usr/share/themes/HighContrastLargePrint/pixmaps" +pixmap_path "/tmp/build/share/themes/HighContrastLargePrint/pixmaps" gtk-icon-sizes = "mini-commander-icon=24,24:print-manager=64,64:panel-button=32,32:gtk-dnd=48,48:gtk-menu=32,32:panel-menu=48,48:gtk-large-toolbar=48,48:gtk-small-toolbar=32,32:gtk-button=32,32:gtk-dialog=64,64" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-themes-2.32.0/gtk-themes/HighContrastLargePrintInverse/gtkrc new/gnome-themes-2.32.1/gtk-themes/HighContrastLargePrintInverse/gtkrc --- old/gnome-themes-2.32.0/gtk-themes/HighContrastLargePrintInverse/gtkrc 2010-09-28 22:46:41.000000000 +0200 +++ new/gnome-themes-2.32.1/gtk-themes/HighContrastLargePrintInverse/gtkrc 2010-11-15 17:49:45.000000000 +0100 @@ -6,7 +6,7 @@ # # High-contrast pixmap icons by jimmac with input from tigert. -pixmap_path "/gnome/usr/share/themes/HighContrastLargePrintInverse/pixmaps" +pixmap_path "/tmp/build/share/themes/HighContrastLargePrintInverse/pixmaps" gtk-icon-sizes = "mini-commander-icon=24,24:print-manager=64,64:panel-button=32,32:gtk-dnd=48,48:gtk-menu=32,32:panel-menu=48,48:gtk-large-toolbar=48,48:gtk-small-toolbar=32,32:gtk-button=32,32:gtk-dialog=64,64" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-themes-2.32.0/gtk-themes/LowContrast/gtkrc new/gnome-themes-2.32.1/gtk-themes/LowContrast/gtkrc --- old/gnome-themes-2.32.0/gtk-themes/LowContrast/gtkrc 2010-09-28 22:46:42.000000000 +0200 +++ new/gnome-themes-2.32.1/gtk-themes/LowContrast/gtkrc 2010-11-15 17:49:47.000000000 +0100 @@ -13,7 +13,7 @@ # Note: this theme is deliberately using the icons from the # LowContrastLargePrint theme at the moment, until we have # some hand-crafted icons at a smaller size to use here. -CB. -pixmap_path "/gnome/usr/share/themes/LowContrastLargePrint/pixmaps" +pixmap_path "/tmp/build/share/themes/LowContrastLargePrint/pixmaps" style "default" { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-themes-2.32.0/gtk-themes/LowContrastLargePrint/gtkrc new/gnome-themes-2.32.1/gtk-themes/LowContrastLargePrint/gtkrc --- old/gnome-themes-2.32.0/gtk-themes/LowContrastLargePrint/gtkrc 2010-09-28 22:46:42.000000000 +0200 +++ new/gnome-themes-2.32.1/gtk-themes/LowContrastLargePrint/gtkrc 2010-11-15 17:49:48.000000000 +0100 @@ -9,7 +9,7 @@ # # email: bill.haneman(a)sun.com -pixmap_path "/gnome/usr/share/themes/LowContrastLargePrint/pixmaps" +pixmap_path "/tmp/build/share/themes/LowContrastLargePrint/pixmaps" gtk-icon-sizes = "mini-commander-icon=24,24:print-manager=64,64:panel-button=32,32:gtk-dnd=48,48:gtk-menu=32,32:panel-menu=48,48:gtk-large-toolbar=48,48:gtk-small-toolbar=32,32:gtk-button=32,32:gtk-dialog=64,64" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-themes-2.32.0/missing new/gnome-themes-2.32.1/missing --- old/gnome-themes-2.32.0/missing 2010-09-28 22:46:24.000000000 +0200 +++ new/gnome-themes-2.32.1/missing 2010-11-15 17:47:55.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,9 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,9 +89,6 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. - Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -107,22 +106,15 @@ esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. +# the program). case $1 in - lex*|yacc*) + lex|yacc) # Not GNU programs, they don't have --version. ;; - tar*) + tar) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -146,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $program in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -156,7 +148,7 @@ touch aclocal.m4 ;; - autoconf*) + autoconf) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -165,7 +157,7 @@ touch configure ;; - autoheader*) + autoheader) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -195,7 +187,7 @@ while read f; do touch "$f"; done ;; - autom4te*) + autom4te) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -218,7 +210,7 @@ fi ;; - bison*|yacc*) + bison|yacc) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -248,7 +240,7 @@ fi ;; - lex*|flex*) + lex|flex) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -271,7 +263,7 @@ fi ;; - help2man*) + help2man) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -285,11 +277,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit $? + exit 1 fi ;; - makeinfo*) + makeinfo) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -318,7 +310,7 @@ touch $file ;; - tar*) + tar) shift # We have already tried tar in the generic part. @@ -371,6 +363,5 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" +# time-stamp-end: "$" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-themes-2.32.0/po/Makefile.in.in new/gnome-themes-2.32.1/po/Makefile.in.in --- old/gnome-themes-2.32.0/po/Makefile.in.in 2010-09-28 22:46:20.000000000 +0200 +++ new/gnome-themes-2.32.1/po/Makefile.in.in 2010-11-15 17:47:37.000000000 +0100 @@ -56,7 +56,7 @@ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi) USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) @@ -129,7 +129,7 @@ done # Empty stubs to satisfy archaic automake needs -dvi info ctags tags CTAGS TAGS ID: +dvi info tags TAGS ID: # Define this as empty until I found a useful application. install-exec installcheck: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-themes-2.32.0/po/ca(a)valencia.po new/gnome-themes-2.32.1/po/ca(a)valencia.po --- old/gnome-themes-2.32.0/po/ca(a)valencia.po 2010-02-09 13:23:18.000000000 +0100 +++ new/gnome-themes-2.32.1/po/ca(a)valencia.po 2010-11-09 13:40:33.000000000 +0100 @@ -1,17 +1,17 @@ -# Valencian (southern Catalan) messages for gnome-themes. +# Catalan messages for gnome-themes. # Copyright © 2002, 2003, 2004, 2007 Free Software Foundation, Inc. # This file is distributed under the same license as the gnome-themes package. # Jordi Mallach <jordi(a)sindominio.net>, 2002, 2003, 2004, 2007. -# Miquel Esplà <miquelespla(a)gmail.com>, 2009 [valencian variant adaptation] # msgid "" msgstr "" "Project-Id-Version: gnome-themes 2.7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-25 13:56+0200\n" +"POT-Creation-Date: 2010-10-29 01:26+0100\n" "PO-Revision-Date: 2009-03-09 21:34+0100\n" "Last-Translator: Jordi Mallach <jordi(a)sindominio.net>\n" "Language-Team: Catalan <tradgnome(a)softcatala.org>\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-control-center for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package gnome-control-center for openSUSE:Factory checked in at Sat Nov 20 12:05:26 CET 2010. -------- --- GNOME/gnome-control-center/gnome-control-center.changes 2010-09-27 16:36:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-control-center/gnome-control-center.changes 2010-11-19 10:17:07.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Nov 19 10:16:12 CET 2010 - vuntz(a)opensuse.org + +- Update to version 2.32.1: + + Default applications: + - Use 'midori' as icon name for Midori web browser + + Mouse: + - Enable 2-finger scrolling through emulation (bgo#625163) + + Keyboard: + - Link against libxklavier also + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-control-center-2.32.0.tar.bz2 New: ---- gnome-control-center-2.32.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-control-center.spec ++++++ --- /var/tmp/diff_new_pack.wutHPs/_old 2010-11-20 12:05:15.000000000 +0100 +++ /var/tmp/diff_new_pack.wutHPs/_new 2010-11-20 12:05:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gnome-control-center (Version 2.32.0) +# spec file for package gnome-control-center (Version 2.32.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -51,7 +51,7 @@ Group: System/GUI/GNOME Obsoletes: fontilus themus acme Provides: fontilus themus acme -Version: 2.32.0 +Version: 2.32.1 Release: 1 Summary: The GNOME Control Center Source: %{name}-%{version}.tar.bz2 ++++++ gnome-control-center-2.32.0.tar.bz2 -> gnome-control-center-2.32.1.tar.bz2 ++++++ ++++ 13895 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-qt4 for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package python-qt4 for openSUSE:Factory checked in at Sat Nov 20 12:05:03 CET 2010. -------- --- python-qt4/python-qt4.changes 2010-10-05 10:57:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-qt4/python-qt4.changes 2010-10-25 15:59:00.000000000 +0200 @@ -1,0 +2,19 @@ +Mon Oct 25 15:58:35 CEST 2010 - dmueller(a)suse.de + +- update to 4.8: + - Added support for Qt v4.7 including the new QtDeclarative module. + - pyqtProperty() can now be used as a method decorator in the same way that + the standard Python property type can be used. + - Added the notify argument to pyqtProperty(). + - Unbound signals can now be subscripted in the same way that bound signals + can. + - Added the missing << operator to QPolygon, QPolygonF and + QXmlStreamAttributes. + - PyQt will now automatically keep a reference to objects set with some sort + of setter method when Qt expects the underlying C++ instance to stay valid + but does not take ownership of it. + - Added the lightmaps.py and stardelegate.py examples from Hans-Peter Jansen. + - Added the --assume-shared option to configure.py. + - The QtAssistant module is no longer built with Qt v4.7 and later. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- PyQt-x11-gpl-4.7.7.tar.bz2 fix-scpk-and-flag-issue.diff New: ---- PyQt-x11-gpl-4.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qt4.spec ++++++ --- /var/tmp/diff_new_pack.iqrVcJ/_old 2010-11-20 12:02:29.000000000 +0100 +++ /var/tmp/diff_new_pack.iqrVcJ/_new 2010-11-20 12:02:29.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package python-qt4 (Version 4.7.7) +# spec file for package python-qt4 (Version 4.8) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,8 +33,8 @@ License: GPLv2 Group: Development/Libraries/Python Summary: PyQt - python bindings for Qt 4 -Version: 4.7.7 -Release: 2 +Version: 4.8 +Release: 1 %define rversion %version Url: http://www.riverbankcomputing.com/software/pyqt/intro BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,7 +42,6 @@ Patch0: link-python.diff Patch2: disable-rpaths.diff Patch3: build-compare.diff -Patch4: fix-scpk-and-flag-issue.diff %py_requires %if %suse_version <= 1110 %define python_sitelib %{py_sitedir} @@ -93,7 +92,6 @@ %patch0 -p1 %patch2 %patch3 -%patch4 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS" ++++++ PyQt-x11-gpl-4.7.7.tar.bz2 -> PyQt-x11-gpl-4.8.tar.bz2 ++++++ python-qt4/PyQt-x11-gpl-4.7.7.tar.bz2 /mounts/work_src_done/STABLE/python-qt4/PyQt-x11-gpl-4.8.tar.bz2 differ: char 11, line 1 ++++++ build-compare.diff ++++++ --- /var/tmp/diff_new_pack.iqrVcJ/_old 2010-11-20 12:02:29.000000000 +0100 +++ /var/tmp/diff_new_pack.iqrVcJ/_new 2010-11-20 12:02:29.000000000 +0100 @@ -1,8 +1,6 @@ -Index: pyuic/uic/__init__.py -=================================================================== ---- pyuic/uic/__init__.py.orig +--- pyuic/uic/__init__.py +++ pyuic/uic/__init__.py -@@ -7,8 +7,7 @@ _header = """# -*- coding: utf-8 -*- +@@ -11,8 +11,7 @@ # Form implementation generated from reading ui file '%s' # @@ -12,7 +10,7 @@ # # WARNING! All changes made in this file will be lost! -@@ -125,7 +124,7 @@ def compileUi(uifile, pyfile, execute=Fa +@@ -129,7 +128,7 @@ indenter.indentwidth = indent ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libnet for openSUSE:Factory
by root＠hilbert.suse.de 20 Nov '10

20 Nov '10

Hello community, here is the log from the commit of package libnet for openSUSE:Factory checked in at Sat Nov 20 12:04:51 CET 2010. -------- --- libnet/libnet.changes 2009-11-03 20:19:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/libnet/libnet.changes 2010-11-19 14:00:03.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Nov 19 12:53:43 UTC 2010 - mvyskocil(a)suse.cz + +- update to 1.1.5 (from libnet-dev.sf.net) a bugfix release + see CHANGELOG for complete list of fixes from 1.1.2.1 +- patches changes: + * remove libnet-endianess-fix.diff + * remove libnet-shared.diff + * remove libnet-1.1.2.1-makefile.diff + * refresh libnet-1.1.5-strict-aliasing-fix.diff + * refresh libnet-1.1.5-arrray-fix.diff +- rename to libnet1 to conforms Shared Library Policy +- split devel files to libnet-devel and documentation to libnet-doc + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libnet-1.1.2.1-arrray-fix.diff libnet-1.1.2.1-makefile.diff libnet-1.1.2.1-strict-aliasing-fix.diff libnet-endianess-fix.diff libnet-shared.diff libnet.tar.bz2 New: ---- libnet-1.1.5-arrray-fix.diff libnet-1.1.5-strict-aliasing-fix.diff libnet-1.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnet.spec ++++++ --- /var/tmp/diff_new_pack.eaPePQ/_old 2010-11-20 12:02:04.000000000 +0100 +++ /var/tmp/diff_new_pack.eaPePQ/_new 2010-11-20 12:02:04.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libnet (Version 1.1.2.1) +# spec file for package libnet (Version 1.1.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 @@ -20,18 +20,15 @@ Name: libnet Summary: A C Library for Portable Packet Creation -Version: 1.1.2.1 -Release: 144 -License: BSD 3-clause (or similar) -Group: System/Libraries -Url: http://www.packetfactory.net/libnet/ -Source: %{name}.tar.bz2 -Patch1: %{name}-endianess-fix.diff -Patch2: %{name}-shared.diff -Patch4: %{name}-%{version}-makefile.diff -Patch5: %{name}-%{version}-strict-aliasing-fix.diff -Patch6: %{name}-%{version}-uninitialized-fix.diff -Patch7: %{name}-%{version}-arrray-fix.diff +Version: 1.1.5 +Release: 1 +License: BSD3c(or similar) +Group: Development/Libraries/C and C++ +Url: http://sourceforge.net/projects/libnet-dev +Source: libnet-%{version}.tar.bz2 +Patch0: libnet-1.1.5-strict-aliasing-fix.diff +Patch1: libnet-1.1.2.1-uninitialized-fix.diff +Patch2: libnet-1.1.5-arrray-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,34 +40,57 @@ tools and network test code. See the man page and sample test code for more detailed information. +%package -n libnet1 +License: BSD3c(or similar) +Summary: A C Library for Portable Packet Creation +Group: Development/Libraries/C and C++ + +%description -n libnet1 +Libnet is an API to help with the construction and handling of network +packets. It provides a portable framework for low-level network packet +writing and handling. Libnet includes packet creation at the IP layer +and at the link layer as well as a host of supplementary and +complementary functionality. Libnet is very useful for writing network +tools and network test code. See the man page and sample test code for +more detailed information. +%package -n libnet-devel +Summary: Devel files for libnet +License: BSD3c(or similar) +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} -Authors: --------- - Mike D. Schiffman <mike(a)infonexus.com> +%description -n libnet-devel +Libnet is an API to help with the construction and handling of network +packets. This package contains devel files. + +%package -n libnet-doc +Summary: Documentation for libnet +License: BSD3c(or similar) +Group: Development/Libraries/C and C++ + +%description -n libnet-doc +Libnet is an API to help with the construction and handling of network +packets. This package contains documentation. %prep -%setup -q -n libnet +%setup -q -n libnet-%{version} +%patch0 %patch1 %patch2 -%patch4 -%patch5 -%patch6 -%patch7 %build autoreconf -fiv -CFLAGS="$RPM_OPT_FLAGS -Wall -Wno-unused" \ +CFLAGS="%{optflags} -Wall -Wno-unused" \ %configure --libdir=/%{_lib} --disable-static --with-pic %{__make} %{?jobs:-j%jobs} %install -make install DESTDIR=$RPM_BUILD_ROOT -install -d -m 755 $RPM_BUILD_ROOT/{usr/bin/,%{_mandir}/man3} -install -m 755 libnet-config $RPM_BUILD_ROOT/usr/bin/ -install -m 644 doc/man/man3/*.3 $RPM_BUILD_ROOT/%{_mandir}/man3 -rm -rf `find -name "CVS" -type d` doc/man -rm -rf sample/{.libs,Makefile*} +%{makeinstall} +install -d -m 755 %{buildroot}/{%{_bindir},%{_mandir}/man3} +install -m 755 libnet-config %{buildroot}/%{_bindir} +install -m 644 doc/man/man3/*.3 %{buildroot}/%{_mandir}/man3 +find doc/ sample/ -name "Makefile*" -o -name ".libs" | xargs rm -rf find sample -name "*.o" -o -type f -perm +111 |xargs rm -rf %{__rm} -v %{buildroot}/%{_lib}/*.la %{__install} -d -m 0755 %{buildroot}%{_libdir} @@ -84,13 +104,20 @@ %postun -p /sbin/ldconfig -%files +%files -n libnet1 %defattr(-,root,root) -%doc doc/* sample +%doc doc/COPYING +/%{_lib}/libnet.so.* %doc %{_mandir}/man3/* -%{_bindir}/* -%{_includedir}/* -/%{_lib}/libnet.so.0* + +%files -n libnet-devel +%defattr(-,root,root) +%{_bindir}/libnet-config +%{_includedir}/libnet* %{_libdir}/libnet.so +%files -n libnet-doc +%defattr(-,root,root) +%doc doc/* sample + %changelog ++++++ libnet-1.1.2.1-arrray-fix.diff -> libnet-1.1.5-arrray-fix.diff ++++++ --- libnet/libnet-1.1.2.1-arrray-fix.diff 2007-01-16 00:22:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/libnet/libnet-1.1.5-arrray-fix.diff 2010-11-19 14:00:00.000000000 +0100 @@ -1,6 +1,13 @@ ---- src/libnet_cq.c -+++ src/libnet_cq.c -@@ -114,7 +114,7 @@ +--- + src/libnet_cq.c | 4 ++-- + src/libnet_init.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +Index: src/libnet_cq.c +=================================================================== +--- src/libnet_cq.c.orig 2010-11-19 11:32:51.750943104 +0100 ++++ src/libnet_cq.c 2010-11-19 11:33:29.934865042 +0100 +@@ -116,7 +116,7 @@ /* label the context with the user specified string */ strncpy(l->label, label, LIBNET_LABEL_SIZE); @@ -9,7 +16,7 @@ l_cq->next = NULL; l_cq->prev = NULL; -@@ -145,7 +145,7 @@ +@@ -147,7 +147,7 @@ /* label the context with the user specified string */ strncpy(l->label, label, LIBNET_LABEL_SIZE); @@ -18,10 +25,12 @@ new->next = l_cq; new->prev = NULL; ---- src/libnet_init.c -+++ src/libnet_init.c -@@ -77,7 +77,7 @@ - l->device = (device ? strdup(device) : NULL); +Index: src/libnet_init.c +=================================================================== +--- src/libnet_init.c.orig 2010-11-19 11:32:51.750943104 +0100 ++++ src/libnet_init.c 2010-11-19 11:33:29.986870383 +0100 +@@ -71,7 +71,7 @@ + l->fd = -1; strncpy(l->label, LIBNET_LABEL_DEFAULT, LIBNET_LABEL_SIZE); - l->label[sizeof(l->label)] = '\0'; ++++++ libnet-1.1.2.1-strict-aliasing-fix.diff -> libnet-1.1.5-strict-aliasing-fix.diff ++++++ --- libnet/libnet-1.1.2.1-strict-aliasing-fix.diff 2007-01-16 00:22:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/libnet/libnet-1.1.5-strict-aliasing-fix.diff 2010-11-19 14:00:00.000000000 +0100 @@ -1,30 +1,8 @@ ---- src/libnet_resolve.c -+++ src/libnet_resolve.c -@@ -370,7 +370,11 @@ - int i; - int32_t l; - int8_t *pp; -- -+ union { -+ int8_t *ipp; -+ char *cpp; -+ } upp = { &pp }; -+ - while (isspace(*s)) - { - s++; -@@ -390,7 +394,7 @@ - /* expect len hex octets separated by ':' */ - for (i = 0; i < *len + 1; i++) - { -- l = strtol(s, (char **)&pp, 16); -+ l = strtol(s, upp.cpp, 16); - if (pp == s || l > 0xff || l < 0) - { - *len = 0; ---- src/libnet_checksum.c -+++ src/libnet_checksum.c -@@ -58,6 +58,27 @@ +Index: src/libnet_checksum.c +=================================================================== +--- src/libnet_checksum.c.orig 2010-11-03 19:35:12.000000000 +0100 ++++ src/libnet_checksum.c 2010-11-19 11:21:29.148823523 +0100 +@@ -91,6 +91,27 @@ return (sum); } @@ -52,21 +30,3 @@ int libnet_toggle_checksum(libnet_t *l, libnet_ptag_t ptag, int mode) { -@@ -173,7 +194,7 @@ - } - else - { -- sum = libnet_in_cksum((u_int16_t *)&iph_p->ip_src, 8); -+ sum = libnet_in_cksum32((u_int32_t *)&iph_p->ip_src, 8); - } - sum += ntohs(IPPROTO_TCP + len); - sum += libnet_in_cksum((u_int16_t *)tcph_p, len); -@@ -191,7 +212,7 @@ - } - else - { -- sum = libnet_in_cksum((u_int16_t *)&iph_p->ip_src, 8); -+ sum = libnet_in_cksum32((u_int32_t *)&iph_p->ip_src, 8); - } - sum += ntohs(IPPROTO_UDP + len); - sum += libnet_in_cksum((u_int16_t *)udph_p, len); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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