libykpers, bump version (#3102)

This commit is contained in:
Schrijvers Luc
2018-09-22 17:30:03 +00:00
committed by waddlesplash
parent be38893d3c
commit 33efb02d4c
2 changed files with 43 additions and 5 deletions

View File

@@ -2,12 +2,14 @@ SUMMARY="YubiKey Personalization package"
DESCRIPTION="A library and command line tool used to personalize \
(i.e., set a AES key) YubiKeys."
HOMEPAGE="https://developers.yubico.com/yubico-c-client/"
COPYRIGHT="2008-2017 Yubico AB"
COPYRIGHT="2008-2018 Yubico AB"
LICENSE="BSD (2-clause)"
REVISION="3"
REVISION="1"
SOURCE_URI="https://developers.yubico.com/yubikey-personalization/Releases/ykpers-$portVersion.tar.gz"
CHECKSUM_SHA256="cf333e133b551adf5963e0f5fe0566f4e397f9784d4c1b8fc56b9d2ebcf982ad"
CHECKSUM_SHA256="2bc8afa16d495a486582bad916d16de1f67c0cce9bb0a35c3123376c2d609480"
SOURCE_FILENAME="libykpers-$portVersion.tar.gz"
SOURCE_DIR="ykpers-$portVersion"
PATCHES="libykpers-$portVersion.patchset"
ARCHITECTURES="?x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
@@ -17,7 +19,7 @@ PROVIDES="
cmd:ykchalresp$secondaryArchSuffix = $portVersion
cmd:ykinfo$secondaryArchSuffix = $portVersion
cmd:ykpersonalize$secondaryArchSuffix = $portVersion
lib:libykpers_1$secondaryArchSuffix = 1.18.0 compat >= 0
lib:libykpers_1$secondaryArchSuffix = 1.19.0 compat >= 0
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -29,7 +31,7 @@ REQUIRES="
PROVIDES_devel="
libykpers${secondaryArchSuffix}_devel = $portVersion
devel:libykpers_1$secondaryArchSuffix = 1.18.0 compat >= 0
devel:libykpers_1$secondaryArchSuffix = 1.19.0 compat >= 0
"
REQUIRES_devel="
libykpers$secondaryArchSuffix == $portVersion base
@@ -43,6 +45,10 @@ BUILD_REQUIRES="
devel:libyubikey$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:autoheader
cmd:automake
cmd:awk
cmd:gcc$secondaryArchSuffix
cmd:grep
@@ -54,6 +60,7 @@ BUILD_PREREQUIRES="
BUILD()
{
autoreconf -vfi
runConfigure ./configure
make $jobArgs
}

View File

@@ -0,0 +1,31 @@
From 4c227676bf627d8cc5213d1d6afb79fc763ba7bf Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Thu, 20 Sep 2018 11:50:07 +0200
Subject: add #define(__HAIKU__) to complete the test
diff --git a/tests/test_args_to_config.c b/tests/test_args_to_config.c
index d0bf261..1481f27 100644
--- a/tests/test_args_to_config.c
+++ b/tests/test_args_to_config.c
@@ -132,7 +132,7 @@ static int _test_config (YKP_CONFIG *cfg, YK_STATUS *st, int argc, char **argv)
ykp_errno = 0;
/* getopt reinit (BSD systems use optreset and a different optind value) */
-#if defined(__GLIBC__) || defined(_WIN32)
+#if defined(__GLIBC__) || defined(_WIN32) || defined(__HAIKU__)
optind = 0;
#else
optind = optreset = 1;
@@ -329,7 +329,7 @@ static void _test_non_config_args(void)
ykp_errno = 0;
/* getopt reinit (BSD systems use optreset and a different optind value) */
-#if defined(__GLIBC__) || defined(_WIN32)
+#if defined(__GLIBC__) || defined(_WIN32) || defined(__HAIKU__)
optind = 0;
#else
optind = optreset = 1;
--
2.19.0