From 198c7e39ba6b920adc9c4541a2ec5d13b4d3c986 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 13 Oct 2011 20:42:44 +0200
Subject: update to latest upstream version
---
package/libvirt/Makefile | 8 ++---
package/libvirt/patches/patch-configure | 38 ----------------------
package/libvirt/patches/patch-libvirt_pc | 9 -----
.../patches/patch-src_storage_storage_backend_c | 11 -------
4 files changed, 4 insertions(+), 62 deletions(-)
delete mode 100644 package/libvirt/patches/patch-configure
delete mode 100644 package/libvirt/patches/patch-libvirt_pc
delete mode 100644 package/libvirt/patches/patch-src_storage_storage_backend_c
(limited to 'package/libvirt')
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index 138f4c13b..8e4329bb8 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -4,13 +4,13 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libvirt
-PKG_VERSION:= 0.8.7
+PKG_VERSION:= 0.9.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= 596bafb53bb6c079a0703f1726cb2305
+PKG_MD5SUM:= b74df374b524d00a22a6c89cfc23099f
PKG_DESCR:= virtualization API
PKG_SECTION:= libs
-PKG_DEPENDS:= libxml2 libgnutls python2 libpcap
PKG_BUILDDEP:= libxml2 gnutls python2 libpcap parted udev
+PKG_DEPENDS:= libxml2 libgnutls python2 libpcap
PKG_URL:= http://www.libvirt.org/
PKG_SITES:= ftp://libvirt.org/libvirt/
@@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBVIRT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-TARGET_CFLAGS+= -std=c99
+CONFIGURE_ENV+= gl_cv_warn__fstack_protector_all=no
CONFIGURE_ARGS+= --without-xen \
--without-uml \
--without-esx \
diff --git a/package/libvirt/patches/patch-configure b/package/libvirt/patches/patch-configure
deleted file mode 100644
index 87eb324fc..000000000
--- a/package/libvirt/patches/patch-configure
+++ /dev/null
@@ -1,38 +0,0 @@
---- libvirt-0.8.7.orig/configure 2011-01-04 03:22:44.000000000 +0100
-+++ libvirt-0.8.7/configure 2011-01-12 18:43:03.000000000 +0100
-@@ -36745,7 +36745,7 @@ $as_echo "$as_me: Found python in enviro
-
- # Find any Python interpreter.
- if test -z "$PYTHON"; then
-- for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
-+ for ac_prog in python python2 python3 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -36920,25 +36920,7 @@ $as_echo "$am_cv_python_pyexecdir" >&6;
- if test -x "$PYTHON_CONFIG"
- then
- PYTHON_INCLUDES=`$PYTHON_CONFIG --includes`
-- else
-- if test -r $PYTHON_EXEC_PREFIX/include/python$PYTHON_VERSION/Python.h
-- then
-- PYTHON_INCLUDES=-I$PYTHON_EXEC_PREFIX/include/python$PYTHON_VERSION
-- else
-- if test -r $prefix/include/python$PYTHON_VERSION/Python.h
-- then
-- PYTHON_INCLUDES=-I$prefix/include/python$PYTHON_VERSION
-- else
-- if test -r /usr/include/python$PYTHON_VERSION/Python.h
-- then
-- PYTHON_INCLUDES=-I/usr/include/python$PYTHON_VERSION
-- else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find python$PYTHON_VERSION/Python.h, disabling bindings" >&5
--$as_echo "$as_me: Could not find python$PYTHON_VERSION/Python.h, disabling bindings" >&6;}
-- with_python=no
-- fi
-- fi
-- fi
-+ echo "DEBUG: $PYTHON_CONFIG"
- fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find python interpreter, disabling bindings" >&5
diff --git a/package/libvirt/patches/patch-libvirt_pc b/package/libvirt/patches/patch-libvirt_pc
deleted file mode 100644
index a46fcce14..000000000
--- a/package/libvirt/patches/patch-libvirt_pc
+++ /dev/null
@@ -1,9 +0,0 @@
---- libvirt-0.8.7.orig/libvirt.pc 2011-01-04 03:23:23.000000000 +0100
-+++ libvirt-0.8.7/libvirt.pc 2011-01-12 18:31:53.000000000 +0100
-@@ -7,5 +7,5 @@ Name: libvirt
- Version: 0.8.7
- Description: libvirt library
- Requires:
--Libs: -L${libdir} -lvirt -ldl
-+Libs: -L${libdir} -lvirt -lintl
- Cflags: -I${includedir}
diff --git a/package/libvirt/patches/patch-src_storage_storage_backend_c b/package/libvirt/patches/patch-src_storage_storage_backend_c
deleted file mode 100644
index 7a1713e7b..000000000
--- a/package/libvirt/patches/patch-src_storage_storage_backend_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libvirt-0.8.7.orig/src/storage/storage_backend.c 2010-12-22 09:54:05.000000000 +0100
-+++ libvirt-0.8.7/src/storage/storage_backend.c 2011-01-12 18:30:49.000000000 +0100
-@@ -131,7 +131,7 @@ virStorageBackendCopyToFD(virStorageVolD
- goto cleanup;
- }
-
-- bzero(&zerobuf, sizeof(zerobuf));
-+ memset(&zerobuf, 0, sizeof(zerobuf));
-
- if (VIR_ALLOC_N(buf, bytes) < 0) {
- ret = -errno;
--
cgit v1.2.3