RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   16-Aug-2010 17:07:15
  Branch: rpm-5_3                          Handle: 2010081615071401

  Modified files:           (Branch: rpm-5_3)
    rpm                     CHANGES
    rpm/rpmio               rpmdav.c rpmssl.c rpmssl.h

  Log:
    - neon: fix: permit building w neon-0.25.x.
    - ssl: fix: permit building w/o ECDSA.

  Summary:
    Revision    Changes     Path
    1.3296.2.58 +2  -0      rpm/CHANGES
    2.116.2.2   +1  -1      rpm/rpmio/rpmdav.c
    2.23.2.3    +5  -3      rpm/rpmio/rpmssl.c
    2.6.4.2     +4  -0      rpm/rpmio/rpmssl.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3296.2.57 -r1.3296.2.58 CHANGES
  --- rpm/CHANGES	16 Aug 2010 13:17:11 -0000	1.3296.2.57
  +++ rpm/CHANGES	16 Aug 2010 15:07:14 -0000	1.3296.2.58
  @@ -1,4 +1,6 @@
   5.3.2 -> 5.3.3:
  +    - jbj: neon: fix: permit building w neon-0.25.x.
  +    - jbj: ssl: fix: permit building w/o ECDSA.
       - jbj: ruby: fix: retrofit RSTRING_PTR/RSTRING_LEN into ruby-1.8.5.
       - jbj: solve: loop over solve db's in a bag.
       - jbj: solve: stub-in toy add/del methods.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmdav.c
  ============================================================================
  $ cvs diff -u -r2.116.2.1 -r2.116.2.2 rpmdav.c
  --- rpm/rpmio/rpmdav.c	23 Jun 2010 16:59:17 -0000	2.116.2.1
  +++ rpm/rpmio/rpmdav.c	16 Aug 2010 15:07:15 -0000	2.116.2.2
  @@ -588,11 +588,11 @@
   
   #if WITH_NEON_MIN_VERSION >= 0x002600
   	ne_set_session_flag(u->sess, NE_SESSFLAG_PERSIST, rpmioHttpPersist);
  +	ne_set_connect_timeout(u->sess, rpmioHttpConnectTimeoutSecs);
   #else
   	ne_set_persist(u->sess, rpmioHttpPersist);
   #endif
   	ne_set_read_timeout(u->sess, rpmioHttpReadTimeoutSecs);
  -	ne_set_connect_timeout(u->sess, rpmioHttpConnectTimeoutSecs);
   	ne_set_useragent(u->sess,
   	    (rpmioHttpUserAgent ? rpmioHttpUserAgent : _rpmioHttpUserAgent));
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmssl.c
  ============================================================================
  $ cvs diff -u -r2.23.2.2 -r2.23.2.3 rpmssl.c
  --- rpm/rpmio/rpmssl.c	18 Jun 2010 17:39:45 -0000	2.23.2.2
  +++ rpm/rpmio/rpmssl.c	16 Aug 2010 15:07:15 -0000	2.23.2.3
  @@ -397,10 +397,10 @@
   int rpmsslVerifyECDSA(pgpDig dig)
   	/*@*/
   {
  -    rpmssl ssl = dig->impl;
       int rc = 0;		/* assume failure. */
   
   #if !defined(OPENSSL_NO_ECDSA)
  +    rpmssl ssl = dig->impl;
       rc = ECDSA_do_verify(ssl->digest, ssl->digestlen, ssl->ecdsasig, ssl->ecdsakey);
   #endif
       rc = (rc == 1);
  @@ -413,10 +413,10 @@
   int rpmsslSignECDSA(pgpDig dig)
   	/*@*/
   {
  -    rpmssl ssl = dig->impl;
       int rc = 0;		/* assume failure. */
   
   #if !defined(OPENSSL_NO_ECDSA)
  +    rpmssl ssl = dig->impl;
       ssl->ecdsasig = ECDSA_do_sign(ssl->digest, ssl->digestlen, ssl->ecdsakey);
       rc = (ssl->ecdsasig != NULL);
   #endif
  @@ -429,10 +429,10 @@
   int rpmsslGenerateECDSA(pgpDig dig)
   	/*@*/
   {
  -    rpmssl ssl = dig->impl;
       int rc = 0;		/* assume failure. */
   
   #if !defined(OPENSSL_NO_ECDSA)
  +    rpmssl ssl = dig->impl;
   
   if (ssl->nid == 0) {		/* XXX FIXME */
   ssl->nid = NID_X9_62_prime256v1;
  @@ -668,6 +668,7 @@
   	    BN_free(ssl->c);
   	ssl->c = NULL;
   
  +#if !defined(OPENSSL_NO_ECDSA)
   	if (ssl->ecdsakey)
   	    EC_KEY_free(ssl->ecdsakey);
   	ssl->ecdsakey = NULL;
  @@ -678,6 +679,7 @@
   	if (ssl->ecdsakey_bad)
   	    EC_KEY_free(ssl->ecdsakey_bad);
   	ssl->ecdsakey_bad = NULL;
  +#endif
   
       }
   /*@=moduncon@*/
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmssl.h
  ============================================================================
  $ cvs diff -u -r2.6.4.1 -r2.6.4.2 rpmssl.h
  --- rpm/rpmio/rpmssl.h	18 Jun 2010 17:39:45 -0000	2.6.4.1
  +++ rpm/rpmio/rpmssl.h	16 Aug 2010 15:07:15 -0000	2.6.4.2
  @@ -36,10 +36,12 @@
       size_t digestlen;
   
       BIO * out;			/* XXX tecdsa */
  +#if !defined(OPENSSL_NO_ECDSA)
       EC_builtin_curve * curves;	/* XXX tecdsa */
       size_t ncurves;
       EC_GROUP * group;		/* XXX tecdsa */
       EC_KEY * ecdsakey_bad;	/* XXX tecdsa */
  +#endif
   
       /* DSA parameters. */
       DSA * dsa;
  @@ -52,9 +54,11 @@
       BIGNUM * c;
   
       /* ECDSA parameters. */
  +#if !defined(OPENSSL_NO_ECDSA)
       int nid;
       EC_KEY * ecdsakey;
       ECDSA_SIG * ecdsasig;
  +#endif
   
   };
   #endif
  @@ .