Update to upstream 1.1.0

Drop patch, no longer using SAX1 handler
This commit is contained in:
Paul W. Frields 2011-04-10 17:15:55 -04:00
parent 421d8bc783
commit b80d49ad1d
4 changed files with 7 additions and 40 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ xmlstarlet-1.0.1.tar.gz
/xmlstarlet-1.0.4.tar.gz
/xmlstarlet-1.0.5.tar.gz
/xmlstarlet-1.0.6.tar.gz
/xmlstarlet-1.1.0.tar.gz

View File

@ -1 +1 @@
92cfb51a278e89ca75bb51dd2623c066 xmlstarlet-1.0.6.tar.gz
1b864b16c1dc78ce87ffc8528f021ab0 xmlstarlet-1.1.0.tar.gz

View File

@ -1,35 +0,0 @@
From 348ee3d65a0f30983c72d43a15d371b47fea65f6 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Fri, 1 Apr 2011 17:41:03 -0400
Subject: [PATCH 1/1] don't write to curXPath[-1]
---
src/xml_elem.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/xml_elem.c b/src/xml_elem.c
index 69f3126..eaabcf2 100644
--- a/src/xml_elem.c
+++ b/src/xml_elem.c
@@ -163,7 +163,9 @@ void elStartElement(void *user_data, const xmlChar *name, const xmlChar **attrs)
*/
void elEndElement(void *user_data, const xmlChar *name)
{
- *(curXPath + xmlStrlen(curXPath) - xmlStrlen(name) - 1) = '\0';
+ int xlen = xmlStrlen(curXPath);
+ int nlen = xmlStrlen(name);
+ *(curXPath + xlen - nlen - (xlen == nlen?0:1)) = '\0';
depth--;
}
@@ -184,6 +186,7 @@ parse_xml_file(const char *filename)
ret = xmlSAXUserParseFile(&xmlSAX_handler, NULL, filename);
xmlCleanupParser();
+ xmlFree(curXPath);
return ret;
}
--
1.7.0.1

View File

@ -1,6 +1,6 @@
Name: xmlstarlet
Version: 1.0.6
Release: 2%{?dist}
Version: 1.1.0
Release: 1%{?dist}
Summary: Command Line XML Toolkit
Group: Applications/Text
License: MIT
@ -8,7 +8,6 @@ URL: http://xmlstar.sourceforge.net/
Source0: http://downloads.sourceforge.net/xmlstar/%{name}-%{version}.tar.gz
Patch0: xmlstarlet-1.0.6-gendoc.patch
# http://sourceforge.net/tracker/?func=detail&aid=3266898&group_id=66612&atid=515106
Patch1: xmlstar-sf3266898.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xmlto automake autoconf libxslt-devel
@ -24,7 +23,6 @@ commands.
%prep
%setup -q
%patch0 -p1 -b .gendoc
%patch1 -p1 -b .sf3266898
%build
@ -60,6 +58,9 @@ rm -fr %{buildroot}
%changelog
* Sun Apr 10 2011 Paul W. Frields <stickster@gmail.com> - 1.1.0-1
- Update to upstream 1.1.0
* Thu Apr 07 2011 Dan Horák <dan[at]danny.cz> - 1.0.6-2
- fix build on 64-bit big-endians