libraries/libvirt: Updated for version 0.9.4.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

4 files changed, 75 insertions, 16 deletions

diff --git a/libraries/libvirt/doinst.sh b/libraries/libvirt/doinst.sh
index a906638af4..d5a0dd37db 100644
--- a/libraries/libvirt/doinst.sh
+++ b/libraries/libvirt/doinst.sh
@@ -12,9 +12,27 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/libvirt/libvirtd.conf.new
 config etc/libvirt/qemu.conf.new
 config etc/libvirt/qemu/networks/default.xml.new
+config etc/libvirt/libvirtd.conf.new
+config etc/libvirt/nwfilter/qemu-announce-self.xml.new
+config etc/libvirt/nwfilter/no-arp-spoofing.xml.new
+config etc/libvirt/nwfilter/no-mac-spoofing.xml.new
+config etc/libvirt/nwfilter/allow-incoming-ipv4.xml.new
+config etc/libvirt/nwfilter/allow-dhcp-server.xml.new
+config etc/libvirt/nwfilter/allow-arp.xml.new
+config etc/libvirt/nwfilter/no-other-rarp-traffic.xml.new
+config etc/libvirt/nwfilter/clean-traffic.xml.new
+config etc/libvirt/nwfilter/qemu-announce-self-rarp.xml.new
+config etc/libvirt/nwfilter/no-mac-broadcast.xml.new
+config etc/libvirt/nwfilter/no-ip-spoofing.xml.new
+config etc/libvirt/nwfilter/allow-dhcp.xml.new
+config etc/libvirt/nwfilter/no-other-l2-traffic.xml.new
+config etc/libvirt/nwfilter/allow-ipv4.xml.new
+config etc/libvirt/nwfilter/no-ip-multicast.xml.new
+config etc/libvirt/lxc.conf.new
 config etc/logrotate.d/libvirtd.new
+config etc/logrotate.d/libvirtd.lxc.new
+config etc/logrotate.d/libvirtd.qemu.new
+config etc/logrotate.d/libvirtd.uml.new
 config etc/sasl2/libvirt.conf.new
-
diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild
index f47c3a922b..bee24a10ae 100644
--- a/libraries/libvirt/libvirt.SlackBuild
+++ b/libraries/libvirt/libvirt.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Michal Bialozor <bialyy@o2.pl>
 
 PRGNAM=libvirt
-VERSION=0.7.7
+VERSION=0.9.4
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,13 +69,54 @@ make \
   EXAMPLE_DIR=/usr/doc/$PRGNAM-$VERSION/examples \
   install-strip DESTDIR=$PKG
 
-# Don't clobber existing config files on upgrade
-mv $PKG/etc/libvirt/libvirtd.conf $PKG/etc/libvirt/libvirtd.conf.new
-mv $PKG/etc/libvirt/qemu.conf $PKG/etc/libvirt/qemu.conf.new
+mv $PKG/etc/libvirt/qemu.conf \
+   $PKG/etc/libvirt/qemu.conf.new
 mv $PKG/etc/libvirt/qemu/networks/default.xml \
    $PKG/etc/libvirt/qemu/networks/default.xml.new
