Compare commits
55 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a5a13fa722 | ||
|
|
dc42e9d3f4 | ||
|
|
73446d903d | ||
|
|
e4cd4a1a02 | ||
|
|
9d3947bc8a | ||
| 5f51ce1d48 | |||
|
|
6007bc46dc | ||
|
|
beef21cf13 | ||
|
|
06705c50b1 | ||
|
|
6cae71f11f | ||
|
|
cbe6566d68 | ||
|
|
0256b68531 | ||
|
|
f5a9c2479b | ||
|
|
6b3fd10292 | ||
|
|
8522dd490a | ||
| b8a7099c9c | |||
| ebe92c9e82 | |||
| 00af2d5796 | |||
|
|
bb088097b5 | ||
| e2130a78f8 | |||
| c7d5346d74 | |||
| 6d38d0d50f | |||
| 0b93e40caf | |||
| 451e12ca42 | |||
| 5c7ea19272 | |||
| 6d522d7a36 | |||
| 2a7acaf2ef | |||
|
|
81094b4871 | ||
| ce9fd70bcd | |||
| 4958451a1d | |||
| db3ceb228f | |||
| 207f5a0ae2 | |||
| 1fbff1b016 | |||
| bbd9e77d47 | |||
| 917600ab63 | |||
| 9eab49e235 | |||
| c531a2446a | |||
|
|
90376ab656 | ||
| 2495aeb8ab | |||
| cf240977e9 | |||
| f03825bddd | |||
|
|
8c5080989f | ||
| db06f0721e | |||
| 35fba70e2c | |||
| 0d3547cbbf | |||
| e119897650 | |||
| 36dbcb1642 | |||
| 630c139487 | |||
| 42de88d09c | |||
| a912707ea1 | |||
| 15bc2f98fe | |||
|
|
e19814da71 | ||
| 2bff0161e8 | |||
| a31bdf3922 | |||
| d60722a846 |
7 changed files with 3 additions and 296 deletions
|
|
@ -1 +0,0 @@
|
|||
virtuoso-opensource-5.0.11.tar.gz
|
||||
21
Makefile
21
Makefile
|
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: virtuoso-opensource
|
||||
# $Id$
|
||||
NAME := virtuoso-opensource
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
||||
3
dead.package
Normal file
3
dead.package
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
2016-05-19: Retired orphaned package, because it was orphaned for
|
||||
more than six weeks.
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
virtuoso-opensource-5_0_11-3_fc11:HEAD:virtuoso-opensource-5.0.11-3.fc11.src.rpm:1248640731
|
||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
|||
9d5507b2a8d244c62f32f1203f10b9d1 virtuoso-opensource-5.0.11.tar.gz
|
||||
|
|
@ -1,114 +0,0 @@
|
|||
diff -up virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c.openssl virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c
|
||||
--- virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c.openssl 2009-04-17 22:07:28.000000000 +0200
|
||||
+++ virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c 2009-08-26 16:03:23.000000000 +0200
|
||||
@@ -4798,7 +4798,11 @@ dk_ssl_free (void *old)
|
||||
static void
|
||||
ssl_server_init ()
|
||||
{
|
||||
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
|
||||
+ const SSL_METHOD *ssl_server_method = NULL;
|
||||
+#else
|
||||
SSL_METHOD *ssl_server_method = NULL;
|
||||
+#endif
|
||||
unsigned char tmp[1024];
|
||||
#ifndef NO_THREAD
|
||||
char err_buf[1024];
|
||||
@@ -4888,12 +4892,12 @@ ssl_server_init ()
|
||||
SSL_CTX_set_session_id_context (ssl_server_ctx, (unsigned char *) &session_id_context, sizeof session_id_context);
|
||||
|
||||
skCAList = SSL_CTX_get_client_CA_list (ssl_server_ctx);
|
||||
- if (sk_num ((STACK *) skCAList) == 0)
|
||||
+ if (sk_X509_NAME_num (skCAList) == 0)
|
||||
log_warning ("ODBC X509 Client authentication requested but no CA known for verification");
|
||||
- for (i = 0; i < sk_num ((STACK *) skCAList); i++)
|
||||
+ for (i = 0; i < sk_X509_NAME_num (skCAList); i++)
|
||||
{
|
||||
char ca_buf[1024];
|
||||
- X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i);
|
||||
+ X509_NAME *ca_name = (X509_NAME *) sk_X509_NAME_value (skCAList, i);
|
||||
if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
|
||||
log_debug ("ODBC Server Using X509 Client CA %s", ca_buf);
|
||||
}
|
||||
@@ -5058,7 +5062,7 @@ ssl_setup:
|
||||
|
||||
if (ca && ca[0] != 0)
|
||||
{
|
||||
- sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
|
||||
+ sk_X509_pop_free (ca_list, X509_free);
|
||||
ca_list = NULL;
|
||||
ca_list = PEM_load_certs (ca, passwd);
|
||||
}
|
||||
@@ -5067,30 +5071,30 @@ ssl_setup:
|
||||
{
|
||||
X509_free (cert);
|
||||
EVP_PKEY_free (pkey);
|
||||
- sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
|
||||
+ sk_X509_pop_free (ca_list, X509_free);
|
||||
return 0;
|
||||
}
|
||||
EVP_PKEY_free (pkey);
|
||||
if (!SSL_use_certificate (ssl, cert))
|
||||
{
|
||||
X509_free (cert);
|
||||
- sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
|
||||
+ sk_X509_pop_free (ca_list, X509_free);
|
||||
return 0;
|
||||
}
|
||||
X509_free (cert);
|
||||
|
||||
if (!SSL_check_private_key (ssl))
|
||||
{
|
||||
- sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
|
||||
+ sk_X509_pop_free (ca_list, X509_free);
|
||||
return 0;
|
||||
}
|
||||
- for (i = 0; i < sk_num ((STACK *) ca_list); i++)
|
||||
+ for (i = 0; i < sk_X509_num (ca_list); i++)
|
||||
{
|
||||
- X509 *ca = (X509 *) sk_value ((STACK *) ca_list, i);
|
||||
+ X509 *ca = sk_X509_value (ca_list, i);
|
||||
SSL_add_client_CA (ssl, ca);
|
||||
X509_STORE_add_cert (SSL_CTX_get_cert_store (ssl_ctx), ca);
|
||||
}
|
||||
- sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
|
||||
+ sk_X509_pop_free (ca_list, X509_free);
|
||||
return 1;
|
||||
}
|
||||
|
||||
diff -up virtuoso-opensource-5.0.11/libsrc/Wi/http.c.openssl virtuoso-opensource-5.0.11/libsrc/Wi/http.c
|
||||
--- virtuoso-opensource-5.0.11/libsrc/Wi/http.c.openssl 2009-04-19 23:48:56.000000000 +0200
|
||||
+++ virtuoso-opensource-5.0.11/libsrc/Wi/http.c 2009-08-26 16:28:03.000000000 +0200
|
||||
@@ -7601,13 +7601,13 @@ http_set_ssl_listen (dk_session_t * list
|
||||
SSL_CTX_set_client_CA_list (ssl_ctx, skCAList);
|
||||
skCAList = SSL_CTX_get_client_CA_list(ssl_ctx);
|
||||
|
||||
- if (sk_num((STACK *) skCAList) == 0)
|
||||
+ if (sk_X509_NAME_num(skCAList) == 0)
|
||||
log_warning ("HTTPS Client authentication requested but no CA known for verification");
|
||||
|
||||
- for (i = 0; i < sk_num((STACK *) skCAList); i++)
|
||||
+ for (i = 0; i < sk_X509_NAME_num(skCAList); i++)
|
||||
{
|
||||
char ca_buf[1024];
|
||||
- X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i);
|
||||
+ X509_NAME *ca_name = sk_X509_NAME_value (skCAList, i);
|
||||
if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
|
||||
log_debug ("HTTPS Using X509 Client CA %s", ca_buf);
|
||||
}
|
||||
@@ -9697,13 +9697,13 @@ http_init_part_two ()
|
||||
|
||||
SSL_CTX_set_client_CA_list (ssl_ctx, skCAList);
|
||||
skCAList = SSL_CTX_get_client_CA_list (ssl_ctx);
|
||||
- if (sk_num((STACK *) skCAList) == 0)
|
||||
+ if (sk_X509_NAME_num(skCAList) == 0)
|
||||
log_warning ("HTTPS Client authentication requested but no CA known for verification");
|
||||
|
||||
- for (i = 0; i < sk_num((STACK *) skCAList); i++)
|
||||
+ for (i = 0; i < sk_X509_NAME_num(skCAList); i++)
|
||||
{
|
||||
char ca_buf[1024];
|
||||
- X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i);
|
||||
+ X509_NAME *ca_name = sk_X509_NAME_value (skCAList, i);
|
||||
if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
|
||||
log_debug ("HTTPS Using X509 Client CA %s", ca_buf);
|
||||
}
|
||||
|
|
@ -1,158 +0,0 @@
|
|||
Name: virtuoso-opensource
|
||||
Version: 5.0.11
|
||||
Release: 4%{?dist}
|
||||
Summary: A high-performance object-relational SQL database
|
||||
|
||||
Group: Applications/Databases
|
||||
# see LICENSE for exception details
|
||||
License: GPLv2 with exceptions
|
||||
URL: http://virtuoso.sourceforge.net/
|
||||
Source0: http://download.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
|
||||
Patch1: virtuoso-opensource-5.0.11-openssl.patch
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
BuildRequires: automake libtool
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
BuildRequires: gperf
|
||||
BuildRequires: htmldoc
|
||||
## when/if we ever decide to ship .jar's
|
||||
#BuildRequires: java-devel
|
||||
BuildRequires: openldap-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: libxml2-devel
|
||||
|
||||
Provides: virtuoso = %{version}-%{release}
|
||||
|
||||
|
||||
%description
|
||||
Virtuoso is a scalable cross-platform server that combines SQL/RDF/XML
|
||||
Data Management with Web Application Server and Web Services Platform
|
||||
functionality.
|
||||
|
||||
%package apps
|
||||
Summary: Applications
|
||||
Group: Applications/Databases
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%description apps
|
||||
%{summary}.
|
||||
|
||||
%package conductor
|
||||
Summary: Server pages
|
||||
Group: Applications/Databases
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%if 0%{?fedora} > 9
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
%description conductor
|
||||
%{summary}.
|
||||
|
||||
%package doc
|
||||
Summary: Documentation
|
||||
Group: Documentation
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%if 0%{?fedora} > 9
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
%description doc
|
||||
%{summary}.
|
||||
|
||||
%package utils
|
||||
Summary: Utilities
|
||||
Group: Applications/Databases
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%description utils
|
||||
%{summary}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n virtuoso-opensource-%{version}
|
||||
%patch1 -p1 -b .openssl
|
||||
|
||||
|
||||
%build
|
||||
# --with-debug avoids useless -debuginfo
|
||||
%configure \
|
||||
--with-layout=redhat \
|
||||
--enable-shared --disable-static \
|
||||
--with-debug
|
||||
|
||||
# smp busted
|
||||
make
|
||||
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/virtuoso
|
||||
mv %{buildroot}%{_var}/lib/virtuoso/db/virtuoso.ini %{buildroot}%{_sysconfdir}/virtuoso/
|
||||
ln -s ../../../..%{_sysconfdir}/virtuoso/virtuoso.ini %{buildroot}%{_var}/lib/virtuoso/db/virtuoso.ini
|
||||
|
||||
# generic'ish binaries, hide them away safely
|
||||
mkdir -p %{buildroot}%{_libexecdir}/virtuoso/
|
||||
mv %{buildroot}%{_bindir}/{inifile,isql,isqlw} \
|
||||
%{buildroot}%{_libexecdir}/virtuoso/
|
||||
|
||||
## unpackaged files
|
||||
rm -vf %{buildroot}%{_libdir}/*.{la,a}
|
||||
rm -vf %{buildroot}%{_libdir}/virtuoso/hosting/*.la
|
||||
rm -vf %{buildroot}%{_libdir}/{jdbc-?.?,jena,sesame}/*.jar
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS COPYING LICENSE
|
||||
%dir %{_sysconfdir}/virtuoso/
|
||||
%config(noreplace) %{_sysconfdir}/virtuoso/virtuoso.ini
|
||||
%{_bindir}/virtuoso-t
|
||||
%{_libdir}/virt*.so
|
||||
%dir %{_datadir}/virtuoso/
|
||||
%dir %{_datadir}/virtuoso/vad/
|
||||
%dir %{_libdir}/virtuoso/
|
||||
%dir %{_libexecdir}/virtuoso/
|
||||
%dir %{_var}/lib/virtuoso
|
||||
%{_var}/lib/virtuoso/db/
|
||||
|
||||
%files apps
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/virtuoso/hosting/
|
||||
%{_datadir}/virtuoso/vad/*.vad
|
||||
%exclude %{_datadir}/virtuoso/vad/conductor_dav.vad
|
||||
|
||||
%files conductor
|
||||
%defattr(-,root,root,-)
|
||||
%{_datadir}/virtuoso/vad/conductor_dav.vad
|
||||
%{_var}/lib/virtuoso/vsp/
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root,-)
|
||||
%{_docdir}/virtuoso/
|
||||
|
||||
%files utils
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/virt_mail
|
||||
%{_libexecdir}/virtuoso/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 26 2009 Tomas Mraz <tmraz@redhat.com> - 5.0.11-4
|
||||
- rebuilt with new openssl
|
||||
|
||||
* Fri Jul 24 2009 Rex Dieter <rdieter@fedoraproject.org> 5.0.11-3
|
||||
- BR: htmldoc
|
||||
- -doc subpkg
|
||||
|
||||
* Sun Jun 07 2009 Rex Dieter <rdieter@fedoraproject.org> 5.0.11-2
|
||||
- omit remaining .la files
|
||||
- fix %%changelog
|
||||
- fix virtuoso.ini dangling symlink
|
||||
|
||||
* Fri May 22 2009 Rex Dieter <rdieter@fedoraproject.org> 5.0.11-1
|
||||
- virtuoso-opensource-5.0.11
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue