December 2015 - crux-commits

ports/kde (kde4): libspectre: added patch for ghostscript >= 9.18
by crux＠crux.nu 29 Dec '15

29 Dec '15

commit ac7835589fa6d4e27e9153b1d0f9574b64f4d7f7 Author: Alan Mizrahi <alan+crux(a)mizrahi.com.ve> Date: Tue Dec 29 13:03:06 2015 +0900 libspectre: added patch for ghostscript >= 9.18 diff --git a/libspectre/libspectre-0.2.7-gs918.patch b/libspectre/libspectre-0.2.7-gs918.patch new file mode 100644 index 0000000..e9a4eda --- /dev/null +++ b/libspectre/libspectre-0.2.7-gs918.patch @@ -0,0 +1,42 @@ +Fixed error namespace for >=ghostscript-gpl-9.18 + +https://bugs.gentoo.org/563540 + +--- libspectre-0.2.7/libspectre/spectre-gs.c ++++ libspectre-0.2.7/libspectre/spectre-gs.c +@@ -43,12 +43,12 @@ + + if (code <= -100) { + switch (code) { +- case e_Fatal: ++ case gs_error_Fatal: + fprintf (stderr, "fatal internal error %d", code); + return TRUE; + break; + +- case e_ExecStackUnderflow: ++ case gs_error_ExecStackUnderflow: + fprintf (stderr, "stack overflow %d", code); + return TRUE; + break; +@@ -109,9 +109,9 @@ + set = _spectre_strdup_printf ("%d %d translate\n", -x, -y); + error = gsapi_run_string_continue (ghostscript_instance, set, strlen (set), + 0, &exit_code); +- error = error == e_NeedInput ? 0 : error; ++ error = error == gs_error_NeedInput ? 0 : error; + free (set); +- if (error != e_NeedInput && critic_error_code (error)) { ++ if (error != gs_error_NeedInput && critic_error_code (error)) { + fclose (fd); + return FALSE; + } +@@ -126,7 +126,7 @@ + read = fread (buf, sizeof (char), to_read, fd); + error = gsapi_run_string_continue (ghostscript_instance, + buf, read, 0, &exit_code); +- error = error == e_NeedInput ? 0 : error; ++ error = error == gs_error_NeedInput ? 0 : error; + left -= read; + } +

1 0

ports/opt (3.2): [notify] flash-player-plugin: updated to 11.2.202.559
by crux＠crux.nu 29 Dec '15

29 Dec '15

commit e5e0fe0f2e0ed15f578b2ee8714665b0eaa6b66d Author: Jose V Beneyto <sepen(a)crux.nu> Date: Tue Dec 29 02:26:43 2015 +0100 [notify] flash-player-plugin: updated to 11.2.202.559 Security update: https://helpx.adobe.com/security/products/flash-player/apsb16-01.html diff --git a/flash-player-plugin/.md5sum b/flash-player-plugin/.md5sum index 042c0d8..8203a56 100644 --- a/flash-player-plugin/.md5sum +++ b/flash-player-plugin/.md5sum @@ -1 +1 @@ -3a536b26dfe45b8d66c4de33fd00e2d3 flash-plugin-11.2.202.554-release.x86_64.rpm +b20fe5056f58ba95c7a3f19e7e9343a2 flash-plugin-11.2.202.559-release.x86_64.rpm diff --git a/flash-player-plugin/Pkgfile b/flash-player-plugin/Pkgfile index 735ab1b..0a4ecfb 100644 --- a/flash-player-plugin/Pkgfile +++ b/flash-player-plugin/Pkgfile @@ -5,7 +5,7 @@ # Depends on: name=flash-player-plugin -version=11.2.202.554 +version=11.2.202.559 release=1 source=(http://fpdownload.macromedia.com/get/flashplayer/pdc/$version/flash…

1 0

ports/core (3.2): gettext: fixed footprint
by crux＠crux.nu 29 Dec '15

29 Dec '15

