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:   19-Feb-2012 17:56:52
  Branch: rpm-5_4                          Handle: 2012021916565100

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

  Log:
    - hkp: revert to "keys.n3npq.net" for CI tests

  Summary:
    Revision    Changes     Path
    1.3501.2.195+1  -0      rpm/CHANGES
    1.39.2.20   +2  -3      rpm/macros/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3501.2.194 -r1.3501.2.195 CHANGES
  --- rpm/CHANGES       18 Feb 2012 22:44:30 -0000      1.3501.2.194
  +++ rpm/CHANGES       19 Feb 2012 16:56:51 -0000      1.3501.2.195
  @@ -1,4 +1,5 @@
   5.4.4 -> 5.4.5:
  +    - jbj: hkp: revert to "keys.n3npq.net" for CI tests.
       - jbj: rpmdb: wire-up heap_regionsize.
       - jbj: rpmdb: fix: db-5.3.15 DB_CONFIG can't handle multichar whitespace.
       - jbj: format: hash RPMTAG_FILE{INODES,DEVICES,RDEVS} in headers.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  ============================================================================
  $ cvs diff -u -r1.39.2.19 -r1.39.2.20 macros.in
  --- rpm/macros/macros.in      15 Feb 2012 20:35:05 -0000      1.39.2.19
  +++ rpm/macros/macros.in      19 Feb 2012 16:56:51 -0000      1.39.2.20
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.39.2.19 2012/02/15 20:35:05 jbj Exp $
  +# $Id: macros.in,v 1.39.2.20 2012/02/19 16:56:51 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
  @@ -529,8 +529,7 @@
   
   # Horowitz Key Protocol server configuration
   #
  -#%_hkp_keyserver         hkp://keys.n3npq.net
  -%_hkp_keyserver         hkp://pool.sks-keyservers.net
  +%_hkp_keyserver         hkp://keys.n3npq.net
   %_hkp_keyserver_query   %{_hkp_keyserver}/pks/lookup?op=get&search=
   
   
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to