Upgrade to 1.2.6;

Add options:
    xen	    (optional)	enable management of XEN virtual domains
	    (requires xentools42.)
    libssh2 enable remote management over ssh2 (default)
    lvm	    (optional) allow management of LVM based storage
	    (only works on Linux, as it looks for pvcreate/etc)
    hal	    (optional) support for hal
    dbus    (optional) support for dbus
    avahi   (optional) support for avahi

Changelog:
1.2.6: Jul 2 2014

Features:
    libxl: add migration support and fixes (Jim Fehlig),
    various improvements and fixes for NUMA (Michal Privoznik)
Documentation:
    security: manager: Document behavior of disk label manipulation
    funcs (Peter Krempa),
    fix some typos in formatdomain.html (Jincheng Miao),
    virsh: man: Correctly spell QEMU (Peter Krempa),
    virsh: man: Fix examples and docs for virsh version (Peter Krempa),
    Added example script on how to convert LXC container config
    (Cédric Bosdonnat),
    blockjob: document recent job addition (Eric Blake),
    virsh: Add details about specified migration host (Chen Fan),
    blockcommit: document semantics of committing active layer (Eric
    Blake),
    fix a typo in hacking.html.in (Wangrui (K)),
    formatcaps: Rework and add stubs to document (Michal Privoznik)
Portability:
    build: link libvirt_conf with libxml (Martin Kletzander),
    vbox: fix linker error (Jim Fehlig),
    libxl: don't break the build on Xen>=4.5 because of
    libxl_vcpu_setaffinity() (Dario Faggioli),
    Add PKG_CONFIG_PATH to run.in script. (Daniel P. Berrange),
    Change 'interface' to 'iface' in virNetworkDHCPLease (Daniel P.  Berrange),
    Fix shadowed variable with older gcc (Ján Tomko),
    Add pkg-config files to allow deps to build against source tree
    (Daniel P. Berrange),
    Add pkg-config files for libvirt-qemu & libvirt-lxc (Daniel P.  Berrange),
    blockjob: avoid compiler uncertainty in info sizing (Eric Blake),
    build: prefer -fstack-protector-strong to -all (Ján Tomko),
    build: remove ssp-buffer-size (Ján Tomko),
    build: remove duplicit warning suppression (Ján Tomko),
    virnetdev: Use ifname in virNetDevGetLinkInfo (Michal Privoznik),
    Fix virbitmaptest on 32-bit (Ján Tomko),
    translations: Don't leave default template fields in .po files
    (Martin Kletzander),
    tests: Build virstoragetest only when storage driver is compiled too
    (Peter Krempa),
    Fix build on freebsd (Pavel Hrdina)
