| 1 |
alonbl 14/06/07 18:40:15 |
| 2 |
|
| 3 |
Added: libtasn1-3.6-build.patch |
| 4 |
Log: |
| 5 |
Version bump, bug#511536 |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/libtasn1/files/libtasn1-3.6-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libtasn1/files/libtasn1-3.6-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libtasn1/files/libtasn1-3.6-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libtasn1-3.6-build.patch |
| 16 |
=================================================================== |
| 17 |
From 895e00804990040e252d93093c7c2adcdfa3efa5 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 19 |
Date: Sat, 7 Jun 2014 21:36:30 +0300 |
| 20 |
Subject: [PATCH] build: tests: fix Test_choice within separate builddir |
| 21 |
|
| 22 |
Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 23 |
--- |
| 24 |
tests/Makefile.am | 2 +- |
| 25 |
tests/Test_choice.c | 6 +++++- |
| 26 |
2 files changed, 6 insertions(+), 2 deletions(-) |
| 27 |
|
| 28 |
diff --git a/tests/Makefile.am b/tests/Makefile.am |
| 29 |
index d6c850a..4762a69 100644 |
| 30 |
--- a/tests/Makefile.am |
| 31 |
+++ b/tests/Makefile.am |
| 32 |
@@ -44,7 +44,7 @@ TESTS = Test_parser Test_tree Test_encoding Test_indefinite \ |
| 33 |
TESTS_ENVIRONMENT = \ |
| 34 |
ASN1PARSER=$(srcdir)/Test_parser.asn \ |
| 35 |
ASN1TREE=$(srcdir)/Test_tree.asn \ |
| 36 |
- ASN1PKIX=$(srcdir)/pkix.asn \ |
| 37 |
+ ASN1CHOICE=$(srcdir)/choice.asn \ |
| 38 |
ASN1PKIX=$(srcdir)/pkix.asn \ |
| 39 |
ASN1CRLDER=$(srcdir)/crl.der \ |
| 40 |
ASN1INDEF=$(srcdir)/TestIndef.p12 \ |
| 41 |
diff --git a/tests/Test_choice.c b/tests/Test_choice.c |
| 42 |
index 07da57e..8a0b5c1 100644 |
| 43 |
--- a/tests/Test_choice.c |
| 44 |
+++ b/tests/Test_choice.c |
| 45 |
@@ -8,12 +8,16 @@ main (int argc, char** argv) |
| 46 |
int result = 0; |
| 47 |
asn1_node definitions = NULL, node1 = NULL, node2 = NULL; |
| 48 |
char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE]; |
| 49 |
+ const char *choicefile = getenv ("ASN1CHOICE"); |
| 50 |
|
| 51 |
char data[1024]; |
| 52 |
int data_size = sizeof (data); |
| 53 |
|
| 54 |
+ if (!choicefile) |
| 55 |
+ choicefile = "choice.asn"; |
| 56 |
+ |
| 57 |
/* Encode */ |
| 58 |
- result = asn1_parser2tree ("choice.asn", &definitions, errorDescription); |
| 59 |
+ result = asn1_parser2tree (choicefile, &definitions, errorDescription); |
| 60 |
if (result != ASN1_SUCCESS) |
| 61 |
{ |
| 62 |
printf ("error in %d\n", __LINE__); |
| 63 |
-- |
| 64 |
1.8.5.5 |
Archives