Update libgcrypt and libgnutls

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index a185d175af900522b5be49f3cd929199a3209b50..6e4e644a8d9004ec34ddbca4b365d20b44445e8e 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1648,13 +1648,14 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
        $(EXTRACT_BZ2)
 ifdef HAVE_WIN32
        patch -p0 < Patches/gnutls-win32.patch
+       (cd $@; cd lgl; ln -sf alloca_.h alloca.h) 
 endif
 
 .gnutls: gnutls .gcrypt .gpg-error
 ifdef HAVE_WIN32
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc && cd gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
+       (cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc && cd gl && make && cd ../lgl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
 else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd gl && make && cd ../lgl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
 endif
        $(INSTALL_NAME)
        touch $@

diff --git a/extras/contrib/src/Patches/gnutls-win32.patch b/extras/contrib/src/Patches/gnutls-win32.patch
index 6f26e06bfa4e193ebc785ee96fd91042daa43c60..376e9b1538b638d1ecd3753e6738ef45adac4469 100644 (file)
--- a/extras/contrib/src/Patches/gnutls-win32.patch
+++ b/extras/contrib/src/Patches/gnutls-win32.patch
@@ -1,32 +1,3 @@
---- gnutls-1.4.0/lib/gnutls_buffers.c  2006-03-08 11:44:59.000000000 +0100
-+++ gnutls/lib/gnutls_buffers.c        2006-07-12 14:29:06.000000000 +0200
-@@ -275,9 +275,12 @@
-       {
-         _gnutls_read_log ("READ: %d returned from %d, errno=%d\n", i,
-                           fd, errno);
--
-+#ifdef _WIN32
-+       if (WSAGetLastError() == WSAEWOULDBLOCK) {
-+#else
-         if (errno == EAGAIN || errno == EINTR)
-           {
-+#endif
-             if (sizeOfPtr - left > 0)
-               {
- 
-@@ -707,8 +710,12 @@
- 
-       if (i == -1)
-       {
-+#ifdef _WIN32
-+      if (WSAGetLastError() == WSAEWOULDBLOCK) {
-+#else
-         if (errno == EAGAIN || errno == EINTR)
-           {
-+#endif
-             session->internals.record_send_buffer_prev_size += n - left;
- 
-             retval =
 --- gnutls-1.4.0/gl/gai_strerror.c     2006-05-12 06:02:19.000000000 -0400
 +++ gnutls/gl/gai_strerror.c   2006-11-22 10:28:13.937500000 -0500
 @@ -64,7 +64,7 @@
@@ -46,3 +17,27 @@
  #ifdef _LIBC
  libc_hidden_def (gai_strerror)
  #endif
+--- gnutls-1.6.1/configure.in  2006-11-26 11:19:05.000000000 +0100
++++ gnutls/configure.in        2007-01-20 01:52:24.000000000 +0100
+@@ -187,9 +187,6 @@
+       fi
+ fi
+ 
+-# Needs to be called outside of 'if' clause.
+-AM_CONDITIONAL(HAVE_LD_OUTPUT_DEF, test "$output_def" = "yes")
+-
+ AC_MSG_RESULT([***
+ *** Detecting C library capabilities...
+ ])
+@@ -583,6 +572,11 @@
+ LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS -I${includedir}"
+ AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
+ AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
++
++
++# Needs to be called outside of 'if' clause.
++AM_CONDITIONAL(HAVE_LD_OUTPUT_DEF, test "$output_def" = "yes" -a "${enable_shared}" != "no")
++
+ export ac_full
+ 
+ CFLAGS="${CFLAGS} ${LIBGCRYPT_CFLAGS}"

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 7113f6c1c20c12ac3e3fd7ba611fcd0b2a75e073..66ec0576000aa08e652edfceb73a58cd6b6e8541 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -123,10 +123,10 @@ PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
 GPGERROR_VERSION=1.3
 GPGERROR_URL=http://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.gz
 #GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.gz
-GCRYPT_VERSION=1.2.2
+GCRYPT_VERSION=1.2.3
 GCRYPT_URL=http://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 #GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2
-GNUTLS_VERSION=1.4.0
+GNUTLS_VERSION=1.6.1
 GNUTLS_URL=http://ftp.gnupg.org/gcrypt/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
 DAAP_VERSION=0.4.0
 DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2