-mv $PKG/etc/logrotate.d/libvirtd $PKG/etc/logrotate.d/libvirtd.new
-mv $PKG/etc/sasl2/libvirt.conf $PKG/etc/sasl2/libvirt.conf.new
+mv $PKG/etc/libvirt/libvirtd.conf \
+   $PKG/etc/libvirt/libvirtd.conf.new
+mv $PKG/etc/libvirt/nwfilter/qemu-announce-self.xml \
+   $PKG/etc/libvirt/nwfilter/qemu-announce-self.xml.new
+mv $PKG/etc/libvirt/nwfilter/no-arp-spoofing.xml \
+   $PKG/etc/libvirt/nwfilter/no-arp-spoofing.xml.new
+mv $PKG/etc/libvirt/nwfilter/no-mac-spoofing.xml \
+   $PKG/etc/libvirt/nwfilter/no-mac-spoofing.xml.new
+mv $PKG/etc/libvirt/nwfilter/allow-incoming-ipv4.xml \
+   $PKG/etc/libvirt/nwfilter/allow-incoming-ipv4.xml.new
+mv $PKG/etc/libvirt/nwfilter/allow-dhcp-server.xml \
+   $PKG/etc/libvirt/nwfilter/allow-dhcp-server.xml.new
+mv $PKG/etc/libvirt/nwfilter/allow-arp.xml \
+   $PKG/etc/libvirt/nwfilter/allow-arp.xml.new
+mv $PKG/etc/libvirt/nwfilter/no-other-rarp-traffic.xml \
+   $PKG/etc/libvirt/nwfilter/no-other-rarp-traffic.xml.new
+mv $PKG/etc/libvirt/nwfilter/clean-traffic.xml \
+   $PKG/etc/libvirt/nwfilter/clean-traffic.xml.new
+mv $PKG/etc/libvirt/nwfilter/qemu-announce-self-rarp.xml \
+   $PKG/etc/libvirt/nwfilter/qemu-announce-self-rarp.xml.new
+mv $PKG/etc/libvirt/nwfilter/no-mac-broadcast.xml \
+   $PKG/etc/libvirt/nwfilter/no-mac-broadcast.xml.new
+mv $PKG/etc/libvirt/nwfilter/no-ip-spoofing.xml \
+   $PKG/etc/libvirt/nwfilter/no-ip-spoofing.xml.new
+mv $PKG/etc/libvirt/nwfilter/allow-dhcp.xml \
+   $PKG/etc/libvirt/nwfilter/allow-dhcp.xml.new
+mv $PKG/etc/libvirt/nwfilter/no-other-l2-traffic.xml \
+   $PKG/etc/libvirt/nwfilter/no-other-l2-traffic.xml.new
+mv $PKG/etc/libvirt/nwfilter/allow-ipv4.xml \
+   $PKG/etc/libvirt/nwfilter/allow-ipv4.xml.new
+mv $PKG/etc/libvirt/nwfilter/no-ip-multicast.xml \
+   $PKG/etc/libvirt/nwfilter/no-ip-multicast.xml.new
+mv $PKG/etc/libvirt/lxc.conf \
+   $PKG/etc/libvirt/lxc.conf.new
+mv $PKG/etc/logrotate.d/libvirtd \
+   $PKG/etc/logrotate.d/libvirtd.new
+mv $PKG/etc/logrotate.d/libvirtd.lxc \
+   $PKG/etc/logrotate.d/libvirtd.lxc.new
+mv $PKG/etc/logrotate.d/libvirtd.qemu \
+   $PKG/etc/logrotate.d/libvirtd.qemu.new
+mv $PKG/etc/logrotate.d/libvirtd.uml \
+   $PKG/etc/logrotate.d/libvirtd.uml.new
+mv $PKG/etc/sasl2/libvirt.conf \
+   $PKG/etc/sasl2/libvirt.conf.new
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -83,9 +124,9 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   ABOUT-NLS AUTHORS ChangeLog COPYING* INSTALL README NEWS TODO \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-rm -rf $PKG/usr/share/doc	# We've got the TODO already
+rm -rf $PKG/usr/share/doc
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info
index 4bdadc593b..06f7d5feec 100644
--- a/libraries/libvirt/libvirt.info
+++ b/libraries/libvirt/libvirt.info
@@ -1,10 +1,10 @@
 PRGNAM="libvirt"
-VERSION="0.7.7"
+VERSION="0.9.4"
 HOMEPAGE="http://libvirt.org"
-DOWNLOAD="http://libvirt.org/sources/libvirt-0.7.7.tar.gz"
-MD5SUM="5f315b0bf20e3964f7657ba1e630cd67"
+DOWNLOAD="http://libvirt.org/sources/libvirt-0.9.4.tar.gz"
+MD5SUM="86b411b11bd23d4af20611699f372af7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Michal Bialozor"
 EMAIL="bialyy@o2.pl"
-APPROVED="Erik Hanson"
+APPROVED="Niels Horn"
diff --git a/libraries/libvirt/slack-desc b/libraries/libvirt/slack-desc
index 48ea1bf7e9..2a68e97cf5 100644
--- a/libraries/libvirt/slack-desc
+++ b/libraries/libvirt/slack-desc
@@ -10,9 +10,9 @@ libvirt: libvirt (The virtualization API)
 libvirt:
 libvirt: libvirt is a toolkit to interact with the virtualization 
 libvirt: capabilities of recent versions of Linux (and other OSes). 
-libvirt: 
+libvirt:
 libvirt: Homepage: http://libvirt.org
-libvirt: 
+libvirt:
 libvirt:
 libvirt:
 libvirt: