virtuoso: update to 7.2.10
test suite was failing on revbump - remove patches that no longer apply - disable static libraries as we're removing them after install anyway - disable tgraphql test (fails inside ./xbps-src) - add which to hostmakedepends - add missing checkdepends - update project homepage
This commit is contained in:
Klara Modin
Duncan Overbruck
parent
bdc0eac52d
commit
1d679c5636
@ -1,46 +0,0 @@
|
||||
From bc8e9890de8c9866e6e1f49c8355ebee915579e4 Mon Sep 17 00:00:00 2001
|
||||
From: q66 <daniel@octaforge.org>
|
||||
Date: Wed, 29 Jan 2020 12:50:46 +0100
|
||||
Subject: [PATCH 1/2] always use IEEE floats
|
||||
|
||||
We don't build on any platforms where this is not the case.
|
||||
|
||||
Fixes platforms for which this is not checked.
|
||||
---
|
||||
libsrc/Dk/Dkmarshal.c | 20 +-------------------
|
||||
1 file changed, 1 insertion(+), 19 deletions(-)
|
||||
|
||||
diff --git libsrc/Dk/Dkmarshal.c libsrc/Dk/Dkmarshal.c
|
||||
index da15a21..b2b6c71 100644
|
||||
--- a/libsrc/Dk/Dkmarshal.c
|
||||
+++ b/libsrc/Dk/Dkmarshal.c
|
||||
@@ -31,25 +31,7 @@
|
||||
# include <netinet/in.h> /* for ntohl, htonl */
|
||||
#endif
|
||||
|
||||
-#if defined (i386) || \
|
||||
- defined (_WIN64) || \
|
||||
- defined (_M_IX86) || \
|
||||
- defined (_M_ALPHA) || \
|
||||
- defined (mc68000) || \
|
||||
- defined (sparc) || \
|
||||
- defined (__x86_64) || \
|
||||
- defined (__alpha) || \
|
||||
- defined (__powerpc) || \
|
||||
- defined (mips) || \
|
||||
- defined (__OS2__) || \
|
||||
- defined (_IBMR2)
|
||||
-# define _IEEE_FLOATS
|
||||
-#elif defined (OPL_SOURCE)
|
||||
-# include <librpc.h>
|
||||
-#else
|
||||
-# include <rpc/types.h>
|
||||
-# include <rpc/xdr.h>
|
||||
-#endif
|
||||
+#define _IEEE_FLOATS
|
||||
|
||||
macro_char_func readtable[256];
|
||||
ses_write_func writetable[256];
|
||||
--
|
||||
2.24.0
|
||||
|
||||
12
srcpkgs/virtuoso/patches/disable-tgraphql-test.patch
Normal file
12
srcpkgs/virtuoso/patches/disable-tgraphql-test.patch
Normal file
@ -0,0 +1,12 @@
|
||||
--- a/binsrc/tests/suite/testall.sh 2023-02-27 18:05:33.000000000 +0100
|
||||
+++ b/binsrc/tests/suite/testall.sh 2023-03-09 14:55:56.918657063 +0100
|
||||
@@ -136,8 +136,7 @@
|
||||
rtest \
|
||||
trepl_rdf \
|
||||
tsoap12 \
|
||||
-tvspxex \
|
||||
-tgraphql "
|
||||
+tvspxex "
|
||||
|
||||
QUICKTEST=1
|
||||
TPCDMODE=local
|
||||
@ -1,15 +0,0 @@
|
||||
Source: @pullmoll
|
||||
Upstream: no
|
||||
Reason: expression requires binary AND, not logical
|
||||
|
||||
--- a/libsrc/util/pcrelib/pcre_study.c 2018-08-16 01:06:21.000000000 +0200
|
||||
+++ b/libsrc/util/pcrelib/pcre_study.c 2020-01-27 15:44:57.715821355 +0100
|
||||
@@ -432,7 +432,7 @@
|
||||
for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
|
||||
for (c = 128; c < 256; c++)
|
||||
{
|
||||
- if ((tcode[c/8] && (1 << (c&7))) != 0)
|
||||
+ if ((tcode[c/8] & (1 << (c&7))) != 0)
|
||||
{
|
||||
int d = (c >> 6) | 0xc0; /* Set bit for this starter */
|
||||
start_bits[d/8] |= (1 << (d&7)); /* and then skip on to the */
|
||||
@ -1,34 +0,0 @@
|
||||
From 125669821d95ff989bf94161b8e2497bfca9d0ab Mon Sep 17 00:00:00 2001
|
||||
From: q66 <daniel@octaforge.org>
|
||||
Date: Wed, 29 Jan 2020 12:54:14 +0100
|
||||
Subject: [PATCH 2/2] Use more portable page size check
|
||||
|
||||
This fixes musl builds.
|
||||
---
|
||||
libsrc/Dk/tlsf.h | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git libsrc/Dk/tlsf.h libsrc/Dk/tlsf.h
|
||||
index ddce478..a9687f4 100644
|
||||
--- a/libsrc/Dk/tlsf.h
|
||||
+++ b/libsrc/Dk/tlsf.h
|
||||
@@ -20,6 +20,7 @@
|
||||
#define _TLSF_H_
|
||||
|
||||
#include <sys/types.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
extern size_t init_memory_pool(size_t, void *);
|
||||
extern size_t get_used_size(void *);
|
||||
@@ -159,7 +160,7 @@ extern void tlsf_base_free (void * c, size_t sz);
|
||||
|
||||
#define DEFAULT_AREA_SIZE (1024*10)
|
||||
|
||||
-#define PAGE_SIZE (getpagesize())
|
||||
+#define PAGE_SIZE ((int)sysconf(_SC_PAGESIZE))
|
||||
|
||||
#ifndef WIN32
|
||||
#ifdef USE_PRINTF
|
||||
--
|
||||
2.24.0
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
Source: @pullmoll
|
||||
Upstream: no
|
||||
Reason: Enable subdir-objects and strip openssl version check which fails for libressl
|
||||
|
||||
--- a/configure.ac 2018-08-16 01:06:21.000000000 +0200
|
||||
+++ b/configure.ac 2020-01-27 15:02:36.946922663 +0100
|
||||
@@ -58,7 +58,7 @@
|
||||
dnl AM_INIT_AUTOMAKE([1.8])
|
||||
dnl AM_INIT_AUTOMAKE([1.9 tar-ustar])
|
||||
dnl
|
||||
-AM_INIT_AUTOMAKE([1.9 tar-ustar])
|
||||
+AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
|
||||
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
@@ -867,32 +867,6 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
-AC_MSG_CHECKING([OpenSSL version])
|
||||
-AC_TRY_COMPILE([
|
||||
-#include <openssl/opensslv.h>
|
||||
-], [
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x0090801fL
|
||||
-#error OpenSSL version too old
|
||||
-#endif
|
||||
- ],[
|
||||
- AC_MSG_RESULT([>= 0.9.8e])
|
||||
- ],[
|
||||
- AC_MSG_ERROR([OpenSSL version 0.9.8e or greater is required.])
|
||||
- ])
|
||||
-
|
||||
-AC_MSG_CHECKING([OpenSSL version])
|
||||
-AC_TRY_COMPILE([
|
||||
-#include <openssl/opensslv.h>
|
||||
-],[
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
|
||||
-#error OpenSSL version too new
|
||||
-#endif
|
||||
- ],[
|
||||
- AC_MSG_RESULT([< 1.1.0])
|
||||
- ],[
|
||||
- AC_MSG_ERROR([OpenSSL version 1.1.0 or greater is currently not supported.])
|
||||
- ])
|
||||
-
|
||||
AC_MSG_CHECKING([usability of the OpenSSL header files and library in ${openssl_dir}])
|
||||
AC_TRY_RUN([
|
||||
#include <openssl/rsa.h>
|
||||
@ -1,15 +0,0 @@
|
||||
Source: @pullmoll
|
||||
Upstream: no
|
||||
Reason: Use the proper interface of libressl which does not expose the internal structure of SSL
|
||||
|
||||
--- a/libsrc/Wi/http.c 2018-08-16 01:06:21.000000000 +0200
|
||||
+++ b/libsrc/Wi/http.c 2020-01-27 15:09:53.284905265 +0100
|
||||
@@ -9949,7 +9949,7 @@
|
||||
cli_ssl_get_error_string (err_buf, sizeof (err_buf));
|
||||
sqlr_new_error ("42000", "..002", "SSL_do_handshake failed %s", err_buf);
|
||||
}
|
||||
- ssl->state = SSL_ST_ACCEPT;
|
||||
+ SSL_set_accept_state (ssl);
|
||||
while (SSL_renegotiate_pending (ssl) && ctr < 1000)
|
||||
{
|
||||
timeout_t to = { 0, 1000 };
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,20 +0,0 @@
|
||||
Description: Comment unknown definition in ssl1.1 - please review!
|
||||
Author: Andreas Tille <tille@debian.org>
|
||||
Bug-Debian: https://bugs.debian.org/828594
|
||||
Last-Update: Mo 11. Feb 13:50:17 CET 2019
|
||||
|
||||
--- a/libsrc/Dk/Dkernel.c
|
||||
+++ b/libsrc/Dk/Dkernel.c
|
||||
@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
|
||||
else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
|
||||
opt = SSL_PROTOCOL_TLSV1_2;
|
||||
#endif
|
||||
+/*
|
||||
#if defined (SSL_OP_NO_TLSv1_3)
|
||||
else if (!strcasecmp (name, "TLSv1_3") || !strcasecmp (name, "TLSv1.3"))
|
||||
opt = SSL_PROTOCOL_TLSV1_3;
|
||||
#endif
|
||||
+*/
|
||||
else if (!strcasecmp (name, "ALL"))
|
||||
opt = SSL_PROTOCOL_ALL;
|
||||
else
|
||||
@ -1,18 +0,0 @@
|
||||
Source: @pullmoll
|
||||
Upstream: no
|
||||
Reason: Avoid mktemp(3) because "Never use this function; see BUGS."
|
||||
|
||||
--- a/libsrc/Dk/Dksesstr.c 2018-08-16 01:06:21.000000000 +0200
|
||||
+++ b/libsrc/Dk/Dksesstr.c 2020-01-27 15:22:00.953876251 +0100
|
||||
@@ -298,8 +298,10 @@
|
||||
if (!ses2->ses_file->ses_max_blocks_in_mem)
|
||||
{
|
||||
char fname[PATH_MAX + 1];
|
||||
+ int fd;
|
||||
snprintf (fname, sizeof (fname), "%s/sesXXXXXX", ses_tmp_dir);
|
||||
- mktemp (fname);
|
||||
+ fd = mkstemp (fname);
|
||||
+ close (fd);
|
||||
|
||||
#if defined (WIN32)
|
||||
# define OPEN_FLAGS O_CREAT | O_RDWR | O_BINARY | O_EXCL | O_TEMPORARY
|
||||
@ -1,18 +1,19 @@
|
||||
# Template file for 'virtuoso'
|
||||
pkgname=virtuoso
|
||||
version=7.2.5.1
|
||||
revision=3
|
||||
version=7.2.10
|
||||
revision=1
|
||||
archs="x86_64* aarch64* ppc64le*"
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-static"
|
||||
hostmakedepends="automake libtool flex gperf net-tools"
|
||||
configure_args="--without-internal-zlib --with-readline --with-layout=debian"
|
||||
hostmakedepends="automake libtool flex gperf net-tools which"
|
||||
makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
|
||||
checkdepends="procps-ng unzip curl wget"
|
||||
short_desc="Scalable cross-platform server of virtuoso"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
license="GPL-2"
|
||||
homepage="http://virtuoso.openlinksw.com/wiki/main/Main/"
|
||||
license="GPL-2.0-only"
|
||||
homepage="https://vos.openlinksw.com/owiki/wiki/VOS/"
|
||||
distfiles="https://github.com/openlink/virtuoso-opensource/archive/v${version}.tar.gz"
|
||||
checksum=3e4807e94098b8265f8cf00867d1215bb1e9d0d274878e59a420742d2de471c2
|
||||
checksum=0379c60cb2ea4fed70ee3ac3f808e5cc9298e48ddcd8d0f4d8cd92711a43e7e5
|
||||
# cannot execute binary file: Exec format error
|
||||
nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio"
|
||||
|
||||
@ -31,9 +32,7 @@ pre_configure() {
|
||||
}
|
||||
|
||||
do_configure() {
|
||||
./configure ${configure_args} --without-internal-zlib --with-readline \
|
||||
--with-layout=debian \
|
||||
--program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/'
|
||||
./configure ${configure_args} --program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/'
|
||||
}
|
||||
|
||||
post_install() {
|
||||
@ -45,8 +44,6 @@ post_install() {
|
||||
rm ${DESTDIR}/usr/lib/virtodbc_r.{a,so}
|
||||
rm ${DESTDIR}/usr/lib/virtodbcu.{a,so}
|
||||
rm ${DESTDIR}/usr/lib/virtodbcu_r.{a,so}
|
||||
# remove static libs.
|
||||
rm ${DESTDIR}/usr/lib/virtuoso-opensource-${version%%.*}/hosting/*.a
|
||||
}
|
||||
|
||||
virtuoso-base_package() {
|
||||
@ -61,7 +58,7 @@ virtuoso-base_package() {
|
||||
install -Dm755 ${wrksrc}/binsrc/tests/$bin \
|
||||
${PKGDESTDIR}/usr/bin/${bin}-vt
|
||||
done
|
||||
# Remove static libs and libtool archives.
|
||||
rm -f ${PKGDESTDIR}/usr/lib/*.{a,la}
|
||||
# Remove libtool archives
|
||||
rm -f ${PKGDESTDIR}/usr/lib/*.la
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user