RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 28-Apr-2010 19:25:06 Branch: rpm-5_1 Handle: 2010042817250105 Modified files: (Branch: rpm-5_1) rpm CHANGES rpmqv.c rpm/lib poptQV.c rpmcli.h rpm/tests .cvsignore Makefile.am rpm/tests/ref .alldigests edos.qa.1 edos.qa.2 manifest Log: - tests: "make check" for RHEL6 beta passes. - backport "make check" sufficient to verify signatures. Summary: Revision Changes Path 1.2288.2.308+2 -0 rpm/CHANGES 2.51.2.5 +8 -0 rpm/lib/poptQV.c 2.80.2.4 +2 -0 rpm/lib/rpmcli.h 1.146.2.5 +9 -1 rpm/rpmqv.c 1.2.26.4 +11 -0 rpm/tests/.cvsignore 1.9.4.15 +158 -39 rpm/tests/Makefile.am 1.1.2.13 +76 -57 rpm/tests/ref/.alldigests 1.1.2.6 +2 -3 rpm/tests/ref/edos.qa.1 1.1.2.6 +1 -2 rpm/tests/ref/edos.qa.2 1.1.2.6 +1 -0 rpm/tests/ref/manifest ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2288.2.307 -r1.2288.2.308 CHANGES --- rpm/CHANGES 28 Apr 2010 14:58:59 -0000 1.2288.2.307 +++ rpm/CHANGES 28 Apr 2010 17:25:01 -0000 1.2288.2.308 @@ -1,4 +1,6 @@ 5.1.9 -> 5.1.10: + - jbj: tests: "make check" for RHEL6 beta passes. + - jbj: backport "make check" sufficient to verify signatures. - jbj: tests: re-enable additional build options. - jbj: tests: "make check" for RHEL6 beta passes. - jbj: rescusitate existing "make check" reference points. @@ . patch -p0 <<'@@ .' Index: rpm/lib/poptQV.c ============================================================================ $ cvs diff -u -r2.51.2.4 -r2.51.2.5 poptQV.c --- rpm/lib/poptQV.c 11 Apr 2009 14:51:00 -0000 2.51.2.4 +++ rpm/lib/poptQV.c 28 Apr 2010 17:25:04 -0000 2.51.2.5 @@ -40,6 +40,7 @@ #define POPT_QUERYBYSOURCEPKGID -1040 #define POPT_WHATCONFLICTS -1041 #define POPT_WHATOBSOLETES -1042 +#define POPT_NOPASSWORD -1043 /* ========== Query/Verify/Signature source args */ static void rpmQVSourceArgCallback( /*...@unused@*/ poptContext con, @@ -111,6 +112,11 @@ qva->qva_source |= RPMQV_DBOFFSET; qva->qva_sourceCount++; break; + + case POPT_NOPASSWORD: + qva->nopassword = 1; + break; + } } @@ -494,6 +500,8 @@ { "untrusted", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &rpmQVKArgs.trust, -1, N_("unset ultimate trust when importing pubkey(s)"), NULL }, + { "nopassword", '\0', POPT_ARG_STRING|POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_NOPASSWORD, + N_("disable password challenge"), NULL }, { "nodigest", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_DIGEST, N_("don't verify package digest(s)"), NULL }, @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmcli.h ============================================================================ $ cvs diff -u -r2.80.2.3 -r2.80.2.4 rpmcli.h --- rpm/lib/rpmcli.h 5 Apr 2009 18:03:08 -0000 2.80.2.3 +++ rpm/lib/rpmcli.h 28 Apr 2010 17:25:04 -0000 2.80.2.4 @@ -757,6 +757,7 @@ /*...@only@*/ /*...@null@*/ const char * qva_queryFormat;/*!< Format for headerSprintf(). */ int sign; /*!< Is a passphrase needed? */ + int nopassword; int trust; /*!< Trust metric when importing pubkeys. */ /*...@observer@*/ const char * passPhrase; /*!< Pass phrase. */ @@ -836,6 +837,7 @@ int noLang; /*!< from --nolang */ int shortCircuit; /*!< from --short-circuit */ int sign; /*!< from --sign */ + int nopassword; int useCatalog; /*!< from --usecatalog */ char buildMode; /*!< Build mode (one of "btBC") */ char buildChar; /*!< Build stage (one of "abcilps ") */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmqv.c ============================================================================ $ cvs diff -u -r1.146.2.4 -r1.146.2.5 rpmqv.c --- rpm/rpmqv.c 5 Apr 2009 22:14:40 -0000 1.146.2.4 +++ rpm/rpmqv.c 28 Apr 2010 17:25:02 -0000 1.146.2.5 @@ -706,7 +706,15 @@ goto exit; } - if (poptPeekArg(optCon)) { + if (poptPeekArg(optCon) +#if defined(IAM_RPMBT) + && !ba->nopassword +#endif +#if defined(IAM_RPMK) + && !ka->nopassword +#endif + ) + { passPhrase = Getpass(_("Enter pass phrase: ")); if (rpmCheckPassPhrase(passPhrase)) { fprintf(stderr, _("Pass phrase check failed\n")); @@ . patch -p0 <<'@@ .' Index: rpm/tests/.cvsignore ============================================================================ $ cvs diff -u -r1.2.26.3 -r1.2.26.4 .cvsignore --- rpm/tests/.cvsignore 15 Oct 2008 20:11:03 -0000 1.2.26.3 +++ rpm/tests/.cvsignore 28 Apr 2010 17:25:05 -0000 1.2.26.4 @@ -1,11 +1,21 @@ +.deps +.depend Makefile Makefile.in +genpgp.h +tpgp +.libs +*.gcda +*.gcno macros popt*.rpm repodata tmp +cAos2-stub +cudf-test devtool-sanity edos-test +millionfile-insanity popt probes-test triggers-D @@ -15,3 +25,4 @@ triggers-N triggers-NA triggers-P +triggers-multiple @@ . patch -p0 <<'@@ .' Index: rpm/tests/Makefile.am ============================================================================ $ cvs diff -u -r1.9.4.14 -r1.9.4.15 Makefile.am --- rpm/tests/Makefile.am 28 Apr 2010 15:00:46 -0000 1.9.4.14 +++ rpm/tests/Makefile.am 28 Apr 2010 17:25:05 -0000 1.9.4.15 @@ -3,32 +3,81 @@ AUTOMAKE_OPTIONS = 1.4 foreign # Note: *.src.rpm's cannot be added here because of suffix rules. -EXTRA_DIST = ref/[^C]* ref/.alldigests +EXTRA_DIST = genpgp.sh tpgp.c ref/[^C]* ref/.alldigests + +EXTRA_PROGRAMS = tpgp SUBDIRS = +AM_CPPFLAGS = \ + -I$(srcdir) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/build \ + -I$(top_srcdir)/lib \ + -I$(top_builddir)/lib \ + -I$(top_srcdir)/rpmdb \ + -I$(top_srcdir)/rpmio \ + -I$(top_srcdir)/misc \ + @WITH_DB_CPPFLAGS@ \ + @WITH_ZLIB_CPPFLAGS@ \ + @WITH_LUA_CPPFLAGS@ \ + @WITH_FILE_CPPFLAGS@ \ + @WITH_PCRE_CPPFLAGS@ \ + @WITH_SYCK_CPPFLAGS@ \ + @WITH_XAR_CPPFLAGS@ + +RPM_LDADD = \ + $(top_builddir)/build/librpmbuild.la \ + $(top_builddir)/lib/librpm.la \ + $(top_builddir)/rpmdb/librpmdb.la \ + $(top_builddir)/rpmio/librpmio.la \ + $(top_builddir)/misc/librpmmisc.la \ + @LTLIBINTL@ + macros = $(abs_top_builddir)/macros:$(testdir)/macros + rpm = $(abs_top_builddir)/rpm --target i386 --macros $(macros) rpm2cpio = $(abs_top_builddir)/tools/rpm2cpio rpmcache = $(abs_top_builddir)/tools/rpmcache --macros $(macros) rpmdigest = $(abs_top_builddir)/tools/rpmdigest -mtree = $(abs_top_builddir)/tools/rpmmtree rpmrepo = $(abs_top_builddir)/tools/rpmrepo + +tpgp = ./tpgp --macros $(macros) + +mtree = $(abs_top_builddir)/tools/rpmmtree wget = /usr/bin/wget -cpio = cpio + +cp = @__CP@ +cpio = @__CPIO@ +diff = @__DIFF@ +echo = /bin/echo +file = @__FILE@ +gpg = @__GPG@ +mkdir = @__MKDIR@ +mv = @__MV@ +rm = @__RM@ +tar = @__TAR@ + +tpgp_SOURCES = genpgp.h tpgp.c +tpgp_LDADD = $(RPM_LDADD) + +tpgp.c: genpgp.h + +genpgp.h: genpgp.sh + -sh $< > $@ .PHONY: check-init check-init: macros @echo "=== $@ ===" @mkdir -p tmp/hrmib/ tmp/repackage/ @${rpm} -v --version > tmp/version - @diff -u {tmp,ref}/version + @-diff -u {tmp,ref}/version || cp {tmp,ref}/version @${rpm} -v --querytags > tmp/querytags - @diff -u {tmp,ref}/querytags + @-diff -u {tmp,ref}/querytags || cp {tmp,ref}/querytags @${rpm} -v --showrc | sed -e "s,$(abs_top_builddir),..,g" > tmp/showrc - -...@diff -u {tmp,ref}/showrc + @-diff -u {tmp,ref}/showrc || cp {tmp,ref}/showrc @${rpmdigest} --alldigests ref/[^C]* > tmp/.alldigests - @diff -u {tmp,ref}/.alldigests + @-diff -u {tmp,ref}/.alldigests || cp {tmp,ref}/.alldigests @-${mtree} -c -p ref | ${mtree} -p ref POPTURI = http://rpm5.org/files/popt/ @@ -40,16 +89,40 @@ -${wget} $(POPTURI)$@ .PHONY: check-pubkeys -check-pubkeys: $(POPTPKGS) +check-pubkeys: tpgp $(POPTPKGS) @echo "=== $@ ===" - @rm -rf tmp/rpmdb + @${rm} -rf tmp/rpmdb + @${mkdir} -p tmp/rpmdb/log tmp/rpmdb/tmp + @${cp} ref/DB_CONFIG tmp/rpmdb + @${rpm} --import tmp/DSA.pubpem + @${rpm} --import tmp/RSA.pubpem + @${echo} -n "--> default:" + @${tpgp} + @${echo} -n "--> beecrypt:" + @${tpgp} --usecrypto bc + @echo "--> gcrypt(note: MPI padding is BROKEN atm):" + @-${tpgp} --usecrypto gc + @${echo} -n "--> nss:" + @-${tpgp} --usecrypto nss + @${echo} -n "--> openssl:" + @-${tpgp} --usecrypto ssl @${rpm} --import $(top_srcdir)/pubkeys/JBJ-GPG-KEY -# -...@${rpm} -Kv --usecrypto gcrypt $(POPTPKGS) > tmp/popt.Kv-gcrypt - -...@${rpm} -Kv --usecrypto ssl $(POPTPKGS) > tmp/popt.Kv-ssl - -...@${rpm} -Kv --usecrypto nss $(POPTPKGS) > tmp/popt.Kv-nss - -...@${rpm} -Kv --usecrypto beecrypt $(POPTPKGS) > tmp/popt.Kv-beecrypt @${rpm} -Kv $(POPTPKGS) > tmp/popt.Kv @diff -u {tmp,ref}/popt.Kv + @${rpm} -Kvv --usecrypto bc $(POPTPKGS) > /dev/null 2>&1 + @-${rpm} -Kvv --usecrypto gc $(POPTPKGS) > /dev/null 2>&1 + @-${rpm} -Kvv --usecrypto nss $(POPTPKGS) > /dev/null 2>&1 + @-${rpm} -Kvv --usecrypto ssl $(POPTPKGS) > /dev/null 2>&1 + +.PHONY: check-sign +check-sign: + @echo "=== $@ ===" + @echo "--> DSA:" + @-${rpm} -D'_gpg_name Donald' --addsign --nopassword cudf-test/*.rpm > /dev/null + @-${rpm} -Kv cudf-test/*.rpm > /dev/null + @echo "--> RSA:" + @-${rpm} -D'_gpg_name Ronald' --addsign --nopassword edos-test/*.rpm > /dev/null + @-${rpm} -Kv edos-test/*.rpm > /dev/null .PHONY: check-markup check-markup: $(POPTPKGS) @@ -71,6 +144,22 @@ # XXX repomd.xml always differs because st->st_ctime is used. @-diff -u {repodata,ref}/repomd.xml > /dev/null 2>&1 +.PHONY: check-macros +check-macros: + @echo "=== $@ ===" + @${rpm} -D 'foo bar' -E '%dump%trace%foo' > /dev/null 2>&1 + @${rpm} -D 'foo %foo' -E '%foo' > /dev/null 2>&1 + @${rpm} -D 'foo bing' -D 'foo bang' -D 'foo boom' -E '%...@foo}' > /dev/null 2>&1 + @${rpm} -E '%(/bin/echo "--> sh: Portable Shar!")' + @-${rpm} -E '%{lua:print("--> lua: Hard Rocks!")}' +# @-${rpm} -E '%{js:print("--> js: Use GPSEE!")}' +# @-${rpm} -E '%{ruby:print "--> ruby: Puppet Gems!"}' +# @-${rpm} -E '%{tcl:puts "--> tcl: Porticus Ports!"}' +# @-${rpm} -E '%{squirrel:print("--> squirrel: Eat Nuts!")}' +# @-${rpm} -E '%{perl:print "--> perl: Artistic Scribbles!"}' +# @-${rpm} -E '%{python:print "--> python: Snake Eggs!",}' +# @-${rpm} -E '%{ficl:.( --> ficl: Das OpenBoot!)}' + %.spec: $(wildcard %-*.src.rpm) @${rpm2cpio} $(wildcard $*-*.src.rpm) | ${cpio} -i --quiet $@ @@ -84,22 +173,23 @@ ${rpm} -i --nosignature --nodeps $...@-*.src.rpm (cd $@ && ${rpm} -q --specfile [email protected] && ${rpm} -q --specsrpm [email protected] && ${rpm} -q --specfile --specedit [email protected] && ${rpm} -bb --nodeps [email protected]) > /dev/null +.PHONY: check-build check-build: $(BUILD_DIRS) @echo "=== $@ ===" @ls -1 */*.rpm > tmp/manifest - @diff -u {tmp,ref}/manifest + @diff -u {tmp,ref}/manifest || ${cp} {tmp,ref}/manifest @rm -rf tmp/cachedb @${rpm} -i -D '_dbpath $(testdir)/tmp/cachedb' --justdb --nodeps edos-test/*.rpm @mkdir -p tmp/hrmib/ tmp/repackage/ @${rpm} -U -- edos-test/glass-1-* - @${rpm} -U -- +car +turbo +engine +window +door edos-test/wheel-2-* - @${rpm} -qaT > tmp/edos.qa.1 - @diff -u {tmp,ref}/edos.qa.1 + @${rpm} -U -- +car +turbo edos-test/{engine-1-*,wheel-2-*,door-1-*,window-0-*} + @${rpm} -qaT | grep -v gpg-pubkey > tmp/edos.qa.1 + @diff -u {tmp,ref}/edos.qa.1 || ${cp} {tmp,ref}/edos.qa.1 @${rpm} -U -- edos-test/engine-2-* -turbo @${rpm} -U -- edos-test/{wheel-3,tyre-1}-* @${rpm} -F -- edos-test/{door-2,window-1,glass-2}-* - @${rpm} -qaT > tmp/edos.qa.2 - @diff -u {tmp,ref}/edos.qa.2 + @${rpm} -qaT | grep -v gpg-pubkey > tmp/edos.qa.2 + @diff -u {tmp,ref}/edos.qa.2 || ${cp} {tmp,ref}/edos.qa.2 @${rpm} -e car engine wheel door tyre window glass check-install: @@ -107,24 +197,31 @@ ${rpm} -U --relocate /tmp/=$(testdir)/tmp/root/ --nodeps devtool-sanity/*.rpm ${rpm} -U probes-test/probes-2*.rpm +.PHONY: check-triggers check-triggers: @echo "=== $@ ===" - -${rpm} -Uv --noparentdirs --nodeps triggers-N/triggers-N*.rpm - ${rpm} -ev --noparentdirs --nodeps triggers-N-a triggers-N-b - -${rpm} -Uv --noparentdirs --nodeps triggers-P/triggers-P*.rpm - ${rpm} -ev --noparentdirs --nodeps triggers-P-a triggers-P-b - -${rpm} -Uv --noparentdirs --nodeps triggers-F/triggers-F*.rpm - ${rpm} -ev --noparentdirs --nodeps triggers-F-a triggers-F-b - -${rpm} -Uv --noparentdirs --nodeps triggers-FP/triggers-FP*.rpm - ${rpm} -ev --noparentdirs --nodeps triggers-FP-a triggers-FP-b - -${rpm} -Uv --noparentdirs --nodeps triggers-D/triggers-D*.rpm - ${rpm} -ev --noparentdirs --nodeps triggers-D-a triggers-D-b - -${rpm} -Uv --noparentdirs --nodeps triggers-DP/triggers-DP*.rpm - ${rpm} -ev --noparentdirs --nodeps triggers-DP-a triggers-DP-b - -borken: - -${rpm} -Uv --noparentdirs --nodeps triggers-NA/triggers-NA*.rpm - ${rpm} -ev --noparentdirs --nodeps triggers-NA-a triggers-NA-b + @-${rpm} -e --noscripts --notriggers --allmatches `${rpm} -qa | grep '^triggers-*'` > /dev/null 2>&1 + @echo "--> N:" + @${rpm} -U --noparentdirs --nodeps triggers-N/triggers-N*.rpm + @${rpm} -e --noparentdirs --nodeps triggers-N-a triggers-N-b + @echo "--> NA:" + @${rpm} -U --noparentdirs --nodeps triggers-NA/triggers-NA*.rpm + @${rpm} -e --noparentdirs --nodeps triggers-NA-a triggers-NA-b + @echo "--> P:" + @${rpm} -U --noparentdirs --nodeps triggers-P/triggers-P*.rpm + @${rpm} -e --noparentdirs --nodeps triggers-P-a triggers-P-b + @echo "--> F:" + @${rpm} -U --noparentdirs --nodeps triggers-F/triggers-F*.rpm + @${rpm} -e --noparentdirs --nodeps triggers-F-a triggers-F-b + @echo "--> FP:" + @${rpm} -U --noparentdirs --nodeps triggers-FP/triggers-FP*.rpm + @${rpm} -e --noparentdirs --nodeps triggers-FP-a triggers-FP-b + @echo "--> D:" + @${rpm} -U --noparentdirs --nodeps triggers-D/triggers-D*.rpm + @${rpm} -e --noparentdirs --nodeps triggers-D-a triggers-D-b + @echo "--> DP:" + @${rpm} -U --noparentdirs --nodeps triggers-DP/triggers-DP*.rpm + @${rpm} -e --noparentdirs --nodeps triggers-DP-a triggers-DP-b check-query: @echo "=== $@ ===" @@ -167,15 +264,37 @@ -...@${rpm} -e devtool-sanity # @${rpm} -e --justdb `${rpm} -qa` --allmatches +check-rpmv3: + @echo "=== $@ ===" + @${rpm} -qlp simplestRPMv3-1.0-2.aix5.3.noarch.rpm + +check-verify: + @echo "=== $@ ===" + @${rpm} -e probes devtool-sanity + @-${rpm} -U --justdb --nodeps tmp/manifest + @-${rpm} -V probes devtool-sanity > /dev/null + @-${rpm} -Va > /dev/null +#XXX @-${rpm} -Vp tmp/manifest + @-${rpm} -e --noscripts --notriggers --allmatches `${rpm} -qa | grep '^triggers-*'` > /dev/null 2>&1 + @${rpm} -e car engine wheel door tyre window glass + @${rpm} -e battery bicycle electric-engine gasoline-engine + @${rpm} -e solar-collector tire turbo + @-${rpm} -e --justdb popt + @${rpm} -e probes + @${rpm} -e devtool-sanity check-jbj: @${rpm} -qp ref/cAos.i386.manifest > /dev/null @-${rpm} -qp $(POPTURI)popt-1.14-1.i386.rpm > /dev/null @-${rpm} -qW $(POPTURI) > /dev/null 2>&1 @-${rpm} -qW ftp://localhost/pub/i386-linux/RPMS > /dev/null 2>&1 -check-local: check-init check-pubkeys check-markup \ - check-build check-install check-query # check-jbj +check-local: check-init check-pubkeys check-markup check-macros \ + check-build check-sign check-install \ + check-query \ + check-triggers # check-jbj clean-local: - rm -rf tmp $(BUILD_DIRS) $(patsubst %,%.spec,$(BUILD_DIRS)) - rm -rf $(POPTPKGS) repodata/ + rm -f genpgp.h + ${sudo} rm -rf tmp/repckage + rm -rf tmp $(BUILD_DIRS) + rm -rf repodata/ @@ . patch -p0 <<'@@ .' Index: rpm/tests/ref/.alldigests ============================================================================ $ cvs diff -u -r1.1.2.12 -r1.1.2.13 .alldigests --- rpm/tests/ref/.alldigests 27 Apr 2010 19:45:49 -0000 1.1.2.12 +++ rpm/tests/ref/.alldigests 28 Apr 2010 17:25:05 -0000 1.1.2.13 @@ -1,3 +1,22 @@ +md2:58d5dcef34697cb807cb3878633126da ref/DB_CONFIG +md4:d43b7ef28771f68e98bd8dcea560e8aa ref/DB_CONFIG +md5:7d1655d30e3b7f3c679a2d2c6dfc379a ref/DB_CONFIG +sha1:36d2682bb884839db2d7f807a9602a2dececc829 ref/DB_CONFIG +sha224:315e8719a3f4df439efadb8f44529ba5ef2f47df2b9ca7aef5f00729 ref/DB_CONFIG +sha256:0ca995cae780585f47cdfff348a4e1d4a0d5aa4b22c6fc6e289b62373bc2887b ref/DB_CONFIG +sha384:67a85005c98083995efee5443ef8640fba8799df7ffe4a94e04c9c593f7067e3ae1c6b0e82a1cdc7952c8e9b5c963f0f ref/DB_CONFIG +sha512:52e37b274b3f80f469e7b4809658e1419e9b4ec530b0372efdcf430f12ce3cebbd807be9eba8794f2dae7f9fff56bdff58a9376ecf0bcc85d739502a14729af2 ref/DB_CONFIG +salsa10:e45834344e7c80c4a35c40b700a8105bf5147b07cb70714f8c4188e9210565ba7b07f3ffdd2e1c0daea830f48023d27f47d3f828b7197f4400c09421408382d9 ref/DB_CONFIG +salsa20:8d350a963aa80b89d275a637b0a3830c834efaff5b7607f9b47133fa0b7807153427c39c5decf3a3213284fb0cbf0bc0def3114f413f2e0335333e977c600e1c ref/DB_CONFIG +rmd128:b300fac435ff896f4e5806b689a1ab47 ref/DB_CONFIG +rmd160:bdbf320315a7b8cc883d805b933f88793ed1c618 ref/DB_CONFIG +rmd256:f7205bc1bd5b64cc72f44f0884427bbe4302c09400920a1bd6527952421f7e6a ref/DB_CONFIG +rmd320:2127d7cf746916fb510c4b071082376791634d5402ac81ad14a62baa7a6fe37a3868c0c881628dca ref/DB_CONFIG +tiger:b05f09743b990dc4888cee2c3efd47d61d3e1c0290582863 ref/DB_CONFIG +crc32:057f4e58 ref/DB_CONFIG +crc64:536da1eb3cf94321 ref/DB_CONFIG +adler32:49493163 ref/DB_CONFIG +jlu32:0ddec8d3 ref/DB_CONFIG md2:bc73129d4e085a7fc6855229f6cd6a07 ref/cAos.i386.manifest md4:ee0b08300b409ccf9d9ad2fcbe2bf3df ref/cAos.i386.manifest md5:c702512431a26602340ccf07f5e114d9 ref/cAos.i386.manifest @@ -17,44 +36,44 @@ crc64:e162a09823b73d2c ref/cAos.i386.manifest adler32:bc4e3265 ref/cAos.i386.manifest jlu32:15e7c79f ref/cAos.i386.manifest -md2:15c9d98656ff9aea586591085308a752 ref/edos.qa.1 -md4:30ba8d3b284753c9bd5650391aede163 ref/edos.qa.1 -md5:d3ee5e8b8636d2e8e41323bc1b7fabca ref/edos.qa.1 -sha1:cd00eea3e49a55fd7f2549cec4b5236bfe4432a6 ref/edos.qa.1 -sha224:e226de04c95ca6f32c99e04efd9784cf7e73e9089c3cf6bef35c05ed ref/edos.qa.1 -sha256:a16aac58748f5dabac446bd5083cda543238ee75dde870a719fac59a2e526b87 ref/edos.qa.1 -sha384:df1ab88c6ccdc9c6509644e242c7a9982882b0e6c7d1d133f4a904145c5b0a7abec83a693c1924213ac03e84a4990925 ref/edos.qa.1 -sha512:e60ae199ddbea1d3a153f4c95039d7953f2d2a4cd03882c0c9a0083b731dcc8a461fb29977997fda63d5ee8267062470729f73e787245e754d6766fb8b4869b2 ref/edos.qa.1 -salsa10:b8d3ba26612d09e0783b1aee7a47cc1ade3cd6f82de1bf0a75863c260fb12680c9479e0a7c4857ba718d0a4b53a65ced2217335a0fe29e3e74aa78f7c3b33d7c ref/edos.qa.1 -salsa20:1bf6f0789bbe62e2d50ca2740958257873526a2e326c3f7cb8cd4b2e52970e7d60e05312a5a9a52df04272ce95e0c9fc77746bfa3cf780950da7009b60acd985 ref/edos.qa.1 -rmd128:6bf0ea7b6add1ea073e8d244152c5530 ref/edos.qa.1 -rmd160:51897320da844aa5a16d9e5148e89949e019974c ref/edos.qa.1 -rmd256:5ff853e907425dc89a32ad1cec641eacc3b0d01158bfed708f23a92829bbe9de ref/edos.qa.1 -rmd320:09deb8eadb8045218938c5d2433653954466865d399f0d87cd7574a6ee1287b2c42d4f6ae787dbe8 ref/edos.qa.1 -tiger:e8ed8ada1d7876292d1224fafc4e88f4cc7360382078815f ref/edos.qa.1 -crc32:a29b183a ref/edos.qa.1 -crc64:d858d5789c626887 ref/edos.qa.1 -adler32:83002f0c ref/edos.qa.1 -jlu32:c7bb1e9b ref/edos.qa.1 -md2:b3f86708c948f0df63c7d6b639dcc44f ref/edos.qa.2 -md4:1de7e99acdfe20bcdd9912c4e2d37873 ref/edos.qa.2 -md5:72a35be51c371f98a825fe9d0a24117c ref/edos.qa.2 -sha1:c751b795c8b17055f18b10056c012bbf70a01559 ref/edos.qa.2 -sha224:90e32f6f56dbeed57cdb1000d4978f36e86679ea33f23e3c6e0e2993 ref/edos.qa.2 -sha256:56b142347eb67aded262d9e57ca0b148810bfc56d435fc66e266d3f646a55c92 ref/edos.qa.2 -sha384:6e0a980f44532fbadb8c7653f33b6aa0a99a99982924f1b1dadf95b43d8e2d54fc0d3a0555e9d0ae0bfaf51536ea0a47 ref/edos.qa.2 -sha512:030a356bad8c41398cf6bf9140a7043f5b4eae10b147a0b763364cd98fcc0851e714f705074bad01adf5b5c8c9f2a420c09034e88e2e634987cdc8f4c338ddc8 ref/edos.qa.2 -salsa10:af526800bc7e1edcbcf2bdff6eb1f4927e4d96138f36c7887b42b174cbf3b318e4f84218b95bc249d940414594001e5ff9863bb259c79d9d469db6f31e1f6acf ref/edos.qa.2 -salsa20:b7665e32a7593b06477165ff72cd3fe38eacb0b22171ea161d60516340192fbfa878b2ccaf432cf74e91e38a255867d5c11e552458766468a37519178408eecb ref/edos.qa.2 -rmd128:f40195562465860c597414819f1dcde1 ref/edos.qa.2 -rmd160:5377994baacbfb96ce69b6bfdbd50e2c114d0ed0 ref/edos.qa.2 -rmd256:a4184ceb54fe81cdd0df00378d632d7f2c8319e596d37fffcc4e527375d269e7 ref/edos.qa.2 -rmd320:95dba0c4de11685d247811ed57f0b1e1916e935b7fe36c02901bd97992b2562c9a6b1a6b5ef9256e ref/edos.qa.2 -tiger:adf7120aff3683d09f287f646caa0dc52cca8761235beb50 ref/edos.qa.2 -crc32:26805a50 ref/edos.qa.2 -crc64:6e73c8b2f84ee27d ref/edos.qa.2 -adler32:54732ea8 ref/edos.qa.2 -jlu32:b08d313a ref/edos.qa.2 +md2:9a66fa0f7ff89bc54a1b0cda34d79ee4 ref/edos.qa.1 +md4:9d237489c256f806fa07dc595c956569 ref/edos.qa.1 +md5:51e838fd5792282cd6588f78265dcce2 ref/edos.qa.1 +sha1:f4becb42fab0e416ee0b9b882234fb8273ab3a68 ref/edos.qa.1 +sha224:eb4e98f379f5cbcf1a91982af0018345739455650449860729ec9593 ref/edos.qa.1 +sha256:48901bb073b25651f5a6605acaf98c609a7cc78c46eedf3b054305b69e50b901 ref/edos.qa.1 +sha384:ae931034995947b288557e5c49a411dfc6d50930c7ba6dd5f533fe759cd0cd7ce591e898e28b07a65a8c455518268930 ref/edos.qa.1 +sha512:a563a25985c21ad4473f35bf1d8afd810bfa93e496aa8a345450e8c8c3ed9d10f53268d34cea88312fadf020ba7f6158ba05c88f2a70f34324a4b39fb222ecf6 ref/edos.qa.1 +salsa10:55482527d4db803b14c348637d9fb6110a3ea2a6b6bc0256f641b66cb1221c4512e464b199fd348c1f7d8bb89e6d9d88faf2539db5363e7dbfb258b49c39c164 ref/edos.qa.1 +salsa20:d47f0724fe0b0ad5573fd169dadbedc78a2949bf34a50418742baa8b1e5f15efecf4ea6dc39e438b40acba4226d01b0d5033710b12a2906a502020da9f25ff1d ref/edos.qa.1 +rmd128:ae3e286aa18332c07fb43b6211f65d2d ref/edos.qa.1 +rmd160:f75ed08b3fcbf987a494db66193447c1bac08a4d ref/edos.qa.1 +rmd256:b789153a221fe22cbd86169010ba0e141b711e2f3b9e095242a87b3d63f555a8 ref/edos.qa.1 +rmd320:9f31eb7120ac051f39090c405295bd0610b15453864f81486f1a30cd8439dcffafcb484e2ce5e81b ref/edos.qa.1 +tiger:0ab8616155f6e79b9776fb3ea73ba85085d6bd12c0fce1ad ref/edos.qa.1 +crc32:37da9b6b ref/edos.qa.1 +crc64:50db04b0bca1fd6f ref/edos.qa.1 +adler32:fd1c2656 ref/edos.qa.1 +jlu32:91ce6975 ref/edos.qa.1 +md2:bb8f9a82b237ea879a33156ee483ecdb ref/edos.qa.2 +md4:922c4a2db0c32988c84886ba4076a06f ref/edos.qa.2 +md5:ac7c4a93a36b054130f47127677101b3 ref/edos.qa.2 +sha1:8c14c951048e0dba0f23c1300d385fdf90eabf78 ref/edos.qa.2 +sha224:036f5965dd70d8903df152f6011e40d13bc20fa8107a3660a39ec5ae ref/edos.qa.2 +sha256:5a26ce8712be4c531a596bc51f611be4b201a4bdc99c50cbfcd8eef7eb61157b ref/edos.qa.2 +sha384:1e1887420f95f51d77a6f1caa0af0ca9bb1bc8a898c9385c380c1e893ced5fa20e81c44ba8900f5223b4921e6fc2fd59 ref/edos.qa.2 +sha512:b7272609b77309b5cf476ed7fd082c1ba53740aeff5939603ebc2e2c1e735f9ecdbfeff8a6fdac0e91edcba3bd7e4a459b12f5363ce1fc85512c3458d398fa00 ref/edos.qa.2 +salsa10:11e922d2113b946effa2c79dd71ddb34e6fbc8e4dd2b78ed2fac8c049e6b4ae18f55dd4269e28723c420143f30f1814591bbb8177e57e70c5992fc47b2a837c2 ref/edos.qa.2 +salsa20:8f5a501fd588dae1490ef5831d0af7a0f5aa1815f9b63ccd16d64f4a3313ae441fa2e848e57fce362286e52ffd75a48b7cfaac9b5f6a718027da5ab8d140c29a ref/edos.qa.2 +rmd128:50d6c1f6a0bd95a1cce3f7c26036cdca ref/edos.qa.2 +rmd160:9c0d934f30881c5400663770a05befd7f67984d8 ref/edos.qa.2 +rmd256:202c84c783d42d882b534e34b866422a97e51614d94e7d1d2b3325d02d692a30 ref/edos.qa.2 +rmd320:a8dd6a79c728749e0533f2d553a625feca4d3178fe300f7ebb9faf7b8dc9e5974c57238d65a548d5 ref/edos.qa.2 +tiger:27aa8cc74e688e30df1ad6f7f094eb7f0dd579c8622d4660 ref/edos.qa.2 +crc32:ab3a6c5e ref/edos.qa.2 +crc64:583071909ef3fd70 ref/edos.qa.2 +adler32:bfff25f3 ref/edos.qa.2 +jlu32:8bbf9c7b ref/edos.qa.2 md2:37f6df01dd4409c4208c9614bd8ef9e8 ref/filelists.xml md4:41db1bddbfb39d06657ebf0716843aa3 ref/filelists.xml md5:9ffb2aa2fe21207be29d9e7c91c249e3 ref/filelists.xml @@ -74,25 +93,25 @@ crc64:cfba6561eac6606e ref/filelists.xml adler32:9d496741 ref/filelists.xml jlu32:4dc620b3 ref/filelists.xml -md2:07931426cec4936010e1e34d84502752 ref/manifest -md4:442a11ced12b37b59fbb590d5cda8d64 ref/manifest -md5:53028ebfb2a0454c4f6aa1ad65f7e8b2 ref/manifest -sha1:b57789e603b7cbe184d1389ae36e8498afe37368 ref/manifest -sha224:d82762a5d1ef25a8223652a7ad1f67aa4c2ceb3c2627314fe18a0499 ref/manifest -sha256:78d9cd6f3f4e416db8b3d73b30a47893b0a8ebe6356f0e3ac104edccbfa67a86 ref/manifest -sha384:4254d48e66ec4f73496c26a191eba2b1d198b2790cb193fec47e1b2297e0b97a56e28817e7f9f2f36e4d379e7bc40f90 ref/manifest -sha512:7719cbe38c2614eb0d7812e604923d3697b9bffdec5278882e7a2aafcb2ad326c4e797a9386007e157dfd1375d8af2f00bc1452b4c4694751edec20c1278a063 ref/manifest -salsa10:793801754f0a6ba75abf7f9f54c2fb8d8ef43a09b1d0d123ede73baf74df912af7ae8f5aa9f5947ec09430c5a7119ddab4a81f0ffc095cc20e025fa3e4f64f84 ref/manifest -salsa20:16a0bc3ca3b559f8e5b25faecc5108956fce7a572421aaacca2153c73410a00d48dab224cba1f83b8a8adbf3f97baf714525e7ee3ef08ad23cecae9a7fd23fc1 ref/manifest -rmd128:47fa6fb87fdd3a123ff32f0cb9b1ded1 ref/manifest -rmd160:bdb97879c640e8d04a6af42ad8a5725a7daa1da0 ref/manifest -rmd256:c2f18bd56e07c598ddca15d218e46d3b09954bc1990db6da2be810af591c0fc3 ref/manifest -rmd320:bb5c2e602e5e411c7e20c02863a2377ec4cd07b39367eed203730a2eb16e2639b355b413233f2356 ref/manifest -tiger:b5cc9471e6c30403ca3ab376b3d4ace5bde1623c0aabcd07 ref/manifest -crc32:3e86ad05 ref/manifest -crc64:2d293ed3e94a17c9 ref/manifest -adler32:9dcb8527 ref/manifest -jlu32:d51fbfb2 ref/manifest +md2:c1a4035d7b4ee83a8bbf476ca6836cd6 ref/manifest +md4:3ad8ea1828348e3af1ab2ddde811a0bb ref/manifest +md5:874156dc1b17db4eb5e357bf1f35c136 ref/manifest +sha1:7e73f2369152efbcb1f6a98abe6dd6dc7db780fc ref/manifest +sha224:4e67dda2df02d8169986cf692614f693798110e2e346458b8d6b57a0 ref/manifest +sha256:cbaea73821261cdf112e99435b95a1c264623341e199566c95258d750ed1574a ref/manifest +sha384:f736158c2fcc19fb216c5522a2948bb88e192277fdbb3be04d380ee758444bc3cc7b4cef6ca6913b12fc4029d860c3e5 ref/manifest +sha512:cdace080372e05a0cf654f8b319c20c9f886ac665406238017bc20c0c98be7cbb40661d070d34b422564b90267fc1e75e2f3a00d4592c9a9ddf7f02e6ec358c4 ref/manifest +salsa10:7c74f399af467f7c81aa6b1e7cf60119db5c920ac4b2c061f3715fda17eba9fda505a4cd38d0a2ae0be1ea09829cc37d435de0516a10c96aa9799e03c63e4b94 ref/manifest +salsa20:6371f843ab2f4a90037762c57a35bc6a091bf3aa140d95e67047cbf774f270388335c87be91b311f4009b3de7039cb6c9565d68978ad97c43ab0981c6edd9f5c ref/manifest +rmd128:af7baa4393aab1c43010e122d84c24b0 ref/manifest +rmd160:6187ca2c9db30243b2bbfa2e4a380fd49243d05d ref/manifest +rmd256:f424378b90b44b3a2ec116aa8f671ca39d79e419297aa13fa62c4b46957a7afc ref/manifest +rmd320:c382d9a5cb60ed4010b4ea4df791f1c25ad2e2fb99045434891d8860fc59522b676a79fd725107b4 ref/manifest +tiger:0ec83db49da33dce01de2793f3211d66f38d27b2516e18e8 ref/manifest +crc32:4ce27f8c ref/manifest +crc64:7a78c630b66806d2 ref/manifest +adler32:a3e78cea ref/manifest +jlu32:1cf5da12 ref/manifest md2:91dc2a60115f51afa015c9d8460fbcd0 ref/other.xml md4:de446601b5df70b67adeffb5ac7d1996 ref/other.xml md5:3b918b2660c49fe0c8787c0f6511f45d ref/other.xml @@ . patch -p0 <<'@@ .' Index: rpm/tests/ref/edos.qa.1 ============================================================================ $ cvs diff -u -r1.1.2.5 -r1.1.2.6 edos.qa.1 --- rpm/tests/ref/edos.qa.1 27 Apr 2010 19:45:49 -0000 1.1.2.5 +++ rpm/tests/ref/edos.qa.1 28 Apr 2010 17:25:06 -0000 1.1.2.6 @@ -1,8 +1,7 @@ -gpg-pubkey-2039b291-3dbaae72 glass-1-0.noarch -wheel-2-0.noarch +window-0-0.noarch car-1-0.noarch turbo-1-0.noarch engine-1-0.noarch -window-2-0.noarch +wheel-2-0.noarch door-1-0.noarch @@ . patch -p0 <<'@@ .' Index: rpm/tests/ref/edos.qa.2 ============================================================================ $ cvs diff -u -r1.1.2.5 -r1.1.2.6 edos.qa.2 --- rpm/tests/ref/edos.qa.2 27 Apr 2010 19:45:49 -0000 1.1.2.5 +++ rpm/tests/ref/edos.qa.2 28 Apr 2010 17:25:06 -0000 1.1.2.6 @@ -1,8 +1,7 @@ -gpg-pubkey-2039b291-3dbaae72 car-1-0.noarch -window-2-0.noarch engine-2-0.noarch wheel-3-0.noarch tyre-1-0.noarch glass-2-0.noarch +window-1-0.noarch door-2-0.noarch @@ . patch -p0 <<'@@ .' Index: rpm/tests/ref/manifest ============================================================================ $ cvs diff -u -r1.1.2.5 -r1.1.2.6 manifest --- rpm/tests/ref/manifest 15 Oct 2008 20:19:49 -0000 1.1.2.5 +++ rpm/tests/ref/manifest 28 Apr 2010 17:25:06 -0000 1.1.2.6 @@ -14,6 +14,7 @@ edos-test/window-0-0.noarch.rpm edos-test/window-1-0.noarch.rpm edos-test/window-2-0.noarch.rpm +popt/popt-1.14-1.i386.rpm probes-test/probes-1-0.noarch.rpm probes-test/probes-2-0.noarch.rpm triggers-DP/triggers-DP-a-1.0-1.noarch.rpm @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