Bug Fixes:
    qemu: copy: Accept 'format' parameter when copying to a non-existing img
    (Peter Krempa),
    storage: gluster: Fix header reader function (Peter Krempa),
    conf: storage: Add volume feature formatter for gluster pools (Peter
    Krempa),
    vboxsnapshotxmltest: Don't write to a file in abs_srcdir (Michal
    Privoznik),
    securityselinuxlabeltest: Don't create dummy file in the srcdir (Michal
    Privoznik),
    Report one error less when getting net dev speed (Ján Tomko),
    Only detect PCI Express devices as root in udev nodedev driver (Ján
    Tomko),
    libxl: add PV console if not explicitly specified (Jim Fehlig),
    qemu: snapshot: Save persistent domain config when taking external
    snapshot (Peter Krempa),
    bhyve: fix build by fixing typo in variable name (Roman Bogorodskiy),
    docs: publish correct enum values (Eric Blake),
    qemu: fix guestfwd chardev option back how it was (Martin Kletzander),
    Fix typo s/SASL_CONF_DIR/SASL_CONF_PATH/ in QEMU VNC code (Daniel P.
    Berrange),
    qemu: blockcopy: Don't remove existing disk mirror info (Peter Krempa),
    bridge: leases: Fix potential crash caused by use after free (Peter
    Krempa),
    Free DHCP leases file in networkGetDHCPLeasesHelper (Ján Tomko),
    Rework remoteSerializeDHCPLease (Ján Tomko),
    Free file header in virStorageFileGetMetadataRecurse (Ján Tomko),
    graphics: remember graphics not auto allocated ports (Giuseppe
    Scrivano),
    LXC: trivially support flag VIR_DRV_FEATURE_TYPED_PARAM_STRING (Chen
    Hanxiao),
    cmdFreepages: initialize @tmp (Michal Privoznik),
    Fix closedir usage in virNumaGetPages (Roman Bogorodskiy),
    Don't include @LIBS@ in libvirt.pc.in file (Daniel P. Berrange),
    virnuma: Actually build huge page code (Michal Privoznik),
    Do not call closedir with NULL argument (Ján Tomko),
    Fix invalid write in virNumaGetDistances (Ján Tomko),
    Properly check the return value of CCWAddressAsString (Ján Tomko),
    virsh: fix broken code in freepages (Eric Blake),
    Fix xmconfigtest (Jim Fehlig),
    vbox_snapshot_conf: fix wrong use of 'xmlSaveFormatFileEnc' (Pavel
    Hrdina),
    tests: fix vbox snapshot xmls (Pavel Hrdina),
    vbox: fix a segfault when taking a snapshot (Yohan BELLEGUIC),
    vbox: snapshot: Avoid memleaks in functions dealing with disk arrays
    (Peter Krempa),
    vbox: snapshot: Avoid memleak in virVBoxSnapshotConfAllChildren (Peter
    Krempa),
    uuid: Fix coverity warning of unchecked return value (Peter Krempa),
    network: bridge: Avoid freeing uninitialized pointer on cleanup path
    (Peter Krempa),
    net: leaseshelper: Refactor copying of old entries to avoid double free
    (Peter Krempa),
    net: leaseshelper: Ignore corrupted lease file and rewrite it (Peter
    Krempa),
    net: leaseshelper: Don't crash if DNSMASQ doesn't provide lease expiry
    (Peter Krempa),
    blockjob: don't remove older-style mirror XML (Eric Blake),
    blockcommit: require base below top (Eric Blake),
    leaseshelper: fix another crash (Pavel Hrdina),
    bhyve: do not cleanup unallocated networks on fail (Roman Bogorodskiy),
    bhyve: fix crash in bhyveBuildNetArgStr (Roman Bogorodskiy),
    storage: report VIR_ERR_NO_STORAGE_VOL when the file doesn't exist
    (Giuseppe Scrivano),
    blockcommit: fix regression with explicit top argument (Eric Blake),
    virsh: forbid negative vcpu argument to vcpupin (Jincheng Miao),
    Fix crash when saving a domain with type none dac label (Ján Tomko),
    vbox_snapshot_conf: Resolve Coverity warnings (John Ferlan),
    vbox_temp: Resolve Coverity warnings (John Ferlan),
    libxl: Resolve Coverity warnings (John Ferlan),
    leaseshelper: fix crash (Pavel Hrdina),
    qemu: Properly label FDs when restoring domain with static label
    (Shivaprasad G Bhat),
    nodeinfo: avoid uninitialized variable on error (Eric Blake),
    storage: fix memory leak with encrypted images (Eric Blake),
    vbox: fix compilation error (Roman Bogorodskiy),
    SELinux: don't fail silently when no label is present (Ján Tomko),
    parallels: Avoid possible leak of "cpu" from parallelsBuildCapabilities
    (Peter Krempa),
    Fix storage format probing (Ján Tomko),
    network: bridge: Avoid memory leak from
    networkBuildDhcpDaemonCommandLine (Peter Krempa),
    qemu: monitor: Fix type of holdtime argument in qemuMonitorJSONSendKey
    (Peter Krempa),
    libxl: Avoid possible use of uninitialized mem in libxlDomainStart
    (Daniel P. Berrange),
    qemu: Remove character device backend only after frontend is gone (Jiri
    Denemark),
    qemu: Remove disk backend only after frontend is gone (Jiri Denemark),
    qemu: Remove interface backend only after frontend is gone (Jiri
    Denemark),
    Don't use AI_ADDRCONFIG when binding to wildcard addresses (Ján
    Tomko),
    qemu: Unref cfg when detaching hostdev interface (Jiri Denemark),
    virsh: Check whether found volume is member of the specified storage
    pool (Peter Krempa)
