Attachment 579038 Details for Bug 814761 – update spec + patch

[patch] update spec + patch

0001-Update-to-0.9.11-release.patch (text/plain), 14.68 KB, created by Marc-Andre Lureau on 2012-04-20 15:22:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc-Andre Lureau

Created: 2012-04-20 15:22:36 UTC

Size: 14.68 KB

patch

obsolete

>From bde5a2d56d05d9f239f82b0795114757a80d2584 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
>Date: Fri, 20 Apr 2012 17:18:22 +0200
>Subject: [PATCH] - Update to 0.9.11 release - Add w64 and static build
>
>---
> ...not-build-shunloadtest-if-pthread-missing.patch |   65 +++++++++
> 0002-build-fix-output-of-pid-values.patch          |   74 ++++++++++
> 0003-build-update-pid_t-type-static-check.patch    |   28 ++++
> mingw-libvirt.spec                                 |  152 +++++++++++++++++---
> 4 files changed, 296 insertions(+), 23 deletions(-)
> create mode 100644 0001-build-do-not-build-shunloadtest-if-pthread-missing.patch
> create mode 100644 0002-build-fix-output-of-pid-values.patch
> create mode 100644 0003-build-update-pid_t-type-static-check.patch
>
>diff --git a/0001-build-do-not-build-shunloadtest-if-pthread-missing.patch b/0001-build-do-not-build-shunloadtest-if-pthread-missing.patch
>new file mode 100644
>index 0000000..75fe363
>--- /dev/null
>+++ b/0001-build-do-not-build-shunloadtest-if-pthread-missing.patch
>@@ -0,0 +1,65 @@
>+From 9e5ff508b88c6d253b6e667a32106c8e0470ad4e Mon Sep 17 00:00:00 2001
>+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
>+Date: Fri, 20 Apr 2012 14:34:33 +0200
>+Subject: [PATCH libvirt 1/3] build: do not build shunloadtest if pthread
>+ missing
>+
>+Fixes build on Windows systems
>+---
>+ configure.ac      |    2 ++
>+ tests/Makefile.am |    8 +++++++-
>+ 2 files changed, 9 insertions(+), 1 deletion(-)
>+
>+diff --git a/configure.ac b/configure.ac
>+index 89fe818..417bd70 100644
>+--- a/configure.ac
>++++ b/configure.ac
>+@@ -154,6 +154,8 @@ AC_CHECK_FUNC([clock_gettime],[
>+ LIBS=$old_libs
>+ AC_SUBST(RT_LIBS)
>+ 
>++AM_CONDITIONAL([HAVE_PTHREAD], [test x"$have_pthread_h" = x"1"])
>++
>+ dnl Availability of various common headers (non-fatal if missing).
>+ AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/un.h \
>+   sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \
>+diff --git a/tests/Makefile.am b/tests/Makefile.am
>+index c4d550f..3d9235c 100644
>+--- a/tests/Makefile.am
>++++ b/tests/Makefile.am
>+@@ -98,7 +98,7 @@ test_programs = virshtest sockettest \
>+ 	nodeinfotest virbuftest \
>+ 	commandtest seclabeltest \
>+ 	virhashtest virnetmessagetest virnetsockettest \
>+-	utiltest virnettlscontexttest shunloadtest \
>++	utiltest virnettlscontexttest \
>+ 	virtimetest viruritest virkeyfiletest \
>+ 	virauthconfigtest
>+ 
>+@@ -106,6 +106,10 @@ test_programs = virshtest sockettest \
>+ ssh_SOURCES = ssh.c
>+ ssh_LDADD = $(COVERAGE_LDFLAGS)
>+ 
>++if HAVE_PTHREAD
>++test_programs += shunloadtest
>++endif
>++
>+ if WITH_XEN
>+ test_programs += xml2sexprtest sexpr2xmltest \
>+ 	xmconfigtest xencapstest statstest reconnect
>+@@ -527,10 +531,12 @@ libshunload_la_SOURCES = shunloadhelper.c
>+ libshunload_la_LIBADD = ../src/libvirt.la
>+ libshunload_la_LDFLAGS = -module -avoid-version -rpath /evil/libtool/hack/to/force/shared/lib/creation
>+ 
>++if HAVE_PTHREAD
>+ shunloadtest_SOURCES = \
>+ 	shunloadtest.c
>+ shunloadtest_LDADD = -lpthread
>+ shunloadtest_DEPENDENCIES = libshunload.la
>++endif
>+ 
>+ if WITH_CIL
>+ CILOPTFLAGS =
>+-- 
>+1.7.10
>+
>diff --git a/0002-build-fix-output-of-pid-values.patch b/0002-build-fix-output-of-pid-values.patch
>new file mode 100644
>index 0000000..efb8d73
>--- /dev/null
>+++ b/0002-build-fix-output-of-pid-values.patch
>@@ -0,0 +1,74 @@
>+From f7584204f13c376cb1b45038252fd80b89a60780 Mon Sep 17 00:00:00 2001
>+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
>+Date: Fri, 20 Apr 2012 14:36:53 +0200
>+Subject: [PATCH libvirt 2/3] build: fix output of pid values
>+
>+Fix a few more places where pid_t is printed with wrong type
>+---
>+ src/conf/domain_audit.c |    4 ++--
>+ src/conf/domain_conf.c  |    4 ++--
>+ src/util/command.c      |    2 +-
>+ src/util/virpidfile.c   |    2 +-
>+ 4 files changed, 6 insertions(+), 6 deletions(-)
>+
>+diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
>+index b885906..653657b 100644
>+--- a/src/conf/domain_audit.c
>++++ b/src/conf/domain_audit.c
>+@@ -562,8 +562,8 @@ virDomainAuditLifecycle(virDomainObjPtr vm, const char *op,
>+     }
>+ 
>+     VIR_AUDIT(VIR_AUDIT_RECORD_MACHINE_CONTROL, success,
>+-              "virt=%s op=%s reason=%s %s uuid=%s vm-pid=%d",
>+-              virt, op, reason, vmname, uuidstr, vm->pid);
>++              "virt=%s op=%s reason=%s %s uuid=%s vm-pid=%lld",
>++              virt, op, reason, vmname, uuidstr, (long long)vm->pid);
>+ 
>+     VIR_FREE(vmname);
>+ }
>+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
>+index ac877f9..15a097a 100644
>+--- a/src/conf/domain_conf.c
>++++ b/src/conf/domain_conf.c
>+@@ -12787,10 +12787,10 @@ static char *virDomainObjFormat(virCapsPtr caps,
>+     int i;
>+ 
>+     state = virDomainObjGetState(obj, &reason);
>+-    virBufferAsprintf(&buf, "<domstatus state='%s' reason='%s' pid='%d'>\n",
>++    virBufferAsprintf(&buf, "<domstatus state='%s' reason='%s' pid='%lld'>\n",
>+                       virDomainStateTypeToString(state),
>+                       virDomainStateReasonToString(state, reason),
>+-                      obj->pid);
>++                      (long long)obj->pid);
>+ 
>+     for (i = 0 ; i < VIR_DOMAIN_TAINT_LAST ; i++) {
>+         if (obj->taint & (1 << i))
>+diff --git a/src/util/command.c b/src/util/command.c
>+index 2837450..800ec8f 100644
>+--- a/src/util/command.c
>++++ b/src/util/command.c
>+@@ -2399,7 +2399,7 @@ void
>+ virPidAbort(pid_t pid)
>+ {
>+     /* Not yet ported to mingw.  Any volunteers?  */
>+-    VIR_DEBUG("failed to reap child %d, abandoning it", pid);
>++    VIR_DEBUG("failed to reap child %lldd, abandoning it", (long long)pid);
>+ }
>+ 
>+ void
>+diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
>+index 1934341..59d0c94 100644
>+--- a/src/util/virpidfile.c
>++++ b/src/util/virpidfile.c
>+@@ -222,7 +222,7 @@ int virPidFileReadPathIfAlive(const char *path,
>+ #endif
>+ 
>+     if (binpath) {
>+-        if (virAsprintf(&procpath, "/proc/%d/exe", *pid) < 0) {
>++        if (virAsprintf(&procpath, "/proc/%lld/exe", (long long)*pid) < 0) {
>+             *pid = -1;
>+             return -1;
>+         }
>+-- 
>+1.7.10
>+
>diff --git a/0003-build-update-pid_t-type-static-check.patch b/0003-build-update-pid_t-type-static-check.patch
>new file mode 100644
>index 0000000..4a6034e
>--- /dev/null
>+++ b/0003-build-update-pid_t-type-static-check.patch
>@@ -0,0 +1,28 @@
>+From 100458e233db5c132a85c8ba5732d55b6c6cf3b3 Mon Sep 17 00:00:00 2001
>+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
>+Date: Fri, 20 Apr 2012 14:45:01 +0200
>+Subject: [PATCH libvirt 3/3] build: update pid_t type static check
>+
>+The code uses long long for pid_t now.
>+It fails on mingw64 without this change.
>+---
>+ src/util/virpidfile.c |    3 +--
>+ 1 file changed, 1 insertion(+), 2 deletions(-)
>+
>+diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
>+index 59d0c94..27811e1 100644
>+--- a/src/util/virpidfile.c
>++++ b/src/util/virpidfile.c
>+@@ -316,8 +316,7 @@ cleanup:
>+     return rc;
>+ }
>+ 
>+-
>+-verify(sizeof(pid_t) <= sizeof(unsigned int));
>++verify(sizeof(pid_t) <= sizeof(long long));
>+ 
>+ int virPidFileAcquirePath(const char *path,
>+                           pid_t pid)
>+-- 
>+1.7.10
>+
>diff --git a/mingw-libvirt.spec b/mingw-libvirt.spec
>index 125eb86..c062208 100644
>--- a/mingw-libvirt.spec
>+++ b/mingw-libvirt.spec
>@@ -1,6 +1,4 @@
>-%define __strip %{mingw32_strip}
>-%define __objdump %{mingw32_objdump}
>-%define __debug_install_post %{mingw32_debug_install_post}
>+%{?mingw_package_header}
> 
> # Default to skipping autoreconf.  Distros can change just this one line
> # (or provide a command-line override) if they backport any patches that
>@@ -24,31 +22,43 @@
> %endif
> 
> Name:           mingw-libvirt
>-Version:        0.9.10
>-Release:        4%{?dist}%{?extra_release}
>+Version:        0.9.11
>+Release:        1%{?dist}%{?extra_release}
> Summary:        MinGW Windows libvirt virtualization library
> 
> License:        LGPLv2+
> Group:          Development/Libraries
> URL:            http://libvirt.org/
> Source0:        ftp://libvirt.org/libvirt/libvirt-%{version}.tar.gz
>-
>+Patch1:         0001-build-do-not-build-shunloadtest-if-pthread-missing.patch
>+Patch2:         0002-build-fix-output-of-pid-values.patch
>+Patch3:         0003-build-update-pid_t-type-static-check.patch
> # Mingw-w64 trunk (jan 27 2012) contains an inline implementation of the
> # vscanf and vfscanf functions in stdio.h. This break compilation of gnulib
> # which tries to provide its own implementation for the vscanf and vfscanf
> # functions. Workaround is by making sure that the inline implementation
> # isn't triggered by #include <stdio.h>
>-Patch0:         libvirt-gnulib-workaround-mingw-w64-vfscanf-failure.patch
>+Patch4:         libvirt-gnulib-workaround-mingw-w64-vfscanf-failure.patch
> 
>-BuildRequires:  mingw32-filesystem
>+BuildRequires:  mingw32-filesystem >= 95
>+BuildRequires:  mingw64-filesystem >= 95
> BuildRequires:  mingw32-gcc
>+BuildRequires:  mingw64-gcc
> BuildRequires:  mingw32-binutils
>+BuildRequires:  mingw64-binutils
> BuildRequires:  mingw32-libgpg-error
>+BuildRequires:  mingw64-libgpg-error
> BuildRequires:  mingw32-libgcrypt
>+BuildRequires:  mingw64-libgcrypt
> BuildRequires:  mingw32-gnutls
>+BuildRequires:  mingw64-gnutls
> BuildRequires:  mingw32-gettext
>+BuildRequires:  mingw64-gettext
> BuildRequires:  mingw32-libxml2
>+BuildRequires:  mingw64-libxml2
> BuildRequires:  mingw32-portablexdr
>+BuildRequires:  mingw64-portablexdr
>+
> BuildRequires:  pkgconfig
> # Need native version for msgfmt
> BuildRequires:  gettext
>@@ -61,30 +71,55 @@ BuildRequires: libtool
> 
> %if %{with_phyp}
> BuildRequires: mingw32-libssh2
>+BuildRequires: mingw64-libssh2
> %endif
> %if %{with_esx}
> BuildRequires: mingw32-curl
>+BuildRequires: mingw64-curl
> %endif
> 
> BuildArch:      noarch
> 
>-%{?mingw32_debug_package}
>-
> %description
> MinGW Windows libvirt virtualization library.
> 
>-
>+# Mingw32
> %package -n mingw32-libvirt
>-Summary:        MinGW Windows libvirt virtualization library
>+Summary: %{summary}
> 
> %description -n mingw32-libvirt
> MinGW Windows libvirt virtualization library.
> 
>+%package -n mingw32-libvirt-static
>+Summary: %{summary}
>+Requires: mingw32-libvirt = %{version}-%{release}
>+
>+%description -n mingw32-libvirt-static
>+MinGW Windows libvirt virtualization library, static version.
>+
>+# Mingw64
>+%package -n mingw64-libvirt
>+Summary: %{summary}
>+
>+%description -n mingw64-libvirt
>+MinGW Windows libvirt virtualization library.
>+
>+%package -n mingw64-libvirt-static
>+Summary: %{summary}
>+Requires: mingw64-libvirt = %{version}-%{release}
>+
>+%description -n mingw64-libvirt-static
>+MinGW Windows libvirt virtualization library, static version.
>+
>+%{?mingw_debug_package}
>+
> 
> %prep
> %setup -q -n libvirt-%{version}
>-%patch0 -p0
>-
>+%patch1 -p1
>+%patch2 -p1
>+%patch3 -p1
>+%patch4 -p0
> 
> %build
> %if ! %{with_phyp}
>@@ -106,8 +141,10 @@ MinGW Windows libvirt virtualization library.
> %if 0%{?enable_autotools}
> autoreconf -if
> %endif
>+
> # XXX enable SASL in future
>-%{mingw32_configure} \
>+%mingw_configure \
>+  --enable-static \
>   --without-xen \
>   --without-qemu \
>   --without-openvz \
>@@ -127,25 +164,29 @@ autoreconf -if
>   --without-netcf \
>   --without-audit \
>   --without-dtrace
>-make
>+
>+
>+%mingw_make %{?_smp_mflags}
> 
> 
> %install
>-make DESTDIR=$RPM_BUILD_ROOT install
>+%mingw_make_install "DESTDIR=$RPM_BUILD_ROOT"
>+
>+# Libtool files don't need to be bundled
>+find $RPM_BUILD_ROOT -name "*.la" -delete
> 
> rm -rf $RPM_BUILD_ROOT%{mingw32_sysconfdir}/libvirt/nwfilter
>+rm -rf $RPM_BUILD_ROOT%{mingw64_sysconfdir}/libvirt/nwfilter
> rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc/*
>+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/doc/*
> rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc/*
>+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc/*
> 
> rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt_iohelper.exe
>-
>-rm $RPM_BUILD_ROOT%{mingw32_libdir}/libvirt.a
>-rm $RPM_BUILD_ROOT%{mingw32_libdir}/libvirt-qemu.a
>-
>-# Drop all .la files
>-find $RPM_BUILD_ROOT -name "*.la" -delete
>+rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt_iohelper.exe
> 
> 
>+# Mingw32
> %files -n mingw32-libvirt
> %dir %{mingw32_sysconfdir}/libvirt/
> %config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt.conf
>@@ -177,6 +218,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
> %{mingw32_datadir}/libvirt/schemas/storageencryption.rng
> %{mingw32_datadir}/libvirt/schemas/storagepool.rng
> %{mingw32_datadir}/libvirt/schemas/storagevol.rng
>+%dir %{mingw32_datadir}/libvirt/api/
>+%{mingw32_datadir}/libvirt/api/libvirt-api.xml
>+%{mingw32_datadir}/libvirt/api/libvirt-qemu-api.xml
> 
> %{mingw32_datadir}/libvirt/cpu_map.xml
> 
>@@ -192,8 +236,70 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
> %{mingw32_mandir}/man1/virt-pki-validate.1*
> %{mingw32_mandir}/man1/virt-host-validate.1*
> 
>+%files -n mingw32-libvirt-static
>+%{mingw32_libdir}/libvirt.a
>+%{mingw32_libdir}/libvirt-qemu.a
>+
>+# Mingw64
>+%files -n mingw64-libvirt
>+%dir %{mingw64_sysconfdir}/libvirt/
>+%config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt.conf
>+
>+%{mingw64_bindir}/libvirt-0.dll
>+%{mingw64_bindir}/virsh.exe
>+%{mingw64_bindir}/virt-xml-validate
>+%{mingw64_bindir}/virt-pki-validate
>+%{mingw64_bindir}/virt-host-validate.exe
>+%{mingw64_bindir}/libvirt-qemu-0.dll
>+
>+%{mingw64_libdir}/libvirt.dll.a
>+%{mingw64_libdir}/pkgconfig/libvirt.pc
>+%{mingw64_libdir}/libvirt-qemu.dll.a
>+
>+%dir %{mingw64_datadir}/libvirt/
>+%dir %{mingw64_datadir}/libvirt/schemas/
>+%{mingw64_datadir}/libvirt/schemas/basictypes.rng
>+%{mingw64_datadir}/libvirt/schemas/capability.rng
>+%{mingw64_datadir}/libvirt/schemas/domain.rng
>+%{mingw64_datadir}/libvirt/schemas/domaincommon.rng
>+%{mingw64_datadir}/libvirt/schemas/domainsnapshot.rng
>+%{mingw64_datadir}/libvirt/schemas/interface.rng
>+%{mingw64_datadir}/libvirt/schemas/network.rng
>+%{mingw64_datadir}/libvirt/schemas/networkcommon.rng
>+%{mingw64_datadir}/libvirt/schemas/nodedev.rng
>+%{mingw64_datadir}/libvirt/schemas/nwfilter.rng
>+%{mingw64_datadir}/libvirt/schemas/secret.rng
>+%{mingw64_datadir}/libvirt/schemas/storageencryption.rng
>+%{mingw64_datadir}/libvirt/schemas/storagepool.rng
>+%{mingw64_datadir}/libvirt/schemas/storagevol.rng
>+%dir %{mingw64_datadir}/libvirt/api/
>+%{mingw64_datadir}/libvirt/api/libvirt-api.xml
>+%{mingw64_datadir}/libvirt/api/libvirt-qemu-api.xml
>+
>+%{mingw64_datadir}/libvirt/cpu_map.xml
>+
>+%{mingw64_datadir}/locale/*/LC_MESSAGES/libvirt.mo
>+
>+%dir %{mingw64_includedir}/libvirt
>+%{mingw64_includedir}/libvirt/libvirt.h
>+%{mingw64_includedir}/libvirt/virterror.h
>+%{mingw64_includedir}/libvirt/libvirt-qemu.h
>+
>+%{mingw64_mandir}/man1/virsh.1*
>+%{mingw64_mandir}/man1/virt-xml-validate.1*
>+%{mingw64_mandir}/man1/virt-pki-validate.1*
>+%{mingw64_mandir}/man1/virt-host-validate.1*
>+
>+%files -n mingw64-libvirt-static
>+%{mingw64_libdir}/libvirt.a
>+%{mingw64_libdir}/libvirt-qemu.a
>+
> 
> %changelog
>+* Thu Apr 19 2012 Marc-AndrÃ© Lureau <marcandre.lureau@redhat.com> - 0.9.11-1
>+- Update to 0.9.11 release
>+- Add w64 and static build
>+
> * Fri Mar 09 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 0.9.10-4
> - Dropped .la files
> 
>-- 
>1.7.10
>

Actions: View | Diff

Attachments on bug 814761: 579038