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:   06-Jun-2010 22:33:29
  Branch: HEAD                             Handle: 2010060620332801

  Modified files:
    rpm                     CHANGES
    rpm/tests               Makefile.am

  Log:
    - tests: per-crypto implementation tests for hkp:// retrieval.

  Summary:
    Revision    Changes     Path
    1.3379      +1  -0      rpm/CHANGES
    1.75        +12 -7      rpm/tests/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3378 -r1.3379 CHANGES
  --- rpm/CHANGES       6 Jun 2010 20:31:39 -0000       1.3378
  +++ rpm/CHANGES       6 Jun 2010 20:33:28 -0000       1.3379
  @@ -1,4 +1,5 @@
   5.3.0 -> 5.4a1:
  +    - jbj: tests: per-crypto implementation tests for hkp:// retrieval.
       - jbj: bc: add RSA/DSA sign/generate methods.
       - jbj: ssl: plug a memory leak.
       - jbj: nss: use common sec_key/pub_key/sig structures.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tests/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.74 -r1.75 Makefile.am
  --- rpm/tests/Makefile.am     29 May 2010 14:21:28 -0000      1.74
  +++ rpm/tests/Makefile.am     6 Jun 2010 20:33:29 -0000       1.75
  @@ -182,18 +182,22 @@
        @${cp} ref/DB_CONFIG tmp/rpmdb
        @${rpm} --import tmp/DSA.pubpem
        @${rpm} --import tmp/RSA.pubpem
  -     @${echo} -n "--> default:"
  +     @${echo} -n "--> default: HKP"
  +     @${thkp} > tmp/hkp || :
  +     @diff -u tmp/hkp ref/hkp || cp tmp/hkp ref/hkp
        @${tpgp}
  -     @${echo} -n "--> beecrypt:"
  +     @${echo} -n "--> beecrypt: HKP"
  +     @${thkp} --usecrypto bc > /dev/null || :
        @${tpgp} --usecrypto bc
  -     @${echo} -n "--> gcrypt:"
  +     @${echo} -n "--> gcrypt: HKP"
  +     @-${thkp} --usecrypto gc > /dev/null 2>&1 || :
        @-${tpgp} --usecrypto gc
  -     @${echo} -n "--> nss:"
  +     @${echo} -n "--> nss: HKP"
  +     @-${thkp} --usecrypto nss > /dev/null || :
        @-${tpgp} --usecrypto nss
  -     @${echo} -n "--> openssl:"
  +     @${echo} -n "--> openssl: HKP"
  +     @-${thkp} --usecrypto ssl > /dev/null || :
        @-${tpgp} --usecrypto ssl
  -     @-${thkp} > tmp/hkp
  -     @-diff -u tmp/hkp ref/hkp || cp tmp/hkp ref/hkp
        @${rpm} --import $(top_srcdir)/pubkeys/JBJ-GPG-KEY
        @${rpm} -Kv $(POPTPKGS) > tmp/popt.Kv
        @diff -u tmp/popt.Kv ref/popt.Kv
  @@ -201,6 +205,7 @@
        @-${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
  +     @echo "=== $@ === done."
   
   .PHONY:      check-sign
   check-sign:
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to