Improvements:
    Introduce virFileReadAllQuiet (Ján Tomko),
    Track privileged state in udev nodedev driver (Ján Tomko),
    build: fix 'make syntax-check' after commit c6cf5df3 (Jim Fehlig),
    LXC: throw an error if we failed to get Idmap elements (Chen Hanxiao),
    cpu: Add new Broadwell CPU model (Jiri Denemark),
    net: merge virNetworkGetDHCPLeases and virNetworkGetDHCPLeasesForMAC
    (Peter Krempa),
    Add test for type none model dac seclabel (Ján Tomko),
    test: add user_xattr check for securityselinuxlabeltest (Jincheng Miao),
    libxl: detect support for save and restore (Jim Fehlig),
    security: nop: Avoid very long lines (Peter Krempa),
    security: Fix header formatting of a few functions (Peter Krempa),
    security: manager: Unify function header format (Peter Krempa),
    security: manager: Avoid forward decl of virSecurityManagerDispose
    (Peter Krempa),
    security: Rename virSecurityManagerRestoreImageLabel to *Disk* (Peter
    Krempa),
    util:
    s/virStorageSourceClearBackingStore/virStorageSourceBackingStoreClear
    (Peter Krempa),
    Fix a typo in a localized string (Daniel Veillard),
    virConnectCompareCPU: Introduce FAIL_INCOMPATIBLE flag (Jiri Denemark),
    cpuCompare*: Add support for reporting failure on incompatible CPUs
    (Jiri Denemark),
    cpu: Cleanup coding style in generic CPU driver (Jiri Denemark),
    virsh: Remove bogus stat on log file (Jiri Denemark),
    enhance hostdev mode 'capabilities' process (Jincheng Miao),
    storage: Don't store parent directory of an image explicitly (Peter
    Krempa),
    storage: Don't canonicalize paths unnecessarily (Peter Krempa),
    tests: virstoragetest: Remove unneeded relative test plumbing (Peter
    Krempa),
    tests: virstoragetest: Don't test relative start of backing chains
    (Peter Krempa),
    util: storage: Remove now redundant backingRelative from
    virStorageSource (Peter Krempa),
    tests: virstoragetest: Remove now unused pathAbs (Peter Krempa),
    storage: Store relative path only for relatively backed storage (Peter
    Krempa),
    tests: virstoragetest: Remove "expBackingStore" field (Peter Krempa),
    util: storage: Add helper to resolve relative path difference (Peter
    Krempa),
    LXC: check whether we get MemSwap[Total|Usage] (Chen Hanxiao),
    qemu: enum cleanups in "src/qemu/*" (Julio Faracco),
    libxl: fix version annotation of migration functions (Jim Fehlig),
    virtportallocator: new function "virPortAllocatorSetUsed" (Giuseppe
    Scrivano),
    net-dhcp-leases: Add virsh support (Nehal J Wani),
    net-dhcp-leases: Private implementation inside network (Nehal J Wani),
    net-dhcp-leases: Implement the remote protocol (Nehal J Wani),
    net-dhcp-leases: Implement the public APIs (Nehal J Wani),
    virNumaGetPages: Don't fail on huge page-less systems (Michal
    Privoznik),
    virNumaGetPageInfo: Take huge pages into account (Michal Privoznik),
    storage: gluster: Avoid name shadow on older compilers (Peter Krempa),
    storage: gluster: Add backend to return unique storage file path (Peter
    Krempa),
    Increase the size of REMOTE_MIGRATE_COOKIE_MAX to REMOTE_STRING_MAX
    (Shivaprasad G Bhat),
    nodedev: Introduce <pci-express/> to PCI devices (Michal Privoznik),
    virpci: Introduce virPCIDeviceIsPCIExpress and friends (Michal
    Privoznik),
    storage: better tests of lookup (Eric Blake),
    storage: renumber lookup tests (Eric Blake),
    storage: add alias for less typing (Eric Blake),
    qemu: snapshot: Don't mark all block disks for metadata reuse (Peter
    Krempa),
    bhyve: silent destroy command errors on cleanup (Roman Bogorodskiy),
    bhyve: implement PCI address allocation (Roman Bogorodskiy),
    virNetDevGetLinkInfo: Don't report link speed if NIC's not up
    (Michal Privoznik),
    tests: virstoragetest: Fix output when hitting errors (Peter
    Krempa),
    blockcommit: update error messages related to block jobs (Eric
    Blake),
    virsh: improve blockcopy UI (Eric Blake),
    virNodeDevCapPCIDevParseXML: Initialize numa_node variable (Michal
    Privoznik),
    virsh: Reject negative numbers in vshCommandOptULongLong (Peter
    Krempa),
    virsh: Reject negative numbers in vshCommandOptUL (Peter Krempa),
    virsh: Reject negative numbers in vshCommandOptUInt (Peter Krempa),
    security: Don't skip labelling for network disks (Peter Krempa),
    storage: volume: Rework lookup of volume objects (Peter Krempa),
    storage: Clean up unlocking of storage pool objects (Peter Krempa),
    storage: pool: Fix handling of errors on pool lookup failure (Peter
    Krempa),
    virsh: include bhyve in virsh -V output (Roman Bogorodskiy),
    maint: exempt graphic binaries from syntax check (Eric Blake),
    vmware: make version parsing more robust (Jean-Baptiste Rouault),
    node_device: Expose link state & speed (Michal Privoznik),
    interface_backend_udev: Implement link speed & state (Michal
    Privoznik),
    virnetdev: Introduce virNetDevGetLinkInfo (Michal Privoznik),
    virInterface: Expose link state & speed (Michal Privoznik),
    vbox_tmpl.c: Add function for undefining snapshot (Yohan BELLEGUIC),
    vbox_tmpl.c: Patch for redefining snapshots (Yohan BELLEGUIC),
    Add vbox_snapshot_conf struct (Yohan BELLEGUIC),
    vbox_tmpl.c: Better XML description for snapshots (Manuel VIVES),
    qemu: ignore -nodefconfig and -nodefaults when parsing commandline
    (Laine Stump),
    test: display qemuParseCommandline warnings when VIR_TEST_DEBUG > 0
    (Laine Stump),
    m4: bhyve: Fix check for the required bhyve programs (Peter Krempa),
    vmx: Relax virtualHW.version check (Matthias Bolte),
    conf: alter disk mirror xml output (Eric Blake),
    conf: store mirroring information in virStorageSource (Eric Blake),
    conf: store disk source as pointer, for easier manipulation (Eric
    Blake),
    conf: consolidate disk def allocation (Eric Blake),
    conf: store snapshot source as pointer, for easier manipulation
    (Eric Blake),
    nodedev: Export NUMA node locality for PCI devices (Michal
    Privoznik),
    Implement pretty flag for vcpuinfo and nodecpumap (Ján Tomko),
    Introduce virBitmapDataToString (Ján Tomko),
    Always report an error if virBitmapFormat fails (Ján Tomko),
    Format NULL bitmap as an empty string (Ján Tomko),
    virsh: Separate API calls and result printing in cmdVcpuinfo (Ján
    Tomko),
    virsh: Invert logic in cmdVcpuinfo (Ján Tomko),
    Parallels: Include CPU info in the capabilities XML (Alexander
    Burluka),
    Parallels: add connectBaselineCPU() (Alexander Burluka),
    Parallels: add domainGetVcpus() (Alexander Burluka),
    maint: prohibit empty first lines (Martin Kletzander),
    Remove unnecessary empty first lines (Martin Kletzander),
    Simplify conditions in virStorageBackendProbeTarget (Ján Tomko),
    Don't reuse 'ret' variable in virStorageBackendProbeTarget (Ján
    Tomko),
    vircaps2xmltest: Introduce basic testing (Michal Privoznik),
    libxl: introduce libxlDomainDefCheckABIStability (Jim Fehlig),
    maint: detect VPATH builds when checking for gnulib update (Eric
    Blake),
    maint: optimize locale.h syntax check (Eric Blake),
    virnuma: Check for numa_bitmask_isbitset presence (Michal
    Privoznik),
    cfg.mk: Introduce rule for setlocale() (Michal Privoznik),
    virnuma: Implement virNumaGetDistances stub for non-NUMA (Michal
    Privoznik),
    virCaps: Expose distance between host NUMA nodes (Michal Privoznik),
    virnuma: Introduce virNumaGetDistances (Michal Privoznik),
    tests: monitor: json: Fix error message when returning json in json
    (Peter Krempa),
    libxl: Move virDomainXMLOptionNew into libxlCreateXMLConf (Daniel P.
    Berrange),
    libxl: Don't pass libxlDriverPrivatePtr into libxlBuildDomainConfig
    (Daniel P. Berrange),
    libxl: Don't pass virDomainObjPtr to libxlBuildDomainConfig (Daniel
    P. Berrange),
    qemu: Return in from qemuDomainRemove*Device (Jiri Denemark),
    tests: storagetest: Unify and reformat storage chain format string
    (Peter Krempa),
    qemu: json: Add format strings for optional command arguments (Peter
    Krempa),
    util: string: Return element count from virStringSplit (Peter
    Krempa),
    storage: Traverse backing chains of network disks (Peter Krempa),
    storage: Change to new backing store parser (Peter Krempa),
    storage: Add infrastructure to parse remote network backing names
    (Peter Krempa),
    storage: Switch metadata crawler to use storage driver file access
    check (Peter Krempa),
    storage: Switch metadata crawler to use storage driver to read
    headers (Peter Krempa),
    storage: Switch metadata crawler to use storage driver to get unique
    path (Peter Krempa),
    storage: backend: Add possibility to suppress errors from backend
    lookup (Peter Krempa),
    test: storage: Initialize storage source to correct type (Peter
    Krempa),
    storage: Determine the local storage type right away (Peter Krempa),
    storage: Move virStorageFileGetMetadata to the storage driver (Peter
    Krempa),
    storage: Add API to check accessibility of storage volumes (Peter
    Krempa),
    storage: backend: Add unique id retrieval API (Peter Krempa),
    xenapi_utils: Adapt to enum cleanups (Michal Privoznik),
    virnuma.c: Fix some comments (Michal Privoznik),
    conf: more enum cleanups in "src/conf/domain_conf.h" (Julio
    Faracco),
    conf: enum cleanups in "src/conf/domain_conf.h" (Julio Faracco),
    cpu: use typedefs for enums in "src/cpu/cpu_map.h" (Julio Faracco),
    virsh-nodedev: Avoid spurious errors (Michal Privoznik),
    qemu: Process DEVICE_DELETED event in a separate thread (Jiri
    Denemark),
    qemu: Finish device removal in the original thread (Jiri Denemark),
    Add helper program to create custom leases (Nehal J Wani)
