Fix config file reading

.cvsignore

@@ -17,6 +17,3 @@ libvirt-0.1.11.tar.gz
 libvirt-0.2.0.tar.gz
 libvirt-0.2.1.tar.gz
 libvirt-0.2.2.tar.gz
-libvirt-0.2.3.tar.gz
-libvirt-0.3.0.tar.gz
-libvirt-0.3.1.tar.gz

branch

@@ -0,0 +1 @@
+F-7

libvirt-0.4.0-conffile-size.patch

@@ -0,0 +1,12 @@
+diff -rup libvirt-0.4.0.orig/src/conf.c libvirt-0.4.0.new/src/conf.c
+--- libvirt-0.4.0.orig/src/conf.c	2007-12-12 08:30:49.000000000 -0500
++++ libvirt-0.4.0.new/src/conf.c	2008-01-02 16:30:12.000000000 -0500
+@@ -705,7 +705,7 @@ error:
+ virConfPtr
+ __virConfReadFile(const char *filename)
+ {
+-    char content[4096];
++    char content[8192];
+     int fd;
+     int len;
+ 

libvirt.spec

@@ -1,12 +1,21 @@
 # -*- rpm-spec -*-
 
+%if "%{fedora}" >= "8"
+%define with_polkit 1
+%define with_proxy no
+%else
+%define with_polkit 0
+%define with_proxy yes
+%endif
+
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.3.1
-Release: 1%{?dist}%{?extra_release}
+Version: 0.4.0
+Release: 2%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
+Patch1: libvirt-%{version}-conffile-size.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -16,15 +25,36 @@ Requires: ncurses
 Requires: dnsmasq
 Requires: bridge-utils
 Requires: iptables
+# So remote clients can access libvirt over SSH tunnel
+# (client invokes 'nc' against the UNIX socket on the server)
+Requires: nc
+Requires: cyrus-sasl
+# Not technically required, but makes 'out-of-box' config
+# work correctly & doesn't have onerous dependancies
+Requires: cyrus-sasl-md5
+%if %{with_polkit}
+Requires: PolicyKit >= 0.6
+%endif
+
 BuildRequires: xen-devel
 BuildRequires: libxml2-devel
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
 BuildRequires: gettext
 BuildRequires: gnutls-devel
+BuildRequires: avahi-devel
+BuildRequires: dnsmasq
+BuildRequires: bridge-utils
+BuildRequires: cyrus-sasl-devel
+%if %{with_polkit}
+BuildRequires: PolicyKit-devel >= 0.6
+%endif
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64 ia64
 
+# Fedora build root suckage
+BuildRequires: gawk
+
 %description
 Libvirt is a C toolkit to interract with the virtualization capabilities
 of recent versions of Linux (and other OSes).
@@ -34,6 +64,7 @@ Summary: Libraries, includes, etc. to compile with the libvirt library
 Group: Development/Libraries
 Requires: libvirt = %{version}
 Requires: pkgconfig
+Requires: xen-devel
 Obsoletes: libvir-devel
 
 %description devel
@@ -54,6 +85,7 @@ of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid
@@ -126,16 +158,24 @@ fi
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
 %{_sysconfdir}/rc.d/init.d/libvirtd
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
+%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
+%config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
+%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
 %dir %{_datadir}/libvirt/
 %dir %{_datadir}/libvirt/networks/
 %{_datadir}/libvirt/networks/default.xml
 %dir %{_localstatedir}/run/libvirt/
 %dir %{_localstatedir}/lib/libvirt/
+%if %{with_polkit}
+%{_datadir}/PolicyKit/policy/libvirtd.policy
+%endif
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
+%if %{with_proxy} == "yes"
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
+%endif
 %attr(0755, root, root) %{_sbindir}/libvirtd
-%doc docs/libvirt.rng
-%doc docs/network.rng
+%doc docs/*.rng
+%doc docs/*.xml
 
 %files devel
 %defattr(-, root, root)
@@ -165,21 +205,48 @@ fi
 %doc docs/examples/python
 
 %changelog
-* Tue Jul 24 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-1.fc8
+* Wed Jan  2 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-2.fc7
+- Fix reading large config files (rhbz #426425)
+
+* Tue Dec 18 2007 Daniel Veillard <veillard@redhat.com> - 0.4.0-1.fc7
+- Release of 0.4.0
+- SASL based authentication
+- improved NUMA and statistics support
+- lots of assorted improvements, bugfixes and cleanups
+- documentation and localization improvements
+
+* Tue Oct  9 2007 Daniel Veillard <veillard@redhat.com> - 0.3.3-1.fc7
+- Release of 0.3.3
+- Avahi support
+- NUMA support
+- lots of assorted improvements, bugfixes and cleanups
+- documentation and localization improvements
+
+* Tue Aug 21 2007 Daniel Veillard <veillard@redhat.com> - 0.3.2-1.fc7
+- Release of 0.3.2
+- API for domains migration
+- APIs for collecting statistics on disks and interfaces
+- lots of assorted bugfixes and cleanups
+- documentation and localization improvements
+
+* Thu Jul 26 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-2.fc7
+- adds fix for bug #249594
+
+* Tue Jul 24 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-1.fc7
 - Release of 0.3.1
 - localtime clock support
 - PS/2 and USB input devices
 - lots of assorted bugfixes and cleanups
 - documentation and localization improvements
 
-* Mon Jul  9 2007 Daniel Veillard <veillard@redhat.com> - 0.3.0-1.fc8
+* Mon Jul  9 2007 Daniel Veillard <veillard@redhat.com> - 0.3.0-1.fc7
 - Release of 0.3.0
 - Secure remote access support
 - unification of daemons
 - lots of assorted bugfixes and cleanups
 - documentation and localization improvements
 
-* Fri Jun  8 2007 Daniel Veillard <veillard@redhat.com> - 0.2.3-1.fc8
+* Fri Jun  8 2007 Daniel Veillard <veillard@redhat.com> - 0.2.3-1.fc7
 - Release of 0.2.3
 - lot of assorted bugfixes and cleanups
 - support for Xen-3.1

sources

@@ -1 +1 @@
-9b8a2a917dbaa028dff9d7bb03ca36ae  libvirt-0.3.1.tar.gz
+2f6c6adb62145988f0e5021e5cbd71d3  libvirt-0.4.0.tar.gz