Accepting request 197201 from Base:System

- Don't run install-info on images (forwarded request 197168 from AndreasSchwab)

OBS-URL: https://build.opensuse.org/request/show/197201
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=64

gnutls-3.2.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0543ca13ce9ee1dea95a9349d319623b74d93b8a23935543197b1682bb7f2b5b
-size 5119264

gnutls-3.2.4-noecc.patch

@@ -1,59 +1,7 @@
-Index: gnutls-3.2.3/lib/algorithms/kx.c
+Index: gnutls-3.2.4/lib/algorithms/publickey.c
 ===================================================================
---- gnutls-3.2.3.orig/lib/algorithms/kx.c
-+++ gnutls-3.2.3/lib/algorithms/kx.c
-@@ -28,9 +28,11 @@
- 
- extern mod_auth_st rsa_auth_struct;
- extern mod_auth_st dhe_rsa_auth_struct;
-+#ifdef ENABLE_ECC
- extern mod_auth_st ecdhe_rsa_auth_struct;
- extern mod_auth_st ecdhe_psk_auth_struct;
- extern mod_auth_st ecdhe_ecdsa_auth_struct;
-+#endif
- extern mod_auth_st dhe_dss_auth_struct;
- extern mod_auth_st anon_auth_struct;
- extern mod_auth_st anon_ecdh_auth_struct;
-@@ -57,13 +59,17 @@ static const gnutls_cred_map cred_mappin
-   {GNUTLS_KX_ANON_DH, GNUTLS_CRD_ANON, GNUTLS_CRD_ANON},
-   {GNUTLS_KX_ANON_ECDH, GNUTLS_CRD_ANON, GNUTLS_CRD_ANON},
-   {GNUTLS_KX_RSA, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE},
-+#ifdef ENABLE_ECDHE
-   {GNUTLS_KX_ECDHE_RSA, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE},
-   {GNUTLS_KX_ECDHE_ECDSA, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE},
-+#endif
-   {GNUTLS_KX_DHE_DSS, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE},
-   {GNUTLS_KX_DHE_RSA, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE},
-   {GNUTLS_KX_PSK, GNUTLS_CRD_PSK, GNUTLS_CRD_PSK},
-   {GNUTLS_KX_DHE_PSK, GNUTLS_CRD_PSK, GNUTLS_CRD_PSK},
-+#ifdef ENABLE_ECDHE
-   {GNUTLS_KX_ECDHE_PSK, GNUTLS_CRD_PSK, GNUTLS_CRD_PSK},
-+#endif
-   {GNUTLS_KX_SRP, GNUTLS_CRD_SRP, GNUTLS_CRD_SRP},
-   {GNUTLS_KX_SRP_RSA, GNUTLS_CRD_SRP, GNUTLS_CRD_CERTIFICATE},
-   {GNUTLS_KX_SRP_DSS, GNUTLS_CRD_SRP, GNUTLS_CRD_CERTIFICATE},
-@@ -98,7 +104,7 @@ static const gnutls_kx_algo_entry _gnutl
-   {"DHE-RSA", GNUTLS_KX_DHE_RSA, &dhe_rsa_auth_struct, 1},
-   {"DHE-DSS", GNUTLS_KX_DHE_DSS, &dhe_dss_auth_struct, 1},
- #endif
--#ifdef ENABLE_ECDHE
-+#if defined(ENABLE_ECDHE) && defined(ENABLE_ECC)
-   {"ECDHE-RSA", GNUTLS_KX_ECDHE_RSA, &ecdhe_rsa_auth_struct, 0},
-   {"ECDHE-ECDSA", GNUTLS_KX_ECDHE_ECDSA, &ecdhe_ecdsa_auth_struct, 0},
- #endif
-@@ -113,7 +119,7 @@ static const gnutls_kx_algo_entry _gnutl
-   {"DHE-PSK", GNUTLS_KX_DHE_PSK, &dhe_psk_auth_struct,
-    1 /* needs DHE params */},
- # endif
--# ifdef ENABLE_ECDHE
-+# if defined(ENABLE_ECDHE) && defined(ENABLE_ECC)
-   {"ECDHE-PSK", GNUTLS_KX_ECDHE_PSK, &ecdhe_psk_auth_struct, 0},
- # endif
- #endif
-Index: gnutls-3.2.3/lib/algorithms/publickey.c
-===================================================================
---- gnutls-3.2.3.orig/lib/algorithms/publickey.c
-+++ gnutls-3.2.3/lib/algorithms/publickey.c
+--- gnutls-3.2.4.orig/lib/algorithms/publickey.c
++++ gnutls-3.2.4/lib/algorithms/publickey.c
 @@ -49,8 +49,10 @@ static const gnutls_pk_map pk_mappings[]
    {GNUTLS_KX_RSA, GNUTLS_PK_RSA, CIPHER_ENCRYPT},
    {GNUTLS_KX_DHE_RSA, GNUTLS_PK_RSA, CIPHER_SIGN},