Cleanups:
    Remove redundant docs from libvirt.h (Jiri Denemark),
    conf: whitespace tweak (Chen Fan)

5 files changed, 81 insertions, 7 deletions

diff --git a/sysutils/libvirt/Makefile b/sysutils/libvirt/Makefile
index 030020ef257..e1106c9dff5 100644
--- a/sysutils/libvirt/Makefile
+++ b/sysutils/libvirt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2014/06/07 16:18:38 agc Exp $
+# $NetBSD: Makefile,v 1.25 2014/07/26 20:25:03 schnoebe Exp $
 
-DISTNAME=		libvirt-1.2.5
+DISTNAME=		libvirt-1.2.6
 CATEGORIES=		sysutils
 MASTER_SITES=		http://libvirt.org/sources/
 
@@ -38,6 +38,8 @@ CONF_FILES+=		${EGDIR}/sasl2/libvirt.conf ${PKG_SYSCONFDIR}/sasl2/libvirt.conf
 AUTO_MKDIRS=		yes
 RCD_SCRIPTS=            libvirtd
 
+.include "options.mk"
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 
diff --git a/sysutils/libvirt/PLIST b/sysutils/libvirt/PLIST
index dedfa85336d..cd4b3b4c12e 100644
--- a/sysutils/libvirt/PLIST
+++ b/sysutils/libvirt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2014/06/07 16:18:38 agc Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/07/26 20:25:03 schnoebe Exp $
 bin/virsh
 bin/virt-host-validate
 bin/virt-pki-validate
