Hello community, here is the log from the commit of package virtuoso for openSUSE:Factory checked in at 2012-01-25 15:02:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-27 18:39:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virtuoso.new/virtuoso.changes 2012-01-25 15:02:54.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Jan 25 10:54:11 UTC 2012 - [email protected] + +- Update suse-gawk-4.diff. It can now be applied regardless of the + Opensuse version. + +------------------------------------------------------------------- +Wed Jan 25 10:45:11 UTC 2012 - [email protected] + +- Back to internal PCRE, system one will result in runtime problems. + +------------------------------------------------------------------- +Sat Jan 21 22:54:25 UTC 2012 - [email protected] + +- Use system PCRE. +- Do not include build dates in binaries. + +------------------------------------------------------------------- New: ---- virtuoso-no-build-dates.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtuoso.spec ++++++ --- /var/tmp/diff_new_pack.Lsvr19/_old 2012-01-25 15:02:57.000000000 +0100 +++ /var/tmp/diff_new_pack.Lsvr19/_new 2012-01-25 15:02:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package virtuoso # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: virtuoso Version: 6.1.4 Release: 0 @@ -36,6 +35,8 @@ 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 +Patch6: virtuoso-no-build-dates.patch BuildRequires: bison BuildRequires: flex BuildRequires: gperf @@ -51,7 +52,8 @@ BuildRequires: libwbxml2-devel BuildRequires: libtool BuildRequires: openldap2-devel -BuildRequires: pcre-devel +# We can't use system pcre because internal pcre is modified for virtuoso's own use +#BuildRequires: pcre-devel BuildRequires: zlib-devel BuildRequires: pkgconfig(ImageMagick) BuildRequires: pkgconfig(libxml-2.0) @@ -97,10 +99,9 @@ %patch1 %patch2 -p1 %patch3 -%if 0%{?suse_version} >= 1210 %patch4 -p1 -%endif %patch5 -p1 +%patch6 %build # autogen.sh because of patching Makefile.am ++++++ suse-gawk-4.diff ++++++ --- /var/tmp/diff_new_pack.Lsvr19/_old 2012-01-25 15:02:57.000000000 +0100 +++ /var/tmp/diff_new_pack.Lsvr19/_new 2012-01-25 15:02:57.000000000 +0100 @@ -1,38 +1,77 @@ diff --git a/binsrc/cached_resources/res_to_c.awk b/binsrc/cached_resources/res_to_c.awk -index 31b4c5c..c608ea6 100644 +index 31b4c5c..9de6789 100644 --- a/binsrc/cached_resources/res_to_c.awk +++ b/binsrc/cached_resources/res_to_c.awk -@@ -32,10 +32,11 @@ BEGIN { +@@ -30,13 +30,7 @@ BEGIN { + } + { fun = $0 - # was: gsub ( /\\/, "\\\\", fun) - q = "\\\\" +- # 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 ( /"/, "\\\"", fun) gsub ( /\$/, "\\044", fun) + gsub ( /.*/, "\"&\\n\",", fun) +diff --git a/binsrc/hosting/perl/pl_to_c.awk b/binsrc/hosting/perl/pl_to_c.awk +index 369610f..7307d41 100644 +--- a/binsrc/hosting/perl/pl_to_c.awk ++++ b/binsrc/hosting/perl/pl_to_c.awk +@@ -42,7 +42,7 @@ END { + } + + x = $0 +- gsub (/\\/, "\\\\", x) ++ gsub ( "\\\\", "&&", x) + gsub (/\"/, "\\\"", x) + print "\"" x "\\n\"" + } +diff --git a/binsrc/hosting/python/py_to_c.awk b/binsrc/hosting/python/py_to_c.awk +index f7d6935..8de1851 100644 +--- a/binsrc/hosting/python/py_to_c.awk ++++ b/binsrc/hosting/python/py_to_c.awk +@@ -48,7 +48,7 @@ END { + } + + x = $0 +- gsub (/\\/, "\\\\", x) ++ gsub ( "\\\\", "&&", x) + gsub (/\"/, "\\\"", x) + print "\"" x "\\n\"" + } +diff --git a/binsrc/ws/wsrm/xsd2sql.awk b/binsrc/ws/wsrm/xsd2sql.awk +index 074a30d..2705207 100644 +--- a/binsrc/ws/wsrm/xsd2sql.awk ++++ b/binsrc/ws/wsrm/xsd2sql.awk +@@ -54,7 +54,7 @@ BEGIN { + print " ses := string_output ();" + } + str = $0 +- gsub ( /\\/, "\\\\", str) ++ gsub ( "\\\\", "&&", str) + gsub ( /'/, "\\'", str) + + # diff --git a/libsrc/Wi/sql_to_c.awk b/libsrc/Wi/sql_to_c.awk -index d524703..452b51c 100644 +index d524703..aea559e 100644 --- a/libsrc/Wi/sql_to_c.awk +++ b/libsrc/Wi/sql_to_c.awk -@@ -344,9 +344,10 @@ BEGIN { +@@ -343,13 +343,7 @@ BEGIN { + # does escape the symbols fun = $0 - q = "\\\\" +- 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) +- gsub ( q, q, fun) +- +- #WAS: gsub ( /\\/, "\\\\", fun) ++ gsub ( "\\\\", "&&", fun) - #WAS: gsub ( /\\/, "\\\\", fun) + # remove whitespace except when there is just a semicolon + if ((in_xsl_mode == 0) && (in_xsd_mode == 0)) ++++++ virtuoso-no-build-dates.patch ++++++ --- bin/makever.orig +++ bin/makever @@ -91,8 +91,7 @@ then cat >&2 <<-EOF_USAGE OpenLink Version Information - Version $PRODUCT_VERSION as of $DATE. - Compiled for $UNAME_SYSTEM $UNAME_RELEASE + Version $PRODUCT_VERSION. Copyright (C) OpenLink Software. Usage: makever [OPTIONS] @@ -114,10 +113,9 @@ cat >$OUTPUT_FILE <<-EOF_VERSION * DO NOT EDIT THIS FILE -- IT WAS GENERATED WITH makever */ - char version[] = "\\ + const char version[] = "\\ $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"; EOF_VERSION -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
