libgcrypt: bump version

This commit is contained in:
Jerome Duval
2015-03-14 10:53:18 +00:00
parent 2bfd392ece
commit a7b17c92dc
4 changed files with 8 additions and 163 deletions

View File

@@ -1,67 +0,0 @@
SUMMARY="GNU's basic cryptographic library."
DESCRIPTION="
Libgcrypt is a general purpose crypto library based on the code \
used in GnuPG.
"
LICENSE="GNU LGPL v3"
COPYRIGHT="2000-2013 Free Software Foundation, Inc."
HOMEPAGE="http://directory.fsf.org/project/libgcrypt/"
SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$portVersion.tar.bz2"
CHECKSUM_SHA256="a1c3efea69f8ffe769f488b300ce190eeeb0c30de24a53f1c1b6e4202fdc2070"
REVISION="2"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="libgcrypt-$portVersion.patchset"
PROVIDES="
libgcrypt${secondaryArchSuffix} = $portVersion compat >= 1.6
lib:libgcrypt${secondaryArchSuffix} = 20.0.1 compat >= 20
"
REQUIRES="
haiku${secondaryArchSuffix}
lib:libgpg_error${secondaryArchSuffix}
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libgpg_error${secondaryArchSuffix}
"
BUILD_PREREQUIRES="
cmd:autoconf
cmd:make
cmd:gcc${secondaryArchSuffix}
"
BUILD()
{
autoconf
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLibs libgcrypt
packageEntries devel \
$developDir $binDir
}
PROVIDES_devel="
libgcrypt${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
devel:libgcrypt$secondaryArchSuffix = 20.0.1 compat >= 20
cmd:dumpsexp$secondaryArchSuffix = $portVersion compat >= 1.6
cmd:libgcrypt_config$secondaryArchSuffix = $portVersion compat >= 1.6
cmd:hmac256$secondaryArchSuffix = $portVersion compat >= 1.6
cmd:mpicalc$secondaryArchSuffix = $portVersion compat >= 1.6
"
REQUIRES_devel="
libgcrypt${secondaryArchSuffix} == $portVersion base
haiku${secondaryArchSuffix}
libgpg_error${secondaryArchSuffix}
"

View File

@@ -7,7 +7,7 @@ LICENSE="GNU LGPL v3"
COPYRIGHT="2000-2013 Free Software Foundation, Inc."
HOMEPAGE="http://directory.fsf.org/project/libgcrypt/"
SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$portVersion.tar.bz2"
CHECKSUM_SHA256="de084492a6b38cdb27b67eaf749ceba76bf7029f63a9c0c3c1b05c88c9885c4c"
CHECKSUM_SHA256="41b4917b93ae34c6a0e2127378d7a4d66d805a2a86a09911d4f9bd871db7025f"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -15,7 +15,7 @@ PATCHES="libgcrypt-$portVersion.patchset"
PROVIDES="
libgcrypt${secondaryArchSuffix} = $portVersion compat >= 1.6
lib:libgcrypt${secondaryArchSuffix} = 20.0.2 compat >= 20
lib:libgcrypt${secondaryArchSuffix} = 20.0.3 compat >= 20
"
REQUIRES="
@@ -53,7 +53,7 @@ INSTALL()
PROVIDES_devel="
libgcrypt${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
devel:libgcrypt$secondaryArchSuffix = 20.0.2 compat >= 20
devel:libgcrypt$secondaryArchSuffix = 20.0.3 compat >= 20
cmd:dumpsexp$secondaryArchSuffix = $portVersion compat >= 1.6
cmd:libgcrypt_config$secondaryArchSuffix = $portVersion compat >= 1.6
cmd:hmac256$secondaryArchSuffix = $portVersion compat >= 1.6

View File

@@ -1,66 +0,0 @@
From cf99e9108a7921ed1650415cb96e1060f169eebd 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 b/configure
index a3d1e23..131d512 100755
--- a/configure
+++ b/configure
@@ -18252,7 +18252,7 @@ esac
#
# Provide information about the build.
#
-BUILD_REVISION="b3936b6"
+BUILD_REVISION=""
cat >>confdefs.h <<_ACEOF
@@ -18261,7 +18261,7 @@ _ACEOF
BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
-BUILD_FILEVERSION="${BUILD_FILEVERSION}45971"
+BUILD_FILEVERSION="${BUILD_FILEVERSION}0"
BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
diff --git a/configure.ac b/configure.ac
index b08c181..a4d443e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -744,6 +744,7 @@ fi
AC_SEARCH_LIBS(setsockopt, [socket], ,
[AC_SEARCH_LIBS(setsockopt, [socket], , , [-lnsl])])
AC_SEARCH_LIBS(setsockopt, [nsl])
+AC_SEARCH_LIBS(socket, [network])
##################################
#### Checks for header files. ####
--
1.8.3.4
From dda47050a951b5746e7b7aaff75654d342abeb94 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 0591b4f..7521080 100644
--- a/src/hwf-x86.c
+++ b/src/hwf-x86.c
@@ -102,7 +102,7 @@ get_xgetbv(void)
unsigned int t_eax;
asm volatile
- ("xgetbv\n\t"
+ (".byte 0x0f, 0x01, 0xd0\n\t"
: "=a" (t_eax)
: "c" (0)
);
--
1.8.3.4

View File

@@ -1,33 +1,11 @@
From a7b5180b15b148a2601eaeef786f106a9137104a Mon Sep 17 00:00:00 2001
From ae4346a9d35315279ebc0711a6508ab7228b23bd 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 b/configure
index 12b0833..a1eed44 100755
--- a/configure
+++ b/configure
@@ -18251,7 +18251,7 @@ esac
#
# Provide information about the build.
#
-BUILD_REVISION="8804b9a"
+BUILD_REVISION=""
cat >>confdefs.h <<_ACEOF
@@ -18260,7 +18260,7 @@ _ACEOF
BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
-BUILD_FILEVERSION="${BUILD_FILEVERSION}34820"
+BUILD_FILEVERSION="${BUILD_FILEVERSION}0"
BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
diff --git a/configure.ac b/configure.ac
index dfbccb7..ff6b7d1 100644
index d9a1670..2cb5df7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -744,6 +744,7 @@ fi
@@ -42,17 +20,17 @@ index dfbccb7..ff6b7d1 100644
1.8.3.4
From 15e722f9905d5caf4b563aca9304ec26c5851541 Mon Sep 17 00:00:00 2001
From 8dabbbf3e4aad2c9654e30a86d03da2022a6e220 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 0591b4f..7521080 100644
index 7ee246d..27dbf5f 100644
--- a/src/hwf-x86.c
+++ b/src/hwf-x86.c
@@ -102,7 +102,7 @@ get_xgetbv(void)
@@ -103,7 +103,7 @@ get_xgetbv(void)
unsigned int t_eax;
asm volatile