@@ -15,10 +15,15 @@ lib/libvirt/connection-driver/libvirt_driver_network.la
 lib/libvirt/connection-driver/libvirt_driver_qemu.la
 lib/libvirt/connection-driver/libvirt_driver_secret.la
 lib/libvirt/connection-driver/libvirt_driver_storage.la
+${PLIST.hal}lib/libvirt/connection-driver/libvirt_driver_nodedev.la
+${PLIST.xen}lib/libvirt/connection-driver/libvirt_driver_libxl.la
 lib/libvirt/lock-driver/lockd.la
 lib/pkgconfig/libvirt.pc
+lib/pkgconfig/libvirt-lxc.pc
+lib/pkgconfig/libvirt-qemu.pc
 libexec/libvirt-guests.sh
 libexec/libvirt_iohelper
+libexec/libvirt_leaseshelper
 man/man1/virsh.1
 man/man1/virt-host-validate.1
 man/man1/virt-pki-validate.1
diff --git a/sysutils/libvirt/distinfo b/sysutils/libvirt/distinfo
index 3161e6876a8..bd05c89a642 100644
--- a/sysutils/libvirt/distinfo
+++ b/sysutils/libvirt/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.5 2014/06/07 16:18:38 agc Exp $
+$NetBSD: distinfo,v 1.6 2014/07/26 20:25:03 schnoebe Exp $
 
