X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Flibvirt;h=fdf6fcdcff6ca045ed84e66d97e262c9832cb5b4;hb=674328ea046162b6293adf46996d6126ff5ae0ed;hp=8ebca73fcaf697bd616e0afc5cf3ae9acf928c8c;hpb=5fba8a0b1ebcb29340e225707193c0147c4cb64a;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/libvirt b/lfs/libvirt
index 8ebca73fca..fdf6fcdcff 100644
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.1.0
+VER        = 5.6.0
 
 THISAPP    = libvirt-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586 x86_64
 PROG       = libvirt
-PAK_VER    = 11
+PAK_VER    = 20
 
 DEPS       = "libpciaccess libyajl ncat qemu"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fd1c054a8b59235e877efb728de79386
+$(DL_FILE)_MD5 = e818bb25ead24119925781b7519a8401
 
 install : $(TARGET)
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -78,21 +78,23 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0001-Change-default-behavior-of-libvirt-guests.sh-for-IPF.patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc \
 			--with-openssl --without-sasl \
 			--without-uml --without-vbox --without-lxc --without-esx --without-vmware --without-openvz \
-			--without-firewalld --without-network --with-interface --with-virtualport --with-macvtap \
+			--without-firewalld --without-network --with-interface --with-virtualport --with-macvtap --without-wireshark-dissector \
 			--disable-nls --without-avahi --without-test-suite --without-dbus \
 			--with-qemu-user=nobody --with-qemu-group=kvm \
-			--with-storage-dir --with-storage-fs --without-storage-lvm  --without-storage-iscsi \
+			--with-storage-dir --with-storage-fs --with-storage-lvm  --without-storage-iscsi \
 			--without-storage-scsi --without-storage-mpath --without-storage-disk --without-storage-rbd --without-storage-sheepdog --without-storage-gluster  --without-storage-zfs
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
-	install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/libvirtd /etc/rc.d/init.d/libvirtd
-	install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/virtlogd /etc/rc.d/init.d/virtlogd
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,libvirtd)
+	$(call INSTALL_INITSCRIPT,virtlogd)
 	mv /usr/libexec/libvirt-guests.sh /etc/rc.d/init.d/libvirt-guests
 	# Backup
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/libvirt /var/ipfire/backup/addons/includes/libvirt
+	# Install libvirtd.conf
+	cp -fv $(DIR_SRC)/config/libvirt/libvirtd.conf /etc/libvirt
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)