Attachment 204153 Details for Bug 237679 – Patch to add missing macros

[patch] Patch to add missing macros

libressl.diff (text/plain), 4.01 KB, created by Cy Schubert on 2019-05-01 19:44:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2019-05-01 19:44:18 UTC

Size: 4.01 KB

patch

obsolete

>diff --git a/security/libressl/Makefile b/security/libressl/Makefile
>index 5b814c626d21..358db65a0a65 100644
>--- a/security/libressl/Makefile
>+++ b/security/libressl/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	libressl
> PORTVERSION=	2.9.1
>+PORTREVISION=	1
> CATEGORIES=	security devel
> MASTER_SITES=	OPENBSD/LibreSSL
> 
>diff --git a/security/libressl/files/patch-include_openssl_asn1t.h b/security/libressl/files/patch-include_openssl_asn1t.h
>new file mode 100644
>index 000000000000..5fb4bb958a28
>--- /dev/null
>+++ b/security/libressl/files/patch-include_openssl_asn1t.h
>@@ -0,0 +1,125 @@
>+--- include/openssl/asn1t.h.orig	2017-11-14 08:25:15.000000000 -0800
>++++ include/openssl/asn1t.h	2019-05-01 12:09:40.110734000 -0700
>+@@ -81,6 +81,9 @@
>+ #define ASN1_ITEM_start(itname) \
>+ 	const ASN1_ITEM itname##_it = {
>+ 
>++#define static_ASN1_ITEM_start(itname) \
>++	static const ASN1_ITEM itname##_it = {
>++
>+ #define ASN1_ITEM_end(itname) \
>+ 		};
>+ 
>+@@ -102,6 +105,17 @@
>+ 		0,\
>+ 		#tname \
>+ 	ASN1_ITEM_end(tname)
>++#define static_ASN1_ITEM_TEMPLATE_END(tname) \
>++	;\
>++	static_ASN1_ITEM_start(tname) \
>++		ASN1_ITYPE_PRIMITIVE,\
>++		-1,\
>++		&tname##_item_tt,\
>++		0,\
>++		NULL,\
>++		0,\
>++		#tname \
>++	ASN1_ITEM_end(tname)
>+ 
>+ 
>+ /* This is a ASN1 type which just embeds a template */
>+@@ -130,6 +144,7 @@
>+ 	static const ASN1_TEMPLATE tname##_seq_tt[] 
>+ 
>+ #define ASN1_SEQUENCE_END(stname) ASN1_SEQUENCE_END_name(stname, stname)
>++#define static_ASN1_SEQUENCE_END(stname) static_ASN1_SEQUENCE_END_name(stname, stname)
>+ 
>+ #define ASN1_SEQUENCE_END_name(stname, tname) \
>+ 	;\
>+@@ -142,6 +157,17 @@
>+ 		sizeof(stname),\
>+ 		#stname \
>+ 	ASN1_ITEM_end(tname)
>++#define static_ASN1_SEQUENCE_END_name(stname, tname) \
>++	;\
>++	static_ASN1_ITEM_start(tname) \
>++		ASN1_ITYPE_SEQUENCE,\
>++		V_ASN1_SEQUENCE,\
>++		tname##_seq_tt,\
>++		sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
>++		NULL,\
>++		sizeof(stname),\
>++		#stname \
>++	ASN1_ITEM_end(tname)
>+ 
>+ #define ASN1_NDEF_SEQUENCE(tname) \
>+ 	ASN1_SEQUENCE(tname)
>+@@ -176,12 +202,24 @@
>+ 		sizeof(tname),\
>+ 		#tname \
>+ 	ASN1_ITEM_end(tname)
>++#define static_ASN1_NDEF_SEQUENCE_END(tname) \
>++	;\
>++	static_ASN1_ITEM_start(tname) \
>++		ASN1_ITYPE_NDEF_SEQUENCE,\
>++		V_ASN1_SEQUENCE,\
>++		tname##_seq_tt,\
>++		sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
>++		NULL,\
>++		sizeof(tname),\
>++		#tname \
>++	ASN1_ITEM_end(tname)
>+ 
>+ #define ASN1_BROKEN_SEQUENCE_END(stname) ASN1_SEQUENCE_END_ref(stname, stname)
>+ 
>+ #define ASN1_SEQUENCE_END_enc(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
>+ 
>+ #define ASN1_SEQUENCE_END_cb(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
>++#define static_ASN1_SEQUENCE_END_cb(stname, tname) static_ASN1_SEQUENCE_END_ref(stname, tname)
>+ 
>+ #define ASN1_SEQUENCE_END_ref(stname, tname) \
>+ 	;\
>+@@ -194,6 +232,17 @@
>+ 		sizeof(stname),\
>+ 		#stname \
>+ 	ASN1_ITEM_end(tname)
>++#define static_ASN1_SEQUENCE_END_ref(stname, tname) \
>++	;\
>++	ASN1_ITEM_start(tname) \
>++		ASN1_ITYPE_SEQUENCE,\
>++		V_ASN1_SEQUENCE,\
>++		tname##_seq_tt,\
>++		sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
>++		&tname##_aux,\
>++		sizeof(stname),\
>++		#stname \
>++	ASN1_ITEM_end(tname)
>+ 
>+ #define ASN1_NDEF_SEQUENCE_END_cb(stname, tname) \
>+ 	;\
>+@@ -238,12 +287,25 @@
>+ 	ASN1_CHOICE(tname)
>+ 
>+ #define ASN1_CHOICE_END(stname) ASN1_CHOICE_END_name(stname, stname)
>++#define static_ASN1_CHOICE_END(stname) static_ASN1_CHOICE_END_name(stname, stname)
>+ 
>+ #define ASN1_CHOICE_END_name(stname, tname) ASN1_CHOICE_END_selector(stname, tname, type)
>++#define static_ASN1_CHOICE_END_name(stname, tname) static_ASN1_CHOICE_END_selector(stname, tname, type)
>+ 
>+ #define ASN1_CHOICE_END_selector(stname, tname, selname) \
>+ 	;\
>+ 	ASN1_ITEM_start(tname) \
>++		ASN1_ITYPE_CHOICE,\
>++		offsetof(stname,selname) ,\
>++		tname##_ch_tt,\
>++		sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\
>++		NULL,\
>++		sizeof(stname),\
>++		#stname \
>++	ASN1_ITEM_end(tname)
>++#define static_ASN1_CHOICE_END_selector(stname, tname, selname) \
>++	;\
>++	static_ASN1_ITEM_start(tname) \
>+ 		ASN1_ITYPE_CHOICE,\
>+ 		offsetof(stname,selname) ,\
>+ 		tname##_ch_tt,\

Flags:

cy: maintainer-approval? (brnrd)

Actions: View | Diff

Attachments on bug 237679: 204153