Hello community, here is the log from the commit of package virtuoso for openSUSE:Factory checked in at 2012-03-29 14:08:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-02-22 19:12:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virtuoso.new/virtuoso.changes 2012-03-29 14:08:20.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Mar 20 16:29:27 UTC 2012 - [email protected] + +- Update to 6.1.5 + * Fixes over 6.1.4. See the Changelog file for full changelog. + * Drop suse-gawk-4.diff + +------------------------------------------------------------------- Old: ---- suse-gawk-4.diff virtuoso-opensource-6.1.4.tar.gz New: ---- virtuoso-opensource-6.1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtuoso.spec ++++++ --- /var/tmp/diff_new_pack.ibW9je/_old 2012-03-29 14:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ibW9je/_new 2012-03-29 14:08:25.000000000 +0200 @@ -16,9 +16,8 @@ # - Name: virtuoso -Version: 6.1.4 +Version: 6.1.5 Release: 0 Summary: Relational database server with RDF License: GPL-2.0 @@ -33,8 +32,6 @@ 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-OPENSUSE suse-gawk-4.diff [email protected] -- Disable the gawk check for Opensuse (required because of SR85083) -Patch4: suse-gawk-4.diff # PATCH-FIX-UPSTREAM patches/virtuoso-wrong-memset.patch [email protected] -- Fix wrong size parameter in memset call Patch5: virtuoso-wrong-memset.patch # PATCH-FIX-OPENSUSE Do not include build date and hostname in binaries @@ -51,8 +48,8 @@ %if 0%{?suse_version} <= 1140 BuildRequires: openssl %endif -BuildRequires: libwbxml2-devel BuildRequires: libtool +BuildRequires: libwbxml2-devel BuildRequires: openldap2-devel # We can't use system pcre because internal pcre is modified for virtuoso's own use #BuildRequires: pcre-devel @@ -98,12 +95,11 @@ %prep %setup -q -n virtuoso-opensource-%{version} %patch0 -p1 -%patch1 +%patch1 -p1 %patch2 -p1 -%patch3 -%patch4 -p1 +%patch3 -p1 %patch5 -p1 -%patch6 +%patch6 -p1 %build # autogen.sh because of patching Makefile.am ++++++ build-sanely.diff ++++++ --- /var/tmp/diff_new_pack.ibW9je/_old 2012-03-29 14:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ibW9je/_new 2012-03-29 14:08:25.000000000 +0200 @@ -1,5 +1,5 @@ diff --git a/Makefile.am b/Makefile.am -index 8e5e9fc..6a1379f 100644 +index 15f4826..bab829f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,13 +23,12 @@ AUTOMAKE_OPTIONS = gnu @@ -18,20 +18,20 @@ NEWS \ README* diff --git a/binsrc/Makefile.am b/binsrc/Makefile.am -index 275c481..c5e3bc5 100644 +index f8225fc..0a79b44 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 = 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 dbpedia +SUBDIRS = virtuoso driver tests # ---------------------------------------------------------------------- diff --git a/binsrc/virtuoso/Makefile.am b/binsrc/virtuoso/Makefile.am -index 996c368..e9026c5 100644 +index 5767285..80d1db1 100644 --- a/binsrc/virtuoso/Makefile.am +++ b/binsrc/virtuoso/Makefile.am @@ -41,7 +41,7 @@ endif @@ -44,7 +44,7 @@ noinst_SCRIPTS = virtuoso diff --git a/configure.in b/configure.in -index 06741d1..9d79a9e 100644 +index a48168c..56a0c42 100644 --- a/configure.in +++ b/configure.in @@ -200,6 +200,23 @@ case ${VIRTUOSO_LAYOUT} in @@ -78,10 +78,10 @@ - AM_LDFLAGS="-s" + AM_LDFLAGS="-g" fi - + diff --git a/libsrc/Makefile.am b/libsrc/Makefile.am -index 3f61ce4..0dd6809 100644 +index 7f264ab..9a0345f 100644 --- a/libsrc/Makefile.am +++ b/libsrc/Makefile.am @@ -19,7 +19,7 @@ @@ -94,7 +94,7 @@ noinst_HEADERS = Dk.h libutil.h diff --git a/libsrc/Wi/sqlver.c b/libsrc/Wi/sqlver.c -index 9b75dc0..c103218 100644 +index 4467a9b..0d1ba47 100644 --- a/libsrc/Wi/sqlver.c +++ b/libsrc/Wi/sqlver.c @@ -28,7 +28,7 @@ ++++++ isql-buffer-overflow.patch ++++++ --- /var/tmp/diff_new_pack.ibW9je/_old 2012-03-29 14:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ibW9je/_new 2012-03-29 14:08:25.000000000 +0200 @@ -1,6 +1,8 @@ ---- binsrc/tests/isql.c 2011-03-28 15:09:54.000000000 +0200 -+++ binsrc/tests/isql.c 2011-07-08 13:08:16.359078462 +0200 -@@ -10251,7 +10251,7 @@ +diff --git a/binsrc/tests/isql.c b/binsrc/tests/isql.c +index b34d61e..ab56d09 100644 +--- a/binsrc/tests/isql.c ++++ b/binsrc/tests/isql.c +@@ -10275,7 +10275,7 @@ line_from_html_file (TCHAR *templatename) { TCHAR tmp1[2002]; ++++++ rpmlint-fixes.diff ++++++ --- /var/tmp/diff_new_pack.ibW9je/_old 2012-03-29 14:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ibW9je/_new 2012-03-29 14:08:25.000000000 +0200 @@ -1,6 +1,8 @@ ---- libsrc/Wi/http_client.c.orig -+++ libsrc/Wi/http_client.c -@@ -423,7 +423,7 @@ http_cli_negotiate_socks4 (dk_session_t +diff --git a/libsrc/Wi/http_client.c b/libsrc/Wi/http_client.c +index 2b27d07..a07ae89 100644 +--- a/libsrc/Wi/http_client.c ++++ b/libsrc/Wi/http_client.c +@@ -423,7 +423,7 @@ http_cli_negotiate_socks4 (dk_session_t * ses, char * in_host, char * name, char socksreq[8] = 0; /* no name */ if (name) { ++++++ virtuoso-no-build-dates.patch ++++++ --- /var/tmp/diff_new_pack.ibW9je/_old 2012-03-29 14:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ibW9je/_new 2012-03-29 14:08:25.000000000 +0200 @@ -1,5 +1,7 @@ ---- bin/makever.orig -+++ bin/makever +diff --git a/bin/makever b/bin/makever +index ece4326..0ddb869 100755 +--- a/bin/makever ++++ b/bin/makever @@ -91,8 +91,7 @@ then cat >&2 <<-EOF_USAGE @@ -7,7 +9,7 @@ - Version $PRODUCT_VERSION as of $DATE. - Compiled for $UNAME_SYSTEM $UNAME_RELEASE + Version $PRODUCT_VERSION. - Copyright (C) OpenLink Software. + Copyright (C) 1998-2012 OpenLink Software. Usage: makever [OPTIONS] @@ -114,10 +113,9 @@ cat >$OUTPUT_FILE <<-EOF_VERSION @@ -19,7 +21,7 @@ $PRODUCT_NAME\\n\\ - Version $PRODUCT_VERSION as of $DATE.\\n\\ - Compiled for $UNAME_SYSTEM $UNAME_RELEASE\\n\\ -+ Version $PRODUCT_VERSION .\\n\\ - Copyright (C) OpenLink Software.\\n"; ++ Version $PRODUCT_VERSION.\\n\\ + Copyright (C) 1998-2012 OpenLink Software.\\n"; EOF_VERSION ++++++ virtuoso-opensource-6.1.0-external_iodbc.patch ++++++ --- /var/tmp/diff_new_pack.ibW9je/_old 2012-03-29 14:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ibW9je/_new 2012-03-29 14:08:25.000000000 +0200 @@ -1,7 +1,8 @@ -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 +diff --git a/configure.in b/configure.in +index a48168c..7214abe 100644 +--- a/configure.in ++++ b/configure.in +@@ -1902,7 +1902,7 @@ AC_DEFINE(NO_UDBC_SDK,1, [Define if using the new iODBC API]) # if test "x$virt_do_iodbc" = "xyes" then @@ -10,7 +11,7 @@ saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$iodbc_CPPFLAGS $CPPFLAGS" -@@ -1842,7 +1842,7 @@ then +@@ -1911,7 +1911,7 @@ then ccincl="$iodbc_CPPFLAGS $ccincl" ++++++ virtuoso-opensource-6.1.4.tar.gz -> virtuoso-opensource-6.1.5.tar.gz ++++++ /work/SRC/openSUSE:Factory/virtuoso/virtuoso-opensource-6.1.4.tar.gz /work/SRC/openSUSE:Factory/.virtuoso.new/virtuoso-opensource-6.1.5.tar.gz differ: char 5, line 1 ++++++ virtuoso-wrong-memset.patch ++++++ --- /var/tmp/diff_new_pack.ibW9je/_old 2012-03-29 14:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ibW9je/_new 2012-03-29 14:08:25.000000000 +0200 @@ -1,20 +1,7 @@ -Index: virtuoso-opensource-6.1.4/libsrc/Wi/srvcr.c -=================================================================== ---- virtuoso-opensource-6.1.4.orig/libsrc/Wi/srvcr.c -+++ virtuoso-opensource-6.1.4/libsrc/Wi/srvcr.c -@@ -2085,7 +2085,7 @@ bif_scroll_cr_open (caddr_t * qst, caddr - { - params[0][inx] = box_copy_tree (bif_arg (qst, args, inx + 1, "__scroll_cr_open")); - } -- memset (opts, 0, sizeof (opts)); -+ memset (opts, 0, sizeof (stmt_options_t)); - opts->so_concurrency = SQL_CONCUR_LOCK; - opts->so_cursor_type = stmt->sst_query->qr_cursor_type; - -Index: virtuoso-opensource-6.1.4/libsrc/Tidy/lexer.c -=================================================================== ---- virtuoso-opensource-6.1.4.orig/libsrc/Tidy/lexer.c -+++ virtuoso-opensource-6.1.4/libsrc/Tidy/lexer.c +diff --git a/libsrc/Tidy/lexer.c b/libsrc/Tidy/lexer.c +index b3f8626..2b68674 100644 +--- a/libsrc/Tidy/lexer.c ++++ b/libsrc/Tidy/lexer.c @@ -191,7 +191,7 @@ Lexer *NewLexer(StreamIn *in) Lexer *lexer; @@ -33,11 +20,11 @@ node->type = TextNode; return node; } -Index: virtuoso-opensource-6.1.4/libsrc/Tidy/tidy.c -=================================================================== ---- virtuoso-opensource-6.1.4.orig/libsrc/Tidy/tidy.c -+++ virtuoso-opensource-6.1.4/libsrc/Tidy/tidy.c -@@ -215,7 +215,7 @@ StreamIn *OpenInputBoxString(caddr_t htm +diff --git a/libsrc/Tidy/tidy.c b/libsrc/Tidy/tidy.c +index d8ee51a..01ee1af 100644 +--- a/libsrc/Tidy/tidy.c ++++ b/libsrc/Tidy/tidy.c +@@ -215,7 +215,7 @@ StreamIn *OpenInputBoxString(caddr_t html_input) { StreamIn *in; in = (StreamIn *)MemAlloc(sizeof(StreamIn)); @@ -46,3 +33,16 @@ in->input.tio_data.lm_memblock = html_input; in->input.tio_data.lm_length = box_length (html_input)-1; in->input.tio_pos = 0; +diff --git a/libsrc/Wi/srvcr.c b/libsrc/Wi/srvcr.c +index 63d9d6c..754a333 100644 +--- a/libsrc/Wi/srvcr.c ++++ b/libsrc/Wi/srvcr.c +@@ -2085,7 +2085,7 @@ bif_scroll_cr_open (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) + { + params[0][inx] = box_copy_tree (bif_arg (qst, args, inx + 1, "__scroll_cr_open")); + } +- memset (opts, 0, sizeof (opts)); ++ memset (opts, 0, sizeof (stmt_options_t)); + opts->so_concurrency = SQL_CONCUR_LOCK; + opts->so_cursor_type = stmt->sst_query->qr_cursor_type; + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
