Attachment #116699 for bug #158688

View | Details | Raw Unified | Return to bug 158688
Collapse All | Expand All




#

PORTNAME=	libvirt
PORTVERSION=	0.9.3
CATEGORIES=	devel
MASTER_SITES=	http://libvirt.org/sources/



LICENSE=	LGPL3
GNU_CONFIGURE=	yes
USE_AUTOTOOLS=	automake autoconf
CONFIGURE_ARGS=	--without-libssh2 \
		--without-sasl \
		--without-yajl \

		--without-network
USE_GMAKE=	yes
USE_GNOME=	gnomehack
GNOME_MAKEFILEIN=	Makefile.am
USE_LDCONFIG=	yes
USE_PYTHON_BUILD=	yes
PLIST_SUB=	PORTVERSION="-${PORTVERSION}"

Lines 1-2 Link Here

(-)devel/libvirt/distinfo (-2 / +2 lines)
1	SHA256 (libvirt-0.9.2.tar.gz) = 9a851fba532bafb604de92819752815a9015f529f6d69c9a93d2c90c79419f38	1	SHA256 (libvirt-0.9.3.tar.gz) = 4d673be9aa7b5618c0fef3cfdbbbeff02df1c83e26680fe40defad2b32a56ae3
2	SIZE (libvirt-0.9.2.tar.gz) = 15793846	2	SIZE (libvirt-0.9.3.tar.gz) = 15958983

Removed Link Here

(-)devel/libvirt/files/patch-docs__apibuild.py (-8 lines)
1	--- ./docs/apibuild.py 2011-06-07 21:31:43.000000000 -0700
2	+++ ./docs/apibuild.py 2011-06-07 21:31:55.000000000 -0700
3	@@ -1,4 +1,4 @@
4	-#!/usr/bin/python -u
5	+#!/usr/bin/env python
6	#
7	# This is the API builder, it parses the C sources and build the
8	# API formal description in XML.




--- ./daemon/libvirtd.h
+++ ./daemon/libvirtd.h
@@ -38,7 +38,9 @@
 # include "logging.h"
 # include "threads.h"
 # include "network.h"
-# include "virnetsaslcontext.h"
+# if HAVE_SASL
+#  include "virnetsaslcontext.h"
+# endif
 # include "virnetserverprogram.h"
 
 # if WITH_DTRACE
@@ -70,7 +72,9 @@ struct daemonClientPrivate {
 
     int domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LAST];
 
+# if HAVE_SASL
     virNetSASLSessionPtr sasl;
+# endif
 
     /* This is only valid if a remote open call has been made on this
      * connection, otherwise it will be NULL.  Also if remote close is
@@ -81,7 +85,9 @@ struct daemonClientPrivate {
     daemonClientStreamPtr streams;
 };
 
+# if HAVE_SASL
 extern virNetSASLContextPtr saslCtxt;
+# endif
 extern virNetServerProgramPtr remoteProgram;
 extern virNetServerProgramPtr qemuProgram;

Return to bug 158688

Lines 6-12 Link Here

(-)devel/libvirt/Makefile (-1 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= libvirt	8	PORTNAME= libvirt
9	PORTVERSION= 0.9.2	9	PORTVERSION= 0.9.3
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= http://libvirt.org/sources/	11	MASTER_SITES= http://libvirt.org/sources/
12		12
Lines 15-20 Link Here
15		15
16	LICENSE= LGPL3	16	LICENSE= LGPL3
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
		18	USE_AUTOTOOLS= automake autoconf
18	CONFIGURE_ARGS= --without-libssh2 \	19	CONFIGURE_ARGS= --without-libssh2 \
19	--without-sasl \	20	--without-sasl \
20	--without-yajl \	21	--without-yajl \
Lines 26-31 Link Here
26	--without-network	27	--without-network
27	USE_GMAKE= yes	28	USE_GMAKE= yes
28	USE_GNOME= gnomehack	29	USE_GNOME= gnomehack
		30	GNOME_MAKEFILEIN= Makefile.am
29	USE_LDCONFIG= yes	31	USE_LDCONFIG= yes
30	USE_PYTHON_BUILD= yes	32	USE_PYTHON_BUILD= yes
31	PLIST_SUB= PORTVERSION="-${PORTVERSION}"	33	PLIST_SUB= PORTVERSION="-${PORTVERSION}"

Added Link Here

(-)devel/libvirt/files/patch-libvirtd.h (+32 lines)
1	--- ./daemon/libvirtd.h
2	+++ ./daemon/libvirtd.h
3	@@ -38,7 +38,9 @@
4	# include "logging.h"
5	# include "threads.h"
6	# include "network.h"
7	-# include "virnetsaslcontext.h"
8	+# if HAVE_SASL
9	+# include "virnetsaslcontext.h"
10	+# endif
11	# include "virnetserverprogram.h"
12
13	# if WITH_DTRACE
14	@@ -70,7 +72,9 @@ struct daemonClientPrivate {
15
16	int domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LAST];
17
18	+# if HAVE_SASL
19	virNetSASLSessionPtr sasl;
20	+# endif
21
22	/* This is only valid if a remote open call has been made on this
23	* connection, otherwise it will be NULL. Also if remote close is
24	@@ -81,7 +85,9 @@ struct daemonClientPrivate {
25	daemonClientStreamPtr streams;
26	};
27
28	+# if HAVE_SASL
29	extern virNetSASLContextPtr saslCtxt;
30	+# endif
31	extern virNetServerProgramPtr remoteProgram;
32	extern virNetServerProgramPtr qemuProgram;