Hi Sebastian, that looks perfect. I just emailed Dennis (my direct colleague) asking him to apply the exact same patch!
Best wishes,
Mischa Sallé
On Sun, Jan 29, 2017 at 09:57:59PM +0100, Sebastian Andrzej Siewior wrote:
> On 2017-01-28 15:38:40 [+0200], Adrian Bunk wrote:
> > Hi,
> Hi,
>
> > #828375 lcmaps-plugins-verify-proxy: FTBFS with openssl 1.1.0
> > #828376 lcmaps-plugins-voms: FTBFS with openssl 1.1.0
> >
> > When trying to fix these FTBFS with OpenSSL 1.1 by switching LCMAPS to
> > 1.0.2 I end up also moving VOMS and Globus to OpenSSL 1.0.2
> >
> > Is this the way to forward, or is there a better solution available
> > for lcmaps-plugins-verify-proxy and lcmaps-plugins-voms in stretch?
>
> If I read this right, #828375 is waiting for the usual sponsor and I see
> nothing regarding #828376.
>
> Dennis, any objections if I NMU it with the attached debdiff or do you
> have something else in mind?
>
> > Thanks
> > Adrian
> >
> Sebastian
> diff -Nru lcmaps-plugins-voms-1.6.2/debian/changelog
> lcmaps-plugins-voms-1.6.2/debian/changelog
> --- lcmaps-plugins-voms-1.6.2/debian/changelog 2014-01-20
> 15:48:08.000000000 +0100
> +++ lcmaps-plugins-voms-1.6.2/debian/changelog 2017-01-29
> 21:51:50.000000000 +0100
> @@ -1,3 +1,10 @@
> +lcmaps-plugins-voms (1.6.2-2.1) unstable; urgency=medium
> +
> + * Non-maintainer upload.
> + * Get it built with openssl 1.1. (Closes: #828376).
> +
> + -- Sebastian Andrzej Siewior <[email protected]> Sun, 29 Jan 2017
> 21:51:50 +0100
> +
> lcmaps-plugins-voms (1.6.2-2) unstable; urgency=low
>
> [ Mischa Salle ]
> diff -Nru lcmaps-plugins-voms-1.6.2/debian/patches/openssl11.patch
> lcmaps-plugins-voms-1.6.2/debian/patches/openssl11.patch
> --- lcmaps-plugins-voms-1.6.2/debian/patches/openssl11.patch 1970-01-01
> 01:00:00.000000000 +0100
> +++ lcmaps-plugins-voms-1.6.2/debian/patches/openssl11.patch 2017-01-29
> 21:51:12.000000000 +0100
> @@ -0,0 +1,20 @@
> +Subject: workaround for openssl 1.1
> +
> +X509 does not have ->name member anymore. It used to be the content of the
> +Subject property. Since it is only for higher debug I don't even try to fetch
> +the Subject property.
> +---
> + src/voms/lcmaps_voms.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +--- a/src/voms/lcmaps_voms.c
> ++++ b/src/voms/lcmaps_voms.c
> +@@ -442,7 +442,7 @@ static int plugin_run_or_verify(
> + if ( ( px509_cred = lcmaps_cred_to_x509(cred) ) )
> + {
> + lcmaps_log_debug(1,"%s: found X509 struct inside gss credential\n",
> logstr);
> +- lcmaps_log_debug(5,"%s: just for kicks: X509->name %s\n",
> logstr,px509_cred->name);
> ++ /* lcmaps_log_debug(5,"%s: just for kicks: X509->name %s\n",
> logstr,px509_cred->name); */
> + }
> + else
> + {
> diff -Nru lcmaps-plugins-voms-1.6.2/debian/patches/series
> lcmaps-plugins-voms-1.6.2/debian/patches/series
> --- lcmaps-plugins-voms-1.6.2/debian/patches/series 2013-11-12
> 16:23:41.000000000 +0100
> +++ lcmaps-plugins-voms-1.6.2/debian/patches/series 2017-01-29
> 21:47:44.000000000 +0100
> @@ -1,2 +1,3 @@
>
>
> +openssl11.patch
--
Nikhef Room H155
Science Park 105 Tel. +31-20-592 5102
1098 XG Amsterdam Fax +31-20-592 5155
The Netherlands Email [email protected]
__ .. ... _._. .... ._ ... ._ ._.. ._.. .._..
smime.p7s
Description: S/MIME cryptographic signature
