RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  j...@rpm5.org
  Module: rpm                              Date:   26-Jul-2014 22:20:36
  Branch: rpm-5_4                          Handle: 2014072620202706

  Modified files:           (Branch: rpm-5_4)
    rpm                     CHANGES
    rpm/macros              macros.rpmbuild.in

  Log:
    - config: switch from zlib -> blake2p.
    - config: switch from DSA -> RSA/SHA1.

  Summary:
    Revision    Changes     Path
    1.3501.2.416+2  -0      rpm/CHANGES
    1.4.4.19    +13 -3      rpm/macros/macros.rpmbuild.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3501.2.415 -r1.3501.2.416 CHANGES
  --- rpm/CHANGES       26 Jul 2014 20:13:32 -0000      1.3501.2.415
  +++ rpm/CHANGES       26 Jul 2014 20:20:27 -0000      1.3501.2.416
  @@ -1,4 +1,6 @@
   5.4.14 -> 5.4.15:
  +    - jbj: config: switch from zlib -> blake2p.
  +    - jbj: config: switch from DSA -> RSA/SHA1.
       - jbj: macros: move an error check earlier.
       - jbj: rpmio: permit URI's everywhere that ".fdio" isn't appended.
       - jbj: l10n: mixed {bdb,sqlite3} dbenv issues w db-6.1.19, disable.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.rpmbuild.in
  ============================================================================
  $ cvs diff -u -r1.4.4.18 -r1.4.4.19 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in     5 May 2014 19:49:32 -0000       1.4.4.18
  +++ rpm/macros/macros.rpmbuild.in     26 Jul 2014 20:20:33 -0000      1.4.4.19
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.4.18 2014/05/05 19:49:32 jbj Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.4.19 2014/07/26 20:20:33 jbj Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -267,6 +267,11 @@
   #    DSA             (default)
   #    RSA             (implies SHA1)
   #    ECDSA           (implies SHA256)
  +#    DSA/SHA1
  +#    DSA/SHA224
  +#    DSA/SHA256
  +#    DSA/SHA384
  +#    DSA/SHA512
   #    RSA/SHA1
   #    RSA/SHA224
   #    RSA/SHA256
  @@ -277,7 +282,7 @@
   #    ECDSA/SHA384    (using NIST P-384)
   #    ECDSA/SHA512    (using NIST P-521)
   #
  -%_build_sign DSA
  +%_build_sign RSA/SHA1
   
   #
   # Choose metadata file digest algorithm:
  @@ -298,8 +303,13 @@
   #    109     Jenkins lookup3.c hashlittle()
   #    111     RIPEMD-256
   #    112     RIPEMD-320
  +#    188     BLAKE2B
  +#    189     BLAKE2BP
  +#    190     BLAKE2S
  +#    191     BLAKE2SP
   #
  -%_build_file_digest_algo     1
  +#%_build_file_digest_algo    1
  +%_build_file_digest_algo     189
   %_build_binary_file_digest_algo      %{_build_file_digest_algo}
   %_build_source_file_digest_algo      %{_build_file_digest_algo}
   
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to