@@ -64,8 +12,8 @@ Index: gnutls-3.2.3/lib/algorithms/publickey.c
 +#endif
    {GNUTLS_KX_DHE_DSS, GNUTLS_PK_DSA, CIPHER_SIGN},
    {GNUTLS_KX_SRP_DSS, GNUTLS_PK_DSA, CIPHER_SIGN},
-   {0, 0, 0}
-@@ -96,7 +98,9 @@ static const gnutls_pk_entry pk_algorith
+   {GNUTLS_KX_RSA_PSK, GNUTLS_PK_RSA, CIPHER_ENCRYPT},
+@@ -97,7 +99,9 @@ static const gnutls_pk_entry pk_algorith
    {"DSA", PK_DSA_OID, GNUTLS_PK_DSA},
    {"GOST R 34.10-2001", PK_GOST_R3410_2001_OID, GNUTLS_PK_UNKNOWN},
    {"GOST R 34.10-94", PK_GOST_R3410_94_OID, GNUTLS_PK_UNKNOWN},
@@ -75,14 +23,15 @@ Index: gnutls-3.2.3/lib/algorithms/publickey.c
    {0, 0, 0}
  };
  
-Index: gnutls-3.2.3/lib/auth/cert.c
+Index: gnutls-3.2.4/lib/auth/cert.c
 ===================================================================
---- gnutls-3.2.3.orig/lib/auth/cert.c
-+++ gnutls-3.2.3/lib/auth/cert.c
-@@ -63,7 +63,11 @@ static gnutls_privkey_t alloc_and_load_p
+--- gnutls-3.2.4.orig/lib/auth/cert.c
++++ gnutls-3.2.4/lib/auth/cert.c
+@@ -63,7 +63,12 @@ static gnutls_privkey_t alloc_and_load_p
                                                     key, int deinit);
  #endif
  
++
 +#ifdef ENABLE_ECC
  #define MAX_CLIENT_SIGN_ALGOS 3
 +#else
