RPM Package Manager, CVS Repository
/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm pcre Date: 10-Sep-2010 21:49:04
Branch: rpm-5_2 Handle: 2010091019490102
Modified files: (Branch: rpm-5_2)
pcre install-sh
rpm CHANGES autogen.sh configure.ac devtool.conf
rpm/misc Makefile.am librpmmisc.vers
rpm/rpmio digest.c rpmbc.c rpmbc.h
rpm/tests/ref .alldigests showrc
Log:
- beecrypt: finish up --with-beecrypt=internal wiring into -lrpmmisc.
- beecrypt: permit --with-beecrypt=internal (w manual checkout/autogen).
Summary:
Revision Changes Path
1.1.1.1.2.3 +8 -3 pcre/install-sh
1.2970.2.66 +2 -0 rpm/CHANGES
2.102.2.2 +24 -15 rpm/autogen.sh
2.372.2.15 +9 -6 rpm/configure.ac
2.293.2.17 +11 -7 rpm/devtool.conf
1.48.2.1 +2 -0 rpm/misc/Makefile.am
1.19.2.3 +70 -0 rpm/misc/librpmmisc.vers
2.48.2.1 +0 -2 rpm/rpmio/digest.c
2.16.2.1 +30 -19 rpm/rpmio/rpmbc.c
2.5.2.1 +6 -0 rpm/rpmio/rpmbc.h
1.22.2.6 +38 -38 rpm/tests/ref/.alldigests
1.14.2.6 +34 -18 rpm/tests/ref/showrc
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: pcre/install-sh
============================================================================
$ cvs diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 install-sh
--- pcre/install-sh 20 Aug 2010 19:16:18 -0000 1.1.1.1.2.2
+++ pcre/install-sh 10 Sep 2010 19:49:02 -0000 1.1.1.1.2.3
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-12-25.00
+scriptversion=2010-02-06.18; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -200,7 +200,11 @@
fi
if test -z "$dir_arg"; then
- trap '(exit $?); exit' 1 2 13 15
+ do_exit='(exit $ret); exit $ret'
+ trap "ret=129; $do_exit" 1
+ trap "ret=130; $do_exit" 2
+ trap "ret=141; $do_exit" 13
+ trap "ret=143; $do_exit" 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
@@ -515,5 +519,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
@@ .
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2970.2.65 -r1.2970.2.66 CHANGES
--- rpm/CHANGES 20 Aug 2010 19:16:10 -0000 1.2970.2.65
+++ rpm/CHANGES 10 Sep 2010 19:49:01 -0000 1.2970.2.66
@@ -1,4 +1,6 @@
5.2.1 -> 5.2.2:
+ - jbj: beecrypt: finish up --with-beecrypt=internal wiring into -lrpmmisc.
+ - jbj: beecrypt: permit --with-beecrypt=internal (w manual checkout/autogen)
- jbj: snapshot rpm-5.2.2 release tarball.
- jbj: update po files (Translation Project).
- jbj: solve: commit to a test framework based on EDOS and Poky.
@@ .
patch -p0 <<'@@ .'
Index: rpm/autogen.sh
============================================================================
$ cvs diff -u -r2.102.2.1 -r2.102.2.2 autogen.sh
--- rpm/autogen.sh 1 Jun 2009 13:44:13 -0000 2.102.2.1
+++ rpm/autogen.sh 10 Sep 2010 19:49:01 -0000 2.102.2.2
@@ -40,21 +40,30 @@
[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1
[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1
-echo "===> pcre"
-( cd pcre && sh ./autogen.sh --noconfigure "$@" )
-echo "<=== pcre"
-echo "===> xz"
-( cd xz && sh ./autogen.sh --noconfigure "$@" )
-echo "<=== xz"
-echo "===> file"
-( cd file && sh ./autogen.sh --noconfigure "$@" )
-echo "<=== file"
-echo "===> syck"
-( cd syck && sh ./autogen.sh --noconfigure "$@" )
-echo "<=== syck"
-echo "===> xar"
-( cd xar && sh ./autogen.sh --noconfigure "$@" )
-echo "<=== xar"
+for dir in bash beecrypt file neon pcre rc syck xar xz; do
+
+ if [ -d $dir ]; then
+ echo "===> $dir"
+ ( cd $dir && sh ./autogen.sh --noconfigure "$@" )
+ echo "<=== $dir"
+fi
+done
+
+#echo "===> pcre"
+#( cd pcre && sh ./autogen.sh --noconfigure "$@" )
+#echo "<=== pcre"
+#echo "===> xz"
+#( cd xz && sh ./autogen.sh --noconfigure "$@" )
+#echo "<=== xz"
+#echo "===> file"
+#( cd file && sh ./autogen.sh --noconfigure "$@" )
+#echo "<=== file"
+#echo "===> syck"
+#( cd syck && sh ./autogen.sh --noconfigure "$@" )
+#echo "<=== syck"
+#echo "===> xar"
+#( cd xar && sh ./autogen.sh --noconfigure "$@" )
+#echo "<=== xar"
echo "===> rpm"
rm -rf autom4te.cache || true
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.372.2.14 -r2.372.2.15 configure.ac
--- rpm/configure.ac 20 Aug 2010 19:16:10 -0000 2.372.2.14
+++ rpm/configure.ac 10 Sep 2010 19:49:01 -0000 2.372.2.15
@@ -44,7 +44,7 @@
dnl # Interfaces removed: AGE=0
AC_SUBST(LT_CURRENT, 5)
AC_SUBST(LT_REVISION, 2)
-AC_SUBST(LT_AGE, 1)
+AC_SUBST(LT_AGE, 2)
dnl # provide RPM exported version
RPM_VERSION="0,0,_,0,0,_"
@@ -994,14 +994,14 @@
AC_ARG_WITH(python, AS_HELP_STRING([--with-python], [build with RPM Python language bindings]), [
if test ".$withval" != .no; then
case "$withval" in
- 2.x|2.3|2.4|2.5|2.6)
+ 2.x|2.3|2.4|2.5|2.6|2.7)
python_version=$withval
;;
yes)
- python_version="2.6 2.5 2.4 2.3 2.x"
+ python_version="2.7 2.6 2.5 2.4 2.3 2.x"
;;
*)
- AC_MSG_WARN([--with-python only supports values "2.x", "2.3", "2.4", "2.5", or "2.6" ignoring...])
+ AC_MSG_WARN([--with-python only supports values "2.x", "2.3", "2.4", "2.5", "2.6", or "2.7" ignoring...])
python_version=""
;;
esac
@@ -1154,8 +1154,11 @@
RPM_CHECK_LIB(
[BeeCrypt], [beecrypt],
[beecrypt], [mpfprintln], [beecrypt/api.h],
- [yes,external], [],
+ [yes,internal:external], [beecrypt:include],
[], [ AC_MSG_ERROR([mandatory BeeCrypt library not found]) ])
+ if test ".$WITH_BEECRYPT" = .no; then
+ AC_MSG_ERROR([BEECRYPT is mandatory])
+ fi
dnl # GCrypt
RPM_CHECK_LIB(
@@ -1289,7 +1292,7 @@
dnl # Python embedding
RPM_CHECK_LIB(
[Python embedding], [pythonembed],
- [python2.6 python2.5], [Py_Initialize], [Python.h],
+ [python2.7 python2.6 python2.5], [Py_Initialize], [Python.h],
[no,external:none], [],
[
], [])
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.293.2.16 -r2.293.2.17 devtool.conf
--- rpm/devtool.conf 20 Aug 2010 19:31:55 -0000 2.293.2.16
+++ rpm/devtool.conf 10 Sep 2010 19:49:01 -0000 2.293.2.17
@@ -3,15 +3,17 @@
##
%common
- MODULE_NAMES="db lua file xar xz pcre syck js/src"
+ MODULE_NAMES="db lua file xar xz pcre syck js/src beecrypt"
+ MODULE_TAG_BEECRYPT=""
MODULE_TAG_DB="rpm-5_2"
- MODULE_TAG_LUA="rpm-5_2"
MODULE_TAG_FILE="rpm-5_2"
- MODULE_TAG_XAR="rpm-5_2"
- MODULE_TAG_XZ="rpm-5_2"
+ MODULE_TAG_JS_SRC="rpm-5_2"
+ MODULE_TAG_LUA="rpm-5_2"
+ MODULE_TAG_NEON=""
MODULE_TAG_PCRE="rpm-5_2"
MODULE_TAG_SYCK="rpm-5_2"
- MODULE_TAG_JS_SRC="rpm-5_2"
+ MODULE_TAG_XAR="rpm-5_2"
+ MODULE_TAG_XZ="rpm-5_2"
%checkout
for name in $MODULE_NAMES "$@"; do
@@ -60,6 +62,8 @@
%system
%system
+ CPPFLAGS="-DRPM_VENDOR_WINDRIVER"
+ export CPPFLAGS
# configure RPM 5 with maximum internal (independence) and maximum
# external (reusability) extend as it usually is the case when
# building and running RPM as the system package manager on a
@@ -80,7 +84,7 @@
--with-tcl=external \
--with-sqlite=external \
--with-syck=internal \
- --with-beecrypt=external \
+ --with-beecrypt=internal \
--with-openssl=external \
--with-nss=external \
--with-gcrypt=external \
@@ -89,7 +93,7 @@
--without-uuid \
--with-attr \
--with-acl \
- --with-xar=internal \
+ --without-xar \
--with-popt=external \
--with-keyutils=external \
--with-pthreads \
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/Makefile.am
============================================================================
$ cvs diff -u -r1.48 -r1.48.2.1 Makefile.am
--- rpm/misc/Makefile.am 2 May 2009 20:06:28 -0000 1.48
+++ rpm/misc/Makefile.am 10 Sep 2010 19:49:02 -0000 1.48.2.1
@@ -33,6 +33,7 @@
librpmmisc_la_LDFLAGS += \
@WITH_DB_LDFLAGS@ \
@WITH_FILE_LDFLAGS@ \
+ @WITH_BEECRYPT_LDFLAGS@ \
@WITH_FICL_LDFLAGS@ \
@WITH_JS_LDFLAGS@ \
@WITH_LUA_LDFLAGS@ \
@@ -46,6 +47,7 @@
@WITH_DB_LIBS@ \
@WITH_FICL_LIBS@ \
@WITH_FILE_LIBS@ \
+ @WITH_BEECRYPT_LIBS@ \
@WITH_JS_LIBS@ \
@WITH_LUA_LIBS@ \
@WITH_PCRE_LIBS@ \
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/librpmmisc.vers
============================================================================
$ cvs diff -u -r1.19.2.2 -r1.19.2.3 librpmmisc.vers
--- rpm/misc/librpmmisc.vers 26 Apr 2010 08:50:05 -0000 1.19.2.2
+++ rpm/misc/librpmmisc.vers 10 Sep 2010 19:49:02 -0000 1.19.2.3
@@ -148,6 +148,76 @@
xar_iter_new;
xar_open;
xar_opt_set;
+ b64crc;
+ b64decode;
+ b64encode;
+ b64encode_chars_per_line;
+ b64encode_eolstr;
+ dldp_pPair;
+ dlkp_pFree;
+ dlkp_pInit;
+ dsaparamMake;
+ dsasign;
+ dsavrfy;
+ i2osp;
+ md4Digest;
+ md4Reset;
+ md4Update;
+ md5Digest;
+ md5Reset;
+ md5Update;
+ mpadd;
+ mpbits;
+ mpbnrnd;
+ mpbsethex;
+ mpfprintln;
+ mplshift;
+ mpnfree;
+ mpnsetbin;
+ mpnsethex;
+ mpnzero;
+ mpsetw;
+ mpzero;
+ randomGeneratorContextFree;
+ randomGeneratorContextInit;
+ randomGeneratorDefault;
+ ripemd128Digest;
+ ripemd128Reset;
+ ripemd128Update;
+ ripemd160Digest;
+ ripemd160Reset;
+ ripemd160Update;
+ ripemd256Digest;
+ ripemd256Reset;
+ ripemd256Update;
+ ripemd320Digest;
+ ripemd320Reset;
+ ripemd320Update;
+ rsakpFree;
+ rsakpMake;
+ rsapricrt;
+ rsavrfy;
+ sha1Digest;
+ sha1Reset;
+ sha1Update;
+ sha224Digest;
+ sha224Reset;
+ sha224Update;
+ sha256Digest;
+ sha256Reset;
+ sha256Update;
+ sha384Digest;
+ sha384Reset;
+ sha384Update;
+ sha512Digest;
+ sha512Reset;
+ sha512Update;
+ hashFunctionContextDigest;
+ hashFunctionContextFree;
+ hashFunctionContextInit;
+ hashFunctionContextUpdateMC;
+ hashFunctionCount;
+ hashFunctionGet;
local:
file_*;
db_*;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/digest.c
============================================================================
$ cvs diff -u -r2.48 -r2.48.2.1 digest.c
--- rpm/rpmio/digest.c 2 Mar 2009 00:45:55 -0000 2.48
+++ rpm/rpmio/digest.c 10 Sep 2010 19:49:03 -0000 2.48.2.1
@@ -321,7 +321,6 @@
ctx->Digest = (int (*)(void *, byte *)) sum64Digest;
/*@=type@*/
break;
-#if defined(HAVE_BEECRYPT_API_H)
case PGPHASHALGO_SHA224:
ctx->name = "SHA224";
ctx->digestsize = 224/8;
@@ -382,7 +381,6 @@
/*@=type@*/
ctx->asn1 = "3051300d060960864801650304020305000440";
break;
-#endif
case PGPHASHALGO_HAVAL_5_160:
default:
free(ctx);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmbc.c
============================================================================
$ cvs diff -u -r2.16 -r2.16.2.1 rpmbc.c
--- rpm/rpmio/rpmbc.c 2 Mar 2009 00:45:55 -0000 2.16
+++ rpm/rpmio/rpmbc.c 10 Sep 2010 19:49:03 -0000 2.16.2.1
@@ -94,11 +94,7 @@
int rc;
/*@-moduncon@*/
-#if defined(HAVE_BEECRYPT_API_H)
rc = rsavrfy(&bc->rsa_pk.n, &bc->rsa_pk.e, &bc->c, &bc->rsahm);
-#else
- rc = rsavrfy(&bc->rsa_pk, &bc->rsahm, &bc->c);
-#endif
/*@=moduncon@*/
return rc;
@@ -115,9 +111,15 @@
assert(sigp->hash_algo == rpmDigestAlgo(ctx));
xx = rpmDigestFinal(ctx, (void **)&dig->sha1, &dig->sha1len, 1);
+ { char * hm = dig->sha1;
+ char lastc = hm[40];
+ /* XXX Truncate to 160bits. */
+ hm[40] = '\0';
/*@-moduncon -noeffectuncon @*/
- mpnzero(&bc->hm); (void) mpnsethex(&bc->hm, dig->sha1);
+ mpnzero(&bc->hm); (void) mpnsethex(&bc->hm, hm);
/*@=moduncon =noeffectuncon @*/
+ hm[40] = lastc;
+ }
/* Compare leading 16 bits of digest for quick check. */
signhash16[0] = (rpmuint8_t)((*bc->hm.data >> 24) & 0xff);
@@ -165,14 +167,14 @@
/**
*/
-static /*@observer@*/
-const char * pgpMpiHex(const rpmuint8_t *p)
+static /*@only@*/
+char * pgpMpiHex(const rpmuint8_t *p)
/*@*/
{
- static char prbuf[2048];
- char *t = prbuf;
- t = pgpHexCvt(t, p+2, pgpMpiLen(p)-2);
- return prbuf;
+ size_t nb = pgpMpiLen(p);
+ char * t = xmalloc(2*nb + 1);
+ (void) pgpHexCvt(t, p+2, nb-2);
+ return t;
}
/**
@@ -206,7 +208,10 @@
if (_pgp_debug)
fprintf(stderr, "*** mbits %u nbits %u nbytes %u t %p[%d] ix %u\n", mbits, nbits, nbytes, t, (2*nbytes+1), ix);
if (ix > 0) memset(t, (int)'0', ix);
- strcpy(t+ix, (const char *) pgpMpiHex(p));
+ { const char * s = pgpMpiHex(p);
+ strcpy(t+ix, s);
+ s = _free(s);
+ }
if (_pgp_debug)
fprintf(stderr, "*** %s %s\n", pre, t);
(void) mpnsethex(mpn, t);
@@ -223,14 +228,19 @@
/*@modifies fileSystem @*/
{
rpmbc bc = dig->impl;
+ const char * s = NULL;
int rc = 0;
switch (itemno) {
default:
assert(0);
+ case 50: /* ECDSA r */
+ case 51: /* ECDSA s */
+ case 60: /* ECDSA curve OID */
+ case 61: /* ECDSA Q */
break;
case 10: /* RSA m**d */
- (void) mpnsethex(&bc->c, pgpMpiHex(p));
+ (void) mpnsethex(&bc->c, s = pgpMpiHex(p));
if (_pgp_debug && _pgp_print)
fprintf(stderr, "\t %s ", pre), mpfprintln(stderr, bc->c.size, bc->c.data);
break;
@@ -241,36 +251,37 @@
rc = pgpMpiSet(pre, 160, &bc->s, p, pend);
break;
case 30: /* RSA n */
- (void) mpbsethex(&bc->rsa_pk.n, pgpMpiHex(p));
+ (void) mpbsethex(&bc->rsa_pk.n, s = pgpMpiHex(p));
if (_pgp_debug && _pgp_print)
fprintf(stderr, "\t %s ", pre), mpfprintln(stderr, bc->rsa_pk.n.size, bc->rsa_pk.n.modl);
break;
case 31: /* RSA e */
- (void) mpnsethex(&bc->rsa_pk.e, pgpMpiHex(p));
+ (void) mpnsethex(&bc->rsa_pk.e, s = pgpMpiHex(p));
if (_pgp_debug && _pgp_print)
fprintf(stderr, "\t %s ", pre), mpfprintln(stderr, bc->rsa_pk.e.size, bc->rsa_pk.e.data);
break;
case 40: /* DSA p */
- (void) mpbsethex(&bc->p, pgpMpiHex(p));
+ (void) mpbsethex(&bc->p, s = pgpMpiHex(p));
if (_pgp_debug && _pgp_print)
fprintf(stderr, "\t %s ", pre), mpfprintln(stderr, bc->p.size, bc->p.modl);
break;
case 41: /* DSA q */
- (void) mpbsethex(&bc->q, pgpMpiHex(p));
+ (void) mpbsethex(&bc->q, s = pgpMpiHex(p));
if (_pgp_debug && _pgp_print)
fprintf(stderr, "\t %s ", pre), mpfprintln(stderr, bc->q.size, bc->q.modl);
break;
case 42: /* DSA g */
- (void) mpnsethex(&bc->g, pgpMpiHex(p));
+ (void) mpnsethex(&bc->g, s = pgpMpiHex(p));
if (_pgp_debug && _pgp_print)
fprintf(stderr, "\t %s ", pre), mpfprintln(stderr, bc->g.size, bc->g.data);
break;
case 43: /* DSA y */
- (void) mpnsethex(&bc->y, pgpMpiHex(p));
+ (void) mpnsethex(&bc->y, s = pgpMpiHex(p));
if (_pgp_debug && _pgp_print)
fprintf(stderr, "\t %s ", pre), mpfprintln(stderr, bc->y.size, bc->y.data);
break;
}
+ s = _free(s);
return rc;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmbc.h
============================================================================
$ cvs diff -u -r2.5 -r2.5.2.1 rpmbc.h
--- rpm/rpmio/rpmbc.h 2 Aug 2008 22:37:38 -0000 2.5
+++ rpm/rpmio/rpmbc.h 10 Sep 2010 19:49:03 -0000 2.5.2.1
@@ -18,11 +18,17 @@
#include <beecrypt/base64.h>
#include <beecrypt/dsa.h>
#include <beecrypt/endianness.h>
+#include <beecrypt/md4.h>
#include <beecrypt/md5.h>
#include <beecrypt/mp.h>
#include <beecrypt/rsa.h>
#include <beecrypt/rsapk.h>
+#include <beecrypt/ripemd128.h>
+#include <beecrypt/ripemd160.h>
+#include <beecrypt/ripemd256.h>
+#include <beecrypt/ripemd320.h>
#include <beecrypt/sha1.h>
+#include <beecrypt/sha224.h>
#include <beecrypt/sha256.h>
#include <beecrypt/sha384.h>
#include <beecrypt/sha512.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/.alldigests
============================================================================
$ cvs diff -u -r1.22.2.5 -r1.22.2.6 .alldigests
--- rpm/tests/ref/.alldigests 20 Aug 2010 19:17:14 -0000 1.22.2.5
+++ rpm/tests/ref/.alldigests 10 Sep 2010 19:49:03 -0000 1.22.2.6
@@ -150,25 +150,25 @@
crc64:5aa3e0193a2726a0 ref/filelists.xml
adler32:b84a906b ref/filelists.xml
jlu32:54496ac5 ref/filelists.xml
-md2:7221cadbdbc89127fa125891ed92f123 ref/manifest
-md4:43c265187f840a1c2e8497d04e211701 ref/manifest
-md5:1e2d4d6ec4a55895729eb1c0456e476a ref/manifest
-sha1:741ee46e223c13d3605f17f4b22e7186e9957b06 ref/manifest
-sha224:a6b828b11d80e9ecc068f631c3cfe6e3b0cd9784adbaf98e434059e4 ref/manifest
-sha256:fdbe3574fd4c649871c96bd68309318e5174e800f5d26cce423a2061c504365a ref/manifest
-sha384:10fd13d229404857b283c19c3e8d9bcb25a2649cec01ea2c226e041178453d2c7d58b00528b97f46f591130326130a6d ref/manifest
-sha512:353c277c38759bfa7275f85a5217fa847dacec375bb4bd37cfd303c6fd7f8bfa2e337ad2b46e9e77b40dcc05e6b2967674f3f20b2434e9a7ee30591401e69456 ref/manifest
-salsa10:474b4f426a856ea470ae38285ebfa7de2143051deac824ea55b8be06b24c2af5f28472357dc14a8841a1a04ec26e5fa913f34752ed4c8e04e99d9346f4d67e2d ref/manifest
-salsa20:93f363197dfe5c8c0c51728e4e65a9d7a18d0bcc7da1b84830da6b2fb649248675a07da409828567995651731814584cc5012cfb3b7134c01c464f091c755451 ref/manifest
-rmd128:8a8fbf9ea5fec3bd145eb9ba1cf8e288 ref/manifest
-rmd160:f831f0ec90556d9fa702a6920003161fe3416251 ref/manifest
-rmd256:b23a52c1a48fe122b2dea58fef5f26530bea4700ee7c7d6dbf5f6be74c863bc7 ref/manifest
-rmd320:ed2d2f1f38270ec1f82b31605f53b07dd65ceda00229446b6dc991a2d02423240aea04202aa85f61 ref/manifest
-tiger:20e34274201d773d3e09dc35f1a06965fca11a1422ac78db ref/manifest
-crc32:d63199ed ref/manifest
-crc64:47775eb8f49b5882 ref/manifest
-adler32:79d1709b ref/manifest
-jlu32:43633c01 ref/manifest
+md2:b61701a12fed4d8577a9725daeb95e81 ref/manifest
+md4:de414960a20b85869f7d19710994c4af ref/manifest
+md5:88efeaa5145e0c2e2d8e582b26c1307e ref/manifest
+sha1:236265c62a1d25b3ac938293e563894b8f38b067 ref/manifest
+sha224:6412ef0c2bc212d1bbd10a1c81984780b550d3d50cae75170a81e9ef ref/manifest
+sha256:096114e241a86462b4362d1af34c27a1066c8e735feb8b127cb0be759a131477 ref/manifest
+sha384:9f6a458114be69c848d608481f0c72e2fcc8da529f057b188f422d8a5fb55cfd420e29db0b8a90c99ad5945f851deed2 ref/manifest
+sha512:157341d553faeced107d772550a22a81081a960ce0199d4eb41310359c13c55dc638c1e2dde96d62cde2a744d31d7d3c4012aadcb83d99256ceac175d3e39853 ref/manifest
+salsa10:1c4d92aefa7a308d99fb682615be3dc635cf851cc76878349136be1c46e888ef1b0f7c4b3989dd9bd62a5d7618d52e861fa868fb049129da69fa0a591f6c13a8 ref/manifest
+salsa20:9a154189a8d0c9494cac98ba57bd9cc44f3358387323efeece84e6bb7696dd793ccdf37275f9a7ed4bd3b83cc5c9b43daae24e258bda32e356f6235a3ad066cc ref/manifest
+rmd128:aa962ba4ceae5c1c3719384221b52357 ref/manifest
+rmd160:5b57557d053ddf0d9136d02ae23b8853cecb7b4c ref/manifest
+rmd256:38e40a638c3f4cc6b264d467e66062886b00174495047aff65812b1add4e0172 ref/manifest
+rmd320:5d787fa6f2737efec7f0e0f327ae517c6bb60a6efd1b619c5bad68a7b5736fabde86383738011af0 ref/manifest
+tiger:a8ac55c53e40edf731a1ed606352b4699e67436b67abfee3 ref/manifest
+crc32:a1ed30bd ref/manifest
+crc64:94325a30f03e9376 ref/manifest
+adler32:6f0d7861 ref/manifest
+jlu32:11aaf0b4 ref/manifest
md2:51fa0d59b3d26e1de32ddd11c2254803 ref/other.xml
md4:104dc2c3f86cfd9fcff42aa2041eed3b ref/other.xml
md5:16b86c1eff15582366d3bb818c2bca93 ref/other.xml
@@ -359,25 +359,25 @@
crc64:78d006d5ebc0570c ref/repomd.xml
adler32:9e112467 ref/repomd.xml
jlu32:6f662ac3 ref/repomd.xml
-md2:ce958529a02d3c3e24c557f9f9a2a9ca ref/showrc
-md4:512bc04435b22122d186e839376196e6 ref/showrc
-md5:d794af2dc3031b5567411994cc74f453 ref/showrc
-sha1:9469492e3061d1fa3a334dc26261f5a755a68592 ref/showrc
-sha224:d040e51a6581967dfa5ee92af73d82ed596e141d5cfb350c455d1b2c ref/showrc
-sha256:4b41946d1cf94e0a560838e1dbda9fef0037836b651a33527387db9e8b19a0ad ref/showrc
-sha384:d72b692755578d8d2b1f50c29784ffd1459a8ae43aa650d48b9ee7ab42e9806f7c694acb7c32018b5a70e3a9dce9eac5 ref/showrc
-sha512:ffbb8f4652ced21ad40dfbad62b52ed28c0876189ecc6b6e235b7c2bbe630708e72534954ae6cf09ea5324fb57895b15ac77a4966124abf6717cf2fae1e2f05e ref/showrc
-salsa10:c682db2ca9ec4e6e3246f38857e5b4f9d91c9792ed99b045f70793efa2441e8eb26bbd32091be1aa9bebd4788531c2438b8fb5d4ca638f9190d097f9779fc01e ref/showrc
-salsa20:ea5e3294d5e17da6ec6b9d1ebf5c1115bb80ea5e8f7ae7412cd86bf49253e2890fdd71104e22012f99ae53a87753e9134542d1da9f81e1b11cac61e3644b2870 ref/showrc
-rmd128:d2fb5dfd8bcd9468d8dad9a4e15f7fcb ref/showrc
-rmd160:385a429e7cb773a6d5112b33cbc299e447959841 ref/showrc
-rmd256:a1687742b606d8d4c430ce6ccf43f1bcee55f88ab420a04bea605849f7be243f ref/showrc
-rmd320:5fcc90988e9369cb5173fb98d159049330c521feca495cb70d6ddf2f16c631048ca0886285078203 ref/showrc
-tiger:4c251266536ebf814d0582fdcff6111afad73669a635088c ref/showrc
-crc32:55afbdc6 ref/showrc
-crc64:ce8a6aea6acb747e ref/showrc
-adler32:bd8a7cfa ref/showrc
-jlu32:71264bde ref/showrc
+md2:f08f2e9741cff8ab1efdfbfa7d43d0ce ref/showrc
+md4:5815c820a6ac370d57ed55780c7e59f1 ref/showrc
+md5:2999c76ef4f9e81c6e75554fb422c686 ref/showrc
+sha1:6e5f47d8fefd558abd18037543274f7377f166dc ref/showrc
+sha224:2fe36fdb44885f01a2d738b66dc2bc64653939939e84b433f4fa4dd4 ref/showrc
+sha256:f5cf339ffbf692aa38a9032b620d6ecbf4ef27ea749a2a453fa1d65065f8d7ca ref/showrc
+sha384:faa606980987a80304b3eb6297634fbed5c1b10424fb5912c3ce5bfc4ada5dea6238b9d759aeb67a6310a59825a53638 ref/showrc
+sha512:8c901113e37dd65b13a7ef5f35bfcc46c4b0f9d32f32eb6a4dfd5604ae9c4be3c4ff5ffd9769b7a6929b8992d98f771166ba1bb6fa234d8186bada9c1958e92a ref/showrc
+salsa10:911444c0cf0cfef7d31b73f8b29de36f886a8555f213ae66f47ee6a87ed21fbb753339e7ad70a96adeb6cfdc390314680e94e827e321c9a20d35cdd93fff3a2a ref/showrc
+salsa20:a3f62514613e416069f7c256cff0992ee9fcefa6ad49f4ab1bb06daf9db16c573abd091e9ec58df9b2636bc2551ce7e65d71badee84317f0026c0a09995a5988 ref/showrc
+rmd128:2d58b0a14fb082410f38cc1ce3918f50 ref/showrc
+rmd160:00537355476950b3f308261caacb4d8ee0dfd9db ref/showrc
+rmd256:ff0f08c4f3021a33c6ad4357efc04d0b182dbda5361e2ccd0de931a6db9797c6 ref/showrc
+rmd320:44671ac3e429a7e9479507ccd0be1e16595ad72eee4e23f42d11add8626e69b28d7299c3570aad4f ref/showrc
+tiger:e204187ed96b69a5bf5b04d687134d0127e34642aaf62baa ref/showrc
+crc32:d800519a ref/showrc
+crc64:673e71b9209d68d8 ref/showrc
+adler32:8295ec1e ref/showrc
+jlu32:32a8a279 ref/showrc
md2:85277b082167a7bfed7e391bc7bcc52d ref/version
md4:ad651280a75fe4bc0128275b640257be ref/version
md5:2ce49947f228f23169de879fda8d3bd1 ref/version
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/showrc
============================================================================
$ cvs diff -u -r1.14.2.5 -r1.14.2.6 showrc
--- rpm/tests/ref/showrc 20 Aug 2010 19:17:14 -0000 1.14.2.5
+++ rpm/tests/ref/showrc 10 Sep 2010 19:49:03 -0000 1.14.2.6
@@ -38,35 +38,51 @@
Features provided by current cpuinfo (from /proc/cpuinfo):
cpuinfo(acpi)
+ cpuinfo(aperfmperf)
cpuinfo(apic)
- cpuinfo(bogomips) = 6669.09
- cpuinfo(cache_size) = 6144_KB
+ cpuinfo(arch_perfmon)
+ cpuinfo(bogomips) = 5985.37
+ cpuinfo(bts)
+ cpuinfo(cache_size) = 4096_KB
cpuinfo(clflush)
+ cpuinfo(clflush_size) = 64
cpuinfo(cmov)
cpuinfo(constant_tsc)
- cpuinfo(cpu_MHz) = 2666.758
+ cpuinfo(cpu_MHz) = 2992.685
cpuinfo(cpu_family) = 6
+ cpuinfo(cx16)
cpuinfo(cx8)
- cpuinfo(est)
+ cpuinfo(de)
+ cpuinfo(dts)
cpuinfo(fpu)
cpuinfo(fpu_exception)
cpuinfo(fxsr)
- cpuinfo(ht)
+ cpuinfo(hypervisor)
+ cpuinfo(lahf_lm)
+ cpuinfo(lm)
+ cpuinfo(mca)
+ cpuinfo(mce)
cpuinfo(mmx)
- cpuinfo(model) = 23
+ cpuinfo(model) = 15
cpuinfo(msr)
+ cpuinfo(mtrr)
cpuinfo(nx)
cpuinfo(pae)
cpuinfo(pat)
+ cpuinfo(pebs)
+ cpuinfo(pge)
cpuinfo(pni)
+ cpuinfo(pse)
+ cpuinfo(pse36)
+ cpuinfo(sep)
cpuinfo(ss)
cpuinfo(sse)
cpuinfo(sse2)
- cpuinfo(sse4_1)
cpuinfo(ssse3)
- cpuinfo(stepping) = 10
+ cpuinfo(stepping) = 6
cpuinfo(tsc)
- cpuinfo(up)
+ cpuinfo(tsc_reliable)
+ cpuinfo(vme)
cpuinfo(wp)
========================
@@ -171,7 +187,7 @@
-14: __chgrp /bin/chgrp
-14: __chmod /bin/chmod
-14: __chown /bin/chown
--14: __cp /bin/cp
+-14: __cp /usr/lib/rpm/bin/cp
-14: __cpio /bin/cpio
-14: __cpp gcc -E
-14: __curl /usr/bin/curl
@@ -207,7 +223,7 @@
-14: __exeext %{nil}
-14: __file /usr/bin/file
-14: __file_context_path /etc/selinux/%{__policy_tree}/contexts/files/file_contexts
--14: __find /usr/bin/find
+-14: __find /usr/lib/rpm/bin/find
-14: __find_provides %{_rpmhome}/find-provides
-14: __find_requires %{_rpmhome}/find-requires
-14: __gpg /usr/bin/gpg
@@ -231,7 +247,7 @@
-14: __libtool_requires %{nil}
-14: __libtoolize libtoolize
-14: __ln_s ln -s
--14: __lua %{_bindir}/lua
+-14: __lua /usr/lib/rpm/bin/lua
-14: __lzma /usr/bin/lzma
-14: __lzop %{_bindir}/lzop
-14: __make /usr/bin/make
@@ -246,12 +262,12 @@
-14: __objext o
-14: __os_install_post %{___build_post}
-14: __patch /usr/bin/patch
--14: __pax %{_bindir}/pax
+-14: __pax /usr/bin/pax
-14: __perl /usr/bin/perl
-14: __perl_provides %{_rpmhome}/perl.prov
-14: __perl_requires %{_rpmhome}/perl.req
-14: __pgp %{_bindir}/pgp
--14: __php %{_bindir}/php
+-14: __php /usr/bin/php
-14: __pkgconfig_provides %{_rpmhome}/pkgconfigdeps.sh --provides
-14: __pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires
-14: __policy_tree %{expand:%%global __policy_tree %{lua:
@@ -265,13 +281,13 @@
end
print (t)
}}%{__policy_tree}
--14: __python /home/jbj/bin/python
+-14: __python /usr/bin/python
-14: __python_provides %{_rpmhome}/pythondeps.sh --provides
-14: __python_requires %{_rpmhome}/pythondeps.sh --requires
-14: __ranlib ranlib
-14: __remsh %{__rsh}
-14: __rm /bin/rm
--14: __rsh %{_bindir}/rsh
+-14: __rsh /usr/bin/rsh
-14: __scriptlet_requires %{nil}
-14: __sed /bin/sed
-14: __sh /bin/sh
@@ -363,8 +379,8 @@
-14: __unzip /usr/bin/unzip
-14: __vcheck %{__perl} %{_rpmhome}/vcheck
-14: __vsflags 0xf0000
--14: __wget /usr/bin/wget
--14: __xar /usr/bin/xar
+-14: __wget /usr/lib/rpm/bin/wget
+-14: __xar /usr/lib/rpm/bin/xar
-14: __xz /usr/bin/xz
-14: _arbitrary_tags Class:Track:Trackprog:Depflags:Transflags:%{_arbitrary_tags_debian}
-14: _arbitrary_tags_debian Priority:Essential:Depends:Predepends:Recommends:Suggests:Enhances:Breaks
@@ .
Received on Fri Sep 10 21:49:04 2010