libgcrypt: update to 1.7.2.

haikuports · Aug 20, 2016 · a22acec · a22acec
1 parent 6cf9492
commit a22acec
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 123 deletions.
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3.recipe b/dev-libs/libgcrypt/libgcrypt-1.6.3.recipe
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.5.recipe → dev-libs/libgcrypt/libgcrypt-1.7.2.recipe b/dev-libs/libgcrypt/libgcrypt-1.6.5.recipe → dev-libs/libgcrypt/libgcrypt-1.7.2.recipe
@@ -2,19 +2,19 @@ SUMMARY="GNU's basic cryptographic library"
 DESCRIPTION="Libgcrypt is a general purpose crypto library based on the code \
 used in GnuPG."
 HOMEPAGE="http://directory.fsf.org/project/libgcrypt/"
-COPYRIGHT="2000-2013 Free Software Foundation, Inc."
+COPYRIGHT="2000-2016 Free Software Foundation, Inc."
 LICENSE="GNU LGPL v3"
-REVISION="3"
-SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$portVersion.tar.bz2"
-CHECKSUM_SHA256="f49ebc5842d455ae7019def33eb5a014a0f07a2a8353dc3aa50a76fd1dafa924"
+REVISION="2"
+SOURCE_URI="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$portVersion.tar.bz2"
+CHECKSUM_SHA256="3d35df906d6eab354504c05d749a9b021944cb29ff5f65c8ef9c3dd5f7b6689f"
 PATCHES="libgcrypt-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	libgcrypt${secondaryArchSuffix} = $portVersion compat >= 1.6
-	lib:libgcrypt${secondaryArchSuffix} = 20.0.5 compat >= 20
+	lib:libgcrypt${secondaryArchSuffix} = 20.1.2 compat >= 20
 	"
 REQUIRES="
 	haiku${secondaryArchSuffix}
@@ -23,7 +23,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libgcrypt${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
-	devel:libgcrypt$secondaryArchSuffix = 20.0.5 compat >= 20
+	devel:libgcrypt$secondaryArchSuffix = 20.1.2 compat >= 20
 	cmd:dumpsexp$secondaryArchSuffix = $portVersion compat >= 1.6
 	cmd:libgcrypt_config$secondaryArchSuffix = $portVersion compat >= 1.6
 	cmd:hmac256$secondaryArchSuffix = $portVersion compat >= 1.6
@@ -55,7 +55,7 @@ BUILD()
 INSTALL()
 {
 	make install
-
+	
 	#remove libtool file
 	rm -f $libDir/libgcrypt.la
 

diff --git a/dev-libs/libgcrypt/patches/libgcrypt-1.6.5.patchset b/dev-libs/libgcrypt/patches/libgcrypt-1.6.5.patchset
diff --git a/...ibgcrypt/patches/libgcrypt-1.6.3.patchset → ...ibgcrypt/patches/libgcrypt-1.7.2.patchset b/...ibgcrypt/patches/libgcrypt-1.6.3.patchset → ...ibgcrypt/patches/libgcrypt-1.7.2.patchset
@@ -1,14 +1,14 @@
-From ae4346a9d35315279ebc0711a6508ab7228b23bd Mon Sep 17 00:00:00 2001
+From 8f17f183b538b6c5bd20cc69e4dcd34913cd5c3e Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 5 Aug 2014 16:50:29 +0000
 Subject: haiku patch
 
 
 diff --git a/configure.ac b/configure.ac
-index d9a1670..2cb5df7 100644
+index f683e21..dabca44 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -744,6 +744,7 @@ fi
+@@ -747,6 +747,7 @@ fi
  AC_SEARCH_LIBS(setsockopt, [socket], ,
  	[AC_SEARCH_LIBS(setsockopt, [socket], , , [-lnsl])])
  AC_SEARCH_LIBS(setsockopt, [nsl])
@@ -17,28 +17,28 @@ index d9a1670..2cb5df7 100644
  ##################################
  #### Checks for header files. ####
 -- 
-1.8.3.4
+2.2.2
 
 
-From 8dabbbf3e4aad2c9654e30a86d03da2022a6e220 Mon Sep 17 00:00:00 2001
+From 2eb88a459c5386a816e74231bc04b4f8a5b42b1e Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 6 Aug 2014 22:08:04 +0000
 Subject: gcc2 patch
 
 
 diff --git a/src/hwf-x86.c b/src/hwf-x86.c
-index 7ee246d..27dbf5f 100644
+index eeacccb..52fad3c 100644
 --- a/src/hwf-x86.c
 +++ b/src/hwf-x86.c
 @@ -103,7 +103,7 @@ get_xgetbv(void)
-   unsigned int t_eax;
+   unsigned int t_eax, t_edx;
 
    asm volatile
 -    ("xgetbv\n\t"
 +    (".byte 0x0f, 0x01, 0xd0\n\t"
-      : "=a" (t_eax)
+      : "=a" (t_eax), "=d" (t_edx)
       : "c" (0)
      );
 -- 
-1.8.3.4
+2.2.2