Re: pkg/49629 (Building security/libgcrypt fails on Solaris 10u7 sparc / Studio Pro 12u1)

[David Holland <dholland-pbugs%netbsd.org@localhost>]

The following reply was made to PR pkg/49629; it has been noted by GNATS.

From: David Holland <dholland-pbugs%netbsd.org@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/49629 (Building security/libgcrypt fails on Solaris 10u7
 sparc / Studio Pro 12u1)
Date: Sat, 7 Feb 2015 17:34:19 +0000

 Not sent to gnats (send stuff to gnats-bugs; it's a reflector) - often
 if replying to your own posts this needs to be set by hand in the mail
 client :-/
 
    ------
 
 From: Malte Dehling <mdehling%gmail.com@localhost>,
 To: solaris-pkg-people%netbsd.org@localhost, gnats-admin%netbsd.org@localhost,
 Subject: Re: pkg/49629 (Building security/libgcrypt fails on Solaris 10u7 sparc
 	/ Studio Pro 12u1)
 Date: Tue, 3 Feb 2015 21:03:37 +0100
 
 With the following patches I am able to build.  They remove duplicate
 conflicting declarations and fix return values.
 
 --- src/g10lib.h.orig   2014-08-21 10:29:09.000000000 +0000
 +++ src/g10lib.h
 @@ -92,7 +92,7 @@
 
  /*-- src/global.c -*/
  int _gcry_global_is_operational (void);
 -gcry_error_t _gcry_vcontrol (enum gcry_ctl_cmds cmd, va_list arg_ptr);
 +gcry_err_code_t _gcry_vcontrol (enum gcry_ctl_cmds cmd, va_list arg_ptr);
  void  _gcry_check_heap (const void *a);
  int _gcry_get_debug_flag (unsigned int mask);
 
 --- src/gcrypt-int.h.orig       2014-08-21 12:50:39.000000000 +0000
 +++ src/gcrypt-int.h
 @@ -328,10 +328,6 @@ void *_gcry_sexp_nth_buffer (const gcry_
                               size_t *rlength);
  char *_gcry_sexp_nth_string (gcry_sexp_t list, int number);
  gcry_mpi_t _gcry_sexp_nth_mpi (gcry_sexp_t list, int number, int mpifmt);
 -gpg_err_code_t _gcry_sexp_extract_param (gcry_sexp_t sexp,
 -                                         const char *path,
 -                                         const char *list,
 -                                         ...) _GCRY_GCC_ATTR_SENTINEL(0);
 
  #define sexp_new(a, b, c, d)         _gcry_sexp_new ((a), (b), (c), (d))
  #define sexp_create(a, b, c, d, e)   _gcry_sexp_create ((a), (b),
 (c), (d), (e))
 @@ -415,15 +411,9 @@ gcry_mpi_point_t _gcry_mpi_point_set (gc
  gcry_mpi_point_t _gcry_mpi_point_snatch_set (gcry_mpi_point_t point,
                                              gcry_mpi_t x, gcry_mpi_t y,
                                              gcry_mpi_t z);
 -gpg_error_t _gcry_mpi_ec_new (gcry_ctx_t *r_ctx,
 -                             gcry_sexp_t keyparam, const char *curvename);
  gcry_mpi_t _gcry_mpi_ec_get_mpi (const char *name, gcry_ctx_t ctx, int copy);
  gcry_mpi_point_t _gcry_mpi_ec_get_point (const char *name,
                                          gcry_ctx_t ctx, int copy);
 -gpg_error_t _gcry_mpi_ec_set_mpi (const char *name, gcry_mpi_t newvalue,
 -                                 gcry_ctx_t ctx);
 -gpg_error_t _gcry_mpi_ec_set_point (const char *name,
 gcry_mpi_point_t newvalue,
 -                                   gcry_ctx_t ctx);
  int _gcry_mpi_ec_get_affine (gcry_mpi_t x, gcry_mpi_t y,
 gcry_mpi_point_t point,
                               mpi_ec_t ctx);
  void _gcry_mpi_ec_dup (gcry_mpi_point_t w, gcry_mpi_point_t u, gcry_ctx_t ctx);
 
 --- src/visibility.c.orig       2014-08-21 12:50:39.000000000 +0000
 +++ src/visibility.c
 @@ -292,7 +292,7 @@ gcry_mpi_copy (const gcry_mpi_t a)
  void
  gcry_mpi_snatch (gcry_mpi_t w, const gcry_mpi_t u)
  {
 -  return _gcry_mpi_snatch (w, u);
 +  _gcry_mpi_snatch (w, u);
  }
 
  gcry_mpi_t