Fix config file reading

.cvsignore

@@ -17,9 +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
-libvirt-0.3.2.tar.gz
-libvirt-0.3.3.tar.gz
-libvirt-0.4.0.tar.gz

Makefile

@@ -3,19 +3,4 @@
 NAME := libvirt
 SPECFILE = $(firstword $(wildcard *.spec))
 
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
+include ../common/Makefile.common

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

@@ -11,10 +11,11 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.4.0
-Release: 1%{?dist}%{?extra_release}
+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
@@ -35,9 +36,7 @@ Requires: cyrus-sasl-md5
 Requires: PolicyKit >= 0.6
 %endif
 
-%ifarch i386 x86_64 ia64
 BuildRequires: xen-devel
-%endif
 BuildRequires: libxml2-devel
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
@@ -51,6 +50,7 @@ BuildRequires: cyrus-sasl-devel
 BuildRequires: PolicyKit-devel >= 0.6
 %endif
 Obsoletes: libvir
+ExclusiveArch: i386 x86_64 ia64
 
 # Fedora build root suckage
 BuildRequires: gawk
@@ -64,9 +64,7 @@ Summary: Libraries, includes, etc. to compile with the libvirt library
 Group: Development/Libraries
 Requires: libvirt = %{version}
 Requires: pkgconfig
-%ifarch i386 x86_64 ia64
 Requires: xen-devel
-%endif
 Obsoletes: libvir-devel
 
 %description devel
@@ -87,15 +85,10 @@ of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
-# Xen is availble only on i386 x86_64 ia64
-%ifarch i386 i686 x86_64 ia64
 %configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid
-%else
-%configure --without-xen --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid
-%endif
-
 make
 
 %install
@@ -212,59 +205,48 @@ fi
 %doc docs/examples/python
 
 %changelog
-* Tue Dec 18 2007 Daniel Veillard <veillard@redhat.com> - 0.4.0-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
-- PolicyKit authentication
 - improved NUMA and statistics support
 - lots of assorted improvements, bugfixes and cleanups
 - documentation and localization improvements
 
-* Mon Oct 15 2007 Daniel P. Berrange <berrange@redhat.com> - 0.3.3-2.fc8
-- Added QEMU driver config file support
-- Added example config files
-
-* Sun Sep 30 2007 Daniel Veillard <veillard@redhat.com> - 0.3.3-1
+* 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
 
-* Fri Aug 24 2007 Daniel Veillard <veillard@redhat.com> - 0.3.2-2.fc8
-- also build on arches where Xen is not available
-
-* Tue Aug 21 2007 Daniel Veillard <veillard@redhat.com> - 0.3.2-1.fc8
+* 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 Aug 16 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-4.fc8
-- Fixes missing Requires for libvirt-devel
-
-* Thu Jul 26 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-3.fc8
+* Thu Jul 26 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-2.fc7
 - adds fix for bug #249594
 
-* Wed Jul 25 2007 Jesse Keating <jkeating@redhat.com> - 0.3.1-2
-- Rebuild for RH #249435
-
-* Tue Jul 24 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-1.fc8
+* 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