Attachment 145424 Details for Bug 192441 – update patch according to Roman advice: VARDIR is not configurable

[patch] update patch according to Roman advice: VARDIR is not configurable

libvirt.txt (text/plain), 6.39 KB, created by Oleg Ginzburg on 2014-08-06 19:55:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Ginzburg

Created: 2014-08-06 19:55:56 UTC

Size: 6.39 KB

patch

obsolete

>diff -ruN libvirt.bak/Makefile libvirt/Makefile
>--- libvirt.bak/Makefile	2014-08-06 23:49:59.000000000 +0400
>+++ libvirt/Makefile	2014-08-06 23:52:34.000000000 +0400
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/devel/libvirt/Makefile 363436 2014-07-30 03:57:23Z pi $
> 
> PORTNAME=	libvirt
>-PORTVERSION=	1.2.6
>-PORTREVISION=	2
>+PORTVERSION=	1.2.7
> CATEGORIES=	devel
> MASTER_SITES=	http://libvirt.org/sources/ \
> 		ftp://libvirt.org/libvirt/
>@@ -40,8 +39,35 @@
> NLS_CONFIGURE_ENABLE=	nls
> NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
> 
>+VARDIR=	/var
>+
> USE_RC_SUBR=	libvirtd
> 
>+LIBVIRT_RUNDIR=	${VARDIR}/run/libvirt
>+RUNDIR_NETWORK=	${LIBVIRT_RUNDIR}/network
>+RUNDIR_QEMU=	${LIBVIRT_RUNDIR}/qemu
>+RUNDIR_LOCKD=	${LIBVIRT_RUNDIR}/lockd
>+
>+LIBVIRT_LOGDIR=	${VARDIR}/log/libvirt
>+LOGDIR_UML=	${LIBVIRT_LOGDIR}/uml
>+LOGDIR_QEMU=	${LIBVIRT_LOGDIR}/qemu
>+LOGDIR_LXC=	${LIBVIRT_LOGDIR}/lxc
>+
>+LIBVIRT_VARLIBDIR=	${VARDIR}/lib/libvirt
>+VARLIBDIR_LOCKD=	${LIBVIRT_VARLIBDIR}/lockd
>+VARLIBDIR_LOCKD_FILES=	${VARLIBDIR_LOCKD}/files
>+VARLIBDIR_IMAGES=	${LIBVIRT_VARLIBDIR}/images
>+VARLIBDIR_BOOT=	${LIBVIRT_VARLIBDIR}/boot
>+VARLIBDIR_DNSMASQ=	${LIBVIRT_VARLIBDIR}/dnsmasq
>+VARLIBDIR_FILESYSTEMS=	${LIBVIRT_VARLIBDIR}/filesystems
>+VARLIBDIR_NETWORK=	${LIBVIRT_VARLIBDIR}/network
>+VARLIBDIR_QEMUDIR=	${LIBVIRT_VARLIBDIR}/qemu
>+VARLIBDIR_QEMUDIR_CHANNEL=	${VARLIBDIR_QEMUDIR}/channel
>+VARLIBDIR_QEMUDIR_CHANNEL_TARGET=	${VARLIBDIR_QEMUDIR_CHANNEL}/target
>+
>+LIBVIRT_CACHEDIR=	${VARDIR}/cache/libvirt
>+CACHEDIR_QEMU=	${LIBVIRT_CACHEDIR}/qemu
>+
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--without-sasl \
> 		--without-avahi \
>@@ -52,7 +78,8 @@
> 		--without-sysctl \
> 		--without-lxc \
> 		--without-uml \
>-		--with-ssh2
>+		--with-ssh2 \
>+		--localstatedir=${VARDIR}
> 
> # workaround to override pkg-config calls
> # random_data fix can be removed when 8.x is eol
>@@ -60,6 +87,28 @@
> 		SSH2_CFLAGS="-I${LOCALBASE}/include" \
> 		ac_cv_type_struct_random_data=""
> 
>+LIBVIRT_SUB=	LIBVIRT_RUNDIR="${LIBVIRT_RUNDIR}" \
>+		RUNDIR_NETWORK="${RUNDIR_NETWORK}" \
>+		RUNDIR_QEMU="${RUNDIR_QEMU}" \
>+		RUNDIR_LOCKD="${RUNDIR_LOCKD}" \
>+		LIBVIRT_LOGDIR="${LIBVIRT_LOGDIR}" \
>+		LOGDIR_UML="${LOGDIR_UML}" \
>+		LOGDIR_QEMU="${LOGDIR_QEMU}" \
>+		LOGDIR_LXC="${LOGDIR_LXC}" \
>+		LIBVIRT_VARLIBDIR="${LIBVIRT_VARLIBDIR}" \
>+		VARLIBDIR_LOCKD="${VARLIBDIR_LOCKD}" \
>+		VARLIBDIR_LOCKD_FILES="${VARLIBDIR_LOCKD_FILES}" \
>+		VARLIBDIR_IMAGES="${VARLIBDIR_IMAGES}" \
>+		VARLIBDIR_BOOT="${VARLIBDIR_BOOT}" \
>+		VARLIBDIR_DNSMASQ="${VARLIBDIR_DNSMASQ}" \
>+		VARLIBDIR_FILESYSTEMS="${VARLIBDIR_FILESYSTEMS}" \
>+		VARLIBDIR_NETWORK="${VARLIBDIR_NETWORK}" \
>+		VARLIBDIR_QEMUDIR="${VARLIBDIR_QEMUDIR}" \
>+		VARLIBDIR_QEMUDIR_CHANNEL="${VARLIBDIR_QEMUDIR_CHANNEL}" \
>+		VARLIBDIR_QEMUDIR_CHANNEL_TARGET="${VARLIBDIR_QEMUDIR_CHANNEL_TARGET}" \
>+		LIBVIRT_CACHEDIR="${LIBVIRT_CACHEDIR}" \
>+		CACHEDIR_QEMU="${CACHEDIR_QEMU}"
>+
> # limit production release x.x.x
> PORTSCOUT=	limit:\d+\.\d+\.\d+$$
> 
>@@ -70,7 +119,11 @@
> USE_LDCONFIG=	yes
> SHLIB_VER=	1002
> PLIST_SUB=	PORTVERSION="-${PORTVERSION}" \
>-		SHLIB_VER=${SHLIB_VER}
>+		SHLIB_VER=${SHLIB_VER} \
>+		${LIBVIRT_SUB}
>+
>+SUB_LIST+=	VARDIR=${VARDIR}
>+
> PORTDOCS=	*
> STRIP_FILES=	libvirt.so.${SHLIB_VER} \
> 		libvirt-qemu.so.${SHLIB_VER} \
>@@ -123,6 +176,15 @@
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib}
> .endfor
> 
>+.for dir in ${LIBVIRT_RUNDIR} ${RUNDIR_NETWORK} ${RUNDIR_QEMU} ${RUNDIR_LOCKD} \
>+	${LIBVIRT_LOGDIR} ${LOGDIR_UML} ${LOGDIR_QEMU} ${LOGDIR_LXC} ${LIBVIRT_VARLIBDIR} \
>+	${VARLIBDIR_LOCKD} ${VARLIBDIR_LOCKD_FILES} ${VARLIBDIR_IMAGES} ${VARLIBDIR_BOOT} \
>+	${VARLIBDIR_DNSMASQ} ${VARLIBDIR_FILESYSTEMS} ${VARLIBDIR_NETWORK} \
>+	${VARLIBDIR_QEMUDIR} ${VARLIBDIR_QEMUDIR_CHANNEL} \
>+	${VARLIBDIR_QEMUDIR_CHANNEL_TARGET} ${LIBVIRT_CACHEDIR} ${CACHEDIR_QEMU}
>+	@${MKDIR} "${STAGEDIR}${dir}"
>+.endfor
>+
> regression-test: build
> 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
> 
>diff -ruN libvirt.bak/distinfo libvirt/distinfo
>--- libvirt.bak/distinfo	2014-07-13 00:17:32.000000000 +0400
>+++ libvirt/distinfo	2014-08-06 16:44:27.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (libvirt-1.2.6.tar.gz) = 38a224559a1d04e5d4163c5c1b810df1f29804ebbb1f057d4abcb41a9e5d5dea
>-SIZE (libvirt-1.2.6.tar.gz) = 29346718
>+SHA256 (libvirt-1.2.7.tar.gz) = 3dfb462cba1188d2c9ba700e1927fa0dbd71f20afdf81ab0c43b27b7fe77defc
>+SIZE (libvirt-1.2.7.tar.gz) = 29676178
>diff -ruN libvirt.bak/files/libvirtd.in libvirt/files/libvirtd.in
>--- libvirt.bak/files/libvirtd.in	2014-04-11 15:51:14.000000000 +0400
>+++ libvirt/files/libvirtd.in	2014-08-06 18:49:40.000000000 +0400
>@@ -20,7 +20,7 @@
> load_rc_config $name
> 
> command=%%PREFIX%%/sbin/libvirtd
>-pidfile=%%LOCALBASE%%/var/run/${name}.pid
>+pidfile=%%VARDIR%%/run/${name}.pid
> 
> command_args="--daemon --pid-file=${pidfile}"
> 
>diff -ruN libvirt.bak/pkg-plist libvirt/pkg-plist
>--- libvirt.bak/pkg-plist	2014-07-13 00:17:32.000000000 +0400
>+++ libvirt/pkg-plist	2014-08-06 18:18:48.000000000 +0400
>@@ -333,29 +333,24 @@
> @dirrmtry %%ETCDIR%%/qemu/networks
> @dirrmtry %%ETCDIR%%/qemu
> @dirrm %%ETCDIR%%
>-@dirrmtry var/run/libvirt/network
>-%%QEMU%%@dirrmtry var/run/libvirt/qemu
>-@dirrmtry var/run/libvirt/lockd
>-@dirrmtry var/run/libvirt
>-@dirrmtry var/run
>-@dirrmtry var/log/libvirt/uml
>-@dirrmtry var/log/libvirt/qemu
>-@dirrmtry var/log/libvirt/lxc
>-@dirrmtry var/log/libvirt
>-@dirrmtry var/log
>-@dirrmtry var/lib/libvirt/lockd/files
>-@dirrmtry var/lib/libvirt/lockd
>-@dirrmtry var/lib/libvirt/images
>-@dirrmtry var/lib/libvirt/boot
>-@dirrmtry var/lib/libvirt/dnsmasq
>-@dirrmtry var/lib/libvirt/filesystems
>-@dirrmtry var/lib/libvirt/network
>-%%QEMU%%@dirrmtry var/lib/libvirt/qemu/channel/target
>-%%QEMU%%@dirrmtry var/lib/libvirt/qemu/channel
>-%%QEMU%%@dirrmtry var/lib/libvirt/qemu
>-@dirrmtry var/lib/libvirt
>-@dirrmtry var/lib
>-%%QEMU%%@dirrmtry var/cache/libvirt/qemu
>-@dirrmtry var/cache/libvirt
>-@dirrmtry var/cache
>-@dirrmtry var
>+@dirrmtry %%RUNDIR_NETWORK%%
>+@dirrmtry %%RUNDIR_QEMU%%
>+@dirrmtry %%RUNDIR_LOCKD%%
>+@dirrmtry %%LIBVIRT_RUNDIR%%
>+@dirrmtry %%LOGDIR_UML%%
>+@dirrmtry %%LOGDIR_QEMU%%
>+@dirrmtry %%LOGDIR_LXC%%
>+@dirrmtry %%LIBVIRT_LOGDIR%%
>+@dirrmtry %%VARLIBDIR_LOCKD%%
>+@dirrmtry %%VARLIBDIR_LOCKD_FILES%%
>+@dirrmtry %%VARLIBDIR_IMAGES%%
>+@dirrmtry %%VARLIBDIR_BOOT%%
>+@dirrmtry %%VARLIBDIR_DNSMASQ%%
>+@dirrmtry %%VARLIBDIR_FILESYSTEMS%%
>+@dirrmtry %%VARLIBDIR_NETWORK%%
>+@dirrmtry %%VARLIBDIR_QEMUDIR%%
>+@dirrmtry %%VARLIBDIR_QEMUDIR_CHANNEL_TARGET%%
>+@dirrmtry %%VARLIBDIR_QEMUDIR_CHANNEL%%
>+@dirrmtry %%LIBVIRT_VARLIBDIR%%
>+@dirrmtry %%CACHEDIR_QEMU%%
>+@dirrmtry %%LIBVIRT_CACHEDIR%%

Actions: View | Diff

Attachments on bug 192441: 145421 | 145424 | 146081