Skip to content

V
vlc
Commit ca6b4d75 authored by Pavlov Konstantin's avatar Pavlov Konstantin Committed by Felix Paul Kühne
Browse files
Options

Contrib: bump gnutls to 2.2.2, bump libgcrypt to 1.4.0. Update gcrypt patch as well.

parent 7c9da0f6
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 12 deletions
extras/contrib/src/Patches/gcrypt.patch
View file @ ca6b4d75
--- libgcrypt/Makefile.am.orig 2006-03-02 16:46:35.000000000 +0100 diff -urN libgcrypt/Makefile.am libgcrypt.patched/Makefile.am
+++ libgcrypt/Makefile.am 2006-03-02 16:47:19.000000000 +0100 --- libgcrypt/Makefile.am 2008-04-02 00:27:11.000000000 +0400
@@ -21,7 +21,7 @@ +++ libgcrypt.patched/Makefile.am 2008-04-02 00:34:34.000000000 +0400
AUTOMAKE_OPTIONS = dist-bzip2 @@ -23,7 +23,7 @@
--enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
DIST_SUBDIRS = mpi cipher src doc tests w32-dll DIST_SUBDIRS = m4 mpi cipher src doc tests
-SUBDIRS = mpi cipher src doc tests -SUBDIRS = mpi cipher src doc tests
+SUBDIRS = mpi cipher src +SUBDIRS = mpi cipher src
EXTRA_DIST = BUGS autogen.sh README.apichanges README.SVN EXTRA_DIST = BUGS autogen.sh README.SVN
DISTCLEANFILES = DISTCLEANFILES =
extras/contrib/src/packages.mak
View file @ ca6b4d75
...@@ -140,11 +140,12 @@ PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2 ...@@ -140,11 +140,12 @@ PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
GPGERROR_VERSION=1.6 GPGERROR_VERSION=1.6
GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.bz2 GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.bz2
#GPGERROR_URL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2 #GPGERROR_URL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
GCRYPT_VERSION=1.2.3 GCRYPT_VERSION=1.4.0
GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2 #GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2
#GCRYPT_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2 GCRYPT_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
GNUTLS_VERSION=1.6.3 GNUTLS_VERSION=2.2.2
GNUTLS_URL=$(VIDEOLAN)/testing/contrib/gnutls-$(GNUTLS_VERSION).tar.bz2 GNUTLS_URL=http://josefsson.org/gnutls/releases/gnutls-$(GNUTLS_VERSION).tar.bz2
#GNUTLS_URL=$(VIDEOLAN)/testing/contrib/gnutls-$(GNUTLS_VERSION).tar.bz2
#GNUTLS_URL=ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2 #GNUTLS_URL=ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
DAAP_VERSION=0.4.0 DAAP_VERSION=0.4.0
DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2 DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment