4 files changed, 22 insertions, 8 deletions

diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index 549e43cf8fcb..a9ab5cfa6d9a 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libvirt
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.3.3
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
@@ -22,7 +21,7 @@ BUILD_DEPENDS=	dnsmasq:dns/dnsmasq \
 RUN_DEPENDS=	dnsmasq:dns/dnsmasq \
 		dmidecode:sysutils/dmidecode
 
-OPTIONS_DEFINE=	DOCS GNUTLS NLS QEMU SASL
+OPTIONS_DEFINE=	DOCS GNUTLS NLS NSS QEMU SASL
 OPTIONS_DEFAULT=	GNUTLS
 OPTIONS_DEFINE_amd64=	XEN
 .if exists(/usr/sbin/bhyve)
@@ -35,6 +34,7 @@ CONFIGURE_ARGS+=	--without-bhyve
 QEMU_DESC=	QEMU driver
 BHYVE_DESC=	bhyve driver
 XEN_DESC=	Xen support via libxl
+NSS_DESC=	Name Service Switch plugin
 
 OPTIONS_SUB=	yes
 
@@ -54,6 +54,8 @@ NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
 
+NSS_CONFIGURE_WITH=	nss-plugin
+
 SASL_CONFIGURE_WITH=	sasl
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
@@ -114,6 +116,9 @@ CONF_FILES=	\
 		virtlockd.conf \
 		virtlogd.conf
 
+post-extract:
+	@${CP} ${FILESDIR}/libvirt_nss_bsd.syms ${WRKSRC}/tools/nss
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|ln -s ../default.xml|true|' \
 			  -e 's|$$(DESTDIR)$$(confdir)/qemu/networks|${STAGEDIR}${EXAMPLESDIR}/networks|' \
diff --git a/devel/libvirt/distinfo b/devel/libvirt/distinfo
index efaf4c02ac5a..bf8a2b96c93b 100644
--- a/devel/libvirt/distinfo
+++ b/devel/libvirt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libvirt-1.3.2.tar.gz) = e3c6fc2683178660b371efb3ac7a1103a3f4b78efac7ffe560bc5917974ccf05
-SIZE (libvirt-1.3.2.tar.gz) = 30056101
+SHA256 (libvirt-1.3.3.tar.gz) = 99603b8dba574bc592673fdf5c77e96cf5221e21104ab0477efeb8aba133858f
+SIZE (libvirt-1.3.3.tar.gz) = 30272467
diff --git a/devel/libvirt/files/libvirt_nss_bsd.syms b/devel/libvirt/files/libvirt_nss_bsd.syms
new file mode 100644
index 000000000000..7da39262c13d
--- /dev/null
+++ b/devel/libvirt/files/libvirt_nss_bsd.syms
@@ -0,0 +1,9 @@
+#
+# Officially exported symbols.
+#
+
+{
+global:
+    nss_module_register;
+local: *;
+};
diff --git a/devel/libvirt/pkg-plist b/devel/libvirt/pkg-plist
index 4817aa946712..691e2ded1682 100644
--- a/devel/libvirt/pkg-plist
+++ b/devel/libvirt/pkg-plist
@@ -55,6 +55,8 @@ lib/libvirt-qemu.so.%%SHLIB_VER%%
 lib/libvirt.so
 lib/libvirt.so.0
 lib/libvirt.so.%%SHLIB_VER%%
+%%NSS%%lib/libnss_libvirt.so.1
+%%NSS%%lib/nss_libvirt.so.1
 libdata/pkgconfig/libvirt.pc
 libdata/pkgconfig/libvirt-lxc.pc
 libdata/pkgconfig/libvirt-qemu.pc
@@ -116,10 +118,7 @@ share/augeas/lenses/tests/test_virtlogd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/drvvirtuozzo.html
 %%DOCSDIR%%%%PORTVERSION%%/html/drvxen.html
 %%DOCSDIR%%%%PORTVERSION%%/html/errors.html
-%%DOCSDIR%%%%PORTVERSION%%/html/et.png
 %%DOCSDIR%%%%PORTVERSION%%/html/firewall.html
-%%DOCSDIR%%%%PORTVERSION%%/html/footer_corner.png
-%%DOCSDIR%%%%PORTVERSION%%/html/footer_pattern.png
 %%DOCSDIR%%%%PORTVERSION%%/html/format.html
 %%DOCSDIR%%%%PORTVERSION%%/html/formatcaps.html
 %%DOCSDIR%%%%PORTVERSION%%/html/formatdomain.html
@@ -183,6 +182,7 @@ share/augeas/lenses/tests/test_virtlogd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/news-2015.html
 %%DOCSDIR%%%%PORTVERSION%%/html/news.html
 %%DOCSDIR%%%%PORTVERSION%%/html/node.gif
+%%DOCSDIR%%%%PORTVERSION%%/html/nss.html
 %%DOCSDIR%%%%PORTVERSION%%/html/pending.html
 %%DOCSDIR%%%%PORTVERSION%%/html/php.html
 %%DOCSDIR%%%%PORTVERSION%%/html/python.html