dist-git conversion

Update EPEL branches to 1.5.2 and include fix for CVE-2010-0055 to all
branches.
2010-07-29 15:31:55 +00:00 · 2010-04-28 12:28:57 +00:00 · 2009-11-26 01:29:07 +00:00 · 2009-09-29 07:19:53 +00:00
4 changed files with 55 additions and 22 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: xar
-# $Id$
-NAME := xar
-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),)
-# attept 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)
--- a/xar-1.5.2-CVE-2010-0055.patch
+++ b/xar-1.5.2-CVE-2010-0055.patch
@ -0,0 +1,49 @@
+Index: xar/lib/archive.c
+===================================================================
+--- xar/lib/archive.c	(revision 224)
+++ xar/lib/archive.c	(revision 225)
+@@ -330,6 +330,44 @@
+ 
+ 		EVP_DigestFinal(&XAR(ret)->toc_ctx, toccksum, &tlen);
+ 
+		const char *value;
+		uint64_t offset = 0;
+		uint64_t length = tlen;
+		if( xar_prop_get( XAR_FILE(ret) , "checksum/offset", &value) == 0 ) {
+			errno = 0;
+			offset = strtoull( value, (char **)NULL, 10);
+			if( errno != 0 ) {
+				xar_close(ret);
+				return NULL;
+			}
+		} else if( xar_signature_first(ret) != NULL ) {
+			// All archives that have a signature also specify the location
+			// of the checksum.  If the location isn't specified, error out.
+			xar_close(ret);
+			return NULL;
+		}
+
+		XAR(ret)->heap_offset = xar_get_heap_offset(ret) + offset;
+		if( lseek(XAR(ret)->fd, XAR(ret)->heap_offset, SEEK_SET) == -1 ) {
+			xar_close(ret);
+			return NULL;
+		}
+		if( xar_prop_get( XAR_FILE(ret) , "checksum/size", &value) == 0 ) {
+			errno = 0;
+			length = strtoull( value, (char **)NULL, 10);
+			if( errno != 0 ) {
+				xar_close(ret);
+				return NULL;
+			}
+		} else if( xar_signature_first(ret) != NULL ) {
+			xar_close(ret);
+			return NULL;
+		}
+		if( length != tlen ) {
+			xar_close(ret);
+			return NULL;
+		}
+
+ 		xar_read_fd(XAR(ret)->fd, cval, tlen);
+ 		XAR(ret)->heap_offset += tlen;
+ 		if( memcmp(cval, toccksum, tlen) != 0 ) {
--- a/xar.spec
+++ b/xar.spec
@ -1,12 +1,13 @@
 Summary: The eXtensible ARchiver
 Name: xar
 Version: 1.5.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: Applications/Archiving
 URL: http://code.google.com/p/xar/
 Source: http://xar.googlecode.com/files/xar-%{version}.tar.gz
 Patch0: xar-1.5-norpath.patch
+Patch1: xar-1.5.2-CVE-2010-0055.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libxml2-devel
 BuildRequires: openssl-devel
@ -37,6 +38,7 @@ Development files for the eXtensible ARchiver.
 %prep
 %setup -q
 %patch0 -p1 -b .norpath
+%patch1 -p1 -b .CVE-2010-0055


 %build
@ -73,6 +75,9 @@ Development files for the eXtensible ARchiver.


 %changelog
+* Wed Apr 28 2010 Matthias Saou <http://freshrpms.net/> 1.5.2-6
+- Include patch to fix CVE-2010-0055 (#570678).
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 1.5.2-5
 - rebuilt with new openssl
Author	SHA1	Message	Date
Fedora Release Engineering	3ca39cccde	dist-git conversion	2010-07-29 15:31:55 +00:00
Matthias Saou	ab4580f527	Update EPEL branches to 1.5.2 and include fix for CVE-2010-0055 to all branches.	2010-04-28 12:28:57 +00:00
Bill Nottingham	d3e4427d0b	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:29:07 +00:00
Jesse Keating	dbb464542f	Initialize branch F-12 for xar	2009-09-29 07:19:53 +00:00