rpms/autofs/F-9 autofs-5.0.4-fix-dumb-libxml2-check.patch, NONE, 1.1 autofs.spec, 1.247, 1.248
Ian Kent
iankent at fedoraproject.org
Wed Nov 19 07:20:16 UTC 2008
- Previous message: rpms/eric/F-9 .cvsignore, 1.12, 1.13 eric.spec, 1.30, 1.31 sources, 1.15, 1.16
- Next message: rpms/eric/devel eric.spec,1.32,1.33 sources,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: iankent
Update of /cvs/pkgs/rpms/autofs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26703
Modified Files:
autofs.spec
Added Files:
autofs-5.0.4-fix-dumb-libxml2-check.patch
Log Message:
* Wed Nov 19 2008 Ian Kent <kent at redhat.com> - 5.0.3-33
- fix libxml2 version check for deciding whether to use workaround.
autofs-5.0.4-fix-dumb-libxml2-check.patch:
--- NEW FILE autofs-5.0.4-fix-dumb-libxml2-check.patch ---
autofs-5.0.4 - fix dumb libxml2 check
From: Ian Kent <raven at themaw.net>
The workaround for libxml2 not deleting its thread specific data
key at library unload has become broken. It was foolish of me to
think that the libxml2 folks would fix this in any reasonable time.
This patch changes the version check to 99 for the major and minor
revisions, the same as the check for the revision to ensure that
the workaround is always used and adds the setting to the build
information produced by the -V option.
---
aclocal.m4 | 4 ++--
configure | 4 ++--
daemon/automount.c | 10 ++++++++++
3 files changed, 14 insertions(+), 4 deletions(-)
--- autofs-5.0.3.orig/aclocal.m4
+++ autofs-5.0.3/aclocal.m4
@@ -201,10 +201,10 @@ else
XML_FLAGS=`$XML_CONFIG --cflags`
XML_VER=`$XML_CONFIG --version`
XML_MAJOR=`echo $XML_VER|cut -d\. -f1`
- if test $XML_MAJOR -le 2
+ if test $XML_MAJOR -le 99
then
XML_MINOR=`echo $XML_VER|cut -d\. -f2`
- if test $XML_MINOR -le 6
+ if test $XML_MINOR -le 99
then
XML_REV=`echo $XML_VER|cut -d\. -f3`
if test $XML_REV -le 99; then
--- autofs-5.0.3.orig/configure
+++ autofs-5.0.3/configure
@@ -2564,10 +2564,10 @@ echo "${ECHO_T}yes" >&6; }
XML_FLAGS=`$XML_CONFIG --cflags`
XML_VER=`$XML_CONFIG --version`
XML_MAJOR=`echo $XML_VER|cut -d\. -f1`
- if test $XML_MAJOR -le 2
+ if test $XML_MAJOR -le 99
then
XML_MINOR=`echo $XML_VER|cut -d\. -f2`
- if test $XML_MINOR -le 6
+ if test $XML_MINOR -le 99
then
XML_REV=`echo $XML_VER|cut -d\. -f3`
if test $XML_REV -le 99; then
--- autofs-5.0.3.orig/daemon/automount.c
+++ autofs-5.0.3/daemon/automount.c
@@ -1776,6 +1776,16 @@ static void show_build_info(void)
#ifdef WITH_DMALLOC
printf("WITH_DMALLOC ");
count = count + 13;
+
+ if (count > 60) {
+ printf("\n ");
+ count = 0;
+ }
+#endif
+
+#ifdef LIBXML2_WORKAROUND
+ printf("LIBXML2_WORKAROUND ");
+ count = count + 19;
#endif
printf("\n\n");
Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-9/autofs.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- autofs.spec 11 Nov 2008 06:10:37 -0000 1.247
+++ autofs.spec 19 Nov 2008 07:19:45 -0000 1.248
@@ -4,7 +4,7 @@
Summary: A tool for automatically mounting and unmounting filesystems
Name: autofs
Version: 5.0.3
-Release: 29
+Release: 33
Epoch: 1
License: GPL
Group: System Environment/Daemons
@@ -67,6 +67,7 @@
Patch55: autofs-5.0.3-add-missing-uris-list-locking.patch
Patch56: autofs-5.0.3-library-reload-fix.patch
Patch57: autofs-5.0.3-expire-thread-create-cond-handling.patch
+Patch58: autofs-5.0.4-fix-dumb-libxml2-check.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs
Conflicts: kernel < 2.6.17
@@ -165,6 +166,7 @@
%patch55 -p1
%patch56 -p1
%patch57 -p1
+%patch58 -p1
%build
#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -217,6 +219,9 @@
%{_libdir}/autofs/
%changelog
+* Wed Nov 19 2008 Ian Kent <kent at redhat.com> - 5.0.3-33
+- fix libxml2 version check for deciding whether to use workaround.
+
* Tue Nov 11 2008 Ian Kent <kent at redhat.com> - 5.0.3-29
- correct buffer length setting in autofs-5.0.3-fix-ifc-buff-size-fix.patch.
- Previous message: rpms/eric/F-9 .cvsignore, 1.12, 1.13 eric.spec, 1.30, 1.31 sources, 1.15, 1.16
- Next message: rpms/eric/devel eric.spec,1.32,1.33 sources,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list