From dda6e6c92a0df55ecc24c915baf41b978c2953eb Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:16:45 +0000 Subject: [PATCH 1/9] Initialize branch F-12 for virtuoso-opensource --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 12ec77ad121787d0990fc63ac36538d750d7a095 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Oct 2009 14:29:17 +0000 Subject: [PATCH 2/9] - virtuoso-opensource-5.0.12 --- .cvsignore | 2 +- sources | 2 +- virtuoso-opensource.spec | 34 ++++++++++++++++++++++++++++------ 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1bec1d4..f1755fc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -virtuoso-opensource-5.0.11.tar.gz +virtuoso-opensource-5.0.12.tar.gz diff --git a/sources b/sources index 4f65f18..493e4e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d5507b2a8d244c62f32f1203f10b9d1 virtuoso-opensource-5.0.11.tar.gz +64949660e3f053ec43d00519a19751aa virtuoso-opensource-5.0.12.tar.gz diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index d997d20..28dcb30 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -1,16 +1,24 @@ + Name: virtuoso-opensource -Version: 5.0.11 -Release: 4%{?dist} +Version: 5.0.12 +Release: 1%{?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 +Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz +#Source0: ftp://download.openlinksw.com/support/vos/virtuoso-opensource-%{snap}.tar.gz Patch1: virtuoso-opensource-5.0.11-openssl.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +## Upstreamable patches +# fix build with ossl-1.0 +Patch50: virtuoso-opensource-5.0.11-openssl.patch +# fix build --with-external-zlib +Patch51: virtuoso-opensource-5.0.12-zlib.patch + BuildRequires: automake libtool BuildRequires: bison BuildRequires: flex @@ -20,7 +28,9 @@ BuildRequires: htmldoc #BuildRequires: java-devel BuildRequires: openldap-devel BuildRequires: openssl-devel +BuildRequires: libiodbc-devel BuildRequires: libxml2-devel +BuildRequires: zlib-devel Provides: virtuoso = %{version}-%{release} @@ -66,8 +76,10 @@ Requires: %{name} = %{version}-%{release} %prep -%setup -q -n virtuoso-opensource-%{version} -%patch1 -p1 -b .openssl +%setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}} + +%patch50 -p1 -b .openssl +%patch51 -p1 -b .zlib %build @@ -75,7 +87,11 @@ Requires: %{name} = %{version}-%{release} %configure \ --with-layout=redhat \ --enable-shared --disable-static \ - --with-debug + --without-internal-zlib \ + --with-debug \ + --enable-iodbc \ + --enable-openssl \ + --enable-xml # smp busted make @@ -141,6 +157,12 @@ rm -rf %{buildroot} %changelog +* Tue Oct 20 2009 Rex Dieter 5.0.12-1 +- virtuoso-opensource-5.0.12 + +* Sun Oct 11 2009 Rex Dieter 5.0.12-0.1.rc9.20090916 +- virtuoso-opensource-20090916 (5.0.12-rc9) + * Wed Aug 26 2009 Tomas Mraz - 5.0.11-4 - rebuilt with new openssl From f1d88a00300ea621b7eb38ec38038478ab9bb442 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Oct 2009 14:34:41 +0000 Subject: [PATCH 3/9] import --- virtuoso-opensource-5.0.12-zlib.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 virtuoso-opensource-5.0.12-zlib.patch diff --git a/virtuoso-opensource-5.0.12-zlib.patch b/virtuoso-opensource-5.0.12-zlib.patch new file mode 100644 index 0000000..00b7a66 --- /dev/null +++ b/virtuoso-opensource-5.0.12-zlib.patch @@ -0,0 +1,18 @@ +diff -up virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c +--- virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib 2009-10-16 05:27:36.000000000 -0500 ++++ virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c 2009-10-20 08:42:56.060132625 -0500 +@@ -57,7 +57,13 @@ + #endif + + #include "zlib.h" +-#include "zutil.h" ++/* #include "zutil.h" */ ++#if MAX_MEM_LEVEL >= 8 ++# define DEF_MEM_LEVEL 8 ++#else ++# define DEF_MEM_LEVEL MAX_MEM_LEVEL ++#endif ++ + #include "srvmultibyte.h" + + #define FS_MAX_STRING (10L * 1024L * 1024L) /* allow files up to 10 MB */ From 7a82c5aae2acf2f069d0f35fd90d903fc5122e68 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:14:40 +0000 Subject: [PATCH 4/9] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 58eec6e..a3f7440 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: virtuoso-opensource -# $Id$ +# $Id: Makefile,v 1.1 2009/07/26 20:07:12 kevin Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f23a53690541c358925c7fef64082f30ba28a214 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 4 Feb 2010 18:23:53 +0000 Subject: [PATCH 5/9] - virtuoso-opensource-6.1.0 - build only what we need for nepomuk, Obsoletes: -apps,-conductor --- .cvsignore | 2 +- sources | 2 +- virtuoso-opensource-5.0.12-zlib.patch | 18 -------- ...uoso-opensource-6.1.0-external_iodbc.patch | 42 +++++++++++++++++ ...so-opensource-6.1.0-nodemos_buildfix.patch | 38 +++++++++++++++ virtuoso-opensource.spec | 46 +++++++++++++++---- 6 files changed, 119 insertions(+), 29 deletions(-) delete mode 100644 virtuoso-opensource-5.0.12-zlib.patch create mode 100644 virtuoso-opensource-6.1.0-external_iodbc.patch create mode 100644 virtuoso-opensource-6.1.0-nodemos_buildfix.patch diff --git a/.cvsignore b/.cvsignore index f1755fc..cba1459 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -virtuoso-opensource-5.0.12.tar.gz +virtuoso-opensource-6.1.0.tar.gz diff --git a/sources b/sources index 493e4e6..fd355d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64949660e3f053ec43d00519a19751aa virtuoso-opensource-5.0.12.tar.gz +49135390d27ab3e445f5e9481ab677bb virtuoso-opensource-6.1.0.tar.gz diff --git a/virtuoso-opensource-5.0.12-zlib.patch b/virtuoso-opensource-5.0.12-zlib.patch deleted file mode 100644 index 00b7a66..0000000 --- a/virtuoso-opensource-5.0.12-zlib.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c ---- virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib 2009-10-16 05:27:36.000000000 -0500 -+++ virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c 2009-10-20 08:42:56.060132625 -0500 -@@ -57,7 +57,13 @@ - #endif - - #include "zlib.h" --#include "zutil.h" -+/* #include "zutil.h" */ -+#if MAX_MEM_LEVEL >= 8 -+# define DEF_MEM_LEVEL 8 -+#else -+# define DEF_MEM_LEVEL MAX_MEM_LEVEL -+#endif -+ - #include "srvmultibyte.h" - - #define FS_MAX_STRING (10L * 1024L * 1024L) /* allow files up to 10 MB */ diff --git a/virtuoso-opensource-6.1.0-external_iodbc.patch b/virtuoso-opensource-6.1.0-external_iodbc.patch new file mode 100644 index 0000000..55a4915 --- /dev/null +++ b/virtuoso-opensource-6.1.0-external_iodbc.patch @@ -0,0 +1,42 @@ +diff -up virtuoso-opensource-6.1.0/configure.external_iodbc virtuoso-opensource-6.1.0/configure +--- virtuoso-opensource-6.1.0/configure.external_iodbc 2010-02-03 14:54:32.000000000 -0600 ++++ virtuoso-opensource-6.1.0/configure 2010-02-04 08:16:53.058591521 -0600 +@@ -26773,7 +26773,7 @@ _ACEOF + # + if test "x$virt_do_iodbc" = "xyes" + then +- iodbc_CPPFLAGS="-I$virt_iodbc_dir/include" ++ iodbc_CPPFLAGS=`pkg-config --cflags libiodbc` + + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$iodbc_CPPFLAGS $CPPFLAGS" +@@ -26936,7 +26936,7 @@ done + + ccincl="$iodbc_CPPFLAGS $ccincl" + +- iodbc_LDFLAGS="-L$virt_iodbc_dir/lib -liodbc -liodbcinst $LIBDL" ++ iodbc_LDFLAGS=`pkg-config --libs libiodbc` + { $as_echo "$as_me:$LINENO: checking for SQLTables in -liodbc" >&5 + $as_echo_n "checking for SQLTables in -liodbc... " >&6; } + if test "${ac_cv_lib_iodbc_SQLTables+set}" = set; then +diff -up virtuoso-opensource-6.1.0/configure.in.external_iodbc virtuoso-opensource-6.1.0/configure.in +--- virtuoso-opensource-6.1.0/configure.in.external_iodbc 2010-02-03 14:49:18.000000000 -0600 ++++ virtuoso-opensource-6.1.0/configure.in 2010-02-04 08:16:51.265605024 -0600 +@@ -1833,7 +1833,7 @@ AC_DEFINE(NO_UDBC_SDK,1, [Define if usin + # + if test "x$virt_do_iodbc" = "xyes" + then +- iodbc_CPPFLAGS="-I$virt_iodbc_dir/include" ++ iodbc_CPPFLAGS=`pkg-config --cflags libiodbc` + + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$iodbc_CPPFLAGS $CPPFLAGS" +@@ -1842,7 +1842,7 @@ then + + ccincl="$iodbc_CPPFLAGS $ccincl" + +- iodbc_LDFLAGS="-L$virt_iodbc_dir/lib -liodbc -liodbcinst $LIBDL" ++ iodbc_LDFLAGS=`pkg-config --libs libiodbc` + AC_CHECK_LIB(iodbc, SQLTables, + [ + virt_do_iodbc="yes" diff --git a/virtuoso-opensource-6.1.0-nodemos_buildfix.patch b/virtuoso-opensource-6.1.0-nodemos_buildfix.patch new file mode 100644 index 0000000..f6d2796 --- /dev/null +++ b/virtuoso-opensource-6.1.0-nodemos_buildfix.patch @@ -0,0 +1,38 @@ +diff -up virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am +--- virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_buildfix 2009-08-31 03:08:47.000000000 -0500 ++++ virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am 2010-02-04 11:51:33.650603771 -0600 +@@ -164,6 +164,7 @@ install-data-local: + chmod +x install_ini.sh + mkdir -p "$(DESTDIR)$(dbdir)" + $(SHELL) install_ini.sh database ++if WITH_DEMO_VAD + if WITH_HTMLDOC + mkdir -p "$(DESTDIR)$(htmldocdir)" + $(INSTALL_DATA) $(top_srcdir)/docsrc/html_virt/*.html "$(DESTDIR)$(htmldocdir)" +@@ -173,6 +174,7 @@ if WITH_HTMLDOC + (cd $(top_srcdir)/docsrc/images; find . -name \*.png -print | cpio -dump "$(DESTDIR)$(htmldocdir)/../images") + (cd $(top_srcdir)/docsrc/images; find . -name \*.ico -print | cpio -dump "$(DESTDIR)$(htmldocdir)/../images") + endif ++endif + + uninstall-local: + rm -f "$(DESTDIR)$(dbdir)/virtuoso.ini" +diff -up virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am +--- virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am.nodemos_buildfix 2008-04-15 16:47:43.000000000 -0500 ++++ virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am 2010-02-04 11:57:45.894591421 -0600 +@@ -24,6 +24,7 @@ + #dist_httproot_DATA = *.html *.css *.txt + + install-data-local: ++if WITH_DEMO_VAD + @echo Installing in "$(httprootdir)" + mkdir -p "$(DESTDIR)$(httprootdir)" + mkdir -p "$(DESTDIR)$(httprootdir)"/images +@@ -37,6 +38,7 @@ install-data-local: + $(INSTALL_DATA) images/*.png "$(DESTDIR)$(httprootdir)"/images + $(INSTALL_DATA) images/*.jpg "$(DESTDIR)$(httprootdir)"/images + $(INSTALL_DATA) vsmx/*.* "$(DESTDIR)$(httprootdir)"/vsmx ++endif + + + uninstall-local: diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 28dcb30..d59b588 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -1,6 +1,9 @@ +# set to omit demos +%define _disable_all_vads --disable-all-vads + Name: virtuoso-opensource -Version: 5.0.12 +Version: 6.1.0 Release: 1%{?dist} Summary: A high-performance object-relational SQL database @@ -10,14 +13,14 @@ License: GPLv2 with exceptions URL: http://virtuoso.sourceforge.net/ Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz #Source0: ftp://download.openlinksw.com/support/vos/virtuoso-opensource-%{snap}.tar.gz -Patch1: virtuoso-opensource-5.0.11-openssl.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ## Upstreamable patches # fix build with ossl-1.0 Patch50: virtuoso-opensource-5.0.11-openssl.patch -# fix build --with-external-zlib -Patch51: virtuoso-opensource-5.0.12-zlib.patch +# based on http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/virtuoso-opensource/current/SOURCES/virtuoso-opensource-6.1.0-extern-iodbc.patch +Patch51: virtuoso-opensource-6.1.0-external_iodbc.patch +Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch BuildRequires: automake libtool BuildRequires: bison @@ -34,6 +37,11 @@ BuildRequires: zlib-devel Provides: virtuoso = %{version}-%{release} +%if 0%{?_disable_all_vads:1} +Obsoletes: virtuoso-apps < 6.1.0 +Obsoletes: virtuoso-conductor < 6.1.0 +%endif + %description Virtuoso is a scalable cross-platform server that combines SQL/RDF/XML @@ -79,7 +87,10 @@ Requires: %{name} = %{version}-%{release} %setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}} %patch50 -p1 -b .openssl -%patch51 -p1 -b .zlib +%patch51 -p1 -b .external_iodbc +%patch52 -p1 -b .nodemos_buildfix + +./autogen.sh %build @@ -89,12 +100,12 @@ Requires: %{name} = %{version}-%{release} --enable-shared --disable-static \ --without-internal-zlib \ --with-debug \ - --enable-iodbc \ + --with-iodbc \ --enable-openssl \ - --enable-xml + --disable-imagemagick \ + %{?_disable_all_vads} -# smp busted -make +make %{?_smp_mflags} %install @@ -102,6 +113,12 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} +# silly that both binaries with internal vs. external libiodbc get built +mv %{buildroot}%{_bindir}/virtuoso-iodbc-t %{buildroot}%{_bindir}/virtuoso-t +mv %{buildroot}%{_bindir}/isql-iodbc %{buildroot}%{_bindir}/isql +mv %{buildroot}%{_bindir}/isqlw-iodbc %{buildroot}%{_bindir}/isqlw +mv %{buildroot}%{_bindir}/odbc_mail %{buildroot}%{_bindir}/virt_mail + 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 @@ -112,6 +129,8 @@ mv %{buildroot}%{_bindir}/{inifile,isql,isqlw} \ %{buildroot}%{_libexecdir}/virtuoso/ ## unpackaged files +# iodbc-ized version of virt_mail, meh. +rm -vf %{buildroot}%{_bindir}/odbc_mail rm -vf %{buildroot}%{_libdir}/*.{la,a} rm -vf %{buildroot}%{_libdir}/virtuoso/hosting/*.la rm -vf %{buildroot}%{_libdir}/{jdbc-?.?,jena,sesame}/*.jar @@ -135,6 +154,7 @@ rm -rf %{buildroot} %dir %{_var}/lib/virtuoso %{_var}/lib/virtuoso/db/ +%if ! 0%{?_disable_all_vads:1} %files apps %defattr(-,root,root,-) %{_libdir}/virtuoso/hosting/ @@ -145,6 +165,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_datadir}/virtuoso/vad/conductor_dav.vad %{_var}/lib/virtuoso/vsp/ +%endif %files doc %defattr(-,root,root,-) @@ -157,6 +178,13 @@ rm -rf %{buildroot} %changelog +* Thu Feb 04 2010 Rex Dieter 6.1.0-1 +- virtuoso-opensource-6.1.0 +- build only what we need for nepomuk, Obsoletes: -apps,-conductor + +* Sat Jan 09 2010 Rex Dieter 6.0.0-1 +- virtuoso-opensource-6.0.0 + * Tue Oct 20 2009 Rex Dieter 5.0.12-1 - virtuoso-opensource-5.0.12 From f570e73e2136d82bf89084d2b5cb174a46ba04a8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 10 Feb 2010 00:51:58 +0000 Subject: [PATCH 6/9] - fix Obsoletes: -apps,-conductor --- virtuoso-opensource.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index d59b588..af09771 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -4,7 +4,7 @@ Name: virtuoso-opensource Version: 6.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -38,8 +38,8 @@ BuildRequires: zlib-devel Provides: virtuoso = %{version}-%{release} %if 0%{?_disable_all_vads:1} -Obsoletes: virtuoso-apps < 6.1.0 -Obsoletes: virtuoso-conductor < 6.1.0 +Obsoletes: virtuoso-opensource-apps < 6.1.0 +Obsoletes: virtuoso-opensource-conductor < 6.1.0 %endif @@ -136,6 +136,11 @@ rm -vf %{buildroot}%{_libdir}/virtuoso/hosting/*.la rm -vf %{buildroot}%{_libdir}/{jdbc-?.?,jena,sesame}/*.jar +%check +## these take a very long time +#make check + + %clean rm -rf %{buildroot} @@ -178,6 +183,9 @@ rm -rf %{buildroot} %changelog +* Tue Feb 09 2010 Rex Dieter 6.1.0-2 +- fix Obsoletes: -apps,-conductor + * Thu Feb 04 2010 Rex Dieter 6.1.0-1 - virtuoso-opensource-6.1.0 - build only what we need for nepomuk, Obsoletes: -apps,-conductor From 85b6ac3d3e742204bde151f989b28f4eeb43a38e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 10 May 2010 20:14:10 +0000 Subject: [PATCH 7/9] - virtuoso-opensource-6.1.1 - Obsoletes: -doc --- .cvsignore | 2 +- sources | 2 +- virtuoso-opensource-5.0.11-openssl.patch | 114 ----------------------- virtuoso-opensource.spec | 26 +++--- 4 files changed, 16 insertions(+), 128 deletions(-) delete mode 100644 virtuoso-opensource-5.0.11-openssl.patch diff --git a/.cvsignore b/.cvsignore index cba1459..f7a2c2a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -virtuoso-opensource-6.1.0.tar.gz +virtuoso-opensource-6.1.1.tar.gz diff --git a/sources b/sources index fd355d3..3e12bc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49135390d27ab3e445f5e9481ab677bb virtuoso-opensource-6.1.0.tar.gz +0695bffacf78e53733c27e96c9d7f9e7 virtuoso-opensource-6.1.1.tar.gz diff --git a/virtuoso-opensource-5.0.11-openssl.patch b/virtuoso-opensource-5.0.11-openssl.patch deleted file mode 100644 index 2c959de..0000000 --- a/virtuoso-opensource-5.0.11-openssl.patch +++ /dev/null @@ -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); - } diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index af09771..0d85024 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -3,8 +3,8 @@ %define _disable_all_vads --disable-all-vads Name: virtuoso-opensource -Version: 6.1.0 -Release: 2%{?dist} +Version: 6.1.1 +Release: 1%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -16,8 +16,6 @@ Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ## Upstreamable patches -# fix build with ossl-1.0 -Patch50: virtuoso-opensource-5.0.11-openssl.patch # based on http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/virtuoso-opensource/current/SOURCES/virtuoso-opensource-6.1.0-extern-iodbc.patch Patch51: virtuoso-opensource-6.1.0-external_iodbc.patch Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch @@ -40,6 +38,7 @@ Provides: virtuoso = %{version}-%{release} %if 0%{?_disable_all_vads:1} Obsoletes: virtuoso-opensource-apps < 6.1.0 Obsoletes: virtuoso-opensource-conductor < 6.1.0 +Obsoletes: virtuoso-opensource-doc < 6.1.1 %endif @@ -59,9 +58,7 @@ Requires: %{name} = %{version}-%{release} Summary: Server pages Group: Applications/Databases Requires: %{name} = %{version}-%{release} -%if 0%{?fedora} > 9 BuildArch: noarch -%endif %description conductor %{summary}. @@ -69,9 +66,7 @@ BuildArch: noarch Summary: Documentation Group: Documentation Requires: %{name} = %{version}-%{release} -%if 0%{?fedora} > 9 BuildArch: noarch -%endif %description doc %{summary}. @@ -86,7 +81,6 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}} -%patch50 -p1 -b .openssl %patch51 -p1 -b .external_iodbc %patch52 -p1 -b .nodemos_buildfix @@ -133,7 +127,11 @@ mv %{buildroot}%{_bindir}/{inifile,isql,isqlw} \ rm -vf %{buildroot}%{_bindir}/odbc_mail rm -vf %{buildroot}%{_libdir}/*.{la,a} rm -vf %{buildroot}%{_libdir}/virtuoso/hosting/*.la -rm -vf %{buildroot}%{_libdir}/{jdbc-?.?,jena,sesame}/*.jar +%if 0%{?_disable_all_vads:1} +rm -rvf %{buildroot}%{_docdir}/virtuoso/ +rm -rvf %{buildroot}%{_libdir}/sesame/ +rm -vf %{buildroot}%{_libdir}/{hibernate,jdbc-?.?,jena,sesame}/*.jar +%endif %check @@ -147,7 +145,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc AUTHORS COPYING LICENSE +%doc AUTHORS ChangeLog COPYING CREDITS LICENSE %dir %{_sysconfdir}/virtuoso/ %config(noreplace) %{_sysconfdir}/virtuoso/virtuoso.ini %{_bindir}/virtuoso-t @@ -170,11 +168,11 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_datadir}/virtuoso/vad/conductor_dav.vad %{_var}/lib/virtuoso/vsp/ -%endif %files doc %defattr(-,root,root,-) %{_docdir}/virtuoso/ +%endif %files utils %defattr(-,root,root,-) @@ -183,6 +181,10 @@ rm -rf %{buildroot} %changelog +* Mon May 10 2010 Rex Dieter 6.1.1-1 +- virtuoso-opensource-6.1.1 +- Obsoletes: -doc + * Tue Feb 09 2010 Rex Dieter 6.1.0-2 - fix Obsoletes: -apps,-conductor From 09ea50eb6323ac818ab383e44e9e44042fd0ea13 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 22 Jul 2010 14:58:01 +0000 Subject: [PATCH 8/9] - virtuoso-opensource-6.1.2 --- .cvsignore | 2 +- sources | 2 +- virtuoso-opensource.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f7a2c2a..b1b4513 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -virtuoso-opensource-6.1.1.tar.gz +virtuoso-opensource-6.1.2.tar.gz diff --git a/sources b/sources index 3e12bc1..2eaf4e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0695bffacf78e53733c27e96c9d7f9e7 virtuoso-opensource-6.1.1.tar.gz +0519e1f104428e0c8b25fad89e3c57ef virtuoso-opensource-6.1.2.tar.gz diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index 0d85024..c2a1276 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -3,7 +3,7 @@ %define _disable_all_vads --disable-all-vads Name: virtuoso-opensource -Version: 6.1.1 +Version: 6.1.2 Release: 1%{?dist} Summary: A high-performance object-relational SQL database @@ -181,6 +181,9 @@ rm -rf %{buildroot} %changelog +* Wed Jul 21 2010 Rex Dieter 6.1.2-1 +- virtuoso-opensource-6.1.2 + * Mon May 10 2010 Rex Dieter 6.1.1-1 - virtuoso-opensource-6.1.1 - Obsoletes: -doc From 262e67f855dffea7688d4c958f125be6e5f5b3ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:05:37 +0000 Subject: [PATCH 9/9] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a3f7440..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: virtuoso-opensource -# $Id: Makefile,v 1.1 2009/07/26 20:07:12 kevin Exp $ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 72c17df..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -virtuoso-opensource-5_0_11-3_fc11:HEAD:virtuoso-opensource-5.0.11-3.fc11.src.rpm:1248640731