commit 300d9d292994adeb107796b1b8c64bd3b76df24e Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Dec 29 01:11:22 2015 +0100 gettext: fixed footprint diff --git a/gettext/.footprint b/gettext/.footprint index 5d78578..2ce2539 100644 --- a/gettext/.footprint +++ b/gettext/.footprint @@ -83,6 +83,16 @@ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/wchar_t.m4 -rw-r--r-- root/root usr/share/aclocal/wint_t.m4 -rw-r--r-- root/root usr/share/aclocal/xsize.m4 +drwxr-xr-x root/root usr/share/gettext-0.19.7/ +drwxr-xr-x root/root usr/share/gettext-0.19.7/its/ +-rw-r--r-- root/root usr/share/gettext-0.19.7/its/appdata.its +-rw-r--r-- root/root usr/share/gettext-0.19.7/its/appdata.loc +-rw-r--r-- root/root usr/share/gettext-0.19.7/its/glade.loc +-rw-r--r-- root/root usr/share/gettext-0.19.7/its/glade1.its +-rw-r--r-- root/root usr/share/gettext-0.19.7/its/glade2.its +-rw-r--r-- root/root usr/share/gettext-0.19.7/its/gsettings.its +-rw-r--r-- root/root usr/share/gettext-0.19.7/its/gsettings.loc +-rw-r--r-- root/root usr/share/gettext-0.19.7/its/gtkbuilder.its drwxr-xr-x root/root usr/share/gettext/ -rw-r--r-- root/root usr/share/gettext/ABOUT-NLS -rw-r--r-- root/root usr/share/gettext/archive.dir.tar.xz

1 0

ports/core (3.2): gettext: updated to 0.19.7
by crux＠crux.nu 29 Dec '15

29 Dec '15

commit 7d19d9e7e749c0408a64e13a044808fcc1d6960f Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Dec 29 01:00:54 2015 +0100 gettext: updated to 0.19.7 diff --git a/gettext/.footprint b/gettext/.footprint index c17532c..5d78578 100644 --- a/gettext/.footprint +++ b/gettext/.footprint @@ -37,17 +37,17 @@ drwxr-xr-x root/root usr/lib/gettext/ lrwxrwxrwx root/root usr/lib/libasprintf.so -> libasprintf.so.0.0.0 lrwxrwxrwx root/root usr/lib/libasprintf.so.0 -> libasprintf.so.0.0.0 -rwxr-xr-x root/root usr/lib/libasprintf.so.0.0.0 --rwxr-xr-x root/root usr/lib/libgettextlib-0.19.6.so +-rwxr-xr-x root/root usr/lib/libgettextlib-0.19.7.so -rwxr-xr-x root/root usr/lib/libgettextlib.la -lrwxrwxrwx root/root usr/lib/libgettextlib.so -> libgettextlib-0.19.6.so +lrwxrwxrwx root/root usr/lib/libgettextlib.so -> libgettextlib-0.19.7.so -rw-r--r-- root/root usr/lib/libgettextpo.a -rwxr-xr-x root/root usr/lib/libgettextpo.la lrwxrwxrwx root/root usr/lib/libgettextpo.so -> libgettextpo.so.0.5.3 lrwxrwxrwx root/root usr/lib/libgettextpo.so.0 -> libgettextpo.so.0.5.3 -rwxr-xr-x root/root usr/lib/libgettextpo.so.0.5.3 --rwxr-xr-x root/root usr/lib/libgettextsrc-0.19.6.so +-rwxr-xr-x root/root usr/lib/libgettextsrc-0.19.7.so -rwxr-xr-x root/root usr/lib/libgettextsrc.la -lrwxrwxrwx root/root usr/lib/libgettextsrc.so -> libgettextsrc-0.19.6.so +lrwxrwxrwx root/root usr/lib/libgettextsrc.so -> libgettextsrc-0.19.7.so -rw-r--r-- root/root usr/lib/preloadable_libintl.so drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/aclocal/ diff --git a/gettext/.md5sum b/gettext/.md5sum index 6f8f67f..d7b1f84 100644 --- a/gettext/.md5sum +++ b/gettext/.md5sum @@ -1 +1 @@ -69d79254ee3b41df23f41c2f4fd720d9 gettext-0.19.6.tar.xz +f81e50556da41b44c1d59ac93474dca5 gettext-0.19.7.tar.xz diff --git a/gettext/Pkgfile b/gettext/Pkgfile index e2d7036..65255ee 100644 --- a/gettext/Pkgfile +++ b/gettext/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses acl name=gettext -version=0.19.6 +version=0.19.7 release=1 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.xz)

