Mailing List Archive: Debian fixes

Debian fixes

Feb 17, 2002, 1:58 PM

Post #1 of 4 (826 views)

[Please Cc: any reply, I'm not subscribed to this list]

Hello,

The following patches fix build problems for powerpc, alpha and sparc
for Linux, and the Hurd in Debian.

Please see details in Debian bugs #133978, #130642, #126368, reachable
at http://bugs.debian.org/number.

The patch is against 1.1.5.

--- libgcrypt-1.1.5.orig/src/misc.c
+++ libgcrypt-1.1.5/src/misc.c
@@ -220,7 +220,7 @@
void
_gcry_log_printf (const char *fmt, ...)
{
- va_list arg_ptr = 0;
+ va_list arg_ptr;

if (fmt)
{
--- libgcrypt-1.1.5.orig/src/sexp.c
+++ libgcrypt-1.1.5/src/sexp.c
@@ -1020,7 +1020,7 @@
gcry_sexp_sscan( GCRY_SEXP *retsexp, size_t *erroff,
const char *buffer, size_t length )
{
- va_list dummy_arg_ptr = 0;
+ va_list dummy_arg_ptr;

return sexp_sscan( retsexp, erroff, buffer, length, dummy_arg_ptr, 0 );
}
--- libgcrypt-1.1.5.orig/cipher/rndunix.c
+++ libgcrypt-1.1.5/cipher/rndunix.c
@@ -907,9 +907,9 @@

#ifndef IS_MODULE
void
-rndunix_constructor(void)
+_gcry_rndunix_constructor(void)
{
- register_internal_cipher_extension( gnupgext_version,
+ _gcry_register_internal_cipher_extension( gnupgext_version,
gnupgext_enum_func );
}
#endif

diff -ur libgcrypt-1.1.5.old/configure.ac libgcrypt-1.1.5/configure.ac
--- libgcrypt-1.1.5.old/configure.ac Tue Dec 18 10:48:31 2001
+++ libgcrypt-1.1.5/configure.ac Thu Feb 14 17:47:36 2002
@@ -36,6 +36,7 @@

AC_CONFIG_SRCDIR([src/gcrypt.h])
AC_CONFIG_AUX_DIR(scripts)
+AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
AM_CONFIG_HEADER(config.h)

@@ -682,7 +683,7 @@
if test "$ac_cv_mpi_extra_asm_modules" != ""; then
for i in $ac_cv_mpi_extra_asm_modules; do
show_extraasm="$show_extraasm $i"
- MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.o"
+ MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.lo"
done
fi
AC_SUBST(MPI_EXTRA_ASM_OBJS)

Thanks,
Jordi
--
Jordi Mallach Pérez || jordi@pusa.informat.uv.es || Rediscovering Freedom,
aka Oskuro in || jordi@sindominio.net || Using Debian GNU/Linux
Reinos de Leyenda || jordi@debian.org || http://debian.org

http://sindominio.net GnuPG public information: pub 1024D/917A225E
telnet pusa.uv.es 23 73ED 4244 FD43 5886 20AC 2644 2584 94BA 917A 225E

Re: Debian fixes [ In reply to ]

jordi at sindominio

Feb 17, 2002, 4:21 PM

Post #2 of 4 (816 views)

Permalink

On Sun, Feb 17, 2002 at 09:58:55PM +0100, Jordi Mallach wrote:
> [Please Cc: any reply, I'm not subscribed to this list]

With respect to the configure.ac patch,

> diff -ur libgcrypt-1.1.5.old/configure.ac libgcrypt-1.1.5/configure.ac
> --- libgcrypt-1.1.5.old/configure.ac Tue Dec 18 10:48:31 2001
> +++ libgcrypt-1.1.5/configure.ac Thu Feb 14 17:47:36 2002
> @@ -36,6 +36,7 @@
>
> AC_CONFIG_SRCDIR([src/gcrypt.h])
> AC_CONFIG_AUX_DIR(scripts)
> +AC_CANONICAL_TARGET
> AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
> AM_CONFIG_HEADER(config.h)
>
> @@ -682,7 +683,7 @@
> if test "$ac_cv_mpi_extra_asm_modules" != ""; then
> for i in $ac_cv_mpi_extra_asm_modules; do
> show_extraasm="$show_extraasm $i"
> - MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.o"
> + MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.lo"
> done
> fi
> AC_SUBST(MPI_EXTRA_ASM_OBJS)

Please note this assumes automake 1.4. Builds will fail with 1.5...
I haven't tried, but maybe it works with 1.5 if the second hunk (.lo)
isn't applied and autoconf & automake is run.

Thanks,
Jordi
--
Jordi Mallach Pérez || jordi@pusa.informat.uv.es || Rediscovering Freedom,
aka Oskuro in || jordi@sindominio.net || Using Debian GNU/Linux
Reinos de Leyenda || jordi@debian.org || http://debian.org

http://sindominio.net GnuPG public information: pub 1024D/917A225E
telnet pusa.uv.es 23 73ED 4244 FD43 5886 20AC 2644 2584 94BA 917A 225E

Re: Debian fixes [ In reply to ]

wk at gnupg

Feb 18, 2002, 4:51 AM

Post #3 of 4 (847 views)

Permalink

On Mon, 18 Feb 2002 00:21:59 +0100, Jordi Mallach said:

> Please note this assumes automake 1.4. Builds will fail with 1.5...

I applied the changes and everything works fine using automake 1.5

Thanks,

Werner

--
Werner Koch Omnis enim res, quae dando non deficit, dum habetur
g10 Code GmbH et non datur, nondum habetur, quomodo habenda est.
Privacy Solutions -- Augustinus

Re: Debian fixes [ In reply to ]

jordi at sindominio

Feb 18, 2002, 6:13 AM

Post #4 of 4 (818 views)

Permalink

On Mon, Feb 18, 2002 at 12:51:37PM +0100, Werner Koch wrote:
> > Please note this assumes automake 1.4. Builds will fail with 1.5...
> I applied the changes and everything works fine using automake 1.5

Hm. It didn't for us, both in sparc and i386. I'll fetch CVS and tell
you if it worked.

Thanks,
Jordi
--
Jordi Mallach Pérez || jordi@pusa.informat.uv.es || Rediscovering Freedom,
aka Oskuro in || jordi@sindominio.net || Using Debian GNU/Linux
Reinos de Leyenda || jordi@debian.org || http://debian.org

http://sindominio.net GnuPG public information: pub 1024D/917A225E
telnet pusa.uv.es 23 73ED 4244 FD43 5886 20AC 2644 2584 94BA 917A 225E