-SHA1 (libvirt-1.2.5.tar.gz) = 9153e2ea312b56be3bb16ab942ec07fd3e15cce9
-RMD160 (libvirt-1.2.5.tar.gz) = 8ebe356c24ec5a161ded808e89f75dbae9db18a3
-Size (libvirt-1.2.5.tar.gz) = 28829671 bytes
+SHA1 (libvirt-1.2.6.tar.gz) = f8a26fe2856435aca142dfdaf2172e08dc59d369
+RMD160 (libvirt-1.2.6.tar.gz) = 6ba113affa24bbaf8f5a05fc75fe90ed139ae41c
+Size (libvirt-1.2.6.tar.gz) = 29346718 bytes
 SHA1 (patch-configure) = d01bd0cf7336d4c0ec0050301095ae0cfac26b7c
 SHA1 (patch-gnulib-lib-base64.h) = 7b7f3738fbeb52ba8e8c5ef2b8926008a4585c4b
 SHA1 (patch-gnulib-lib-fflush.c) = abfd289afd87d993bbf13cc815443f938cacf7ef
 SHA1 (patch-gnulib-lib-fseeko.c) = 1dc0c761d3285da5a418690bfc2e37de90f0e870
+SHA1 (patch-src-network-bridge_driver.c) = db637cc003edc054833473a1da74f695f9f7e227
 SHA1 (patch-src-rpc-virnetmessage.c) = 5a09402a71c1f7082d775503ce3ef17e7c41424c
 SHA1 (patch-src-util-virutil.c) = 64710144c4e1c7e1d9f5ca84c47be6f8b01a70f8
 SHA1 (patch-tools--virsh-secret.c) = 424f53edabf535be73e08addea3b4310de08cf8e
diff --git a/sysutils/libvirt/options.mk b/sysutils/libvirt/options.mk
new file mode 100644
index 00000000000..929e2921404
--- /dev/null
+++ b/sysutils/libvirt/options.mk
@@ -0,0 +1,47 @@
+# $NetBSD: options.mk,v 1.1 2014/07/26 20:25:03 schnoebe Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.libvirt
+
+# Common options.
+# PKG_SUPPORTED_OPTIONS+=xen3 xen33 xen41 xen42
+PKG_SUPPORTED_OPTIONS+=	xen4 libssh2 lvm hal dbus avahi
+PKG_SUGGESTED_OPTIONS=	libssh2 
+
+.include "../../mk/bsd.options.mk"
+
+# xentools42 is the only version to install
+# the include files
+PLIST_VARS+= xen hal
+
+.if !empty(PKG_OPTIONS:Mxen)
+PLIST.xen = yes
+CONFIGURE_ARGS+=	--without-xen
+CONFIGURE_ARGS+=	--with-libxl=${BUILDLINK_PREFIX.xentools42}
+CONFIGURE_ARGS+=	--with-xenapi=${BUILDLINK_PREFIX.xentools42}
+.  include "../../sysutils/xentools42/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mlibssh2)
+CONFIGURE_ARGS+=	--with-ssh2=${BUILDLINK_PREFIX.libssh2}
+.   include "../../security/libssh2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mlvm)
+CONFIGURE_ARGS+=	--with-storage-lvm
+.endif
+
+.if !empty(PKG_OPTIONS:Mhal)
+PLIST.hal = yes
+CONFIGURE_ARGS+=	--with-hal=${BUILDLINK_PREFIX.hal}
+.   include "../../sysutils/hal/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mdbus)
+CONFIGURE_ARGS+=	--with-dbus=${BUILDLINK_PREFIX.dbus}
+.   include "../../sysutils/dbus/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mavahi)
+CONFIGURE_ARGS+=	--with-avahi=${BUILDLINK_PREFIX.avahi}
+.   include "../../net/avahi/buildlink3.mk"
+.endif
diff --git a/sysutils/libvirt/patches/patch-src-network-bridge_driver.c b/sysutils/libvirt/patches/patch-src-network-bridge_driver.c
new file mode 100644
index 00000000000..6c2b24c471f
--- /dev/null
+++ b/sysutils/libvirt/patches/patch-src-network-bridge_driver.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src-network-bridge_driver.c,v 1.1 2014/07/26 20:25:04 schnoebe Exp $
+
+--- src/network/bridge_driver.c.orig	2014-06-27 14:51:07.000000000 +0000
++++ src/network/bridge_driver.c
+@@ -328,6 +328,14 @@ networkRemoveInactive(virNetworkDriverSt
+     return ret;
+ }
+ 
++#if !defined(IFNAMSIZ)
++# if defined(IF_NAMESIZE)
++#  define IFNAMSIZ  IF_NAMESIZE
++# else
++#  error " IFNAMSIZ is not defined!"
++# endif
++#endif
++
+ static char *
+ networkBridgeDummyNicName(const char *brname)
+ {