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

[Malte Dehling <mdehling%gmail.com@localhost>]

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


On Tue, Feb 3, 2015 at 5:45 PM, Malte Dehling <mdehling%gmail.com@localhost> wrote:
> The following reply was made to PR pkg/49629; it has been noted by GNATS.
>
> From: Malte Dehling <mdehling%gmail.com@localhost>
> To: gnats-bugs%netbsd.org@localhost
> Cc:
> Subject: Re: pkg/49629 (Building security/libgcrypt fails on Solaris 10u7
>  sparc / Studio Pro 12u1)
> Date: Tue, 3 Feb 2015 17:44:11 +0100
>
>  --001a11c2ec3ac64fc5050e31c768
>  Content-Type: text/plain; charset=UTF-8
>
>  To fix: remove duplicate declarations from gcrypt-int.h , see here for
>  details:
>  http://lists.gnupg.org/pipermail/gnupg-users/2014-November/051675.html .
>  (same problem apparently exists on AIX.)
>
>  On Mon, Feb 2, 2015 at 10:32 PM, <wiz%netbsd.org@localhost> wrote:
>
>  > Synopsis: Building security/libgcrypt fails on Solaris 10u7 sparc / Studio
>  > Pro 12u1
>  >
>  > Responsible-Changed-From-To: pkg-manager->solaris-pkg-people
>  > Responsible-Changed-By: wiz%NetBSD.org@localhost
>  > Responsible-Changed-When: Mon, 02 Feb 2015 21:32:41 +0000
>  > Responsible-Changed-Why:
>  > Solaris pkgsrc problem.
>  >
>  >
>  >
>  >
>
>  --001a11c2ec3ac64fc5050e31c768
>  Content-Type: text/html; charset=UTF-8
>  Content-Transfer-Encoding: quoted-printable
>
>  <div dir=3D"ltr"><div>To fix: remove duplicate declarations from gcrypt-int=
>  .h , see here for details: <a href=3D"http://lists.gnupg.org/pipermail/gnup=
>  g-users/2014-November/051675.html" target=3D"_blank">http://lists.gnupg.org=
>  /pipermail/gnupg-users/2014-November/051675.html</a> .<br></div>(same probl=
>  em apparently exists on AIX.)<br><div><div><div class=3D"gmail_extra"><br><=
>  div class=3D"gmail_quote">On Mon, Feb 2, 2015 at 10:32 PM,  <span dir=3D"lt=
>  r">&lt;<a href=3D"mailto:wiz%netbsd.org@localhost"; target=3D"_blank">wiz%netbsd.org@localhost</=
>  a>&gt;</span> wrote:<br><blockquote class=3D"gmail_quote" style=3D"margin:0=
>   0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Synopsis: Building s=
>  ecurity/libgcrypt fails on Solaris 10u7 sparc / Studio Pro 12u1<br>
>  <br>
>  Responsible-Changed-From-To: pkg-manager-&gt;solaris-pkg-people<br>
>  Responsible-Changed-By: wiz%NetBSD.org@localhost<br>
>  Responsible-Changed-When: Mon, 02 Feb 2015 21:32:41 +0000<br>
>  Responsible-Changed-Why:<br>
>  Solaris pkgsrc problem.<br>
>  <br>
>  <br>
>  <br>
>  </blockquote></div><br></div></div></div></div>
>
>  --001a11c2ec3ac64fc5050e31c768--
>