1 0

ports/compat-32 (3.2): mesa3d-32: 11.0.7 -> 11.0.8
by crux＠crux.nu 28 Dec '15

28 Dec '15

commit 7b77c3cf5ca80c048020fef0b7d8fc5c25703323 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Tue Dec 29 00:43:29 2015 +1100 mesa3d-32: 11.0.7 -> 11.0.8 diff --git a/mesa3d-32/.md5sum b/mesa3d-32/.md5sum index ec62760..aff2846 100644 --- a/mesa3d-32/.md5sum +++ b/mesa3d-32/.md5sum @@ -1 +1 @@ -5bb515d4b0931b7a9e1bfec3da73f10f mesa-11.0.7.tar.xz +83638efaa55d00075752fce57f91bf2d mesa-11.0.8.tar.xz diff --git a/mesa3d-32/Pkgfile b/mesa3d-32/Pkgfile index 5ba76d8..f34e5f6 100644 --- a/mesa3d-32/Pkgfile +++ b/mesa3d-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: elfutils-32 eudev-32 expat-32 libdrm-32 libvdpau-32 llvm-32 mesa3d xorg-dri3proto-32 xorg-glproto-32 xorg-libxdamage-32 xorg-libxshmfence-32 xorg-libxvmc-32 xorg-presentproto-32 name=mesa3d-32 -version=11.0.7 +version=11.0.8 release=1 source=(ftp://ftp.freedesktop.org/pub/mesa/$version/mesa-$version.tar.xz)

1 0

ports/compat-32 (3.2): xorg-libxi-32: 1.7.5 -> 1.7.6
by crux＠crux.nu 28 Dec '15

28 Dec '15

commit 6fc698a5bfef8d6cc092f45a4ec755ab946c1125 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Tue Dec 29 00:44:26 2015 +1100 xorg-libxi-32: 1.7.5 -> 1.7.6 diff --git a/xorg-libxi-32/.md5sum b/xorg-libxi-32/.md5sum index 5520ec9..c814410 100644 --- a/xorg-libxi-32/.md5sum +++ b/xorg-libxi-32/.md5sum @@ -1 +1 @@ -9f02462855c598a0cd0ddfd98c6e25f5 libXi-1.7.5.tar.bz2 +510e555ecfffa8d2298a0f42b725e563 libXi-1.7.6.tar.bz2 diff --git a/xorg-libxi-32/Pkgfile b/xorg-libxi-32/Pkgfile index a480d13..7d13c8b 100644 --- a/xorg-libxi-32/Pkgfile +++ b/xorg-libxi-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xorg-xproto-32 xorg-libx11-32 xorg-xextproto-32 xorg-libxext-32 xorg-inputproto xorg-libxi xorg-libxfixes-32 name=xorg-libxi-32 -version=1.7.5 +version=1.7.6 release=1 source=(http://xorg.freedesktop.org/releases/individual/lib/libXi-$version.…

1 0

ports/opt (3.2): lesstif: include xorg-libxext dependcy
by crux＠crux.nu 27 Dec '15

27 Dec '15

commit 7cd34c93231cb81afc9fc91f9b126bff431224c3 Author: Thomas Penteker <tek(a)serverop.de> Date: Sun Dec 27 23:58:25 2015 +0100 lesstif: include xorg-libxext dependcy diff --git a/lesstif/Pkgfile b/lesstif/Pkgfile index 10dc1e3..12c3acf 100644 --- a/lesstif/Pkgfile +++ b/lesstif/Pkgfile @@ -1,8 +1,8 @@ # Description: A free replacement for Motif -# URL: http://www.lesstif.org/ +# URL: http://www.lesstif.org/ # Maintainer: Thomas Penteker, tek at serverop dot de -# Packager: Antti Nykanen, aon at iki dot fi -# Depends on: freetype, xorg-libxt +# Packager: Antti Nykanen, aon at iki dot fi +# Depends on: freetype, xorg-libxt, xorg-libxext name=lesstif version=0.95.2

1 0

ports/opt (3.2): qemu-agent: 2.2.1 -> 2.5.0
by crux＠crux.nu 27 Dec '15

27 Dec '15

commit 1f927bc4f4b9155e2753b5181725f47ccf780b9f Author: Thomas Penteker <tek(a)serverop.de> Date: Sun Dec 27 23:41:12 2015 +0100 qemu-agent: 2.2.1 -> 2.5.0 diff --git a/qemu-agent/.md5sum b/qemu-agent/.md5sum index c36c108..0ea9ca5 100644 --- a/qemu-agent/.md5sum +++ b/qemu-agent/.md5sum @@ -1,2 +1,2 @@ -833ff4457062456d38d6567f802ffef4 qemu-2.2.1.tar.bz2 +f469f2330bbe76e3e39db10e9ac4f8db qemu-2.5.0.tar.bz2 9ccbefaec374e646820a0c28b28914dc qemu-agent diff --git a/qemu-agent/Pkgfile b/qemu-agent/Pkgfile index a809cf3..014df60 100644 --- a/qemu-agent/Pkgfile +++ b/qemu-agent/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libsdl glib name=qemu-agent -version=2.2.1 +version=2.5.0 release=1 source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2 qemu-agent)

1 0

ports/opt (3.2): qemu-all: 2.3.0 -> 2.5.0
by crux＠crux.nu 27 Dec '15

27 Dec '15

commit 4e8601977920c306b8d70c12fdbdf885074181e7 Author: Thomas Penteker <tek(a)serverop.de> Date: Sun Dec 27 23:36:59 2015 +0100 qemu-all: 2.3.0 -> 2.5.0 diff --git a/qemu-all/.footprint b/qemu-all/.footprint index 44b1759..de54cdd 100644 --- a/qemu-all/.footprint +++ b/qemu-all/.footprint @@ -1,11 +1,11 @@ drwxr-xr-x root/root etc/ -drwxr-xr-x root/root etc/qemu/ --rw-r--r-- root/root etc/qemu/target-x86_64.conf (EMPTY) drwxr-xr-x root/root etc/udev/ drwxr-xr-x root/root etc/udev/rules.d/ -rw-r--r-- root/root etc/udev/rules.d/60-kvm.rules drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/ivshmem-client +-rwxr-xr-x root/root usr/bin/ivshmem-server -rwxr-xr-x root/root usr/bin/qemu-aarch64 -rwxr-xr-x root/root usr/bin/qemu-alpha -rwxr-xr-x root/root usr/bin/qemu-arm @@ -64,19 +64,19 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/qemu-system-x86_64 -rwxr-xr-x root/root usr/bin/qemu-system-xtensa -rwxr-xr-x root/root usr/bin/qemu-system-xtensaeb +-rwxr-xr-x root/root usr/bin/qemu-tilegx -rwxr-xr-x root/root usr/bin/qemu-unicore32 -rwxr-xr-x root/root usr/bin/qemu-x86_64 -rwxr-xr-x root/root usr/bin/virtfs-proxy-helper drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/qemu/ -rwxr-xr-x root/root usr/lib/qemu/qemu-bridge-helper -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/qemu-img.1.gz --rw-r--r-- root/root usr/man/man1/qemu.1.gz -drwxr-xr-x root/root usr/man/man8/ --rw-r--r-- root/root usr/man/man8/qemu-nbd.8.gz drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man1/ +-rw-r--r-- root/root usr/share/man1/qemu-img.1.gz +-rw-r--r-- root/root usr/share/man1/qemu.1.gz +drwxr-xr-x root/root usr/share/man8/ +-rw-r--r-- root/root usr/share/man8/qemu-nbd.8.gz drwxr-xr-x root/root usr/share/qemu/ -rw-r--r-- root/root usr/share/qemu/QEMU,cgthree.bin -rw-r--r-- root/root usr/share/qemu/QEMU,tcx.bin @@ -158,6 +158,7 @@ drwxr-xr-x root/root usr/share/qemu/keymaps/ -rw-r--r-- root/root usr/share/qemu/vgabios-qxl.bin -rw-r--r-- root/root usr/share/qemu/vgabios-stdvga.bin -rw-r--r-- root/root usr/share/qemu/vgabios-vmware.bin +-rw-r--r-- root/root usr/share/qemu/vgabios-virtio.bin -rw-r--r-- root/root usr/share/qemu/vgabios.bin drwxr-xr-x root/root var/ drwxr-xr-x root/root var/run/ diff --git a/qemu-all/.md5sum b/qemu-all/.md5sum index b711d54..52ef0c5 100644 --- a/qemu-all/.md5sum +++ b/qemu-all/.md5sum @@ -1,2 +1 @@ -d2ec15ed5ad82e6bf0eb90bb9c27b656 CVE-3456.diff -2fab3ea4460de9b57192e5b8b311f221 qemu-2.3.0.tar.bz2 +f469f2330bbe76e3e39db10e9ac4f8db qemu-2.5.0.tar.bz2 diff --git a/qemu-all/CVE-3456.diff b/qemu-all/CVE-3456.diff deleted file mode 100644 index 2844caa..0000000 --- a/qemu-all/CVE-3456.diff +++ /dev/null @@ -1,81 +0,0 @@ -From: Petr Matousek <pmatouse(a)redhat.com> -Date: Wed, 6 May 2015 07:48:59 +0000 (+0200) -Subject: fdc: force the fifo access to be in bounds of the allocated buffer -X-Git-Url: http://git.qemu.org/?p=qemu.git;a=commitdiff_plain;h=e907746266721f305d67bc… - -fdc: force the fifo access to be in bounds of the allocated buffer - -During processing of certain commands such as FD_CMD_READ_ID and -FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could -get out of bounds leading to memory corruption with values coming -from the guest. - -Fix this by making sure that the index is always bounded by the -allocated memory. - -This is CVE-2015-3456. - -Signed-off-by: Petr Matousek <pmatouse(a)redhat.com> -Reviewed-by: John Snow <jsnow(a)redhat.com> -Signed-off-by: John Snow <jsnow(a)redhat.com> ---- - -diff --git a/hw/block/fdc.c b/hw/block/fdc.c -index f72a392..d8a8edd 100644 ---- a/hw/block/fdc.c -+++ b/hw/block/fdc.c -@@ -1497,7 +1497,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) - { - FDrive *cur_drv; - uint32_t retval = 0; -- int pos; -+ uint32_t pos; - - cur_drv = get_cur_drv(fdctrl); - fdctrl->dsr &= ~FD_DSR_PWRDOWN; -@@ -1506,8 +1506,8 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) - return 0; - } - pos = fdctrl->data_pos; -+ pos %= FD_SECTOR_LEN; - if (fdctrl->msr & FD_MSR_NONDMA) { -- pos %= FD_SECTOR_LEN; - if (pos == 0) { - if (fdctrl->data_pos != 0) - if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { -@@ -1852,10 +1852,13 @@ static void fdctrl_handle_option(FDCtrl *fdctrl, int direction) - static void fdctrl_handle_drive_specification_command(FDCtrl *fdctrl, int direction) - { - FDrive *cur_drv = get_cur_drv(fdctrl); -+ uint32_t pos; - -- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { -+ pos = fdctrl->data_pos - 1; -+ pos %= FD_SECTOR_LEN; -+ if (fdctrl->fifo[pos] & 0x80) { - /* Command parameters done */ -- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { -+ if (fdctrl->fifo[pos] & 0x40) { - fdctrl->fifo[0] = fdctrl->fifo[1]; - fdctrl->fifo[2] = 0; - fdctrl->fifo[3] = 0; -@@ -1955,7 +1958,7 @@ static uint8_t command_to_handler[256]; - static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) - { - FDrive *cur_drv; -- int pos; -+ uint32_t pos; - - /* Reset mode */ - if (!(fdctrl->dor & FD_DOR_nRESET)) { -@@ -2004,7 +2007,9 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) - } - - FLOPPY_DPRINTF("%s: %02x\n", __func__, value); -- fdctrl->fifo[fdctrl->data_pos++] = value; -+ pos = fdctrl->data_pos++; -+ pos %= FD_SECTOR_LEN; -+ fdctrl->fifo[pos] = value; - if (fdctrl->data_pos == fdctrl->data_len) { - /* We now have all parameters - * and will be able to treat the command diff --git a/qemu-all/Pkgfile b/qemu-all/Pkgfile index 48ab6e5..770ab38 100644 --- a/qemu-all/Pkgfile +++ b/qemu-all/Pkgfile @@ -6,17 +6,14 @@ # Nice to have: libseccomp libiscsi libusb usbredir spice name=qemu-all -version=2.3.0 -release=2 -source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2 - CVE-3456.diff) +version=2.5.0 +release=1 +source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2) build() { cd qemu-$version - patch -p1 -i $SRC/CVE-3456.diff - ./configure --prefix=/usr \ --cc="${CC:=gcc}" \ --host-cc="${CC:=gcc}" \ @@ -31,15 +28,13 @@ build() { -e 's|#include <sys/resource.h>|#include <sys/resource.h>\r\n#include "qemu\/xattr.h"|g' \ fsdev/virtfs-proxy-helper.c - # fix include issues with nspr - echo 'QEMU_CFLAGS+=-I/usr/include/nspr' >> libcacard/Makefile make ${MAKEFLAGS:=} make DESTDIR=$PKG install make qemu.1 qemu-img.1 qemu-nbd.8 - install -D -m 644 qemu.1 $PKG/usr/man/man1/qemu.1 - install -D -m 644 qemu-img.1 $PKG/usr/man/man1/qemu-img.1 - install -D -m 644 qemu-nbd.8 $PKG/usr/man/man8/qemu-nbd.8 + install -D -m 644 qemu.1 $PKG/usr/share/man1/qemu.1 + install -D -m 644 qemu-img.1 $PKG/usr/share/man1/qemu-img.1 + install -D -m 644 qemu-nbd.8 $PKG/usr/share/man8/qemu-nbd.8 install -d $PKG/etc/udev/rules.d/ echo 'KERNEL=="kvm", NAME="kvm", OWNER="root", GROUP="kvm", MODE="0660"' > \

1 0

ports/opt (3.2): qemu: 2.3.0 -> 2.5.0
by crux＠crux.nu 27 Dec '15

27 Dec '15

commit b788ec7a5754c2be1fd6c6c16800c2a4f17c9a9a Author: Thomas Penteker <tek(a)serverop.de> Date: Sun Dec 27 23:06:41 2015 +0100 qemu: 2.3.0 -> 2.5.0 diff --git a/qemu/.footprint b/qemu/.footprint index 743bbde..088a84b 100644 --- a/qemu/.footprint +++ b/qemu/.footprint @@ -1,11 +1,11 @@ drwxr-xr-x root/root etc/ -drwxr-xr-x root/root etc/qemu/ --rw-r--r-- root/root etc/qemu/target-x86_64.conf (EMPTY) drwxr-xr-x root/root etc/udev/ drwxr-xr-x root/root etc/udev/rules.d/ -rw-r--r-- root/root etc/udev/rules.d/60-kvm.rules drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/ivshmem-client +-rwxr-xr-x root/root usr/bin/ivshmem-server -rwxr-xr-x root/root usr/bin/qemu-ga -rwxr-xr-x root/root usr/bin/qemu-i386 -rwxr-xr-x root/root usr/bin/qemu-img @@ -18,13 +18,12 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/qemu/ -rwxr-xr-x root/root usr/lib/qemu/qemu-bridge-helper -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/qemu-img.1.gz --rw-r--r-- root/root usr/man/man1/qemu.1.gz -drwxr-xr-x root/root usr/man/man8/ --rw-r--r-- root/root usr/man/man8/qemu-nbd.8.gz drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man1/ +-rw-r--r-- root/root usr/share/man1/qemu-img.1 +-rw-r--r-- root/root usr/share/man1/qemu.1 +drwxr-xr-x root/root usr/share/man8/ +-rw-r--r-- root/root usr/share/man8/qemu-nbd.8 drwxr-xr-x root/root usr/share/qemu/ -rw-r--r-- root/root usr/share/qemu/QEMU,cgthree.bin -rw-r--r-- root/root usr/share/qemu/QEMU,tcx.bin @@ -105,6 +104,7 @@ drwxr-xr-x root/root usr/share/qemu/keymaps/ -rw-r--r-- root/root usr/share/qemu/vgabios-cirrus.bin -rw-r--r-- root/root usr/share/qemu/vgabios-qxl.bin -rw-r--r-- root/root usr/share/qemu/vgabios-stdvga.bin +-rw-r--r-- root/root usr/share/qemu/vgabios-virtio.bin -rw-r--r-- root/root usr/share/qemu/vgabios-vmware.bin -rw-r--r-- root/root usr/share/qemu/vgabios.bin drwxr-xr-x root/root var/ diff --git a/qemu/.md5sum b/qemu/.md5sum index b711d54..52ef0c5 100644 --- a/qemu/.md5sum +++ b/qemu/.md5sum @@ -1,2 +1 @@ -d2ec15ed5ad82e6bf0eb90bb9c27b656 CVE-3456.diff -2fab3ea4460de9b57192e5b8b311f221 qemu-2.3.0.tar.bz2 +f469f2330bbe76e3e39db10e9ac4f8db qemu-2.5.0.tar.bz2 diff --git a/qemu/CVE-3456.diff b/qemu/CVE-3456.diff deleted file mode 100644 index 2844caa..0000000 --- a/qemu/CVE-3456.diff +++ /dev/null @@ -1,81 +0,0 @@ -From: Petr Matousek <pmatouse(a)redhat.com> -Date: Wed, 6 May 2015 07:48:59 +0000 (+0200) -Subject: fdc: force the fifo access to be in bounds of the allocated buffer -X-Git-Url: http://git.qemu.org/?p=qemu.git;a=commitdiff_plain;h=e907746266721f305d67bc… - -fdc: force the fifo access to be in bounds of the allocated buffer - -During processing of certain commands such as FD_CMD_READ_ID and -FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could -get out of bounds leading to memory corruption with values coming -from the guest. - -Fix this by making sure that the index is always bounded by the -allocated memory. - -This is CVE-2015-3456. - -Signed-off-by: Petr Matousek <pmatouse(a)redhat.com> -Reviewed-by: John Snow <jsnow(a)redhat.com> -Signed-off-by: John Snow <jsnow(a)redhat.com> ---- - -diff --git a/hw/block/fdc.c b/hw/block/fdc.c -index f72a392..d8a8edd 100644 ---- a/hw/block/fdc.c -+++ b/hw/block/fdc.c -@@ -1497,7 +1497,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) - { - FDrive *cur_drv; - uint32_t retval = 0; -- int pos; -+ uint32_t pos; - - cur_drv = get_cur_drv(fdctrl); - fdctrl->dsr &= ~FD_DSR_PWRDOWN; -@@ -1506,8 +1506,8 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) - return 0; - } - pos = fdctrl->data_pos; -+ pos %= FD_SECTOR_LEN; - if (fdctrl->msr & FD_MSR_NONDMA) { -- pos %= FD_SECTOR_LEN; - if (pos == 0) { - if (fdctrl->data_pos != 0) - if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { -@@ -1852,10 +1852,13 @@ static void fdctrl_handle_option(FDCtrl *fdctrl, int direction) - static void fdctrl_handle_drive_specification_command(FDCtrl *fdctrl, int direction) - { - FDrive *cur_drv = get_cur_drv(fdctrl); -+ uint32_t pos; - -- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { -+ pos = fdctrl->data_pos - 1; -+ pos %= FD_SECTOR_LEN; -+ if (fdctrl->fifo[pos] & 0x80) { - /* Command parameters done */ -- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { -+ if (fdctrl->fifo[pos] & 0x40) { - fdctrl->fifo[0] = fdctrl->fifo[1]; - fdctrl->fifo[2] = 0; - fdctrl->fifo[3] = 0; -@@ -1955,7 +1958,7 @@ static uint8_t command_to_handler[256]; - static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) - { - FDrive *cur_drv; -- int pos; -+ uint32_t pos; - - /* Reset mode */ - if (!(fdctrl->dor & FD_DOR_nRESET)) { -@@ -2004,7 +2007,9 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) - } - - FLOPPY_DPRINTF("%s: %02x\n", __func__, value); -- fdctrl->fifo[fdctrl->data_pos++] = value; -+ pos = fdctrl->data_pos++; -+ pos %= FD_SECTOR_LEN; -+ fdctrl->fifo[pos] = value; - if (fdctrl->data_pos == fdctrl->data_len) { - /* We now have all parameters - * and will be able to treat the command diff --git a/qemu/Pkgfile b/qemu/Pkgfile index f081c3e..b93754f 100644 --- a/qemu/Pkgfile +++ b/qemu/Pkgfile @@ -6,17 +6,14 @@ # Nice to have: libseccomp libiscsi libusb usbredir spice name=qemu -version=2.3.0 +version=2.5.0 release=1 -source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2 - CVE-3456.diff) +source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2) build() { cd $name-$version - patch -p1 -i $SRC/CVE-3456.diff - ./configure --prefix=/usr \ --cc="${CC:=gcc}" \ --host-cc="${CC:=gcc}" \ @@ -32,15 +29,13 @@ build() { -e 's|#include <sys/resource.h>|#include <sys/resource.h>\r\n#include "qemu\/xattr.h"|g' \ fsdev/virtfs-proxy-helper.c - # fix include issues with nspr - echo 'QEMU_CFLAGS+=-I/usr/include/nspr' >> libcacard/Makefile make ${MAKEFLAGS:=} make DESTDIR=$PKG install make qemu.1 qemu-img.1 qemu-nbd.8 - install -D -m 644 qemu.1 $PKG/usr/man/man1/qemu.1 - install -D -m 644 qemu-img.1 $PKG/usr/man/man1/qemu-img.1 - install -D -m 644 qemu-nbd.8 $PKG/usr/man/man8/qemu-nbd.8 + install -D -m 644 qemu.1 $PKG/usr/share/man1/qemu.1 + install -D -m 644 qemu-img.1 $PKG/usr/share/man1/qemu-img.1 + install -D -m 644 qemu-nbd.8 $PKG/usr/share/man8/qemu-nbd.8 install -d $PKG/etc/udev/rules.d/ echo 'KERNEL=="kvm", NAME="kvm", OWNER="root", GROUP="kvm", MODE="0660"' > \

1 0