Hello community, here is the log from the commit of package virt-sandbox for openSUSE:Factory checked in at 2018-03-13 10:24:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-sandbox (Old) and /work/SRC/openSUSE:Factory/.virt-sandbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-sandbox" Tue Mar 13 10:24:31 2018 rev:16 rq:585947 version:0.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/virt-sandbox/virt-sandbox.changes 2017-12-14 11:01:20.412443262 +0100 +++ /work/SRC/openSUSE:Factory/.virt-sandbox.new/virt-sandbox.changes 2018-03-13 10:24:37.120523296 +0100 @@ -1,0 +2,7 @@ +Mon Mar 12 13:55:48 UTC 2018 - [email protected] + +- Build with libtirpc (bsc#1084896) + 15396686-avoid-setting-XDR_LIBS-to-none-required.patch + b9031e08-search-for-standalone-xdr-library.patch + +------------------------------------------------------------------- New: ---- 15396686-avoid-setting-XDR_LIBS-to-none-required.patch b9031e08-search-for-standalone-xdr-library.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-sandbox.spec ++++++ --- /var/tmp/diff_new_pack.v7gipz/_old 2018-03-13 10:24:38.856461101 +0100 +++ /var/tmp/diff_new_pack.v7gipz/_new 2018-03-13 10:24:38.856461101 +0100 @@ -1,7 +1,7 @@ # # spec file for package virt-sandbox # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,8 @@ Patch1: 559b54d-load-ext4.patch Patch2: f24d003b-sync-unmount-shutdown.patch Patch3: 35d13f92-python3.patch +Patch4: b9031e08-search-for-standalone-xdr-library.patch +Patch5: 15396686-avoid-setting-XDR_LIBS-to-none-required.patch # Patches pending upstream review Patch100: no-unmount-for-lxc-machines.patch @@ -53,6 +55,10 @@ BuildRequires: libtool BuildRequires: libvirt-glib-devel >= 0.2.1 BuildRequires: perl +%if 0%{?suse_version} >= 1500 +BuildRequires: libtirpc-devel +BuildRequires: rpcgen +%endif %if 0%{?suse_version} >= 1330 BuildRequires: xz-static-devel %endif @@ -104,6 +110,8 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %patch100 -p1 %patch200 -p1 ++++++ 15396686-avoid-setting-XDR_LIBS-to-none-required.patch ++++++ >From 15396686df15aa3f8c29fb053ebba78c11369760 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" <[email protected]> Date: Thu, 18 Jan 2018 16:53:49 +0000 Subject: [sandbox] Avoid setting XDR_LIBS to "none required" Signed-off-by: Daniel P. Berrange <[email protected]> --- m4/virt-xdr.m4 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/m4/virt-xdr.m4 b/m4/virt-xdr.m4 index f67b4c9..b39392a 100644 --- a/m4/virt-xdr.m4 +++ b/m4/virt-xdr.m4 @@ -1,7 +1,11 @@ AC_DEFUN([LIBVIRT_SANDBOX_XDR], [ old_LIBS="$LIBS" + XDR_LIBS= AC_SEARCH_LIBS([xdrmem_create], [portablexdr rpc xdr nsl tirpc], [ - XDR_LIBS="$ac_cv_search_xdrmem_create" + if test "$ac_cv_search_xdrmem_create" != "none required" + then + XDR_LIBS="$ac_cv_search_xdrmem_create" + fi ],[ AC_MSG_ERROR([Cannot find a XDR library]) ]) -- 2.16.1 ++++++ b9031e08-search-for-standalone-xdr-library.patch ++++++ >From b9031e08f031124d18b416a4cbebbd6eeb0ea9f8 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" <[email protected]> Date: Thu, 18 Jan 2018 16:03:52 +0000 Subject: [sandbox] Search for standalone xdr library Signed-off-by: Daniel P. Berrange <[email protected]> --- configure.ac | 1 + libvirt-sandbox/Makefile.am | 4 ++++ m4/virt-xdr.m4 | 29 +++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 m4/virt-xdr.m4 diff --git a/configure.ac b/configure.ac index 00c2d7e..5d64f0d 100644 --- a/configure.ac +++ b/configure.ac @@ -111,6 +111,7 @@ LIBVIRT_SANDBOX_WIN32 LIBVIRT_SANDBOX_COVERAGE LIBVIRT_SANDBOX_RPCGEN LIBVIRT_SANDBOX_SELINUX +LIBVIRT_SANDBOX_XDR LIBVIRT_SANDBOX_STATIC_LIBC diff --git a/libvirt-sandbox/Makefile.am b/libvirt-sandbox/Makefile.am index b303078..48cc997 100644 --- a/libvirt-sandbox/Makefile.am +++ b/libvirt-sandbox/Makefile.am @@ -157,6 +157,7 @@ libvirt_sandbox_1_0_la_CFLAGS = \ $(LIBVIRT_GLIB_CFLAGS) \ $(LIBVIRT_GOBJECT_CFLAGS) \ $(SELINUX_CFLAGS) \ + $(XDR_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) libvirt_sandbox_1_0_la_LIBADD = \ @@ -165,6 +166,7 @@ libvirt_sandbox_1_0_la_LIBADD = \ $(LIBVIRT_GOBJECT_LIBS) \ $(SELINUX_LIBS) \ $(CYGWIN_EXTRA_LIBADD) \ + $(XDR_LIBS) \ $(NULL) libvirt_sandbox_1_0_la_DEPENDENCIES = \ libvirt-sandbox.sym @@ -194,6 +196,7 @@ libvirt_sandbox_init_common_CFLAGS = \ $(GIO_UNIX_CFLAGS) \ $(CAPNG_CFLAGS) \ $(SELINUX_CFLAGS) \ + $(XDR_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) libvirt_sandbox_init_common_LDFLAGS = \ @@ -203,6 +206,7 @@ libvirt_sandbox_init_common_LDFLAGS = \ $(LIBVIRT_GCONFIG_LIBS) \ $(CAPNG_LIBS) \ $(SELINUX_LIBS) \ + $(XDR_LIBS) \ $(WARN_CFLAGS) \ $(NULL) libvirt_sandbox_init_common_LDADD = \ diff --git a/m4/virt-xdr.m4 b/m4/virt-xdr.m4 new file mode 100644 index 0000000..f67b4c9 --- /dev/null +++ b/m4/virt-xdr.m4 @@ -0,0 +1,29 @@ +AC_DEFUN([LIBVIRT_SANDBOX_XDR], [ + old_LIBS="$LIBS" + AC_SEARCH_LIBS([xdrmem_create], [portablexdr rpc xdr nsl tirpc], [ + XDR_LIBS="$ac_cv_search_xdrmem_create" + ],[ + AC_MSG_ERROR([Cannot find a XDR library]) + ]) + LIBS="$old_LIBS" + + AC_CACHE_CHECK([where to find <rpc/rpc.h>], [lv_cv_xdr_cflags], [ + for add_CFLAGS in '' '-I/usr/include/tirpc' 'missing'; do + if test x"$add_CFLAGS" = xmissing; then + lv_cv_xdr_cflags=missing; break + fi + CFLAGS="$old_CFLAGS $add_CFLAGS" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <rpc/rpc.h> + ]])], [lv_cv_xdr_cflags=${add_CFLAGS:-none}; break]) + done + ]) + CFLAGS=$old_CFLAGS + case $lv_cv_xdr_cflags in + none) XDR_CFLAGS= ;; + missing) AC_MSG_ERROR([Unable to find <rpc/rpc.h>]) ;; + *) XDR_CFLAGS=$lv_cv_xdr_cflags ;; + esac + + AC_SUBST([XDR_LIBS]) + AC_SUBST([XDR_CFLAGS]) +]) -- 2.16.1
