libgcrypt, bump version (#2039)

This commit is contained in:
Schrijvers Luc
2018-01-02 11:32:57 +01:00
committed by fbrosson
parent e08931dd26
commit df87dea2a9
6 changed files with 20 additions and 193 deletions

View File

@@ -1,60 +0,0 @@
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."
LICENSE="GNU LGPL v3"
REVISION="2"
SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.3.tar.bz2"
CHECKSUM_SHA256="bcf5334e7da352c45de6aec5d2084ce9a1d30029ff4a4a5da13f1848874759d1"
PATCHES="libgcrypt-1.5.3.patch"
ARCHITECTURES="x86"
PROVIDES="
libgcrypt = $portVersion compat >= 1.5
lib:libgcrypt = 11.8.2 compat >= 11
"
REQUIRES="
haiku
lib:libgpg_error
"
PROVIDES_devel="
libgcrypt_devel = $portVersion compat >= 1.5
devel:libgcrypt = 11.8.2 compat >= 11
cmd:dumpsexp = $portVersion compat >= 1.5
cmd:libgcrypt_config = $portVersion compat >= 1.5
cmd:hmac256 = $portVersion compat >= 1.5
"
REQUIRES_devel="
libgcrypt == $portVersion base
libgpg_error_devel
"
BUILD_REQUIRES="
haiku_devel
devel:libgpg_error
"
BUILD_PREREQUIRES="
cmd:autoconf
cmd:make
cmd:gcc
"
BUILD()
{
autoconf
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLibs libgcrypt
packageEntries devel \
$developDir $binDir
}

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."
HOMEPAGE="http://directory.fsf.org/project/libgcrypt/"
COPYRIGHT="2000-2013 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"
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
"
REQUIRES="
haiku${secondaryArchSuffix}
lib:libgpg_error${secondaryArchSuffix}
"
PROVIDES_devel="
libgcrypt${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
devel:libgcrypt$secondaryArchSuffix = 20.0.5 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}
devel:libgpg_error${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
#remove libtool file
rm -f $libDir/libgcrypt.la
prepareInstalledDevelLibs libgcrypt
packageEntries devel \
$developDir $binDir $manDir $dataDir $infoDir
}

View File

@@ -6,15 +6,18 @@ COPYRIGHT="2000-2017 Free Software Foundation, Inc."
LICENSE="GNU LGPL v3"
REVISION="1"
SOURCE_URI="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$portVersion.tar.bz2"
CHECKSUM_SHA256="7a2875f8b1ae0301732e878c0cca2c9664ff09ef71408f085c50e332656a78b3"
CHECKSUM_SHA256="c8064cae7558144b13ef0eb87093412380efa16c4ee30ad12ecb54886a524c07"
PATCHES="libgcrypt-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
libVersion=20.2.2
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
libgcrypt$secondaryArchSuffix = $portVersion compat >= 1.6
lib:libgcrypt$secondaryArchSuffix = 20.2.1 compat >= 20
libgcrypt$secondaryArchSuffix = $portVersion
lib:libgcrypt$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -22,12 +25,12 @@ REQUIRES="
"
PROVIDES_devel="
libgcrypt${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
devel:libgcrypt$secondaryArchSuffix = 20.2.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 = 2.0
libgcrypt${secondaryArchSuffix}_devel = $portVersion
devel:libgcrypt$secondaryArchSuffix = $libVersion
cmd:dumpsexp$secondaryArchSuffix
cmd:libgcrypt_config$secondaryArchSuffix
cmd:hmac256$secondaryArchSuffix
cmd:mpicalc$secondaryArchSuffix
"
REQUIRES_devel="
libgcrypt$secondaryArchSuffix == $portVersion base
@@ -41,14 +44,19 @@ BUILD_REQUIRES="
devel:libgpg_error$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:make
cmd:gcc$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
"
defineDebugInfoPackage libgcrypt$secondaryArchSuffix \
$libDir/libgcrypt.so.$libVersion
BUILD()
{
autoconf
autoreconf -vfi
runConfigure ./configure
make $jobArgs
}
@@ -58,7 +66,7 @@ INSTALL()
make install
#remove libtool file
rm -f $libDir/libgcrypt.la
rm -f $libDir/*.la
prepareInstalledDevelLib libgcrypt

View File

@@ -1,10 +0,0 @@
--- libgcrypt-1.5.3/configure.ac 2011-06-29 08:53:22.065011712 +0000
+++ libgcrypt-1.5.3-haiku/configure.ac 2012-04-09 17:24:30.365690880 +0000
@@ -619,6 +619,7 @@
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. ####

View File

@@ -1,44 +0,0 @@
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.ac b/configure.ac
index d9a1670..2cb5df7 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 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 7ee246d..27dbf5f 100644
--- a/src/hwf-x86.c
+++ b/src/hwf-x86.c
@@ -103,7 +103,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