- fix: obscure corner case(s) with rpmvercmp (#50977).

CVS patchset: 6004
CVS date: 2003/01/10 20:34:26

CHANGES

@@ -105,6 +105,7 @@
 	- python: put rpmmodule.so where python expects to find.
 	- add brp-strip-static-archive build root policy helper.
 	- add -lelf to rpm LDFLAGS, not LDADD, since there is no libelf.la now.
+	- fix: obscure corner case(s) with rpmvercmp (#50977).
 
 4.0.4 -> 4.1:
 	- loosely wire beecrypt library into rpm.

lib/rpmvercmp.c

@@ -67,7 +67,8 @@ int rpmvercmp(const char * a, const char * b)
 	/* take care of the case where the two version segments are */
 	/* different types: one numeric, the other alpha (i.e. empty) */
 	if (one == str1) return -1;	/* arbitrary */
-	if (two == str2) return -1;
+	/* XXX See patch #60884 (and details) from bugzilla #50977. */
+	if (two == str2) return (isnum ? 1 : -1);
 
 	if (isnum) {
 	    /* this used to be done by converting the digit segments */

rpm.spec.in

@@ -20,7 +20,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.54
+Release: 0.55
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -464,6 +464,9 @@ exit 0
 %{__includedir}/popt.h
 
 %changelog
+* Fri Jan 10 2003 Jeff Johnson <jbj@redhat.com> 4.2-0.55
+- fix: obscure corner case(s) with rpmvercmp (#50977).
+
 * Wed Jan  8 2003 Jeff Johnson <jbj@redhat.com> 4.2-0.54
 - python: put rpmmodule.so where python expects to find.
 - add brp-strip-static-archive build root policy helper.

rpmrc.in

@@ -1,7 +1,7 @@
 #/*! \page config_rpmrc Default configuration: /usr/lib/rpm/rpmrc
 # \verbatim
 #
-# $Id: rpmrc.in,v 2.53 2002/11/27 01:28:55 jbj Exp $
+# $Id: rpmrc.in,v 2.54 2003/01/10 20:34:26 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -119,6 +119,9 @@ arch_canon:	s390x: s390x	15
 
 arch_canon:	ppc64:	ppc64	16
 
+arch_canon:	sh: sh		17
+arch_canon:	xtensa: xtensa	18
+
 #############################################################
 # Canonical OS names and numbers