Hello community, here is the log from the commit of package virtuoso for openSUSE:Factory checked in at 2011-11-14 14:43:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtuoso (Old) and /work/SRC/openSUSE:Factory/.virtuoso.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtuoso", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/virtuoso/virtuoso.changes 2011-10-28 15:25:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virtuoso.new/virtuoso.changes 2011-11-14 14:44:03.000000000 +0100 @@ -1,0 +2,21 @@ +Wed Nov 2 21:30:24 UTC 2011 - [email protected] + +- Update to 6.1.4: + * Database Engine and SPARQL optimizations and enhancements. + * HTTP enhancements such as SPARQL 1.1 Graph Store and SPARQL CRUD + * New Sponger cartridges for Eventbrite, Eventful, Foursquare, Google+, + Google Place, Google Product, Google Profile, Gowalla, Guardian, + Hyperpublic, Jigsaw, LinkedIn, Plancast, ProgrammableWeb, Seatgeek, Seevl, + SimpleGeo, Upcoming, XRD, Zappos, and Zoopla. + * Fixes to existing cartridges. Fixes include deadlock handling, memory + handling and leaks, and SPARQL and SPARUL fixes. + * The Jena and Sesame2 drivers have been updated. + See NEWS file for more details. + Spec file updates: + * Removed fastjar from BuildRequires: (not needed). +- Removed: virtuoso-opensource-utf8.patch (fixed upstream). +- Use the internal libpcre to avoid runtime errors +- Added: suse-gawk-4.diff to avoid generating bugged code + (SR85083 reintroduced the gawk3 behaviour in gawk4, which makes the patched code fail) + +------------------------------------------------------------------- Old: ---- virtuoso-opensource-6.1.3.tar.bz2 virtuoso-opensource-utf8.patch New: ---- suse-gawk-4.diff virtuoso-opensource-6.1.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtuoso.spec ++++++ --- /var/tmp/diff_new_pack.Ni5rBf/_old 2011-11-14 14:44:08.000000000 +0100 +++ /var/tmp/diff_new_pack.Ni5rBf/_new 2011-11-14 14:44:08.000000000 +0100 @@ -18,14 +18,13 @@ Name: virtuoso -Version: 6.1.3 +Version: 6.1.4 Release: 7 License: GPLv2 Summary: Relational database server with RDF Url: http://virtuoso.openlinksw.com/ Group: Productivity/Databases/Servers -# http://prdownloads.sourceforge.net/virtuoso/virtuoso-opensource-6.1.3.tar.gz -Source0: virtuoso-opensource-%{version}.tar.bz2 +Source0: http://prdownloads.sourceforge.net/virtuoso/%{name}-opensource-%{version}.tar.gz # PATCH-FIX-OPENSUSE build-sanely.diff -- Build only things needed by KDE Patch0: build-sanely.diff # PATCH-FIX-OPENSUSE rpmlint-fixes.diff -- Fix "bufferoverflowstrncat" post-build-check error @@ -34,10 +33,9 @@ Patch2: virtuoso-opensource-6.1.0-external_iodbc.patch # PATCH-FIX-UPSTREAM isql-buffer-overflow.patch [email protected] -- Fix buffer overflow in isql.c Patch3: isql-buffer-overflow.patch -# PATCH-FIX-UPSTREAM virtuoso-opensource-utf8.patch [email protected] -- bko #271664 -Patch4: virtuoso-opensource-utf8.patch +# PATCH-FIX-OPENSUSE suse-gawk-4.diff [email protected] -- Disable the gawk check for Opensuse (required because of SR85083) +Patch4: suse-gawk-4.diff BuildRequires: bison -BuildRequires: fastjar BuildRequires: flex BuildRequires: gperf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -95,14 +93,15 @@ %prep %setup -q -n virtuoso-opensource-%{version} -%patch0 +%patch0 -p1 %patch1 %patch2 -p1 %patch3 -%patch4 +%if 0%{?suse_version} >= 1210 +%patch4 -p1 +%endif %build -rm -rf libsrc/util/pcrelib # autogen.sh because of patching Makefile.am ./autogen.sh %configure --without-internal-zlib \ @@ -110,6 +109,7 @@ --with-layout=openSUSE \ --disable-all-vads \ --with-iodbc=%{_prefix} + make %{?_smp_mflags} %install @@ -128,14 +128,12 @@ %files -n virtuoso-server %defattr(-,root,root,-) -%dir %{_libdir}/virtuoso +%doc %{_defaultdocdir}/virtuoso %{_bindir}/virtuoso-t %{_bindir}/isql* %files -n virtuoso-drivers %defattr(-,root,root,-) -%{_docdir}/virtuoso/ -%exclude %{_docdir}/virtuoso/INSTALL %{_libdir}/virtodbc.la %{_libdir}/virtodbc.so %{_libdir}/virtodbc_r.la ++++++ build-sanely.diff ++++++ --- /var/tmp/diff_new_pack.Ni5rBf/_old 2011-11-14 14:44:08.000000000 +0100 +++ /var/tmp/diff_new_pack.Ni5rBf/_new 2011-11-14 14:44:08.000000000 +0100 @@ -1,8 +1,52 @@ -Build only things needed by KDE, not everything and the kitchensync (which -includes also a lot of testcases). - ---- configure.in.orig -+++ configure.in +diff --git a/Makefile.am b/Makefile.am +index 8e5e9fc..6a1379f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -23,13 +23,12 @@ AUTOMAKE_OPTIONS = gnu + ACLOCAL_AMFLAGS = -I binsrc/config + + +-SUBDIRS = . docsrc libsrc binsrc appsrc ++SUBDIRS = . docsrc libsrc binsrc + + dist_doc_DATA = \ + AUTHORS \ + COPYING \ + CREDITS \ +- INSTALL \ + LICENSE \ + NEWS \ + README* +diff --git a/binsrc/Makefile.am b/binsrc/Makefile.am +index 275c481..c5e3bc5 100644 +--- a/binsrc/Makefile.am ++++ b/binsrc/Makefile.am +@@ -19,7 +19,7 @@ + # + # + +-SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting bpel b3s tutorial yacutia samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena sesame sesame2 sesame3 redland hibernate ++SUBDIRS = virtuoso driver tests + + + # ---------------------------------------------------------------------- +diff --git a/binsrc/virtuoso/Makefile.am b/binsrc/virtuoso/Makefile.am +index 996c368..e9026c5 100644 +--- a/binsrc/virtuoso/Makefile.am ++++ b/binsrc/virtuoso/Makefile.am +@@ -41,7 +41,7 @@ endif + + LIBS += @ZLIB_LIB@ + +-lib_LTLIBRARIES = libvirtuoso-t.la $(IODBC_LIBS) $(MONO_LIBS) $(IODBC_MONO_LIBS) ++noinst_LTLIBRARIES = libvirtuoso-t.la $(IODBC_LIBS) $(MONO_LIBS) $(IODBC_MONO_LIBS) + bin_PROGRAMS = virtuoso-t $(IODBC_PROGS) + + noinst_SCRIPTS = virtuoso +diff --git a/configure.in b/configure.in +index 06741d1..9d79a9e 100644 +--- a/configure.in ++++ b/configure.in @@ -200,6 +200,23 @@ case ${VIRTUOSO_LAYOUT} in hostingdir=$libdir/virtuoso/hosting ;; @@ -27,8 +71,10 @@ [[Ff]][[Rr]][[Ee]][[Ee]][[Bb]][[Ss]][[Dd]]) # FreeBSD virtuoso_layout=FreeBSD if test "x$prefix" = "xNONE" ---- libsrc/Makefile.am.orig -+++ libsrc/Makefile.am +diff --git a/libsrc/Makefile.am b/libsrc/Makefile.am +index 3f61ce4..0dd6809 100644 +--- a/libsrc/Makefile.am ++++ b/libsrc/Makefile.am @@ -19,7 +19,7 @@ # # @@ -38,132 +84,10 @@ noinst_HEADERS = Dk.h libutil.h ---- Makefile.am.orig -+++ Makefile.am -@@ -23,7 +23,7 @@ AUTOMAKE_OPTIONS = gnu - ACLOCAL_AMFLAGS = -I binsrc/config - - --SUBDIRS = . docsrc libsrc binsrc appsrc -+SUBDIRS = . docsrc libsrc binsrc - - dist_doc_DATA = \ - AUTHORS \ ---- binsrc/Makefile.am.orig -+++ binsrc/Makefile.am -@@ -19,7 +19,7 @@ - # - # - --SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting bpel b3s tutorial yacutia samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena sesame sesame2 sesame3 redland hibernate -+SUBDIRS = virtuoso driver tests - - - # ---------------------------------------------------------------------- ---- binsrc/virtuoso/Makefile.am.orig -+++ binsrc/virtuoso/Makefile.am -@@ -41,7 +41,7 @@ endif - - LIBS += @ZLIB_LIB@ - --lib_LTLIBRARIES = libvirtuoso-t.la $(IODBC_LIBS) $(MONO_LIBS) $(IODBC_MONO_LIBS) -+noinst_LTLIBRARIES = libvirtuoso-t.la $(IODBC_LIBS) $(MONO_LIBS) $(IODBC_MONO_LIBS) - bin_PROGRAMS = virtuoso-t $(IODBC_PROGS) - - noinst_SCRIPTS = virtuoso ---- libsrc/util/Makefile.am.orig -+++ libsrc/util/Makefile.am -@@ -32,6 +32,7 @@ libutil_la_CFLAGS += -I$(top_srcdir)/li - libutil_la_CFLAGS += -I$(top_srcdir)/libsrc/Dk - libutil_la_CFLAGS += -DSUPPORT_UTF8 - libutil_la_LDFLAGS = -prefer-pic -+libutil_la_LIBADD = -lpcre - - libutil_la_SOURCES = \ - buildarg.c \ -@@ -85,24 +86,7 @@ libutil_la_SOURCES = \ - virt_mbsnrtowcs.c \ - virt_wcrtomb.c \ - virt_wcs_mask.c \ -- virt_wcsnrtombs.c \ -- pcrelib/pcre_chartables.c \ -- pcrelib/pcre_compile.c \ -- pcrelib/pcre_config.c \ -- pcrelib/pcre_dfa_exec.c \ -- pcrelib/pcre_exec.c \ -- pcrelib/pcre_fullinfo.c \ -- pcrelib/pcre_get.c \ -- pcrelib/pcre_globals.c \ -- pcrelib/pcre_newline.c \ -- pcrelib/pcre_ord2utf8.c \ -- pcrelib/pcre_study.c \ -- pcrelib/pcre_tables.c \ -- pcrelib/pcre_try_flipped.c \ -- pcrelib/pcre_ucd.c \ -- pcrelib/pcre_valid_utf8.c \ -- pcrelib/pcre_version.c \ -- pcrelib/pcre_xclass.c -+ virt_wcsnrtombs.c - - - BUILT_SOURCES = getdate.c -@@ -121,11 +105,6 @@ EXTRA_DIST = \ - getdate.y \ - MSG_BG.bin \ - MSG_EN.bin \ -- pcrelib/AUTHORS \ -- pcrelib/LICENCE \ -- pcrelib/*.c \ -- pcrelib/*.h \ -- pcrelib/*.src \ - win32/ptrlong.h \ - win32/syslog.c \ - win32/syslog.h \ ---- libsrc/Wi/bif_regexp.c.orig -+++ libsrc/Wi/bif_regexp.c -@@ -28,7 +28,7 @@ - #include "multibyte.h" - #include "srvmultibyte.h" - --#include "util/pcrelib/pcre.h" -+#include <pcre.h> - - /* - typedef struct rx_query_s { ---- libsrc/Wi/xqf.c.orig -+++ libsrc/Wi/xqf.c -@@ -38,7 +38,7 @@ - #include "xpf.h" - #include "xqf.h" - --#include "util/pcrelib/pcre.h" -+#include <pcre.h> - - #define ecm_isname(c) \ - ( ((c) & ~0xFF) ? (ecm_utf8props[(c)] & ECM_ISNAME) : \ ---- libsrc/Xml.new/datatypes.c.orig -+++ libsrc/Xml.new/datatypes.c -@@ -25,7 +25,7 @@ - - #include "xmlparser_impl.h" - #include "schema.h" --#include "pcre.h" -+#include <pcre.h> - - ptrlong - xs_get_primitive_typeidx (vxml_parser_t * parser, xs_component_t *type) ---- libsrc/Wi/Makefile.am.orig -+++ libsrc/Wi/Makefile.am -@@ -490,6 +490,7 @@ libwi_la_SOURCES += \ - - libwi_la_CFLAGS = $(libwi_base_la_cflags) - libwi_la_LDLAGS = -static -+libwi_la_LIBADD = -lpcre - - #KUBL_UNIV_FILES_ODBC - libwi_odbc_la_SOURCES += \ ---- libsrc/Wi/sqlver.c.orig -+++ libsrc/Wi/sqlver.c +diff --git a/libsrc/Wi/sqlver.c b/libsrc/Wi/sqlver.c +index 9b75dc0..c103218 100644 +--- a/libsrc/Wi/sqlver.c ++++ b/libsrc/Wi/sqlver.c @@ -28,7 +28,7 @@ #include "sqlver.h" #include "wi.h" ++++++ suse-gawk-4.diff ++++++ diff --git a/binsrc/cached_resources/res_to_c.awk b/binsrc/cached_resources/res_to_c.awk index 31b4c5c..c608ea6 100644 --- a/binsrc/cached_resources/res_to_c.awk +++ b/binsrc/cached_resources/res_to_c.awk @@ -32,10 +32,11 @@ BEGIN { fun = $0 # was: gsub ( /\\/, "\\\\", fun) q = "\\\\" - if (PROCINFO["version"] ~ /^4/) - gsub ( q, q q, fun) - else - gsub ( q, q, fun) + ## SUSE uses gawk4 with gsub functionality from gawk 3 + ##if (PROCINFO["version"] ~ /^4/) + ## gsub ( q, q q, fun) + ##else + gsub ( q, q, fun) gsub ( /"/, "\\\"", fun) gsub ( /\$/, "\\044", fun) diff --git a/libsrc/Wi/sql_to_c.awk b/libsrc/Wi/sql_to_c.awk index d524703..452b51c 100644 --- a/libsrc/Wi/sql_to_c.awk +++ b/libsrc/Wi/sql_to_c.awk @@ -344,9 +344,10 @@ BEGIN { # does escape the symbols fun = $0 q = "\\\\" - if (PROCINFO["version"] ~ /^4/) - gsub ( q, q q, fun) - else + ## SUSE uses gawk4 with gsub functionality from gawk 3 + ##if (PROCINFO["version"] ~ /^4/) + ## gsub ( q, q q, fun) + ##else gsub ( q, q, fun) #WAS: gsub ( /\\/, "\\\\", fun) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
