aboutsummaryrefslogtreecommitdiffstats
path: root/main/libvirt
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2012-11-05 07:24:38 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2012-11-05 07:24:59 +0000
commite5062519c7d5bb13f50592b08bb332aa3f345c8c (patch)
treeb60358d6503f8ef32971ac977acb1fbc7ec12a4e /main/libvirt
parentdefd141cdf47626784ffb405fc9531ad56d257e9 (diff)
downloadaports-e5062519c7d5bb13f50592b08bb332aa3f345c8c.tar.bz2
aports-e5062519c7d5bb13f50592b08bb332aa3f345c8c.tar.xz
main/libvirt: remove uclibc patch from upstream
Diffstat (limited to 'main/libvirt')
-rw-r--r--main/libvirt/APKBUILD6
-rw-r--r--main/libvirt/libvirt-1.0.0-remove-uclibc-mkostemp-redefine.patch (renamed from main/libvirt/libvirt-1.0.0-uclibc-mkostemp.patch)12
2 files changed, 10 insertions, 8 deletions
diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD
index d4778aaf9d..623141fd1e 100644
--- a/main/libvirt/APKBUILD
+++ b/main/libvirt/APKBUILD
@@ -4,7 +4,7 @@ vmajor="1.0.0"
vminor=""
pkgver="${vmajor}"
_ver="${pkgver/_rc/-rc}"
-pkgrel=0
+pkgrel=1
pkgdesc="A virtualization API for several hypervisor and container systems"
url="http://libvirt.org/"
arch="all"
@@ -22,6 +22,7 @@ source="http://libvirt.org/sources/$pkgname-$pkgver.tar.gz
libvirt.confd
libvirt.initd
uclibc-physmem.patch
+ libvirt-1.0.0-remove-uclibc-mkostemp-redefine.patch
"
_builddir="$srcdir"/$pkgname-$vmajor
@@ -127,4 +128,5 @@ uml() {
md5sums="7c8b006de7338e30866bb56738803b21 libvirt-1.0.0.tar.gz
1c84a7baeafe0a7f4e9d7ae5180311b7 libvirt.confd
d897df38c7e7fa1a297aa551108633c9 libvirt.initd
-df9cbfaf8a6e520a4822914a300add4d uclibc-physmem.patch"
+df9cbfaf8a6e520a4822914a300add4d uclibc-physmem.patch
+e992133db641b20cb43dda704518984d libvirt-1.0.0-remove-uclibc-mkostemp-redefine.patch"
diff --git a/main/libvirt/libvirt-1.0.0-uclibc-mkostemp.patch b/main/libvirt/libvirt-1.0.0-remove-uclibc-mkostemp-redefine.patch
index 98fc07b6cf..f7e5a5e143 100644
--- a/main/libvirt/libvirt-1.0.0-uclibc-mkostemp.patch
+++ b/main/libvirt/libvirt-1.0.0-remove-uclibc-mkostemp-redefine.patch
@@ -1,14 +1,14 @@
--- a/src/util/logging.c
+++ b/src/util/logging.c
-@@ -58,6 +58,11 @@
+@@ -58,11 +58,6 @@
#define VIR_FROM_THIS VIR_FROM_NONE
-+#ifdef __UCLIBC__
-+/* uclibc does not implement mkostemp GNU extention */
-+#define mkostemp(x,y) mkstemp(x)
-+#endif
-+
+-#ifdef __UCLIBC__
+-/* uclibc does not implement mkostemp GNU extention */
+-#define mkostemp(x,y) mkstemp(x)
+-#endif
+-
VIR_ENUM_DECL(virLogSource)
VIR_ENUM_IMPL(virLogSource, VIR_LOG_FROM_LAST,
"file",