From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0A86E138010 for ; Mon, 8 Oct 2012 22:06:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14BA721C002; Mon, 8 Oct 2012 22:06:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4539D21C006 for ; Mon, 8 Oct 2012 22:06:30 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78FA233D782 for ; Mon, 8 Oct 2012 22:06:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 251DEE543E for ; Mon, 8 Oct 2012 22:06:28 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1349734113.d08d7ccf3cf46bdad51e82cad14427eca857397b.dilfridge@gentoo> Subject: [gentoo-commits] dev/dilfridge:master commit in: app-emulation/qemu/, app-emulation/qemu/files/ X-VCS-Repository: dev/dilfridge X-VCS-Files: app-emulation/qemu/ChangeLog app-emulation/qemu/Manifest app-emulation/qemu/files/qemu-0.11.0-mips64-user-fix.patch app-emulation/qemu/files/qemu-0.11.1-CVE-2012-0029-backport.patch app-emulation/qemu/files/qemu-1.0-static-1.patch app-emulation/qemu/files/qemu-1.0-static-2.patch app-emulation/qemu/files/qemu-ifdown app-emulation/qemu/files/qemu-ifup app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch app-emulation/qemu/metadata.xml app-emulation/qemu/qemu-1.0-r4.ebuild X-VCS-Directories: app-emulation/qemu/ app-emulation/qemu/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: d08d7ccf3cf46bdad51e82cad14427eca857397b X-VCS-Branch: master Date: Mon, 8 Oct 2012 22:06:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9f8b8620-03ac-4b89-8eee-3a697accf9b1 X-Archives-Hash: fde02bc11a77464926d33fc418d9c629 commit: d08d7ccf3cf46bdad51e82cad14427eca857397b Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Mon Oct 8 22:08:33 2012 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Mon Oct 8 22:08:33 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=d08d7ccf [app-emulation/qemu] Not needed anymore --- app-emulation/qemu/ChangeLog | 15 - app-emulation/qemu/Manifest | 32 --- .../qemu/files/qemu-0.11.0-mips64-user-fix.patch | 11 - .../files/qemu-0.11.1-CVE-2012-0029-backport.patch | 35 --- app-emulation/qemu/files/qemu-1.0-static-1.patch | 55 ---- app-emulation/qemu/files/qemu-1.0-static-2.patch | 54 ---- app-emulation/qemu/files/qemu-ifdown | 20 -- app-emulation/qemu/files/qemu-ifup | 22 -- ...00-bounds-packet-size-against-buffer-size.patch | 37 --- app-emulation/qemu/metadata.xml | 45 ---- app-emulation/qemu/qemu-1.0-r4.ebuild | 279 -------------------- 11 files changed, 0 insertions(+), 605 deletions(-) diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog deleted file mode 100644 index c2c12da..0000000 --- a/app-emulation/qemu/ChangeLog +++ /dev/null @@ -1,15 +0,0 @@ -# ChangeLog for app-emulation/qemu -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*qemu-1.0-r4 (25 Feb 2012) - - 25 Feb 2012; Andreas K. Huettel -qemu-1.0-r3.ebuild, - +qemu-1.0-r4.ebuild, +files/qemu-1.0-static-1.patch, - +files/qemu-1.0-static-2.patch: - Got this to build. Lots of warnings about shared glibc though... - - 25 Feb 2012; Andreas K. Huettel -qemu-0.11.1.ebuild, - -qemu-0.11.1-r1.ebuild, -qemu-1.0-r2.ebuild, -qemu-9999.ebuild: - [app-emulation/qemu] clean out stuff I dont need - diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest deleted file mode 100644 index b7688f3..0000000 --- a/app-emulation/qemu/Manifest +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f -AUX qemu-0.11.1-CVE-2012-0029-backport.patch 1448 RMD160 efdf7bfe481bbfec2106d4a1652ec4df3242eb97 SHA1 dd44a1c1224c90f93bfcb19c612c6920325e6624 SHA256 fb739ca478977f17b73489823b92d8964da1bb308db997596e1160900f2c9236 -AUX qemu-1.0-static-1.patch 1700 RMD160 2ef3c9a87d852312d752d12db8b397423f6f9835 SHA1 81231024eeb53fbc29c5311aa08264c745bfe46b SHA256 465ad010e794e7a84a2eae81ab917983a2ed4f6cc6b9a159c9ced2a11864ba7b -AUX qemu-1.0-static-2.patch 2520 RMD160 9f4d72fdf3aef138325a94c9a6c915452cbef79f SHA1 b0419953ed2077cdd25c88bed80912fe564e415f SHA256 5bb46b0c33454364950d8321108ebd145fdd9ab5c2a82a6e0577c7f2a47e9031 -AUX qemu-ifdown 478 RMD160 2187fbf352e6b84686f0cf0e9e9ebe5d26359858 SHA1 1daccb4785fe503687562798f90be1414267e27d SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d -AUX qemu-ifup 554 RMD160 9769d79ab6456bdd7e3e689005f629e2a67b858d SHA1 dde2b27acabe6fe23ca40f90ff6950bb12a4b506 SHA256 eae9b50680442acc29c65a245a2d26a63756ad4cb894e08cb5ea249686801f1d -AUX qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch 1412 RMD160 53749555d464e56cfab39b0fa2e8120ab2c024db SHA1 9046e72b8c7496840e340f6fc351434b8830f191 SHA256 9a06665c47b76b2501f148713c46f8ce0b14ed03da5e6cb03c0d141f5d91900a -DIST qemu-1.0-patches.tar.xz 43540 RMD160 79a39d5a8050fe8eedd5e0becb828d2ae0b465c3 SHA1 423880fb32f27e05d1382ed341e6cc4bee840dc3 SHA256 32a8b98cd5fd661268328d71efbfafd65972102b10da363193f3da98bd9b2d72 -DIST qemu-1.0.tar.gz 10848714 RMD160 3a60aef6cfebba6896bdb12c99525da5456172fd SHA1 7dcb1b3516554d6d899d7488cd444dbb7721fcee SHA256 47674b7da559d5e1b44cc401af9ac5ad962d14e9eede12567b13e4b841989737 -EBUILD qemu-1.0-r4.ebuild 7596 RMD160 2c3310dc38e3b892816efe9cc17efb7f51dd1500 SHA1 485bd72e7e3a34fc64b4d03a9e291b7821505166 SHA256 3acc828c4e01f2c170c0a3cb4a4458f86375a4d079eff715f4092ac1d505e14f -MISC ChangeLog 578 RMD160 2c518f04fa197f6a110acc1eb51a4635f31a8994 SHA1 2f78e85f7e546d2db3344771fc488bb71d3afc11 SHA256 19c4287ef2710784fb238b0ea596281d5f16072ac897e9a2b18273408af86d8e -MISC metadata.xml 2575 RMD160 d53217a49f76391725580cb4ebb22c0ed43588bf SHA1 0b1f51a4bf30e8899cb0379e14eba26c6aa00b7f SHA256 a07e1dd5932d91789f481394b318cf20f4c5a529168b8e5adb299736a643b94b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQIcBAEBCgAGBQJPSR21AAoJENwGBM22xfferrQQAILGLd13zxwrJV7k+mABW4Bp -St+a0jfOzcpHM1Uk7eIIat/s5YrthF7auxV8hlWVRqW0+oVgZhfUwzbkknUDDowT -r5NsR8rit54Tzgxwn7xxIFMRnlf9NQyLFBFW2lgSs1z6E6U9FyRg4zZdH8LKkVhj -hyLcFg3DN4fsYq753fHtFrzTcsiyZLhCxq1vy/NRLvpeEn1ByZXGs9DRW5yd54sC -eqvVEvD6/zcYhIe69Jalod/56g+C5feib1BXc69Hv8OrawggE2w9MuqZ1URXTpZx -kSvMOUlsEGdXpU+du/rrIuo66INN/z0FUHt6koZsReGLGeepdi3uPleUfMZK6doF -z9txGFkF6NOfgYdk0EKKUWpX6d/JBQsL92XohfmrsErxzNOLDtTQdLVp+HGuXJ/u -cpa/voDfDpRkv+P2w7PSBpQYULWU98ogAY0BM0+CzLKL191CnyISTBUte4IQL8Zk -4pF3CsRT487AD9o+iUKTgMR16YKD5r4q+EPdQCr3fUQoSnQ0nikzL9WJgHmYiAN3 -5p16pE9N3BV4F8f552c5eJc5tvOlOLxhvBTmN7vlnJwxd5lDlgmWY1CeTH4kh/0B -a6nJePYQMRRb1ikHC9QhBaeXLYYx81F4+TPc8aRtr+pK5vCaD2eTHgo2dDI1doZp -t/OGqagE92iB7qWIxcsW -=mi/0 ------END PGP SIGNATURE----- diff --git a/app-emulation/qemu/files/qemu-0.11.0-mips64-user-fix.patch b/app-emulation/qemu/files/qemu-0.11.0-mips64-user-fix.patch deleted file mode 100644 index c069f89..0000000 --- a/app-emulation/qemu/files/qemu-0.11.0-mips64-user-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qemu-0.11.0.orig/linux-user/main.c 2009-10-23 02:19:57.000000000 +0200 -+++ qemu-0.11.0/linux-user/main.c 2009-10-23 02:47:09.000000000 +0200 -@@ -1469,6 +1469,8 @@ - - #ifdef TARGET_MIPS - -+#define TARGET_QEMU_ESIGRETURN 255 -+ - #define MIPS_SYS(name, args) args, - - static const uint8_t mips_syscall_args[] = { diff --git a/app-emulation/qemu/files/qemu-0.11.1-CVE-2012-0029-backport.patch b/app-emulation/qemu/files/qemu-0.11.1-CVE-2012-0029-backport.patch deleted file mode 100644 index d8935e3..0000000 --- a/app-emulation/qemu/files/qemu-0.11.1-CVE-2012-0029-backport.patch +++ /dev/null @@ -1,35 +0,0 @@ -Backported upstream patch: -> From d0ed2d2e8e863a9a64c9fc9c08fa68bee546ad00 Mon Sep 17 00:00:00 2001 -> From: Anthony Liguori -> Date: Mon, 23 Jan 2012 07:30:43 -0600 -> Subject: [PATCH 26/26] e1000: bounds packet size against buffer size -> -> Otherwise we can write beyond the buffer and corrupt memory. This is tracked -> as CVE-2012-0029. -> -> Signed-off-by: Anthony Liguori ---- - hw/e1000.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/hw/e1000.c b/hw/e1000.c -index b0542d7..54ade40 100644 ---- a/hw/e1000.c -+++ b/hw/e1000.c -@@ -447,6 +447,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) - bytes = split_size; - if (tp->size + bytes > msh) - bytes = msh - tp->size; -+ -+ bytes = MIN(sizeof(tp->data) - tp->size, bytes); - cpu_physical_memory_read(addr, tp->data + tp->size, bytes); - if ((sz = tp->size + bytes) >= hdr && tp->size < hdr) - memmove(tp->header, tp->data, hdr); -@@ -462,6 +464,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) - // context descriptor TSE is not set, while data descriptor TSE is set - DBGOUT(TXERR, "TCP segmentaion Error\n"); - } else { -+ split_size = MIN(sizeof(tp->data) - tp->size, split_size); - cpu_physical_memory_read(addr, tp->data + tp->size, split_size); - tp->size += split_size; - } diff --git a/app-emulation/qemu/files/qemu-1.0-static-1.patch b/app-emulation/qemu/files/qemu-1.0-static-1.patch deleted file mode 100644 index f19b407..0000000 --- a/app-emulation/qemu/files/qemu-1.0-static-1.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 17884d7b6462b0fe497f08fec6091ffbe04caa8d Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Tue, 31 Jan 2012 22:03:45 +0300 -Subject: [PATCH] ./configure: request pkg-config to provide private libs when static linking - -Added wrapper around pkg-config to allow: -- safe options injection via ${QEMU_PKG_CONFIG_FLAGS} -- spaces in path to pkg-config - -Signed-off-by: Sergei Trofimovich -CC: Peter Maydell -Signed-off-by: Anthony Liguori ---- - configure | 11 ++++++++--- - 1 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/configure b/configure -index f69e08f..8fd5404 100755 ---- a/configure -+++ b/configure -@@ -234,7 +234,11 @@ ld="${LD-${cross_prefix}ld}" - libtool="${LIBTOOL-${cross_prefix}libtool}" - strip="${STRIP-${cross_prefix}strip}" - windres="${WINDRES-${cross_prefix}windres}" --pkg_config="${PKG_CONFIG-${cross_prefix}pkg-config}" -+pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}" -+query_pkg_config() { -+ "${pkg_config_exe}" ${QEMU_PKG_CONFIG_FLAGS} "$@" -+} -+pkg_config=query_pkg_config - sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}" - - # default flags for all hosts -@@ -553,6 +557,7 @@ for opt do - --static) - static="yes" - LDFLAGS="-static $LDFLAGS" -+ QEMU_PKG_CONFIG_FLAGS="--static $QEMU_PKG_CONFIG_FLAGS" - ;; - --mandir=*) mandir="$optarg" - ;; -@@ -1449,8 +1454,8 @@ fi - ########################################## - # pkg-config probe - --if ! has $pkg_config; then -- echo "Error: pkg-config binary '$pkg_config' not found" -+if ! has "$pkg_config_exe"; then -+ echo "Error: pkg-config binary '$pkg_config_exe' not found" - exit 1 - fi - --- -1.7.0.4 - diff --git a/app-emulation/qemu/files/qemu-1.0-static-2.patch b/app-emulation/qemu/files/qemu-1.0-static-2.patch deleted file mode 100644 index bac2918..0000000 --- a/app-emulation/qemu/files/qemu-1.0-static-2.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 5f01e06f1fc7904a03e02b68c829aa25c2085baa Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Tue, 31 Jan 2012 22:03:58 +0300 -Subject: [PATCH] ./configure: add link check for nss-smartcard - -Current './configure --static && make' fails for me: - - LINK qemu-nbd - /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lssl3 - /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lsmime3 - /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lnssutil3 - /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lnss3 - /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lplds4 - /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lplc4 - /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lnspr4 - -My system does not provide static libraries for nss, so -fix autoconfiguration by link checking. - -Signed-off-by: Sergei Trofimovich -CC: qemu-trivial -Signed-off-by: Anthony Liguori ---- - configure | 13 +++++++++---- - 1 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index 8fd5404..3b0b300 100755 ---- a/configure -+++ b/configure -@@ -2528,11 +2528,16 @@ if test "$smartcard" != "no" ; then - smartcard_cflags="" - # TODO - what's the minimal nss version we support? - if test "$smartcard_nss" != "no"; then -- if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 ; then -+ cat > $TMPC << EOF -+#include -+int main(void) { PK11_FreeSlot(0); return 0; } -+EOF -+ smartcard_cflags="-I\$(SRC_PATH)/libcacard" -+ libcacard_libs=$($pkg_config --libs nss 2>/dev/null) -+ libcacard_cflags=$($pkg_config --cflags nss 2>/dev/null) -+ if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \ -+ compile_prog "$smartcard_cflags $libcacard_cflags" "$libcacard_libs"; then - smartcard_nss="yes" -- smartcard_cflags="-I\$(SRC_PATH)/libcacard" -- libcacard_libs=$($pkg_config --libs nss 2>/dev/null) -- libcacard_cflags=$($pkg_config --cflags nss 2>/dev/null) - QEMU_CFLAGS="$QEMU_CFLAGS $smartcard_cflags $libcacard_cflags" - LIBS="$libcacard_libs $LIBS" - else --- -1.7.0.4 - diff --git a/app-emulation/qemu/files/qemu-ifdown b/app-emulation/qemu/files/qemu-ifdown deleted file mode 100644 index c173e43..0000000 --- a/app-emulation/qemu/files/qemu-ifdown +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -if [ -x /sbin/brctl ]; then - BRCTL="/sbin/brctl" -elif [ -x /usr/sbin/brctl ]; then - BRCTL="/usr/sbin/brctl" -else - echo "no bridge utils installed" - exit 1 -fi - -if [ -x /sbin/ip ]; then - switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') ) - ${BRCTL} delif ${switch} $1 - /sbin/ip link set $1 down -else - switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') ) - ${BRCTL} delif ${switch} $1 - /sbin/ifconfig $1 down -fi diff --git a/app-emulation/qemu/files/qemu-ifup b/app-emulation/qemu/files/qemu-ifup deleted file mode 100644 index 4a30e7d..0000000 --- a/app-emulation/qemu/files/qemu-ifup +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -if [ -x /sbin/brctl ]; then - BRCTL="/sbin/brctl" -elif [ -x /usr/sbin/brctl ]; then - BRCTL="/usr/sbin/brctl" -else - echo "no bridge utils installed" - exit 1 -fi - -if [ -x /sbin/ip ]; then - switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') ) - /sbin/ip link set $1 up -else - switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') ) - /sbin/ifconfig $1 0.0.0.0 up -fi - -[[ ${switch#} -ne "1" ]] && logger -t qemu "$0 found more than one bridge connecting $1 to ${switch}" -${BRCTL} addif ${switch} $1 - diff --git a/app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch b/app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch deleted file mode 100644 index bd2bdc7..0000000 --- a/app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d0ed2d2e8e863a9a64c9fc9c08fa68bee546ad00 Mon Sep 17 00:00:00 2001 -From: Anthony Liguori -Date: Mon, 23 Jan 2012 07:30:43 -0600 -Subject: [PATCH 26/26] e1000: bounds packet size against buffer size - -Otherwise we can write beyond the buffer and corrupt memory. This is tracked -as CVE-2012-0029. - -Signed-off-by: Anthony Liguori ---- - hw/e1000.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/hw/e1000.c b/hw/e1000.c -index 986ed9c..e164d79 100644 ---- a/hw/e1000.c -+++ b/hw/e1000.c -@@ -466,6 +466,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) - bytes = split_size; - if (tp->size + bytes > msh) - bytes = msh - tp->size; -+ -+ bytes = MIN(sizeof(tp->data) - tp->size, bytes); - pci_dma_read(&s->dev, addr, tp->data + tp->size, bytes); - if ((sz = tp->size + bytes) >= hdr && tp->size < hdr) - memmove(tp->header, tp->data, hdr); -@@ -481,6 +483,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) - // context descriptor TSE is not set, while data descriptor TSE is set - DBGOUT(TXERR, "TCP segmentaion Error\n"); - } else { -+ split_size = MIN(sizeof(tp->data) - tp->size, split_size); - pci_dma_read(&s->dev, addr, tp->data + tp->size, split_size); - tp->size += split_size; - } --- -1.7.7.6 - diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml deleted file mode 100644 index d01eb3f..0000000 --- a/app-emulation/qemu/metadata.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - qemu - - lu_zero@gentoo.org - - - slyfox@gentoo.org - Sergei Trofimovich - - - Enables support for Linux's Async IO - Adds support for braille displays using brltty - Adds support for read-only block device emulation based on files - located on http and ftp servers - Enable esound output for sound emulation - Enables firmware device tree support - Enable TLS support for the VNC console server - Enables the kernel acceleration module on a x86/x86-64 cpu - Use the KVM (Kernel Virtual Machine) infrastructure on compatible hardware - Enable the ncurses-based console - Build support for Smartcard devices emulation using dev-libs/nss - Enable opengl/x11 output for lm32 target. - Enable pulseaudio output for sound emulation - Provides the qemu-ifup script for use with - QEMU's built in bridging - Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD - Enable the SDL-based console - Enable static build, useful to chroot in user-mode - emulation - Enable Spice protocol support via app-emulation/spice - Enable TLS support for the VNC console server - Use sys-apps/usbredir to redirect USB - devices to another machine over TCP - Enable Virtual Distributed Ethernet (VDE) based networking - Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet - - Add support for getting and setting POSIX extended attributes, through - sys-apps/attr. Requisite for the virtfs backend. - - Support specific optimizations when files are stored on XFS filesystem. - Enables support for Xen backends - - diff --git a/app-emulation/qemu/qemu-1.0-r4.ebuild b/app-emulation/qemu/qemu-1.0-r4.ebuild deleted file mode 100644 index b5b76a3..0000000 --- a/app-emulation/qemu/qemu-1.0-r4.ebuild +++ /dev/null @@ -1,279 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.0-r3.ebuild,v 1.1 2012/02/21 08:04:00 lu_zero Exp $ - -EAPI=4 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.qemu.org/qemu.git - http://git.qemu.org/git/qemu.git" - GIT_ECLASS="git-2" -fi - -inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs - -if [[ ${PV} != *9999* ]]; then - SRC_URI="http://wiki.qemu.org/download/${P}.tar.gz - http://dev.gentoo.org/~lu_zero/distfiles/${P}-patches.tar.xz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="QEMU emulator and ABI wrapper" -HOMEPAGE="http://www.qemu.org" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss -opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde -+vhost-net xattr xen" - -COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb" -IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32" - -for target in ${IUSE_SOFTMMU_TARGETS}; do - IUSE="${IUSE} +qemu_softmmu_targets_${target}" -done - -for target in ${IUSE_USER_TARGETS}; do - IUSE="${IUSE} +qemu_user_targets_${target}" - RDEPEND="${RDEPEND} - !app-emulation/qemu-user[qemu_user_targets_${target}?]" -done - -RESTRICT="test" - -RDEPEND="${RDEPEND} - !app-emulation/qemu-kvm - >=dev-libs/glib-2.0 - sys-apps/pciutils - >=sys-apps/util-linux-2.16.0 - sys-libs/zlib - aio? ( - static? ( dev-libs/libaio[static-libs] ) - !static? ( dev-libs/libaio ) - ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bluetooth? ( net-wireless/bluez ) - brltty? ( app-accessibility/brltty ) - curl? ( - static? ( net-misc/curl[static-libs] ) - !static? ( net-misc/curl ) - ) - esd? ( media-sound/esound ) - fdt? ( >=sys-apps/dtc-1.2.0 ) - jpeg? ( virtual/jpeg ) - ncurses? ( - static? ( sys-libs/ncurses[static-libs] ) - !static? ( sys-libs/ncurses ) - ) - nss? ( dev-libs/nss ) - opengl? ( - virtual/opengl - x11-libs/libX11 - ) - png? ( media-libs/libpng ) - pulseaudio? ( media-sound/pulseaudio ) - qemu-ifup? ( - sys-apps/iproute2 - net-misc/bridge-utils - ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl ) - sdl? ( - static? ( >=media-libs/libsdl-1.2.11[X,static-libs] ) - !static? ( >=media-libs/libsdl-1.2.11[X] ) - ) - spice? ( - >=app-emulation/spice-0.9.0 - >=app-emulation/spice-protocol-0.8.1 - ) - ssl? ( - static? ( net-libs/gnutls[static-libs(+)] ) - !static? ( net-libs/gnutls ) - ) - static? ( - >=sys-apps/util-linux-2.16.0[static-libs] - sys-libs/zlib[static-libs] - ) - usbredir? ( sys-apps/usbredir ) - vde? ( net-misc/vde ) - xattr? ( sys-apps/attr ) - xen? ( app-emulation/xen-tools ) -" - -DEPEND="${RDEPEND} - app-text/texi2html - dev-util/pkgconfig - >=sys-kernel/linux-headers-2.6.35 -" - -# alpha ELF binary. don't let portage mess with it -STRIP_MASK="usr/share/qemu/palcode-clipper" - -QA_PRESTRIPPED=" - usr/share/qemu/openbios-ppc - usr/share/qemu/openbios-sparc64 - usr/share/qemu/openbios-sparc32 - usr/share/qemu/palcode-clipper -" -# keep sorted -QA_WX_LOAD="${QA_PRESTRIPPED} - usr/bin/qemu-alpha - usr/bin/qemu-arm - usr/bin/qemu-armeb - usr/bin/qemu-cris - usr/bin/qemu-i386 - usr/bin/qemu-m68k - usr/bin/qemu-microblaze - usr/bin/qemu-microblazeel - usr/bin/qemu-mips - usr/bin/qemu-mipsel - usr/bin/qemu-ppc - usr/bin/qemu-ppc64 - usr/bin/qemu-ppc64abi32 - usr/bin/qemu-sh4 - usr/bin/qemu-sh4eb - usr/bin/qemu-sparc - usr/bin/qemu-sparc32plus - usr/bin/qemu-sparc64 - usr/bin/qemu-s390x - usr/bin/qemu-unicore32 - usr/bin/qemu-x86_64 -" - -pkg_setup() { - use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64" -} - -src_prepare() { - # fixing static support - epatch "${FILESDIR}"/${P}-static-*.patch - - # bug #400595 / CVE-2012-0029 - epatch "${FILESDIR}"/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch - - EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" epatch - - # prevent docs to get automatically installed - sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target || die - # append CFLAGS while linking - sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die - - # Fix underlinking. - # Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS= - sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die -} - -src_configure() { - local conf_opts audio_opts user_targets - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - use "qemu_softmmu_targets_${target}" && \ - softmmu_targets="${softmmu_targets} ${target}-softmmu" - done - - for target in ${IUSE_USER_TARGETS} ; do - use "qemu_user_targets_${target}" && \ - user_targets="${user_targets} ${target}-linux-user" - done - - if [[ -z ${softmmu_targets} ]]; then - conf_opts="${conf_opts} --disable-system" - else - einfo "Building the following softmmu targets: ${softmmu_targets}" - fi - - if [[ -n ${user_targets} ]]; then - einfo "Building the following user targets: ${user_targets}" - conf_opts="${conf_opts} --enable-linux-user" - else - conf_opts="${conf_opts} --disable-linux-user" - fi - - # Fix QA issues. QEMU needs executable heaps and we need to mark it as such - conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap" - - # Add support for static builds - use static && conf_opts="${conf_opts} --static" - - #config options - conf_opts="${conf_opts} - $(use_enable aio linux-aio) - $(use_enable bluetooth bluez) - $(use_enable brltty brlapi) - $(use_enable curl) - $(use_enable fdt) - $(use_enable hardened pie) - $(use_enable jpeg vnc-jpeg) - $(use_enable ncurses curses) - $(use_enable nss smartcard-nss) - $(use_enable opengl) - $(use_enable png vnc-png) - $(use_enable rbd) - $(use_enable sasl vnc-sasl) - $(use_enable sdl) - $(use_enable spice) - $(use_enable ssl vnc-tls) - $(use_enable threads vnc-thread) - $(use_enable vde) - $(use_enable vhost-net) - $(use_enable xen) - $(use_enable xattr attr) - --disable-darwin-user --disable-bsd-user - " - - # audio options - audio_opts="oss" - use alsa && audio_opts="alsa ${audio_opts}" - use esd && audio_opts="esd ${audio_opts}" - use pulseaudio && audio_opts="pa ${audio_opts}" - use sdl && audio_opts="sdl ${audio_opts}" - - set -- --prefix="${EPREFIX}"/usr \ - --sysconfdir="${EPREFIX}"/etc \ - --disable-strip \ - --disable-werror \ - --disable-kvm \ - --disable-libiscsi \ - --enable-nptl \ - --enable-uuid \ - ${conf_opts} \ - --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \ - --audio-drv-list="${audio_opts}" \ - --target-list="${softmmu_targets} ${user_targets}" \ - --cc="$(tc-getCC)" \ - --host-cc="$(tc-getBUILD_CC)" - - echo ./configure "$@" # show actual options - ./configure "$@" || die "configure failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - if [[ -n ${softmmu_targets} ]]; then - if use qemu-ifup; then - exeinto /etc/qemu - doexe "${FILESDIR}"/qemu-if{up,down} - fi - fi - - dodoc Changelog MAINTAINERS TODO pci-ids.txt || die - newdoc pc-bios/README README.pc-bios || die - dohtml qemu-doc.html qemu-tech.html || die -} - -pkg_postinst() { - use qemu-ifup || return - elog "You will need the Universal TUN/TAP driver compiled into your" - elog "kernel or loaded as a module to use the virtual network device" - elog "if using -net tap. You will also need support for 802.1d" - elog "Ethernet Bridging and a configured bridge if using the provided" - elog "qemu-ifup script from /etc/qemu." - echo -}