databases/virtuoso: prepare for upcoming libcrypto bump.
Move HOMEPAGE to https, regen PLIST and WANTLIB.
This commit is contained in:
tb
parent
80971585d9
commit
7fadcd9f0b
@ -1,22 +1,23 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2019/07/12 20:44:03 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2021/10/08 09:39:22 tb Exp $
|
||||
|
||||
BROKEN-macppc = make: don't know how to make all
|
||||
|
||||
COMMENT = object-relational SQL database
|
||||
DISTNAME = virtuoso-opensource-6.1.6
|
||||
REVISION = 8
|
||||
REVISION = 9
|
||||
PKGNAME = ${DISTNAME:C/-opensource//}
|
||||
|
||||
CATEGORIES = databases
|
||||
HOMEPAGE = http://www.openlinksw.com/
|
||||
HOMEPAGE = https://www.openlinksw.com/
|
||||
|
||||
# GPLv2, plus some more rights given
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xext Xt
|
||||
WANTLIB += bz2 c crypto djvulibre expat fftw3 fontconfig freetype
|
||||
WANTLIB += iconv jbig jpeg lcms2 lzma m openjp2 png pthread
|
||||
WANTLIB += ssl tiff webp xcb xml2 z
|
||||
WANTLIB += aom bz2 c crypto dav1d de265 djvulibre expat fontconfig
|
||||
WANTLIB += freetype heif iconv jasper jbig jpeg lcms2 lzma m openjp2
|
||||
WANTLIB += png pthread raw_r ssl tiff webp webpdemux webpmux xcb
|
||||
WANTLIB += x265 xml2 z zstd
|
||||
|
||||
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=virtuoso/}
|
||||
|
||||
|
||||
73
databases/virtuoso/patches/patch-libsrc_Wi_bif_crypto_c
Normal file
73
databases/virtuoso/patches/patch-libsrc_Wi_bif_crypto_c
Normal file
@ -0,0 +1,73 @@
|
||||
$OpenBSD: patch-libsrc_Wi_bif_crypto_c,v 1.1 2021/10/08 09:39:22 tb Exp $
|
||||
|
||||
Index: libsrc/Wi/bif_crypto.c
|
||||
--- libsrc/Wi/bif_crypto.c.orig
|
||||
+++ libsrc/Wi/bif_crypto.c
|
||||
@@ -1419,7 +1419,7 @@ bif_get_certificate_info (caddr_t * qst, caddr_t * err
|
||||
int i;
|
||||
char tmp[1024];
|
||||
char *ext_oid = (char *) (BOX_ELEMENTS (args) > 4 ? bif_string_arg (qst, args, 4, "get_certificate_info") : VIRT_CERT_EXT);
|
||||
- STACK_OF (X509_EXTENSION) * exts = cert->cert_info->extensions;
|
||||
+ STACK_OF (X509_EXTENSION) * exts = X509_get0_extensions(cert);
|
||||
for (i = 0; i < sk_X509_EXTENSION_num (exts); i++)
|
||||
{
|
||||
X509_EXTENSION *ex = sk_X509_EXTENSION_value (exts, i);
|
||||
@@ -1431,7 +1431,7 @@ bif_get_certificate_info (caddr_t * qst, caddr_t * err
|
||||
char *data_ptr;
|
||||
BIO *mem = BIO_new (BIO_s_mem ());
|
||||
if (!X509V3_EXT_print (mem, ex, 0, 0))
|
||||
- M_ASN1_OCTET_STRING_print (mem, ex->value);
|
||||
+ M_ASN1_OCTET_STRING_print (mem, X509_EXTENSION_get_data(ex));
|
||||
len = BIO_get_mem_data (mem, &data_ptr);
|
||||
if (len > 0 && data_ptr)
|
||||
{
|
||||
@@ -1488,13 +1488,13 @@ bif_get_certificate_info (caddr_t * qst, caddr_t * err
|
||||
int n, i, len;
|
||||
char *s, *data_ptr;
|
||||
BIO *mem = BIO_new (BIO_s_mem ());
|
||||
- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
|
||||
+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
|
||||
{
|
||||
- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
|
||||
- n = OBJ_obj2nid (ne->object);
|
||||
+ ne = X509_NAME_get_entry(subj, i);
|
||||
+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
|
||||
if ((n == NID_undef) || ((s = OBJ_nid2sn (n)) == NULL))
|
||||
{
|
||||
- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
|
||||
+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
|
||||
s = buffer;
|
||||
}
|
||||
if (!strcmp (s, attr))
|
||||
@@ -1505,7 +1505,7 @@ bif_get_certificate_info (caddr_t * qst, caddr_t * err
|
||||
}
|
||||
if (ne_ret)
|
||||
{
|
||||
- ASN1_STRING_print (mem, ne_ret->value);
|
||||
+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne_ret));
|
||||
len = BIO_get_mem_data (mem, &data_ptr);
|
||||
if (len > 0 && data_ptr)
|
||||
{
|
||||
@@ -1526,17 +1526,17 @@ bif_get_certificate_info (caddr_t * qst, caddr_t * err
|
||||
dk_set_t set = NULL;
|
||||
caddr_t val;
|
||||
BIO *mem = BIO_new (BIO_s_mem ());
|
||||
- for (i = 0; NULL != subj && i < sk_X509_NAME_ENTRY_num(subj->entries); i++)
|
||||
+ for (i = 0; NULL != subj && i < X509_NAME_entry_count(subj); i++)
|
||||
{
|
||||
val = NULL;
|
||||
- ne = sk_X509_NAME_ENTRY_value(subj->entries,i);
|
||||
- n = OBJ_obj2nid (ne->object);
|
||||
+ ne = X509_NAME_get_entry(subj, i);
|
||||
+ n = OBJ_obj2nid (X509_NAME_ENTRY_get_object(ne));
|
||||
if ((n == NID_undef) || ((s = OBJ_nid2sn (n)) == NULL))
|
||||
{
|
||||
- i2t_ASN1_OBJECT (buffer, sizeof (buffer), ne->object);
|
||||
+ i2t_ASN1_OBJECT (buffer, sizeof (buffer), X509_NAME_ENTRY_get_object(ne));
|
||||
s = buffer;
|
||||
}
|
||||
- ASN1_STRING_print (mem, ne->value);
|
||||
+ ASN1_STRING_print (mem, X509_NAME_ENTRY_get_data(ne));
|
||||
len = BIO_get_mem_data (mem, &data_ptr);
|
||||
if (len > 0 && data_ptr)
|
||||
{
|
||||
14
databases/virtuoso/patches/patch-libsrc_Wi_http_c
Normal file
14
databases/virtuoso/patches/patch-libsrc_Wi_http_c
Normal file
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-libsrc_Wi_http_c,v 1.1 2021/10/08 09:39:22 tb Exp $
|
||||
|
||||
Index: libsrc/Wi/http.c
|
||||
--- libsrc/Wi/http.c.orig
|
||||
+++ libsrc/Wi/http.c
|
||||
@@ -8356,7 +8356,7 @@ ssl_server_set_certificate (SSL_CTX* ssl_ctx, char * c
|
||||
log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
|
||||
break;
|
||||
}
|
||||
- CRYPTO_add(&k->xek_x509->references, 1, CRYPTO_LOCK_X509);
|
||||
+ X509_up_ref(k->xek_x509);
|
||||
tok = strtok_r (NULL, ",", &tok_s);
|
||||
}
|
||||
dk_free_box (str);
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2016/03/27 15:31:23 naddy Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.3 2021/10/08 09:39:22 tb Exp $
|
||||
@bin bin/inifile
|
||||
@bin bin/isql
|
||||
@bin bin/isqlw
|
||||
@ -16,7 +16,7 @@ lib/jdbc-4.0/virtjdbc4.jar
|
||||
lib/jdbc-4.0/virtjdbc4ssl.jar
|
||||
lib/jena/
|
||||
lib/jena/virt_jena.jar
|
||||
lib/libvirtuoso-t.a
|
||||
@static-lib lib/libvirtuoso-t.a
|
||||
lib/libvirtuoso-t.la
|
||||
lib/sesame/
|
||||
lib/sesame/create-virtuoso.xsl
|
||||
@ -28,20 +28,20 @@ lib/virtuoso/
|
||||
lib/virtuoso/hosting/
|
||||
lib/virtuoso/hosting/im.a
|
||||
lib/virtuoso/hosting/im.la
|
||||
lib/virtuoso/hosting/im.so
|
||||
@so lib/virtuoso/hosting/im.so
|
||||
lib/virtuoso/plugins/
|
||||
lib/virtuoso/plugins/virtodbc.a
|
||||
lib/virtuoso/plugins/virtodbc.la
|
||||
lib/virtuoso/plugins/virtodbc.so
|
||||
@so lib/virtuoso/plugins/virtodbc.so
|
||||
lib/virtuoso/plugins/virtodbc_r.a
|
||||
lib/virtuoso/plugins/virtodbc_r.la
|
||||
lib/virtuoso/plugins/virtodbc_r.so
|
||||
@so lib/virtuoso/plugins/virtodbc_r.so
|
||||
lib/virtuoso/plugins/virtodbcu.a
|
||||
lib/virtuoso/plugins/virtodbcu.la
|
||||
lib/virtuoso/plugins/virtodbcu.so
|
||||
@so lib/virtuoso/plugins/virtodbcu.so
|
||||
lib/virtuoso/plugins/virtodbcu_r.a
|
||||
lib/virtuoso/plugins/virtodbcu_r.la
|
||||
lib/virtuoso/plugins/virtodbcu_r.so
|
||||
@so lib/virtuoso/plugins/virtodbcu_r.so
|
||||
share/doc/virtuoso/
|
||||
share/doc/virtuoso/AUTHORS
|
||||
share/doc/virtuoso/COPYING
|
||||
@ -66,7 +66,6 @@ share/virtuoso/db/
|
||||
@sample /var/virtuoso/db/
|
||||
share/virtuoso/db/virtuoso.ini
|
||||
@sample /var/virtuoso/db/virtuoso.ini
|
||||
share/virtuoso/vad/
|
||||
@sample /var/virtuoso/vad/
|
||||
share/virtuoso/vsp/
|
||||
@sample /var/virtuoso/vsp/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user