Changeset b268e2e8d2721942dfd1ca41987756940e2f05db

Show
Ignore:
Timestamp:
05/22/08 08:50:00 (4 months ago)
Author:
Jean-Baptiste Kempf <jb@altair.videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@altair.videolan.org> 1211439000 +0200
git-parent:

[b95cac1c3685e4d3ce7f16303957cf100cdd5541]

git-author:
Jean-Baptiste Kempf <jb@altair.videolan.org> 1211439000 +0200
Message:

GnuTLS and libgcrypt bump from 2.2.2 to 2.2.5 and 1.4.0 to 1.4.1

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/contrib/src/Patches/gnutls-win32.patch

    re618a3e rb268e2e  
    1 --- gnutls-1.4.0/gl/gai_strerror.c 2006-05-12 06:02:19.000000000 -0400 
    2 +++ gnutls/gl/gai_strerror.c    2006-11-22 10:28:13.937500000 -0500 
    3 @@ -64,7 +64,7 @@ 
     1--- gnutls-2.2.5/gl/gai_strerror.c 2008-02-21 08:58:18.000000000 +0100 
     2+++ gnutls/gl/gai_strerror.c    2008-05-22 08:20:56.000000000 +0200 
     3@@ -62,7 +62,7 @@ 
    44     { EAI_IDN_ENCODE, N_("Parameter string not correctly encoded") } 
    55 #endif 
    …… 
    1010 gai_strerror (int code) 
    1111 { 
    12 @@ -75,6 +75,7 @@ 
     12@@ -73,6 +73,7 @@ 
    1313  
    1414   return _("Unknown error"); 
    …… 
    1818 libc_hidden_def (gai_strerror) 
    1919 #endif 
    20 --- gnutls-1.6.1/configure.in  2006-11-26 11:19:05.000000000 +0100 
    21 +++ gnutls/configure.in 2007-01-20 01:52:24.000000000 +0100 
    22 @@ -187,9 +187,6 @@ 
     20--- gnutls-2.2.5/configure.in  2008-05-19 21:45:47.000000000 +0200 
     21+++ gnutls/configure.in 2008-05-22 08:19:02.000000000 +0200 
     22@@ -200,8 +200,6 @@ 
    2323    fi 
    2424 fi 
    …… 
    2626-# Needs to be called outside of 'if' clause. 
    2727-AM_CONDITIONAL(HAVE_LD_OUTPUT_DEF, test "$output_def" = "yes") 
    28 - 
    29  AC_MSG_RESULT([*** 
    30  *** Detecting C library capabilities... 
    31  ]) 
    32 @@ -583,6 +572,11 @@ 
    33  LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS -I${includedir}" 
    34  AC_SUBST(LIBGNUTLS_EXTRA_LIBS) 
    35  AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS) 
    36 + 
     28 AM_CONDITIONAL([HAVE_GCC_GNU89_INLINE_OPTION], 
     29                [test "$_gcc_gnu89_inline" = "yes"]) 
     30  
     31@@ -715,6 +713,10 @@ 
     32 AC_SUBST(LIBGNUTLS_LIBS) 
     33 AC_SUBST(LIBGNUTLS_CFLAGS) 
     34  
    3735+ 
    3836+# Needs to be called outside of 'if' clause. 
    39 +AM_CONDITIONAL(HAVE_LD_OUTPUT_DEF, test "$output_def" = "yes" -a "${enable_shared}" != "no") 
     37+AM_CONDITIONAL(HAVE_LD_OUTPUT_DEF, test "$output_def" = "yes") 
    4038+ 
    41  export ac_full 
     39 LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LTLIBOPENCDK $LZO_LIBS $LIBGNUTLS_LIBS" 
     40 LIBGNUTLS_EXTRA_CFLAGS="$INCOPENCDK -I${includedir}" 
     41 AC_SUBST(LIBGNUTLS_EXTRA_LIBS) 
     42--- gnutls-2.2.5/lib/Makefile.in    2008-05-19 21:48:35.000000000 +0200 
     43+++ gnutls/lib/Makefile.in  2008-05-22 08:30:01.000000000 +0200 
     44@@ -643,7 +643,6 @@ 
     45 target_cpu = @target_cpu@ 
     46 target_os = @target_os@ 
     47 target_vendor = @target_vendor@ 
     48-top_build_prefix = @top_build_prefix@ 
     49 top_builddir = @top_builddir@ 
     50 top_srcdir = @top_srcdir@ 
     51 SUBDIRS = x509 $(am__append_1) 
     52@@ -712,7 +711,7 @@ 
     53 libgnutls_la_LIBADD = ../lgl/liblgnu.la x509/libgnutls_x509.la \ 
     54    @LTLIBZ@ $(LIBGCRYPT_LIBS) @LTLIBINTL@ $(am__append_6) 
     55 @HAVE_LD_OUTPUT_DEF_TRUE@defexecdir = $(bindir) 
     56-@HAVE_LD_OUTPUT_DEF_TRUE@defexec_DATA = libgnutls-$(SOVERSION).def 
     57+@HAVE_LD_OUTPUT_DEF_TRUE@defexec_DATA = 
    4258  
    43  CFLAGS="${CFLAGS} ${LIBGCRYPT_CFLAGS}" 
     59 # C++ library 
     60 @ENABLE_CXX_TRUE@CPP_OBJECTS = gnutlsxx.cpp 
     61--- gnutls-2.2.5/lib/Makefile.am    2008-05-19 21:45:13.000000000 +0200 
     62+++ gnutls/lib/Makefile.am  2008-05-22 08:44:16.000000000 +0200 
     63@@ -123,7 +123,7 @@ 
     64 if HAVE_LD_OUTPUT_DEF 
     65 libgnutls_la_LDFLAGS += -Wl,--output-def,libgnutls-$(SOVERSION).def 
     66 defexecdir = $(bindir) 
     67-defexec_DATA = libgnutls-$(SOVERSION).def 
     68+defexec_DATA =  
     69 DISTCLEANFILES += $(defexec_DATA) 
     70 endif 
     71  

  • extras/contrib/src/packages.mak

    r8d961ec rb268e2e  
    142142GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.bz2 
    143143#GPGERROR_URL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2 
    144 GCRYPT_VERSION=1.4.0 
     144GCRYPT_VERSION=1.4.1 
    145145#GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2 
    146146GCRYPT_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2 
    147 GNUTLS_VERSION=2.2.2 
     147GNUTLS_VERSION=2.2.5 
    148148GNUTLS_URL=http://www.gnu.org/software/gnutls/releases/gnutls-$(GNUTLS_VERSION).tar.bz2 
    149149OPENCDK_VERSION=0.6.6