Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7aa383293edbd7f989b6e28b4a77499e47cceab3
commit 7aa383293edbd7f989b6e28b4a77499e47cceab3 Author: kikadf <[email protected]> Date: Tue Jan 21 18:34:37 2014 +0100 libvirt-1.1.3.3-1-x86_64 * Change m8r * Version bump diff --git a/source/xlib-extra/libvirt/FrugalBuild b/source/xlib-extra/libvirt/FrugalBuild index 99023c3..5e9f519 100644 --- a/source/xlib-extra/libvirt/FrugalBuild +++ b/source/xlib-extra/libvirt/FrugalBuild @@ -1,9 +1,12 @@ -# Compiling Time: 1.22 SBU -# Maintainer: jercel <[email protected]> +# Compiling Time: 3.83 SBU +# Maintainer: kikadf <[email protected]> +# Contributor: jercel <[email protected]> + +options+=('asneeded') pkgname=libvirt -pkgver=0.9.11.3 -pkgrel=7 +pkgver=1.1.3.3 +pkgrel=1 pkgdesc="libvirt is a library providing access to information from various virtualization tools" url="http://libvirt.org"; depends=('libxml2' 'gnutls>=2.12.12' 'cyrus-sasl' 'parted>=3.1' \ @@ -13,15 +16,13 @@ rodepends=('dnsmasq' 'bridge-utils' 'iproute2') makedepends=('python' 'gtk-doc') groups=('xlib-extra') archs=('x86_64' 'i686') -up2date="Flasttar ftp://ftp.libvirt.org/$pkgname/stable_updates/"; +up2date="Flasttar ftp://ftp.libvirt.org/libvirt/stable_updates/"; backup=(etc/sysconfig/libvirtd etc/sysconfig/libvirt-guests etc/libvirt/libvirtd.conf etc/libvirt/libvirt.conf) source=(ftp://ftp.libvirt.org/$pkgname/stable_updates/$pkgname-$pkgver.tar.gz \ - libvirt-guests fix_iptables_path.patch libnl3.patch services.patch) -sha1sums=('2bcb00a901113f53fb5eb3fd2d2a3b3e68dcc0f4' \ + libvirt-guests fix_iptables_path.patch) +sha1sums=('54bda48ea4bd195bb0430118d79e3f55cb0ffce0' \ '5dfe166fee4ca188dab779f842aac9868bff265b' \ - '3ef036f94a6903e871e2ae8ea2b01fa81943e375' \ - '00ffb171da0c0209c96ff42ecaa81b3caa15b3be' \ - 'e7c9a2f718779b637e1b922c5a99a908a74256ff') + '3ef036f94a6903e871e2ae8ea2b01fa81943e375') Fconfopts+=" --with-udev --with-avahi --with-init-script=systemd" subpkgs=('libvirt-python') @@ -36,14 +37,8 @@ _F_systemd_units=(libvirtd= libvirt-guests=) Finclude systemd build() { - Fpatchall - sed -i '/AM_PROG_CC_STDC/d' configure.ac # replaced by AC_PROG_CC - sed -i 's/undefine/virsh-undefine/' tests/Makefile.am # backport of a20f06d9d9b0353d7fb7a8e11a631253d5961b96 - Fautoreconf - Fmake - Fmakeinstall + Fbuild Fsplit libvirt-python usr/lib/python* - Fsplit libvirt-python usr/share/doc/libvirt-python-$pkgver Frm /var/run Fmkdir /etc/tmpfiles.d cat > $Fdestdir/etc/tmpfiles.d/libvirt.conf << EOF @@ -53,7 +48,6 @@ d $Flocalstatedir/run/libvirt/qemu 0755 root root - d $Flocalstatedir/run/libvirt/uml 0755 root root - EOF Fgenscriptlet - Frm /etc/rc.d/init.d Fexe /usr/libexec/libvirt-guests } diff --git a/source/xlib-extra/libvirt/libnl3.patch b/source/xlib-extra/libvirt/libnl3.patch deleted file mode 100644 index 56f137f..0000000 --- a/source/xlib-extra/libvirt/libnl3.patch +++ /dev/null @@ -1,198 +0,0 @@ -diff -ur a/configure.ac b/configure.ac ---- a/configure.ac 2012-05-09 01:58:29.818367078 -0500 -+++ b/configure.ac 2012-05-09 01:58:50.261366310 -0500 -@@ -2601,18 +2601,31 @@ - - dnl netlink library - -+LIBNL_ROUTE3_CFLAGS="" -+LIBNL_ROUTE3_LIBS="" - LIBNL_CFLAGS="" - LIBNL_LIBS="" - have_libnl=no - - if test "$with_linux" = "yes"; then -- PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [ -+ PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [ - have_libnl=yes -- AC_DEFINE_UNQUOTED([HAVE_LIBNL], 1, [whether the netlink library is available]) -- ], [ -- if test "$with_macvtap" = "yes"; then -- AC_MSG_ERROR([libnl-devel >= $LIBNL_REQUIRED is required for macvtap support]) -- fi -+ AC_DEFINE([HAVE_LIBNL3], [1], [Use libnl-3.0]) -+ AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is available]) -+ PKG_CHECK_MODULES([LIBNL_ROUTE3], [libnl-route-3.0]) -+ LIBNL_CFLAGS="$LIBNL_CFLAGS $LIBNL_ROUTE3_CFLAGS" -+ LIBNL_LIBS="$LIBNL_LIBS $LIBNL_ROUTE3_LIBS" -+ ], [PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [ -+ have_libnl=yes -+ AC_DEFINE_UNQUOTED([HAVE_LIBNL], [1], -+ [whether the netlink library is available]) -+ AC_DEFINE_UNQUOTED([HAVE_LIBNL1], [1], -+ [whether the netlink v1 library is available]) -+ ], [ -+ if test "$with_macvtap" = "yes"; then -+ AC_MSG_ERROR([libnl-devel >= $LIBNL_REQUIRED is required for macvtap support]) -+ fi -+ ]) - ]) - fi - AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"]) -Only in b: configure.ac.orig -diff -ur a/daemon/Makefile.am b/daemon/Makefile.am ---- a/daemon/Makefile.am 2012-05-09 01:58:29.846367078 -0500 -+++ b/daemon/Makefile.am 2012-05-09 02:11:09.930338530 -0500 -@@ -96,6 +96,7 @@ - $(XDR_CFLAGS) $(POLKIT_CFLAGS) \ - $(WARN_CFLAGS) \ - $(COVERAGE_CFLAGS) \ -+ $(LIBNL_CFLAGS) \ - -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ - -DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" - -diff -ur a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am 2012-05-09 01:58:29.836367078 -0500 -+++ b/src/Makefile.am 2012-05-09 02:00:30.320362552 -0500 -@@ -807,12 +807,14 @@ - libvirt_driver_qemu_la_CFLAGS = $(NUMACTL_CFLAGS) \ - $(GNUTLS_CFLAGS) \ - $(LIBXML_CFLAGS) \ -+ $(LIBNL_CFLAGS) \ - -I$(top_srcdir)/src/conf $(AM_CFLAGS) - libvirt_driver_qemu_la_LDFLAGS = $(AM_LDFLAGS) - libvirt_driver_qemu_la_LIBADD = $(NUMACTL_LIBS) \ - $(CAPNG_LIBS) \ - $(GNUTLS_LIBS) \ -- $(LIBXML_LIBS) -+ $(LIBXML_LIBS) \ -+ $(LIBNL_LIBS) - if WITH_DRIVER_MODULES - libvirt_driver_qemu_la_LIBADD += ../gnulib/lib/libgnu.la - libvirt_driver_qemu_la_LDFLAGS += -module -avoid-version -@@ -838,8 +840,9 @@ - #libvirt_la_BUILT_LIBADD += libvirt_driver_lxc.la - endif - libvirt_driver_lxc_la_CFLAGS = \ -+ $(LIBNL_CFLAGS) \ - -I$(top_srcdir)/src/conf $(AM_CFLAGS) --libvirt_driver_lxc_la_LIBADD = $(CAPNG_LIBS) -+libvirt_driver_lxc_la_LIBADD = $(CAPNG_LIBS) $(LIBNL_LIBS) - if WITH_SECDRIVER_SELINUX - libvirt_driver_lxc_la_LIBADD += $(SELINUX_LIBS) - endif -@@ -939,9 +942,10 @@ - #libvirt_la_BUILT_LIBADD += libvirt_driver_network.la - endif - libvirt_driver_network_la_CFLAGS = \ -+ $(LIBNL_CFLAGS) \ - -I$(top_srcdir)/src/conf $(AM_CFLAGS) - if WITH_DRIVER_MODULES --libvirt_driver_network_la_LIBADD = ../gnulib/lib/libgnu.la -+libvirt_driver_network_la_LIBADD = ../gnulib/lib/libgnu.la $(LIBNL_LIBS) - libvirt_driver_network_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) - endif - libvirt_driver_network_la_SOURCES = $(NETWORK_DRIVER_SOURCES) -@@ -1084,9 +1088,9 @@ - noinst_LTLIBRARIES += libvirt_driver_nwfilter.la - endif - libvirt_driver_nwfilter_la_CFLAGS = $(LIBPCAP_CFLAGS) \ -- -I$(top_srcdir)/src/conf $(AM_CFLAGS) -+ -I$(top_srcdir)/src/conf $(LIBNL_CFLAGS) $(AM_CFLAGS) - libvirt_driver_nwfilter_la_LDFLAGS = $(LD_AMFLAGS) --libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) -+libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) $(LIBNL_LIBS) - if WITH_DRIVER_MODULES - libvirt_driver_nwfilter_la_LIBADD += ../gnulib/lib/libgnu.la - libvirt_driver_nwfilter_la_LDFLAGS += -module -avoid-version -@@ -1541,6 +1545,7 @@ - $(CAPNG_CFLAGS) \ - $(YAJL_CFLAGS) \ - $(AUDIT_CFLAGS) \ -+ $(LIBNL_CFLAGS) \ - -I$(top_srcdir)/src/conf \ - $(AM_CFLAGS) - if HAVE_LIBBLKID -Only in b/src: Makefile.am.orig -Only in b/src: Makefile.am.rej -diff -ur a/src/util/virnetlink.c b/src/util/virnetlink.c ---- a/src/util/virnetlink.c 2012-05-09 01:58:29.825367080 -0500 -+++ b/src/util/virnetlink.c 2012-05-09 01:58:50.267366311 -0500 -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2010-2011 Red Hat, Inc. -+ * Copyright (C) 2010-2012 Red Hat, Inc. - * Copyright (C) 2010-2012 IBM Corporation - * - * This library is free software; you can redistribute it and/or -@@ -60,6 +60,16 @@ - int deleted; - }; - -+# ifdef HAVE_LIBNL1 -+# define virNetlinkAlloc nl_handle_alloc -+# define virNetlinkFree nl_handle_destroy -+typedef struct nl_handle virNetlinkHandle; -+# else -+# define virNetlinkAlloc nl_socket_alloc -+# define virNetlinkFree nl_socket_free -+typedef struct nl_sock virNetlinkHandle; -+# endif -+ - typedef struct _virNetlinkEventSrvPrivate virNetlinkEventSrvPrivate; - typedef virNetlinkEventSrvPrivate *virNetlinkEventSrvPrivatePtr; - struct _virNetlinkEventSrvPrivate { -@@ -67,7 +77,7 @@ - virMutex lock; - int eventwatch; - int netlinkfd; -- struct nl_handle *netlinknh; -+ virNetlinkHandle *netlinknh; - /*Events*/ - int handled; - size_t handlesCount; -@@ -121,7 +131,7 @@ - int fd; - int n; - struct nlmsghdr *nlmsg = nlmsg_hdr(nl_msg); -- struct nl_handle *nlhandle = nl_handle_alloc(); -+ virNetlinkHandle *nlhandle = virNetlinkAlloc(); - - if (!nlhandle) { - virReportSystemError(errno, -@@ -178,7 +188,7 @@ - *respbuflen = 0; - } - -- nl_handle_destroy(nlhandle); -+ virNetlinkFree(nlhandle); - return rc; - } - -@@ -285,7 +295,7 @@ - - virNetlinkEventServerLock(srv); - nl_close(srv->netlinknh); -- nl_handle_destroy(srv->netlinknh); -+ virNetlinkFree(srv->netlinknh); - virEventRemoveHandle(srv->eventwatch); - - /* free any remaining clients on the list */ -@@ -346,7 +356,7 @@ - virNetlinkEventServerLock(srv); - - /* Allocate a new socket and get fd */ -- srv->netlinknh = nl_handle_alloc(); -+ srv->netlinknh = virNetlinkAlloc(); - - if (!srv->netlinknh) { - virReportSystemError(errno, -@@ -392,7 +402,7 @@ - error_server: - if (ret < 0) { - nl_close(srv->netlinknh); -- nl_handle_destroy(srv->netlinknh); -+ virNetlinkFree(srv->netlinknh); - } - error_locked: - virNetlinkEventServerUnlock(srv); diff --git a/source/xlib-extra/libvirt/qemu-no-cgroup.patch b/source/xlib-extra/libvirt/qemu-no-cgroup.patch deleted file mode 100644 index b926ad4..0000000 --- a/source/xlib-extra/libvirt/qemu-no-cgroup.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c -index e71d3fa..44211a6 100644 ---- a/src/qemu/qemu_cgroup.c -+++ b/src/qemu/qemu_cgroup.c -@@ -46,7 +46,7 @@ static const char *const defaultDeviceACL[] = { - int qemuCgroupControllerActive(struct qemud_driver *driver, - int controller) - { -- if (driver->cgroup == NULL) -+ /*if (driver->cgroup == NULL)*/ - return 0; - if (!virCgroupMounted(driver->cgroup, controller)) - return 0; -@@ -202,7 +202,7 @@ int qemuSetupCgroup(struct qemud_driver *driver, - (const char *const *)driver->cgroupDeviceACL : - defaultDeviceACL; - -- if (driver->cgroup == NULL) -+ /*if (driver->cgroup == NULL)*/ - return 0; /* Not supported, so claim success */ - - rc = virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 1); -@@ -364,7 +364,7 @@ int qemuRemoveCgroup(struct qemud_driver *driver, - virCgroupPtr cgroup; - int rc; - -- if (driver->cgroup == NULL) -+ /*if (driver->cgroup == NULL)*/ - return 0; /* Not supported, so claim success */ - - rc = virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0); -@@ -388,7 +388,7 @@ int qemuAddToCgroup(struct qemud_driver *driver, - int ret = -1; - int rc; - -- if (driver->cgroup == NULL) -+ /*if (driver->cgroup == NULL)*/ - return 0; /* Not supported, so claim success */ - - rc = virCgroupForDomain(driver->cgroup, def->name, &cgroup, 0); diff --git a/source/xlib-extra/libvirt/services.patch b/source/xlib-extra/libvirt/services.patch deleted file mode 100644 index 95fc986..0000000 --- a/source/xlib-extra/libvirt/services.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -ur a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in ---- a/daemon/libvirtd.service.in 2012-07-12 14:00:01.267787136 -0500 -+++ b/daemon/libvirtd.service.in 2012-07-12 14:00:17.267416163 -0500 -@@ -6,9 +6,6 @@ - [Unit] - Description=Virtualization daemon - After=syslog.target --After=udev.target --After=avahi.target --After=dbus.target - Before=libvirt-guests.service - - [Service] -diff -ur a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in ---- a/tools/libvirt-guests.service.in 2012-07-12 14:00:01.317785977 -0500 -+++ b/tools/libvirt-guests.service.in 2012-07-12 16:35:14.230173887 -0500 -@@ -6,8 +6,10 @@ - EnvironmentFile=-/etc/sysconfig/libvirt-guests - # Hack just call traditional service until we factor - # out the code --ExecStart=/etc/init.d/libvirt-guests start --ExecStop=/etc/init.d/libvirt-guests stop -+ExecStart=/usr/libexec/libvirt-guests start -+ExecStop=/usr/libexec/libvirt-guests stop -+Type=oneshot -+RemainAfterExit=yes - - [Install] - WantedBy=multi-user.target _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