@@ -91,7 +40,7 @@ Index: gnutls-3.2.3/lib/auth/cert.c
  #define CERTTYPE_SIZE (MAX_CLIENT_SIGN_ALGOS+1)
  typedef enum CertificateSigType
  { RSA_SIGN = 1, DSA_SIGN = 2, ECDSA_SIGN = 64
-@@ -1438,8 +1442,10 @@ _gnutls_check_supported_sign_algo (Certi
+@@ -1438,8 +1443,10 @@ _gnutls_check_supported_sign_algo (Certi
        return GNUTLS_PK_RSA;
      case DSA_SIGN:
        return GNUTLS_PK_DSA;
@@ -102,7 +51,7 @@ Index: gnutls-3.2.3/lib/auth/cert.c
      }
  
    return -1;
-@@ -1735,7 +1741,9 @@ _gnutls_gen_cert_server_cert_req (gnutls
+@@ -1735,7 +1742,9 @@ _gnutls_gen_cert_server_cert_req (gnutls
    tmp_data[0] = CERTTYPE_SIZE - 1;
    tmp_data[1] = RSA_SIGN;
    tmp_data[2] = DSA_SIGN;
@@ -112,10 +61,10 @@ Index: gnutls-3.2.3/lib/auth/cert.c
  
    ret = _gnutls_buffer_append_data (data, tmp_data, CERTTYPE_SIZE);
    if (ret < 0)
-Index: gnutls-3.2.3/lib/auth/dhe_psk.c
+Index: gnutls-3.2.4/lib/auth/dhe_psk.c
 ===================================================================
---- gnutls-3.2.3.orig/lib/auth/dhe_psk.c
-+++ gnutls-3.2.3/lib/auth/dhe_psk.c
+--- gnutls-3.2.4.orig/lib/auth/dhe_psk.c
++++ gnutls-3.2.4/lib/auth/dhe_psk.c
 @@ -92,6 +92,7 @@ const mod_auth_st ecdhe_psk_auth_struct
  };
  #endif
@@ -180,10 +129,10 @@ Index: gnutls-3.2.3/lib/auth/dhe_psk.c
 +#endif
  
  #endif /* ENABLE_PSK */
-Index: gnutls-3.2.3/lib/ext/ecc.c
+Index: gnutls-3.2.4/lib/ext/ecc.c
 ===================================================================
---- gnutls-3.2.3.orig/lib/ext/ecc.c
-+++ gnutls-3.2.3/lib/ext/ecc.c
+--- gnutls-3.2.4.orig/lib/ext/ecc.c
++++ gnutls-3.2.4/lib/ext/ecc.c
 @@ -35,6 +35,7 @@
  /* Maps record size to numbers according to the
   * extensions draft.
@@ -198,10 +147,10 @@ Index: gnutls-3.2.3/lib/ext/ecc.c
  }
 +
 +#endif
-Index: gnutls-3.2.3/lib/gnutls_extensions.c
+Index: gnutls-3.2.4/lib/gnutls_extensions.c
 ===================================================================
---- gnutls-3.2.3.orig/lib/gnutls_extensions.c
-+++ gnutls-3.2.3/lib/gnutls_extensions.c
+--- gnutls-3.2.4.orig/lib/gnutls_extensions.c
++++ gnutls-3.2.4/lib/gnutls_extensions.c
 @@ -351,6 +351,7 @@ _gnutls_ext_init (void)
    if (ret != GNUTLS_E_SUCCESS)
      return ret;
@@ -218,10 +167,10 @@ Index: gnutls-3.2.3/lib/gnutls_extensions.c
  
    ret = _gnutls_ext_register (&ext_mod_sig);
    if (ret != GNUTLS_E_SUCCESS)
-Index: gnutls-3.2.3/lib/gnutls_priority.c
+Index: gnutls-3.2.4/lib/gnutls_priority.c
 ===================================================================
---- gnutls-3.2.3.orig/lib/gnutls_priority.c
-+++ gnutls-3.2.3/lib/gnutls_priority.c
+--- gnutls-3.2.4.orig/lib/gnutls_priority.c
++++ gnutls-3.2.4/lib/gnutls_priority.c
 @@ -245,35 +245,45 @@ gnutls_certificate_type_set_priority (gn
  }
  
@@ -268,7 +217,7 @@ Index: gnutls-3.2.3/lib/gnutls_priority.c
    0
  };
  
-@@ -458,51 +468,75 @@ static const int comp_priority[] = {
+@@ -416,51 +426,75 @@ static const int comp_priority[] = {
  static const int sign_priority_default[] = {
    GNUTLS_SIGN_RSA_SHA256,
    GNUTLS_SIGN_DSA_SHA256,
@@ -344,10 +293,10 @@ Index: gnutls-3.2.3/lib/gnutls_priority.c
    0
  };
  
-Index: gnutls-3.2.3/lib/nettle/pk.c
+Index: gnutls-3.2.4/lib/nettle/pk.c
 ===================================================================
---- gnutls-3.2.3.orig/lib/nettle/pk.c
-+++ gnutls-3.2.3/lib/nettle/pk.c
+--- gnutls-3.2.4.orig/lib/nettle/pk.c
++++ gnutls-3.2.4/lib/nettle/pk.c
 @@ -146,6 +146,7 @@ static int _wrap_nettle_pk_derive(gnutls
  
    switch (algo)
@@ -428,10 +377,10 @@ Index: gnutls-3.2.3/lib/nettle/pk.c
      default:
        ret = gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
      }
-Index: gnutls-3.2.3/tests/cert-tests/dane
+Index: gnutls-3.2.4/tests/cert-tests/dane
 ===================================================================
---- gnutls-3.2.3.orig/tests/cert-tests/dane
-+++ gnutls-3.2.3/tests/cert-tests/dane
+--- gnutls-3.2.4.orig/tests/cert-tests/dane
++++ gnutls-3.2.4/tests/cert-tests/dane
 @@ -22,6 +22,8 @@
  
  set -e
@@ -441,10 +390,10 @@ Index: gnutls-3.2.3/tests/cert-tests/dane
  srcdir=${srcdir:-.}
  DANETOOL=${DANETOOL:-../../src/danetool$EXEEXT}
  
-Index: gnutls-3.2.3/tests/dtls/dtls-nb
+Index: gnutls-3.2.4/tests/dtls/dtls-nb
 ===================================================================
---- gnutls-3.2.3.orig/tests/dtls/dtls-nb
-+++ gnutls-3.2.3/tests/dtls/dtls-nb
+--- gnutls-3.2.4.orig/tests/dtls/dtls-nb
++++ gnutls-3.2.4/tests/dtls/dtls-nb
 @@ -22,9 +22,7 @@
  
  set -e
@@ -456,10 +405,10 @@ Index: gnutls-3.2.3/tests/dtls/dtls-nb
  
  ./dtls-stress -nb -shello 021 -sfinished 01 -cfinished 012 SKeyExchange CKeyExchange CFinished
  ./dtls-stress -nb -shello 012 -sfinished 10 -cfinished 210 SHello SKeyExchange SHelloDone
-Index: gnutls-3.2.3/tests/dtls/dtls
+Index: gnutls-3.2.4/tests/dtls/dtls
 ===================================================================
---- gnutls-3.2.3.orig/tests/dtls/dtls
-+++ gnutls-3.2.3/tests/dtls/dtls
+--- gnutls-3.2.4.orig/tests/dtls/dtls
++++ gnutls-3.2.4/tests/dtls/dtls
 @@ -22,9 +22,7 @@
  
  set -e
@@ -471,10 +420,10 @@ Index: gnutls-3.2.3/tests/dtls/dtls
  
  ./dtls-stress -shello 021 -sfinished 01 -cfinished 012 SKeyExchange CKeyExchange CFinished
  ./dtls-stress -shello 012 -sfinished 10 -cfinished 210 SHello SKeyExchange SHelloDone
-Index: gnutls-3.2.3/tests/ecdsa/ecdsa
+Index: gnutls-3.2.4/tests/ecdsa/ecdsa
 ===================================================================
---- gnutls-3.2.3.orig/tests/ecdsa/ecdsa
-+++ gnutls-3.2.3/tests/ecdsa/ecdsa
+--- gnutls-3.2.4.orig/tests/ecdsa/ecdsa
++++ gnutls-3.2.4/tests/ecdsa/ecdsa
 @@ -22,6 +22,8 @@
  
  #set -e
@@ -484,10 +433,10 @@ Index: gnutls-3.2.3/tests/ecdsa/ecdsa
  srcdir=${srcdir:-.}
  CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
  
-Index: gnutls-3.2.3/tests/mini-dtls-heartbeat.c
+Index: gnutls-3.2.4/tests/mini-dtls-heartbeat.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/mini-dtls-heartbeat.c
-+++ gnutls-3.2.3/tests/mini-dtls-heartbeat.c
+--- gnutls-3.2.4.orig/tests/mini-dtls-heartbeat.c
++++ gnutls-3.2.4/tests/mini-dtls-heartbeat.c
 @@ -27,7 +27,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -497,10 +446,10 @@ Index: gnutls-3.2.3/tests/mini-dtls-heartbeat.c
  
  int
  main ()
-Index: gnutls-3.2.3/tests/mini-dtls-record.c
+Index: gnutls-3.2.4/tests/mini-dtls-record.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/mini-dtls-record.c
-+++ gnutls-3.2.3/tests/mini-dtls-record.c
+--- gnutls-3.2.4.orig/tests/mini-dtls-record.c
++++ gnutls-3.2.4/tests/mini-dtls-record.c
 @@ -29,7 +29,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -510,10 +459,10 @@ Index: gnutls-3.2.3/tests/mini-dtls-record.c
  
  int
  main ()
-Index: gnutls-3.2.3/tests/mini-dtls-rehandshake.c
+Index: gnutls-3.2.4/tests/mini-dtls-rehandshake.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/mini-dtls-rehandshake.c
-+++ gnutls-3.2.3/tests/mini-dtls-rehandshake.c
+--- gnutls-3.2.4.orig/tests/mini-dtls-rehandshake.c
++++ gnutls-3.2.4/tests/mini-dtls-rehandshake.c
 @@ -27,7 +27,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -523,10 +472,10 @@ Index: gnutls-3.2.3/tests/mini-dtls-rehandshake.c
  
  int main()
  {
-Index: gnutls-3.2.3/tests/mini-dtls-srtp.c
+Index: gnutls-3.2.4/tests/mini-dtls-srtp.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/mini-dtls-srtp.c
-+++ gnutls-3.2.3/tests/mini-dtls-srtp.c
+--- gnutls-3.2.4.orig/tests/mini-dtls-srtp.c
++++ gnutls-3.2.4/tests/mini-dtls-srtp.c
 @@ -27,7 +27,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -536,10 +485,10 @@ Index: gnutls-3.2.3/tests/mini-dtls-srtp.c
  
  int
  main (int argc, char** argv)
-Index: gnutls-3.2.3/tests/mini-handshake-timeout.c
+Index: gnutls-3.2.4/tests/mini-handshake-timeout.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/mini-handshake-timeout.c
-+++ gnutls-3.2.3/tests/mini-handshake-timeout.c
+--- gnutls-3.2.4.orig/tests/mini-handshake-timeout.c
++++ gnutls-3.2.4/tests/mini-handshake-timeout.c
 @@ -28,7 +28,7 @@
  #include <stdlib.h>
  #include <string.h>
@@ -562,10 +511,10 @@ Index: gnutls-3.2.3/tests/mini-handshake-timeout.c
  }
  
  static void
-Index: gnutls-3.2.3/tests/mini-loss-time.c
+Index: gnutls-3.2.4/tests/mini-loss-time.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/mini-loss-time.c
-+++ gnutls-3.2.3/tests/mini-loss-time.c
+--- gnutls-3.2.4.orig/tests/mini-loss-time.c
++++ gnutls-3.2.4/tests/mini-loss-time.c
 @@ -28,7 +28,7 @@
  #include <stdlib.h>
  #include <string.h>
@@ -575,10 +524,10 @@ Index: gnutls-3.2.3/tests/mini-loss-time.c
  
  int main()
  {
-Index: gnutls-3.2.3/tests/mini-record.c
+Index: gnutls-3.2.4/tests/mini-record.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/mini-record.c
-+++ gnutls-3.2.3/tests/mini-record.c
+--- gnutls-3.2.4.orig/tests/mini-record.c
++++ gnutls-3.2.4/tests/mini-record.c
 @@ -27,7 +27,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -588,10 +537,10 @@ Index: gnutls-3.2.3/tests/mini-record.c
  
  int main()
  {
-Index: gnutls-3.2.3/tests/mini-record-range.c
+Index: gnutls-3.2.4/tests/mini-record-range.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/mini-record-range.c
-+++ gnutls-3.2.3/tests/mini-record-range.c
+--- gnutls-3.2.4.orig/tests/mini-record-range.c
++++ gnutls-3.2.4/tests/mini-record-range.c
 @@ -27,7 +27,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -601,10 +550,10 @@ Index: gnutls-3.2.3/tests/mini-record-range.c
  
  int main()
  {
-Index: gnutls-3.2.3/tests/mini-xssl.c
+Index: gnutls-3.2.4/tests/mini-xssl.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/mini-xssl.c
-+++ gnutls-3.2.3/tests/mini-xssl.c
+--- gnutls-3.2.4.orig/tests/mini-xssl.c
++++ gnutls-3.2.4/tests/mini-xssl.c
 @@ -27,7 +27,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -614,10 +563,10 @@ Index: gnutls-3.2.3/tests/mini-xssl.c
  
  int main()
  {
-Index: gnutls-3.2.3/tests/pkcs12_simple.c
+Index: gnutls-3.2.4/tests/pkcs12_simple.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/pkcs12_simple.c
-+++ gnutls-3.2.3/tests/pkcs12_simple.c
+--- gnutls-3.2.4.orig/tests/pkcs12_simple.c
++++ gnutls-3.2.4/tests/pkcs12_simple.c
 @@ -50,6 +50,10 @@ doit (void)
    gnutls_x509_privkey_t pkey;
    int ret;
@@ -629,10 +578,10 @@ Index: gnutls-3.2.3/tests/pkcs12_simple.c
    ret = global_init ();
    if (ret < 0)
      fail ("global_init failed %d\n", ret);
-Index: gnutls-3.2.3/tests/slow/keygen.c
+Index: gnutls-3.2.4/tests/slow/keygen.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/slow/keygen.c
-+++ gnutls-3.2.3/tests/slow/keygen.c
+--- gnutls-3.2.4.orig/tests/slow/keygen.c
++++ gnutls-3.2.4/tests/slow/keygen.c
 @@ -65,6 +65,11 @@ doit (void)
                  if (algorithm == GNUTLS_PK_DH)
                      continue;
@@ -645,10 +594,10 @@ Index: gnutls-3.2.3/tests/slow/keygen.c
                  ret = gnutls_x509_privkey_init (&pkey);
                  if (ret < 0)
                    {
-Index: gnutls-3.2.3/tests/srp/mini-srp.c
+Index: gnutls-3.2.4/tests/srp/mini-srp.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/srp/mini-srp.c
-+++ gnutls-3.2.3/tests/srp/mini-srp.c
+--- gnutls-3.2.4.orig/tests/srp/mini-srp.c
++++ gnutls-3.2.4/tests/srp/mini-srp.c
 @@ -27,7 +27,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -658,10 +607,10 @@ Index: gnutls-3.2.3/tests/srp/mini-srp.c
  
  int main()
  {
-Index: gnutls-3.2.3/lib/auth/ecdhe.c
+Index: gnutls-3.2.4/lib/auth/ecdhe.c
 ===================================================================
---- gnutls-3.2.3.orig/lib/auth/ecdhe.c
-+++ gnutls-3.2.3/lib/auth/ecdhe.c
+--- gnutls-3.2.4.orig/lib/auth/ecdhe.c
++++ gnutls-3.2.4/lib/auth/ecdhe.c
 @@ -50,7 +50,7 @@ static int
  proc_ecdhe_client_kx (gnutls_session_t session,
                                      uint8_t * data, size_t _data_size);
@@ -671,10 +620,10 @@ Index: gnutls-3.2.3/lib/auth/ecdhe.c
  const mod_auth_st ecdhe_ecdsa_auth_struct = {
    "ECDHE_ECDSA",
    _gnutls_gen_cert_server_crt,
-Index: gnutls-3.2.3/tests/mini-dtls-hello-verify.c
+Index: gnutls-3.2.4/tests/mini-dtls-hello-verify.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/mini-dtls-hello-verify.c
-+++ gnutls-3.2.3/tests/mini-dtls-hello-verify.c
+--- gnutls-3.2.4.orig/tests/mini-dtls-hello-verify.c
++++ gnutls-3.2.4/tests/mini-dtls-hello-verify.c
 @@ -27,7 +27,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -684,10 +633,10 @@ Index: gnutls-3.2.3/tests/mini-dtls-hello-verify.c
  
  int main()
  {
-Index: gnutls-3.2.3/tests/mini-alpn.c
+Index: gnutls-3.2.4/tests/mini-alpn.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/mini-alpn.c
-+++ gnutls-3.2.3/tests/mini-alpn.c
+--- gnutls-3.2.4.orig/tests/mini-alpn.c
++++ gnutls-3.2.4/tests/mini-alpn.c
 @@ -25,7 +25,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -697,10 +646,10 @@ Index: gnutls-3.2.3/tests/mini-alpn.c
  
  int
  main (int argc, char** argv)
-Index: gnutls-3.2.3/tests/mini-dtls-large.c
+Index: gnutls-3.2.4/tests/mini-dtls-large.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/mini-dtls-large.c
-+++ gnutls-3.2.3/tests/mini-dtls-large.c
+--- gnutls-3.2.4.orig/tests/mini-dtls-large.c
++++ gnutls-3.2.4/tests/mini-dtls-large.c
 @@ -25,7 +25,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -722,10 +671,87 @@ Index: gnutls-3.2.3/tests/mini-dtls-large.c
                                  NULL);
  
      gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
-Index: gnutls-3.2.3/tests/priorities.c
+Index: gnutls-3.2.4/tests/mini-x509-callbacks.c
 ===================================================================
---- gnutls-3.2.3.orig/tests/priorities.c
-+++ gnutls-3.2.3/tests/priorities.c
+--- gnutls-3.2.4.orig/tests/mini-x509-callbacks.c
++++ gnutls-3.2.4/tests/mini-x509-callbacks.c
+@@ -56,13 +56,19 @@ unsigned int msg_order[] = {
+ 	GNUTLS_HANDSHAKE_CLIENT_HELLO,
+ 	GNUTLS_HANDSHAKE_SERVER_HELLO,
+ 	GNUTLS_HANDSHAKE_CERTIFICATE_PKT,
++#ifndef ENABLE_ECC
++	/*Sent: CERTIFICATE REQUEST, expected SERVER KEY EXCHANGE*/
++	GNUTLS_HANDSHAKE_CERTIFICATE_REQUEST,
++#else
+ 	GNUTLS_HANDSHAKE_SERVER_KEY_EXCHANGE,
+ 	GNUTLS_HANDSHAKE_CERTIFICATE_REQUEST,
++#endif
+ 	GNUTLS_HANDSHAKE_SERVER_HELLO_DONE,
+ 	GNUTLS_HANDSHAKE_CERTIFICATE_PKT,
+ 	GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE,
+ 	GNUTLS_HANDSHAKE_FINISHED,
+ 	GNUTLS_HANDSHAKE_FINISHED,
++
+ };
+ 
+ static int handshake_callback (gnutls_session_t session, unsigned int htype, unsigned post, unsigned int incoming)
+Index: gnutls-3.2.4/lib/algorithms/kx.c
+===================================================================
+--- gnutls-3.2.4.orig/lib/algorithms/kx.c
++++ gnutls-3.2.4/lib/algorithms/kx.c
+@@ -28,9 +28,11 @@
+ 
+ extern mod_auth_st rsa_auth_struct;
+ extern mod_auth_st dhe_rsa_auth_struct;
++#ifdef ENABLE_ECC
+ extern mod_auth_st ecdhe_rsa_auth_struct;
+ extern mod_auth_st ecdhe_psk_auth_struct;
+ extern mod_auth_st ecdhe_ecdsa_auth_struct;
++#endif
+ extern mod_auth_st dhe_dss_auth_struct;
+ extern mod_auth_st anon_auth_struct;
+ extern mod_auth_st anon_ecdh_auth_struct;
+@@ -58,14 +60,18 @@ static const gnutls_cred_map cred_mappin
+   {GNUTLS_KX_ANON_DH, GNUTLS_CRD_ANON, GNUTLS_CRD_ANON},
+   {GNUTLS_KX_ANON_ECDH, GNUTLS_CRD_ANON, GNUTLS_CRD_ANON},
+   {GNUTLS_KX_RSA, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE},
++#ifdef ENABLE_ECDHE
+   {GNUTLS_KX_ECDHE_RSA, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE},
+   {GNUTLS_KX_ECDHE_ECDSA, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE},
++#endif
+   {GNUTLS_KX_DHE_DSS, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE},
+   {GNUTLS_KX_DHE_RSA, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE},
+   {GNUTLS_KX_PSK, GNUTLS_CRD_PSK, GNUTLS_CRD_PSK},
+   {GNUTLS_KX_DHE_PSK, GNUTLS_CRD_PSK, GNUTLS_CRD_PSK},
+   {GNUTLS_KX_RSA_PSK, GNUTLS_CRD_PSK, GNUTLS_CRD_CERTIFICATE},
++#ifdef ENABLE_ECDHE
+   {GNUTLS_KX_ECDHE_PSK, GNUTLS_CRD_PSK, GNUTLS_CRD_PSK},
++#endif
+   {GNUTLS_KX_SRP, GNUTLS_CRD_SRP, GNUTLS_CRD_SRP},
+   {GNUTLS_KX_SRP_RSA, GNUTLS_CRD_SRP, GNUTLS_CRD_CERTIFICATE},
+   {GNUTLS_KX_SRP_DSS, GNUTLS_CRD_SRP, GNUTLS_CRD_CERTIFICATE},
+@@ -100,7 +106,7 @@ static const gnutls_kx_algo_entry _gnutl
+   {"DHE-RSA", GNUTLS_KX_DHE_RSA, &dhe_rsa_auth_struct, 1},
+   {"DHE-DSS", GNUTLS_KX_DHE_DSS, &dhe_dss_auth_struct, 1},
+ #endif
+-#ifdef ENABLE_ECDHE
++#if defined(ENABLE_ECDHE) && defined(ENABLE_ECC)
+   {"ECDHE-RSA", GNUTLS_KX_ECDHE_RSA, &ecdhe_rsa_auth_struct, 0},
+   {"ECDHE-ECDSA", GNUTLS_KX_ECDHE_ECDSA, &ecdhe_ecdsa_auth_struct, 0},
+ #endif
+@@ -116,7 +122,7 @@ static const gnutls_kx_algo_entry _gnutl
+   {"DHE-PSK", GNUTLS_KX_DHE_PSK, &dhe_psk_auth_struct,
+    1 /* needs DHE params */},
+ # endif
+-# ifdef ENABLE_ECDHE
++# if defined(ENABLE_ECDHE) && defined(ENABLE_ECC)
+   {"ECDHE-PSK", GNUTLS_KX_ECDHE_PSK, &ecdhe_psk_auth_struct, 0},
+ # endif
+ #endif
+Index: gnutls-3.2.4/tests/priorities.c
+===================================================================
+--- gnutls-3.2.4.orig/tests/priorities.c
++++ gnutls-3.2.4/tests/priorities.c
 @@ -73,7 +73,7 @@ unsigned i, si, count = 0;
  for (i=0;i<ret;i++)
    fprintf(stderr, "%s\n", gnutls_cipher_get_name(t[i]));
@@ -749,7 +775,7 @@ Index: gnutls-3.2.3/tests/priorities.c
  doit (void)
  {
 +#ifdef ENABLE_ECC
- const int normal = 40;
+ const int normal = 42;
  const int null = 5;
  const int sec128 = 32;
 +#else
@@ -782,27 +808,3 @@ Index: gnutls-3.2.3/tests/priorities.c
 +#endif
  }
  
-Index: gnutls-3.2.3/tests/mini-x509-callbacks.c
-===================================================================
---- gnutls-3.2.3.orig/tests/mini-x509-callbacks.c
-+++ gnutls-3.2.3/tests/mini-x509-callbacks.c
-@@ -56,13 +56,19 @@ unsigned int msg_order[] = {
- 	GNUTLS_HANDSHAKE_CLIENT_HELLO,
- 	GNUTLS_HANDSHAKE_SERVER_HELLO,
- 	GNUTLS_HANDSHAKE_CERTIFICATE_PKT,
-+#ifndef ENABLE_ECC
-+	/*Sent: CERTIFICATE REQUEST, expected SERVER KEY EXCHANGE*/
-+	GNUTLS_HANDSHAKE_CERTIFICATE_REQUEST,
-+#else
- 	GNUTLS_HANDSHAKE_SERVER_KEY_EXCHANGE,
- 	GNUTLS_HANDSHAKE_CERTIFICATE_REQUEST,
-+#endif
- 	GNUTLS_HANDSHAKE_SERVER_HELLO_DONE,
- 	GNUTLS_HANDSHAKE_CERTIFICATE_PKT,
- 	GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE,
- 	GNUTLS_HANDSHAKE_FINISHED,
- 	GNUTLS_HANDSHAKE_FINISHED,
-+
- };
- 
- static int handshake_callback (gnutls_session_t session, unsigned int htype, unsigned post, unsigned int incoming)

gnutls-3.2.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:119570af3eb83b411252bf617688b9b9143e4349f48657b7ebaea57d90ff707f
+size 4959876

gnutls.changes

@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Mon Sep  2 16:23:59 UTC 2013 - schwab@linux-m68k.org
+
+- Don't run install-info on images
+
+-------------------------------------------------------------------
+Mon Sep  2 07:43:21 UTC 2013 - shchang@suse.com
+
+- Update to 3.2.4
+** libgnutls: Fixes when session tickets and session DB are used.
+Report and initial patch by Stefan Buehler.
+
+** libgnutls: Added the RSA-PSK key exchange. Patch by by Frank Morgner,
+based on previous patch by Bardenheuer GmbH and Bundesdruckerei GmbH.
+
+** libgnutls: Added ciphersuites that use ARCFOUR with ECDHE. Patch
+by Stefan Buehler.
+
+** libgnutls: Added the PFS priority string option.
+
+** libgnutls: Gnulib included files are strictly LGPLv2.
+
+** libgnutls: Corrected gnutls_certificate_server_set_request().
+Reported by Petr Pisar.
+
+** API and ABI modifications:
+gnutls_record_set_timeout: Exported 
+
+Add files:gnutls-3.2.4.tar.xz.sig, gnutls-3.2.4.tar.xz, gnutls-3.2.4-noecc.patch
+Delete file: gnutls-3.2.3-noecc.patch
+
 -------------------------------------------------------------------
 Fri Aug 30 00:31:19 CEST 2013 - ro@suse.de
 

gnutls.spec

@@ -21,7 +21,7 @@
 %define gnutls_ossl_sover 27
 
 Name:           gnutls
-Version:        3.2.3
+Version:        3.2.4
 Release:        0
 Summary:        The GNU Transport Layer Security Library
 License:        LGPL-2.1+ and GPL-3.0+
@@ -37,8 +37,9 @@ Source3:        baselibs.conf
 Patch3:         gnutls-3.0.26-skip-test-fwrite.patch
 
 # Disable elliptic curves for reasons. - meissner&cfarrell
-Patch5:         gnutls-3.2.3-noecc.patch
+Patch5:         gnutls-3.2.4-noecc.patch
 Patch6:         gnutls-implement-trust-store-dir.diff
+Patch7:         make-obs-happy-with-gnutls_3.2.4.patch
 
 BuildRequires:  automake
 BuildRequires:  gcc-c++
@@ -140,6 +141,7 @@ Files needed for software development using gnutls.
 %patch3
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 autoreconf -if
@@ -194,11 +196,9 @@ rm -rf %{buildroot}
 
 %post -n libgnutls-devel
 %install_info --info-dir=%{_infodir} %{_infodir}/gnutls.info.gz
-%install_info --info-dir=%{_infodir} %{_infodir}/pkcs11-vision.png.gz
 
 %postun -n libgnutls-devel
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/gnutls.info.gz
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/pkcs11-vision.png.gz
 
 %files -f libgnutls.lang
 %defattr(-, root, root)

make-obs-happy-with-gnutls_3.2.4.patch

@@ -0,0 +1,47 @@
+Index: gnutls-3.2.4/doc/examples/ex-client-xssl1.c
+===================================================================
+--- gnutls-3.2.4.orig/doc/examples/ex-client-xssl1.c
++++ gnutls-3.2.4/doc/examples/ex-client-xssl1.c
+@@ -80,6 +80,8 @@ int main (void)
+   xssl_cred_deinit (cred);
+ 
+   gnutls_global_deinit ();
++
++  return 0;
+ }
+ 
+ 
+Index: gnutls-3.2.4/doc/examples/ex-client-xssl2.c
+===================================================================
+--- gnutls-3.2.4.orig/doc/examples/ex-client-xssl2.c
++++ gnutls-3.2.4/doc/examples/ex-client-xssl2.c
+@@ -95,4 +95,6 @@ int main (void)
+   xssl_cred_deinit (cred);
+ 
+   gnutls_global_deinit ();
++
++  return 0;
+ }
+Index: gnutls-3.2.4/doc/examples/print-ciphersuites.c
+===================================================================
+--- gnutls-3.2.4.orig/doc/examples/print-ciphersuites.c
++++ gnutls-3.2.4/doc/examples/print-ciphersuites.c
+@@ -51,4 +51,5 @@ int main(int argc, char** argv)
+ {
+   if (argc > 1)
+     print_cipher_suite_list (argv[1]);
++  return 0;
+ }
+Index: gnutls-3.2.4/src/serv.c
+===================================================================
+--- gnutls-3.2.4.orig/src/serv.c
++++ gnutls-3.2.4/src/serv.c
+@@ -1216,6 +1216,8 @@ main (int argc, char **argv)
+     udp_server (name, port, mtu);
+   else
+     tcp_server (name, port);
++
++  return 0;
+ }
+ 
+ static void