[SCM] Git repository for pkg-virtuoso branch, master, updated. debian/6.1.3+dfsg1-2.1-8-g140ed05
José Manuel Santamar?==?UTF-8?Q?ía Lema
panfaust at gmail.com
Wed May 23 16:06:26 UTC 2012
The following commit has been merged in the master branch:
commit 902c7ba08b04eebf0cce30d20b868edce4ada802
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Wed May 23 16:32:01 2012 +0200
Refresh various patches to make them apply without any offset.
diff --git a/debian/changelog b/debian/changelog
index 2544303..04d92da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ virtuoso-opensource (6.1.5+dfsg1-5) UNRELEASED; urgency=low
* Update patches:
- drop fix-wide-char-encoding.patch, applied upstream.
- update repack-zlib.patch.
+ - refresh other patches in order to make them apply without any offset.
-- José Manuel Santamaría Lema <panfaust at gmail.com> Tue, 22 May 2012 19:26:43 +0200
diff --git a/debian/patches/build-short-timeout.patch b/debian/patches/build-short-timeout.patch
index f8a1dcd..3bde8b5 100644
--- a/debian/patches/build-short-timeout.patch
+++ b/debian/patches/build-short-timeout.patch
@@ -3,10 +3,10 @@ Description: Shorten test initialization timeouts
causes resources tie-ups on buildds where a FTBFS result in a silently
binary.
Author: Obey Arthur Liu <arthur at milliways.fr>
-Last-Update: 2010-05-12
+Last-Update: 2012-05-23
--- a/appsrc/ODS-Addressbook/make_vad.sh
+++ b/appsrc/ODS-Addressbook/make_vad.sh
-@@ -93,7 +93,7 @@
+@@ -143,7 +143,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -17,7 +17,7 @@ Last-Update: 2010-05-12
then
--- a/appsrc/ODS-Blog/make_vad.sh
+++ b/appsrc/ODS-Blog/make_vad.sh
-@@ -112,7 +112,7 @@
+@@ -113,7 +113,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -28,7 +28,7 @@ Last-Update: 2010-05-12
then
--- a/appsrc/ODS-Bookmark/make_vad.sh
+++ b/appsrc/ODS-Bookmark/make_vad.sh
-@@ -97,7 +97,7 @@
+@@ -143,7 +143,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -39,7 +39,7 @@ Last-Update: 2010-05-12
then
--- a/appsrc/ODS-Briefcase/make_vad.sh
+++ b/appsrc/ODS-Briefcase/make_vad.sh
-@@ -113,7 +113,7 @@
+@@ -154,7 +154,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -50,7 +50,7 @@ Last-Update: 2010-05-12
then
--- a/appsrc/ODS-Calendar/make_vad.sh
+++ b/appsrc/ODS-Calendar/make_vad.sh
-@@ -96,7 +96,7 @@
+@@ -142,7 +142,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -61,7 +61,7 @@ Last-Update: 2010-05-12
then
--- a/appsrc/ODS-Community/make_vad.sh
+++ b/appsrc/ODS-Community/make_vad.sh
-@@ -100,7 +100,7 @@
+@@ -138,7 +138,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -72,7 +72,7 @@ Last-Update: 2010-05-12
then
--- a/appsrc/ODS-Discussion/make_vad.sh
+++ b/appsrc/ODS-Discussion/make_vad.sh
-@@ -110,7 +110,7 @@
+@@ -110,7 +110,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -83,7 +83,7 @@ Last-Update: 2010-05-12
then
--- a/appsrc/ODS-FeedManager/make_vad.sh
+++ b/appsrc/ODS-FeedManager/make_vad.sh
-@@ -96,7 +96,7 @@
+@@ -142,7 +142,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -94,7 +94,7 @@ Last-Update: 2010-05-12
then
--- a/appsrc/ODS-Framework/make_vad.sh
+++ b/appsrc/ODS-Framework/make_vad.sh
-@@ -138,7 +138,7 @@
+@@ -140,7 +140,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -105,7 +105,7 @@ Last-Update: 2010-05-12
then
--- a/appsrc/ODS-Framework/oauth/make_vad.sh
+++ b/appsrc/ODS-Framework/oauth/make_vad.sh
-@@ -188,7 +188,7 @@
+@@ -188,7 +188,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -116,7 +116,7 @@ Last-Update: 2010-05-12
then
--- a/appsrc/ODS-Gallery/make_vad.sh
+++ b/appsrc/ODS-Gallery/make_vad.sh
-@@ -101,7 +101,7 @@
+@@ -126,7 +126,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -127,7 +127,7 @@ Last-Update: 2010-05-12
then
--- a/appsrc/ODS-Polls/make_vad.sh
+++ b/appsrc/ODS-Polls/make_vad.sh
-@@ -95,7 +95,7 @@
+@@ -130,7 +130,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -138,7 +138,7 @@ Last-Update: 2010-05-12
then
--- a/appsrc/ODS-WebMail/make_vad.sh
+++ b/appsrc/ODS-WebMail/make_vad.sh
-@@ -96,7 +96,7 @@
+@@ -141,7 +141,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -149,7 +149,7 @@ Last-Update: 2010-05-12
then
--- a/appsrc/ODS-Wiki/make_vad.sh
+++ b/appsrc/ODS-Wiki/make_vad.sh
-@@ -131,7 +131,7 @@
+@@ -132,7 +132,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -160,7 +160,7 @@ Last-Update: 2010-05-12
then
--- a/binsrc/b3s/make_vad.sh
+++ b/binsrc/b3s/make_vad.sh
-@@ -203,7 +203,7 @@
+@@ -204,7 +204,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -171,7 +171,7 @@ Last-Update: 2010-05-12
then
--- a/binsrc/bpel/make_vad.sh
+++ b/binsrc/bpel/make_vad.sh
-@@ -254,7 +254,7 @@
+@@ -254,7 +254,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -182,7 +182,7 @@ Last-Update: 2010-05-12
then
--- a/binsrc/hosting/mono/tests/tclrsrv.sh
+++ b/binsrc/hosting/mono/tests/tclrsrv.sh
-@@ -217,7 +217,7 @@
+@@ -217,7 +217,7 @@ START_SERVER ()
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -193,7 +193,7 @@ Last-Update: 2010-05-12
stat="true"
--- a/binsrc/isparql/make_vad.sh
+++ b/binsrc/isparql/make_vad.sh
-@@ -117,7 +117,7 @@
+@@ -117,7 +117,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -204,7 +204,7 @@ Last-Update: 2010-05-12
then
--- a/binsrc/rdf_mappers/make_vad.sh
+++ b/binsrc/rdf_mappers/make_vad.sh
-@@ -234,7 +234,7 @@
+@@ -251,7 +251,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -215,7 +215,7 @@ Last-Update: 2010-05-12
then
--- a/binsrc/samples/demo/make_vad.sh
+++ b/binsrc/samples/demo/make_vad.sh
-@@ -115,7 +115,7 @@
+@@ -115,7 +115,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -226,7 +226,7 @@ Last-Update: 2010-05-12
then
--- a/binsrc/samples/demo/mkdemo.sh
+++ b/binsrc/samples/demo/mkdemo.sh
-@@ -140,7 +140,7 @@
+@@ -140,7 +140,7 @@ BANNER()
START_SERVER()
{
@@ -237,7 +237,7 @@ Last-Update: 2010-05-12
if [ "z$HOST_OS" != "z" ]
--- a/binsrc/samples/demo/mkdoc.sh
+++ b/binsrc/samples/demo/mkdoc.sh
-@@ -161,7 +161,7 @@
+@@ -161,7 +161,7 @@ START_SERVER()
{
if [ "z$DEMODB" = "z" ]
then
@@ -248,7 +248,7 @@ Last-Update: 2010-05-12
if [ "z$HOST_OS" != "z" ]
--- a/binsrc/samples/sparql_demo/make_vad.sh
+++ b/binsrc/samples/sparql_demo/make_vad.sh
-@@ -113,7 +113,7 @@
+@@ -113,7 +113,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -259,7 +259,7 @@ Last-Update: 2010-05-12
then
--- a/binsrc/sync/make_vad.sh
+++ b/binsrc/sync/make_vad.sh
-@@ -104,7 +104,7 @@
+@@ -104,7 +104,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -270,7 +270,7 @@ Last-Update: 2010-05-12
then
--- a/binsrc/tutorial/make_vad.sh
+++ b/binsrc/tutorial/make_vad.sh
-@@ -104,7 +104,7 @@
+@@ -104,7 +104,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -281,7 +281,7 @@ Last-Update: 2010-05-12
then
--- a/binsrc/vsp/admin/debug/make_vad.sh
+++ b/binsrc/vsp/admin/debug/make_vad.sh
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -292,7 +292,7 @@ Last-Update: 2010-05-12
then
--- a/binsrc/vspx/suite/vspx_suite.sh
+++ b/binsrc/vspx/suite/vspx_suite.sh
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ virtuoso_start() {
ddate=`date`
starth=`date | cut -f 2 -d :`
starts=`date | cut -f 3 -d :|cut -f 1 -d " "`
@@ -303,7 +303,7 @@ Last-Update: 2010-05-12
stat="true"
--- a/binsrc/yacutia/mkvad.sh
+++ b/binsrc/yacutia/mkvad.sh
-@@ -148,7 +148,7 @@
+@@ -148,7 +148,7 @@ LOG()
START_SERVER()
{
@@ -314,7 +314,7 @@ Last-Update: 2010-05-12
if [ "z$HOST_OS" != "z" ]
--- a/binsrc/bpel/tests/tpcc/run.sh
+++ b/binsrc/bpel/tests/tpcc/run.sh
-@@ -167,17 +167,17 @@
+@@ -167,17 +167,17 @@ cp ../Sut.* bpeltpcc
cat ../dbservices.wsdl | sed -e "s/HTTPPORTDB/$HTTPPORTDB/g" > bpeltpcc/dbservices.wsdl
cat ../tdservices.wsdl | sed -e "s/HTTPPORTTD/$HTTPPORTTD/g" > bpeltpcc/tdservices.wsdl
MakeConfig $DS1 $HTTPPORTBP
@@ -337,7 +337,7 @@ Last-Update: 2010-05-12
# Configure endpoint hosts
--- a/binsrc/tests/biftest/tests/tjavavm.sh
+++ b/binsrc/tests/biftest/tests/tjavavm.sh
-@@ -103,7 +103,7 @@
+@@ -103,7 +103,7 @@ rm -f $DBFILE
MAKECFG_FILE ../../suite/$TESTCFGFILE $PORT $CFGFILE
SHUTDOWN_SERVER
@@ -357,7 +357,7 @@ Last-Update: 2010-05-12
HOST_OS=`uname -s | grep WIN`
SERVER=./virtuoso-iodbc-sample-t
PORT=${PORT-1111}
-@@ -169,7 +169,7 @@
+@@ -169,7 +169,7 @@ echo
echo $ISQL $DSN dba dba PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT "EXEC=raw_exit()" >> $OUTPUT
$ISQL $DSN dba dba PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT "EXEC=raw_exit()" >> $OUTPUT
rm -rf virtuoso.db virtuoso.log virtuoso.lck virtuoso.trx core
@@ -368,7 +368,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN MANAGER MANAGER PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT thook1.sql
--- a/binsrc/tests/dotnet/test_server.sh
+++ b/binsrc/tests/dotnet/test_server.sh
-@@ -149,7 +149,7 @@
+@@ -149,7 +149,7 @@ MAKE_CFG ../suite/$TESTCFGFILE $DS1 $HTT
if [ -f VirtuosoClientSuite/OpenLink.Data.$CLIENT ] ; then
@@ -379,7 +379,7 @@ Last-Update: 2010-05-12
if [ "x$DTC_TEST" != "x" ]
--- a/binsrc/tests/lubm/tlubm.sh
+++ b/binsrc/tests/lubm/tlubm.sh
-@@ -40,7 +40,7 @@
+@@ -40,7 +40,7 @@ then
fi
SHUTDOWN_SERVER
@@ -390,7 +390,7 @@ Last-Update: 2010-05-12
--- a/binsrc/tests/suite/bpel.sh
+++ b/binsrc/tests/suite/bpel.sh
-@@ -225,7 +225,7 @@
+@@ -225,7 +225,7 @@ MakeConfig $DS1 $HP1
if [ "$TEST_ECHO" = "yes" ] ; then
CNT=`expr $CNT + 1`
@@ -399,7 +399,7 @@ Last-Update: 2010-05-12
LOG "ECHO BPEL script test"
DoCommand $DS1 "vad_install ('bpel_filesystem.vad', 0, 1);" "bpel_filesystem.vad install"
-@@ -260,7 +260,7 @@
+@@ -260,7 +260,7 @@ MakeConfig $DS1 $HP1
DSN=$DS1
SHUTDOWN_SERVER
CNT=`expr $CNT + 1`
@@ -408,7 +408,7 @@ Last-Update: 2010-05-12
cp ../bpel_filesystem.vad ./
DoCommand $DS1 "vad_install ('bpel_filesystem.vad', 0, 1);" "bpel_filesystem.vad install"
#DoCommand $DS1 "trace_on('soap');" "TRACE ON"
-@@ -336,7 +336,7 @@
+@@ -336,7 +336,7 @@ cp -r ../../../bpel/tests/fault1/*.vsp .
MakeConfig $DS2 $HP2
DSN=$DS2
SHUTDOWN_SERVER
@@ -417,7 +417,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DS2 PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < ../fault1/ini2.sql
#DoCommand $DS2 "vhost_define (lpath=>'/BPELREQ/', ppath=>'/SOAP/', soap_user=>'DBA');" "Request vhost"
cd ../fault1
-@@ -345,7 +345,7 @@
+@@ -345,7 +345,7 @@ MakeConfig $DS1 $HP1
DSN=$DS1
SHUTDOWN_SERVER
CNT=`expr $CNT + 1`
@@ -426,7 +426,7 @@ Last-Update: 2010-05-12
cp ../bpel_filesystem.vad ./
DoCommand $DS1 "vad_install ('bpel_filesystem.vad', 0, 1);" "bpel_filesystem.vad install"
DoCommand $DS1 "create user BPELTEST;" "create user BPELTEST"
-@@ -356,13 +356,13 @@
+@@ -356,13 +356,13 @@ DoCommand $DS1 "vhost_define (vhost=>'*i
RUN $ISQL $DS1 BPELTEST BPELTEST PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT -u 'http_port_two=$HP2' < ini.sql
SHUTDOWN_SERVER
CNT=`expr $CNT + 1`
@@ -444,7 +444,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DS1 dba dba PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT -u 'http_port_two=$HP2' < processXQuery/ini.sql
--- a/binsrc/tests/suite/byteorder.sh
+++ b/binsrc/tests/suite/byteorder.sh
-@@ -87,7 +87,7 @@
+@@ -87,7 +87,7 @@ RUN $SERVER $FOREGROUND_OPTION
SHUTDOWN_SERVER
@@ -455,7 +455,7 @@ Last-Update: 2010-05-12
--- a/binsrc/tests/suite/gtkbench.sh
+++ b/binsrc/tests/suite/gtkbench.sh
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ rm -f $DBFILE
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
SHUTDOWN_SERVER
@@ -466,7 +466,7 @@ Last-Update: 2010-05-12
RUN $GTKBENCH $LOGIN -C
--- a/binsrc/tests/suite/inprocess.sh
+++ b/binsrc/tests/suite/inprocess.sh
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ SHUTDOWN_SERVER
rm -f $DBLOGFILE
rm -f $DBFILE
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
@@ -477,7 +477,7 @@ Last-Update: 2010-05-12
if test $STATUS -ne 0
--- a/binsrc/tests/suite/large_db.sh
+++ b/binsrc/tests/suite/large_db.sh
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ if [ $skip_5g -eq 0 ]
then
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
@@ -486,7 +486,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < large_db_5g.sql
-@@ -69,7 +69,7 @@
+@@ -69,7 +69,7 @@ rm -f $DBFILE
LOG "Staring server with $OBACKUP_REP_OPTION large_"
RUN $SERVER $FOREGROUND_OPTION $OBACKUP_REP_OPTION "large_"
@@ -495,7 +495,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < large_db_check.sql
SHUTDOWN_SERVER
-@@ -104,7 +104,7 @@
+@@ -104,7 +104,7 @@ esac
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
@@ -504,7 +504,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < large_db_3g.sql
-@@ -126,7 +126,7 @@
+@@ -126,7 +126,7 @@ rm -f witemp.cfg db-1.seg db-2.seg tmp-1
LOG "Staring server with $OBACKUP_REP_OPTION large_"
RUN $SERVER $FOREGROUND_OPTION $OBACKUP_REP_OPTION "large_"
@@ -513,7 +513,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < large_db_3g_check.sql
SHUTDOWN_SERVER
-@@ -162,7 +162,7 @@
+@@ -162,7 +162,7 @@ esac
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
@@ -524,7 +524,7 @@ Last-Update: 2010-05-12
--- a/binsrc/tests/suite/msdtc.sh
+++ b/binsrc/tests/suite/msdtc.sh
-@@ -146,7 +146,7 @@
+@@ -146,7 +146,7 @@ mkINI "virtuoso.ini" $DS1
LOGFILE=../msdtc.output
cp -r ../plugins ./
@@ -533,7 +533,7 @@ Last-Update: 2010-05-12
cd ..
rm -rf msdtc2
-@@ -156,7 +156,7 @@
+@@ -156,7 +156,7 @@ cd msdtc2
mkINI "virtuoso.ini" $DS2
cp -r ../plugins ./
@@ -542,7 +542,7 @@ Last-Update: 2010-05-12
cd ..
LOGFILE=msdtc.output
-@@ -218,7 +218,7 @@
+@@ -218,7 +218,7 @@ RUN $ISQL $DS2 dba dba '"EXEC=shutdown;"
sleep 10
@@ -551,7 +551,7 @@ Last-Update: 2010-05-12
cd ..
RUN $ISQL $DS2 PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < msdtc_conn_check.sql
-@@ -244,7 +244,7 @@
+@@ -244,7 +244,7 @@ mkINI "virtuoso.ini" $DS3
LOGFILE=../msdtc.output
cp -r ../plugins ./
@@ -562,7 +562,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DS2 PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < msdtc_conn_check.sql
--- a/binsrc/tests/suite/nwxml.sh
+++ b/binsrc/tests/suite/nwxml.sh
-@@ -35,7 +35,7 @@
+@@ -35,7 +35,7 @@ SHUTDOWN_SERVER
cp "${HOME}/binsrc/samples/demo/noise.txt" .
rm -f $DELETEMASK
MAKECFG_FILE_WITH_HTTP $TESTCFGFILE $PORT $HTTPPORT $CFGFILE
@@ -571,7 +571,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < tlogft1.sql
if test $STATUS -ne 0
-@@ -45,7 +45,7 @@
+@@ -45,7 +45,7 @@ then
fi
STOP_SERVER
@@ -580,7 +580,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < tlogft2.sql
if test $STATUS -ne 0
-@@ -98,7 +98,7 @@
+@@ -98,7 +98,7 @@ fi
#fi
STOP_SERVER
@@ -589,7 +589,7 @@ Last-Update: 2010-05-12
#RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < nwxml3b.sql
#if test $STATUS -ne 0
-@@ -151,7 +151,7 @@
+@@ -151,7 +151,7 @@ then
fi
STOP_SERVER
@@ -600,7 +600,7 @@ Last-Update: 2010-05-12
#if test $STATUS -ne 0
--- a/binsrc/tests/suite/obackup.sh
+++ b/binsrc/tests/suite/obackup.sh
-@@ -46,7 +46,7 @@
+@@ -46,7 +46,7 @@ mkdir nw1 nw2 nw3 nw4 nw5
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
SHUTDOWN_SERVER
@@ -609,7 +609,7 @@ Last-Update: 2010-05-12
RUN $INS $DSN 100000 100
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < nwdemo_norefs.sql
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ER
RUN $ISQL $DSN '"EXEC=shutdown();"' ERRORS=STDOUT
@@ -618,7 +618,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < nwdemo_update.sql
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < obackup.sql
-@@ -69,7 +69,7 @@
+@@ -69,7 +69,7 @@ rm -f $DBLOGFILE $DBFILE
echo "Staring server with $OBACKUP_REP_OPTION nwdemo_i_#"
RUN $SERVER $FOREGROUND_OPTION $OBACKUP_REP_OPTION "nwdemo_i_#" $OBACKUP_DIRS_OPTION nw1,nw2,nw3,nw4,nw5
@@ -627,7 +627,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < obackup1.sql
-@@ -83,7 +83,7 @@
+@@ -83,7 +83,7 @@ rm -f $DBLOGFILE $DBFILE
echo "Staring server with $OBACKUP_REP_OPTION nwdemo_i_#"
RUN $SERVER $FOREGROUND_OPTION $OBACKUP_REP_OPTION "nwdemo_i_#" $OBACKUP_DIRS_OPTION nw1,nw2,nw3,nw4,nw5
@@ -636,7 +636,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < obackupck.sql
-@@ -102,7 +102,7 @@
+@@ -102,7 +102,7 @@ rm -f $DBFILE
echo "Staring server with $OBACKUP_REP_OPTION vvv"
RUN $SERVER $FOREGROUND_OPTION $OBACKUP_REP_OPTION "vvv"
@@ -645,7 +645,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < obackup_userck2.sql
-@@ -127,7 +127,7 @@
+@@ -127,7 +127,7 @@ RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ER
RUN $ISQL $DSN '"EXEC=shutdown();"' ERRORS=STDOUT
@@ -654,7 +654,7 @@ Last-Update: 2010-05-12
echo "Updating tpcc table, stage 1"
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < tpcc_update1.sql
-@@ -139,7 +139,7 @@
+@@ -139,7 +139,7 @@ rm -f $DBFILE
echo "Staring server with $OBACKUP_REP_OPTION tpcc_k_#"
RUN $SERVER $FOREGROUND_OPTION $OBACKUP_REP_OPTION "tpcc_k_#"
@@ -663,7 +663,7 @@ Last-Update: 2010-05-12
echo "Checking tpcc database"
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < ob_tpcc_check.sql
-@@ -154,7 +154,7 @@
+@@ -154,7 +154,7 @@ rm -f $DBFILE
echo "Staring server with $OBACKUP_REP_OPTION tpcc_i_#"
RUN $SERVER $FOREGROUND_OPTION $OBACKUP_REP_OPTION "tpcc_i_#"
@@ -674,7 +674,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < ob_tpcc_check.sql
--- a/binsrc/tests/suite/oledb.sh
+++ b/binsrc/tests/suite/oledb.sh
-@@ -116,7 +116,7 @@
+@@ -116,7 +116,7 @@ MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
#REGISTER_PROVIDER
@@ -685,7 +685,7 @@ Last-Update: 2010-05-12
if [ $STATUS -ne 0 ]; then
--- a/binsrc/tests/suite/rtest.sh
+++ b/binsrc/tests/suite/rtest.sh
-@@ -65,7 +65,7 @@
+@@ -65,7 +65,7 @@ mkdir remote1
cd remote1
MAKECFG_FILE ../$TESTCFGFILE $DS1 $CFGFILE
ln -s ../words.esp words.esp
@@ -694,7 +694,7 @@ Last-Update: 2010-05-12
cd ..
rm -rf remote2
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ mkdir remote2
cd remote2
MAKECFG_FILE ../$TESTCFGFILE $DS2 $CFGFILE
ln -s ../words.esp words.esp
@@ -703,7 +703,7 @@ Last-Update: 2010-05-12
cd ..
LOG "Loading base tables"
-@@ -162,7 +162,7 @@
+@@ -162,7 +162,7 @@ then
fi
cd remote1
@@ -714,7 +714,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DS2 PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < rtest5.sql
--- a/binsrc/tests/suite/tblob_recode.sh
+++ b/binsrc/tests/suite/tblob_recode.sh
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,7 @@ rm -f $DBLOGFILE $DBFILE
SHUTDOWN_SERVER
rm -f $DBLOGFILE $DBFILE
@@ -725,7 +725,7 @@ Last-Update: 2010-05-12
--- a/binsrc/tests/suite/tclstart.sh
+++ b/binsrc/tests/suite/tclstart.sh
-@@ -52,4 +52,4 @@
+@@ -52,4 +52,4 @@ export CFGFILE DBFILE DBLOGFILE DELETEMA
export BACKUP_DUMP_OPTION CRASH_DUMP_OPTION TESTCFGFILE SERVER
. ./test_fn.sh
@@ -733,7 +733,7 @@ Last-Update: 2010-05-12
+START_SERVER $PORT 60
--- a/binsrc/tests/suite/tcpt.sh
+++ b/binsrc/tests/suite/tcpt.sh
-@@ -37,7 +37,7 @@
+@@ -37,7 +37,7 @@ rm -f *.cpt-after-recov *.trx-after-reco
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
STOP_SERVER
@@ -742,7 +742,7 @@ Last-Update: 2010-05-12
RUN $INS $DSN 100000 1
-@@ -45,7 +45,7 @@
+@@ -45,7 +45,7 @@ RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ER
rm -f $LOCKFILE
#exit;
@@ -751,7 +751,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < tcptck.sql
-@@ -60,14 +60,14 @@
+@@ -60,14 +60,14 @@ rm -f $DBLOGFILE
rm -f $DBFILE
rm -f *.cpt-after-recov *.trx-after-recov *.cpt
@@ -770,7 +770,7 @@ Last-Update: 2010-05-12
--- a/binsrc/tests/suite/tdav.sh
+++ b/binsrc/tests/suite/tdav.sh
-@@ -81,7 +81,7 @@
+@@ -81,7 +81,7 @@ MakeIni
_dsn=$DSN
DSN=$DS1
SHUTDOWN_SERVER
@@ -781,7 +781,7 @@ Last-Update: 2010-05-12
--- a/binsrc/tests/suite/tdav_meta.sh
+++ b/binsrc/tests/suite/tdav_meta.sh
-@@ -89,7 +89,7 @@
+@@ -95,7 +95,7 @@ fi
_dsn=$DSN
DSN=$DS1
SHUTDOWN_SERVER
@@ -792,7 +792,7 @@ Last-Update: 2010-05-12
LOG "test1"
--- a/binsrc/tests/suite/tdbp.sh
+++ b/binsrc/tests/suite/tdbp.sh
-@@ -183,7 +183,7 @@
+@@ -183,7 +183,7 @@ BANNER "STARTED DBPUMP DATA EXPORT TEST
SHUTDOWN_SERVER
rm -f $DBLOGFILE $DBFILE
@@ -801,7 +801,7 @@ Last-Update: 2010-05-12
gunzip -c pdd_txt.gz >pdd.txt
-@@ -234,7 +234,7 @@
+@@ -234,7 +234,7 @@ SHUTDOWN_SERVER
LOG "Removing database"
rm -f $DBLOGFILE $DBFILE
LOG "Starting an empty database"
@@ -810,7 +810,7 @@ Last-Update: 2010-05-12
GenPUMP2 $SAVDSN t2.args
-@@ -245,7 +245,7 @@
+@@ -245,7 +245,7 @@ ${DBPUMP} @t2.args > dbpump0.tmp 2>&1
DoCommand $SAVDSN 'select U_NAME, U_PASSWORD, U_GROUP, U_ID, U_DATA, U_IS_ROLE, U_SQL_ENABLE from "DB"."DBA"."SYS_USERS";' "Getting users"
STOP_SERVER
@@ -821,7 +821,7 @@ Last-Update: 2010-05-12
if test $STATUS -ne 0
--- a/binsrc/tests/suite/tdconv.sh
+++ b/binsrc/tests/suite/tdconv.sh
-@@ -210,7 +210,7 @@
+@@ -210,7 +210,7 @@ ${OLD_DBPUMP} @t1.args
SHUTDOWN_SERVER
rm -f $DBLOGFILE $DBFILE
@@ -832,7 +832,7 @@ Last-Update: 2010-05-12
--- a/binsrc/tests/suite/tdrop.sh
+++ b/binsrc/tests/suite/tdrop.sh
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ rm -f $DBLOGFILE
rm -f $DBFILE
MakeIni
@@ -841,7 +841,7 @@ Last-Update: 2010-05-12
LOG "FILLING TPC-C DB"
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,7 @@ fi
../tpcc "localhost:$DS1" $USR $PWD i 1
SHUTDOWN_SERVER
@@ -850,7 +850,7 @@ Last-Update: 2010-05-12
#RUN $ISQL $DS1 '"EXEC=load tdrop1.sql;"' ERRORS=stdout >> $LOGFILE
-@@ -108,13 +108,13 @@
+@@ -108,13 +108,13 @@ fi
SHUTDOWN_SERVER
@@ -868,7 +868,7 @@ Last-Update: 2010-05-12
SHUTDOWN_SERVER
--- a/binsrc/tests/suite/testall.sh
+++ b/binsrc/tests/suite/testall.sh
-@@ -150,7 +150,7 @@
+@@ -150,7 +150,7 @@ STOP_SERVER
#
# Start the server once:
#
@@ -877,7 +877,7 @@ Last-Update: 2010-05-12
-@@ -273,7 +273,7 @@
+@@ -273,7 +273,7 @@ fi
#
rm -f $DELETEMASK
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
@@ -888,7 +888,7 @@ Last-Update: 2010-05-12
if $ISQL $DSN "EXEC=status();" VERBOSE=OFF ERRORS=STDOUT > ident.txt
--- a/binsrc/tests/suite/thttp.sh
+++ b/binsrc/tests/suite/thttp.sh
-@@ -799,7 +799,7 @@
+@@ -817,7 +817,7 @@ case $1 in
BLOG_TEST=0
LOG "ODS & Blog2 VAD packages are not built"
fi
@@ -899,7 +899,7 @@ Last-Update: 2010-05-12
then
--- a/binsrc/tests/suite/timsg.sh
+++ b/binsrc/tests/suite/timsg.sh
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ END_CFG
;;
esac
@@ -910,7 +910,7 @@ Last-Update: 2010-05-12
cp words.esp test_1947.db.test
--- a/binsrc/tests/suite/tjdbc.sh
+++ b/binsrc/tests/suite/tjdbc.sh
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ rm -f $DBLOGFILE
rm -f $DBFILE
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
@@ -919,7 +919,7 @@ Last-Update: 2010-05-12
ECHO "STARTED: JDBC 2 Test suite"
cd $JDBCDIR
-@@ -81,7 +81,7 @@
+@@ -81,7 +81,7 @@ rm -f $DBLOGFILE
rm -f $DBFILE
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
@@ -930,7 +930,7 @@ Last-Update: 2010-05-12
cd $JDBCDIR
--- a/binsrc/tests/suite/tpcd.sh
+++ b/binsrc/tests/suite/tpcd.sh
-@@ -58,7 +58,7 @@
+@@ -58,7 +58,7 @@ rm -rf tpcdremote1
mkdir tpcdremote1
cd tpcdremote1
MAKECFG_FILE ../$TESTCFGFILE $DS1 $CFGFILE
@@ -939,7 +939,7 @@ Last-Update: 2010-05-12
cd ..
LOG
-@@ -91,7 +91,7 @@
+@@ -91,7 +91,7 @@ rm -rf tpcdremote2
mkdir tpcdremote2
cd tpcdremote2
MAKECFG_FILE ../$TESTCFGFILE $DS2 $CFGFILE
@@ -950,7 +950,7 @@ Last-Update: 2010-05-12
LOG
--- a/binsrc/tests/suite/tproviders.sh
+++ b/binsrc/tests/suite/tproviders.sh
-@@ -51,7 +51,7 @@
+@@ -51,7 +51,7 @@ MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
NIGHTLY_PORT=$PORT
export NIGHTLY_PORT
@@ -961,7 +961,7 @@ Last-Update: 2010-05-12
# Run Jena tests
--- a/binsrc/tests/suite/tproxy.sh
+++ b/binsrc/tests/suite/tproxy.sh
-@@ -243,7 +243,7 @@
+@@ -243,7 +243,7 @@ case $1 in
GenHTML
GenVSP
STOP_SERVER
@@ -972,7 +972,7 @@ Last-Update: 2010-05-12
--- a/binsrc/tests/suite/trecov.sh
+++ b/binsrc/tests/suite/trecov.sh
-@@ -35,7 +35,7 @@
+@@ -35,7 +35,7 @@ rm -f $DBFILE
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
SHUTDOWN_SERVER
@@ -981,7 +981,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < treg1.sql
-@@ -101,7 +101,7 @@
+@@ -101,7 +101,7 @@ rm -f $DBFILE.r1 $DBLOGFILE.r1 $SRVMSGLO
cp $DBFILE $DBFILE.r1
cp $DBLOGFILE $DBLOGFILE.r1
cp $SRVMSGLOGFILE $SRVMSGLOGFILE.r1
@@ -990,7 +990,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < recovck1.sql
-@@ -175,7 +175,7 @@
+@@ -175,7 +175,7 @@ else
exit 3
fi
@@ -999,7 +999,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < recovck1.sql
if test $STATUS -ne 0
-@@ -230,7 +230,7 @@
+@@ -230,7 +230,7 @@ else
exit 3
fi
@@ -1008,7 +1008,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < recovck1.sql
if test $STATUS -ne 0
then
-@@ -281,7 +281,7 @@
+@@ -281,7 +281,7 @@ else
exit 3
fi
@@ -1017,7 +1017,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < recovck1.sql
if test $STATUS -ne 0
-@@ -344,7 +344,7 @@
+@@ -344,7 +344,7 @@ START_SERVER $PORT 0 $FOREGROUND_OPTION
## now check for results
RUN ls -la virtuoso.*
@@ -1028,7 +1028,7 @@ Last-Update: 2010-05-12
if test $STATUS -ne 0
--- a/binsrc/tests/suite/trecov_schema.sh
+++ b/binsrc/tests/suite/trecov_schema.sh
-@@ -45,7 +45,7 @@
+@@ -45,7 +45,7 @@ case $SERVER in
esac
SHUTDOWN_SERVER
@@ -1037,7 +1037,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < treg1.sql
-@@ -103,7 +103,7 @@
+@@ -103,7 +103,7 @@ then
fi
SHUTDOWN_SERVER
@@ -1046,7 +1046,7 @@ Last-Update: 2010-05-12
LOG "Next we do a checkpoint third time and then kill database server with"
LOG "raw_exit() after which we should get Lost Connection to Server -error."
#RUN $ISQL $DSN '"EXEC=checkpoint; raw_exit();"' ERRORS=STDOUT
-@@ -155,7 +155,7 @@
+@@ -155,7 +155,7 @@ cp $DBFILE $DBFILE.sr4
## now check for results
RUN ls -la virtuoso.*
@@ -1057,7 +1057,7 @@ Last-Update: 2010-05-12
if test $STATUS -ne 0
--- a/binsrc/tests/suite/trepl.sh
+++ b/binsrc/tests/suite/trepl.sh
-@@ -284,7 +284,7 @@
+@@ -284,7 +284,7 @@ cd rep1
MakeConfig $DBNAME1 $http1 $DS1
CHECK_PORT $http1
ECHO "Starting server 'rep1'"
@@ -1066,7 +1066,7 @@ Last-Update: 2010-05-12
cd ..
# Second replication server configuration
-@@ -293,7 +293,7 @@
+@@ -293,7 +293,7 @@ cd rep2
MakeConfig $DBNAME2 $http2 $DS2
CHECK_PORT $http2
ECHO "Starting server 'rep2'"
@@ -1075,7 +1075,7 @@ Last-Update: 2010-05-12
cd ..
if [ $_nservers -gt 2 ]
-@@ -302,7 +302,7 @@
+@@ -302,7 +302,7 @@ then
MakeConfig $DBNAME3 $http3 $DS3
CHECK_PORT $http3
ECHO "Starting server 'rep3'"
@@ -1086,7 +1086,7 @@ Last-Update: 2010-05-12
}
--- a/binsrc/tests/suite/treplh.sh
+++ b/binsrc/tests/suite/treplh.sh
-@@ -175,14 +175,14 @@
+@@ -175,14 +175,14 @@ cd rep1
MakeConfig $DBNAME1 $http1 $DS1
CHECK_PORT $http1
ECHO "Starting server 'rep1'"
@@ -1105,7 +1105,7 @@ Last-Update: 2010-05-12
SILENT=0
--- a/binsrc/tests/suite/tsec.sh
+++ b/binsrc/tests/suite/tsec.sh
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ SHUTDOWN_SERVER
rm -f $DBLOGFILE
rm -f $DBFILE
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
@@ -1114,7 +1114,7 @@ Last-Update: 2010-05-12
RUN $INS $DSN 20 100
# note that the test script filename has to be given as the fourth
-@@ -147,7 +147,7 @@
+@@ -162,7 +162,7 @@ fi
SHUTDOWN_SERVER
@@ -1125,7 +1125,7 @@ Last-Update: 2010-05-12
--- a/binsrc/tests/suite/tsoap12.sh
+++ b/binsrc/tests/suite/tsoap12.sh
-@@ -4273,7 +4273,7 @@
+@@ -4273,7 +4273,7 @@ CHECK_PORT $TPORT
sav_log=$LOGFILE
LOGFILE=tsoap12.output
export LOGFILE
@@ -1136,7 +1136,7 @@ Last-Update: 2010-05-12
--- a/binsrc/tests/suite/tsparql.sh
+++ b/binsrc/tests/suite/tsparql.sh
-@@ -42,7 +42,7 @@
+@@ -42,7 +42,7 @@ fi
STOP_SERVER
rm -f $DELETEMASK
MAKECFG_FILE_WITH_HTTP $TESTCFGFILE $PORT $HTTPPORT $CFGFILE
@@ -1147,7 +1147,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT -u "HTTPPORT=$HTTPPORT" -u "HTTPPORT1=$HTTPPORT1" < tsparql.sql
--- a/binsrc/tests/suite/tsparql_demo.sh
+++ b/binsrc/tests/suite/tsparql_demo.sh
-@@ -45,7 +45,7 @@
+@@ -45,7 +45,7 @@ STOP_SERVER
rm -f $DBLOGFILE
rm -f $DBFILE
MAKECFG_FILE_WITH_HTTP $TESTCFGFILE $PORT $HTTPPORT $CFGFILE
@@ -1158,7 +1158,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < nwdemo.sql
--- a/binsrc/tests/suite/tsql.sh
+++ b/binsrc/tests/suite/tsql.sh
-@@ -37,7 +37,7 @@
+@@ -37,7 +37,7 @@ rm -f $DBFILE
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
@@ -1167,7 +1167,7 @@ Last-Update: 2010-05-12
RUN $INS $DSN 100000 100
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < tcptrb3.sql
if test $STATUS -ne 0
-@@ -56,7 +56,7 @@
+@@ -56,7 +56,7 @@ fi
RUN $ISQL $DSN '"EXEC=raw_exit();"' ERRORS=STDOUT
@@ -1176,7 +1176,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < tcptrb2.sql
if test $STATUS -ne 0
-@@ -68,7 +68,7 @@
+@@ -68,7 +68,7 @@ fi
@@ -1187,7 +1187,7 @@ Last-Update: 2010-05-12
if test $STATUS -ne 0
--- a/binsrc/tests/suite/tsql2.sh
+++ b/binsrc/tests/suite/tsql2.sh
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ rm -f $DBFILE
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
SHUTDOWN_SERVER
@@ -1198,7 +1198,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < tschema1.sql
--- a/binsrc/tests/suite/tsql3.sh
+++ b/binsrc/tests/suite/tsql3.sh
-@@ -37,7 +37,7 @@
+@@ -37,7 +37,7 @@ rm -f noise.txt
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
SHUTDOWN_SERVER
@@ -1207,7 +1207,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < tnull.sql
if test $STATUS -ne 0
-@@ -229,7 +229,7 @@
+@@ -229,7 +229,7 @@ then
mv $CFGFILE BACK_$CFGFILE
cat BACK_$CFGFILE | sed -e "s/ADD_VIEWS/1/g" > $CFGFILE
cat $CFGFILE >> $LOGFILE
@@ -1218,7 +1218,7 @@ Last-Update: 2010-05-12
if test $STATUS -ne 0
--- a/binsrc/tests/suite/tsqllite.sh
+++ b/binsrc/tests/suite/tsqllite.sh
-@@ -34,13 +34,13 @@
+@@ -34,13 +34,13 @@ CLEAN_DBFILE
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
STOP_SERVER
@@ -1236,7 +1236,7 @@ Last-Update: 2010-05-12
if test $STATUS -ne 0
--- a/binsrc/tests/suite/tsqlo.sh
+++ b/binsrc/tests/suite/tsqlo.sh
-@@ -91,7 +91,7 @@
+@@ -91,7 +91,7 @@ rm -f $DBLOGFILE
rm -f $DBFILE
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
@@ -1245,7 +1245,7 @@ Last-Update: 2010-05-12
LOG "Loading base tables"
RUN $INS $DSN 1000 20 dba dba
-@@ -157,7 +157,7 @@
+@@ -157,7 +157,7 @@ rm -f $DBLOGFILE
rm -f $DBFILE
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
@@ -1254,7 +1254,7 @@ Last-Update: 2010-05-12
LOG "Loading base tables"
RUN $INS $DSN 1000 20 dba dba
-@@ -195,14 +195,14 @@
+@@ -195,14 +195,14 @@ rm -rf oremote1
mkdir oremote1
cd oremote1
MAKECFG_FILE ../$TESTCFGFILE $DS1 $CFGFILE
@@ -1273,7 +1273,7 @@ Last-Update: 2010-05-12
fi
--- a/binsrc/tests/suite/tstriping.sh
+++ b/binsrc/tests/suite/tstriping.sh
-@@ -56,7 +56,7 @@
+@@ -56,7 +56,7 @@ rm -f $LOGFILE db-1.seg db-2.seg tmp-1.t
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
@@ -1282,7 +1282,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DS1 ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF < toutdsk.sql
if test $STATUS -ne 0
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ else
fi
SHUTDOWN_SERVER
@@ -1293,7 +1293,7 @@ Last-Update: 2010-05-12
then
--- a/binsrc/tests/suite/tsxml.sh
+++ b/binsrc/tests/suite/tsxml.sh
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ rm -f $DBFILE
cat $TESTCFGFILE | sed -e "s/PORT/$PORT/g" -e "s/CASE_MODE/$CASE_MODE/g" > $CFGFILE
# SHUTDOWN_SERVER
@@ -1304,7 +1304,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < schemasource/vsputils.isql
--- a/binsrc/tests/suite/ttutorial.sh
+++ b/binsrc/tests/suite/ttutorial.sh
-@@ -118,7 +118,7 @@
+@@ -118,7 +118,7 @@ cat $CFGFILE | sed -e "s/CaseMode = 1/Ca
cp tmp.ini $CFGFILE
rm tmp.ini
@@ -1315,7 +1315,7 @@ Last-Update: 2010-05-12
if test $STATUS -ne 0
--- a/binsrc/tests/suite/tupgrade_recov.sh
+++ b/binsrc/tests/suite/tupgrade_recov.sh
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ cp test_1947.db.test $DBFILE
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
SHUTDOWN_SERVER
@@ -1324,7 +1324,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < treg1.sql
-@@ -100,7 +100,7 @@
+@@ -100,7 +100,7 @@ fi
STOP_SERVER
sleep 5
@@ -1333,7 +1333,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < recovck1.sql
-@@ -150,7 +150,7 @@
+@@ -150,7 +150,7 @@ else
fi
rm -f $DBFILE
@@ -1342,7 +1342,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < recovck1.sql
if test $STATUS -ne 0
-@@ -176,7 +176,7 @@
+@@ -176,7 +176,7 @@ rm -f $DBLOGFILE
mv backup.log $DBLOGFILE
rm -f $DBFILE
@@ -1351,7 +1351,7 @@ Last-Update: 2010-05-12
RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < recovck1.sql
if test $STATUS -ne 0
then
-@@ -203,7 +203,7 @@
+@@ -203,7 +203,7 @@ else
fi
rm -f $DBFILE
@@ -1362,7 +1362,7 @@ Last-Update: 2010-05-12
if test $STATUS -ne 0
--- a/binsrc/tests/suite/tvad.sh
+++ b/binsrc/tests/suite/tvad.sh
-@@ -74,13 +74,13 @@
+@@ -74,13 +74,13 @@ END_SQL
#SHUTDOWN_SERVER
STOP_SERVER
@@ -1378,7 +1378,7 @@ Last-Update: 2010-05-12
}
-@@ -249,7 +249,7 @@
+@@ -249,7 +249,7 @@ GenVAD4 t4.xml
SHUTDOWN_SERVER
rm -f $DBLOGFILE $DBFILE
@@ -1389,7 +1389,7 @@ Last-Update: 2010-05-12
DoCommand $DSN "select \"DB\".\"DBA\".\"VAD_PACK\" ('t2.xml', '', 't2.vad');" "VAD_PACK 2"
--- a/binsrc/tests/suite/tvad2.sh
+++ b/binsrc/tests/suite/tvad2.sh
-@@ -72,13 +72,13 @@
+@@ -72,13 +72,13 @@ END_SQL
echo "+ " $ISQL $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* >> $LOGFILE
SHUTDOWN_SERVER
@@ -1405,7 +1405,7 @@ Last-Update: 2010-05-12
}
-@@ -94,7 +94,7 @@
+@@ -94,7 +94,7 @@ cp -f $HOME/binsrc/tests/suite/vad_test/
SHUTDOWN_SERVER
rm -f $DBLOGFILE $DBFILE
@@ -1416,7 +1416,7 @@ Last-Update: 2010-05-12
DoCommand $DSN "select \"DB\".\"DBA\".\"VAD_PACK\" ('vad_test2.xml', '', 'vad_test2.vad');" "VAD_PACK 2"
--- a/binsrc/tests/suite/tvsp.sh
+++ b/binsrc/tests/suite/tvsp.sh
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ rm -f $DBFILE
MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE
SHUTDOWN_SERVER
@@ -1427,7 +1427,7 @@ Last-Update: 2010-05-12
--- a/binsrc/tests/suite/tvspx.sh
+++ b/binsrc/tests/suite/tvspx.sh
-@@ -303,7 +303,7 @@
+@@ -303,7 +303,7 @@ GenURIall
#MakeIni
MakeConfig
CHECK_PORT $TPORT
@@ -1438,7 +1438,7 @@ Last-Update: 2010-05-12
DoCommand $DSN "DB.DBA.VHOST_DEFINE ('*ini*', '*ini*', '/', '/', 0, 0, NULL, NULL, NULL, NULL, 'dba', NULL, NULL, 0);"
--- a/binsrc/tests/suite/tvspxex.sh
+++ b/binsrc/tests/suite/tvspxex.sh
-@@ -2597,7 +2597,7 @@
+@@ -2597,7 +2597,7 @@ cp -f ../tvspxex.awk .
#MakeIni
MakeConfig
CHECK_PORT $TPORT
@@ -1449,7 +1449,7 @@ Last-Update: 2010-05-12
--- a/binsrc/tests/suite/twcopy.sh
+++ b/binsrc/tests/suite/twcopy.sh
-@@ -598,7 +598,7 @@
+@@ -608,7 +608,7 @@ GenEndPage 19 ./dir3/sub32/
MakeIni
@@ -1460,7 +1460,7 @@ Last-Update: 2010-05-12
--- a/binsrc/tests/suite/twiki.sh
+++ b/binsrc/tests/suite/twiki.sh
-@@ -132,7 +132,7 @@
+@@ -132,7 +132,7 @@ case $SERVER in
LOG "ODS & Blog2 VAD packages are not built"
fi
@@ -1471,7 +1471,7 @@ Last-Update: 2010-05-12
--- a/binsrc/tests/suite/txslt.sh
+++ b/binsrc/tests/suite/txslt.sh
-@@ -133,7 +133,7 @@
+@@ -133,7 +133,7 @@ rm -rf xslt
mkdir xslt
cd xslt
MakeConfig $DS1 $HTTP_PORT
@@ -1482,7 +1482,7 @@ Last-Update: 2010-05-12
MakeSQLXML
--- a/binsrc/tests/tpcrun/tpc_run.sh
+++ b/binsrc/tests/tpcrun/tpc_run.sh
-@@ -184,7 +184,7 @@
+@@ -184,7 +184,7 @@ initialize() {
BANNER "INITIALIZE TPC BENCHMARK DATABASE"
STOP_SERVER
@@ -1491,7 +1491,7 @@ Last-Update: 2010-05-12
RUN $ISQL $PORT dba dba ../tpccddk.sql
if test $STATUS -ne 0
-@@ -225,7 +225,7 @@
+@@ -225,7 +225,7 @@ run_tpcc() {
BANNER "STARTING TPC BENCHMARK DATABASE TEST"
# STOP_SERVER
@@ -1500,7 +1500,7 @@ Last-Update: 2010-05-12
#
# Start manual checkpointing (XXX is this really necessary)
-@@ -307,7 +307,7 @@
+@@ -307,7 +307,7 @@ run_tpcc() {
SHUTDOWN_SERVER
rm -f *.db *.trx
RUN $SERVER $FOREGROUND_OPTION $OBACKUP_REP_OPTION "tpcc-"
diff --git a/debian/patches/config-debian-paths.patch b/debian/patches/config-debian-paths.patch
index 9c41e4b..656c5e7 100644
--- a/debian/patches/config-debian-paths.patch
+++ b/debian/patches/config-debian-paths.patch
@@ -1,10 +1,10 @@
Description: config debian paths
Make installation paths more Debian compatible.
Author: Obey Arthur Liu <arthur at milliways.fr>
-Last-Update: 2011-07-29
+Last-Update: 2012-05-23
--- a/configure
+++ b/configure
-@@ -3707,14 +3707,14 @@
+@@ -3600,14 +3600,14 @@ case ${VIRTUOSO_LAYOUT} in
prefix=/usr
localstatedir=/var
fi
@@ -29,7 +29,7 @@ Last-Update: 2011-07-29
[Gg][Ee][Nn][Tt][Oo][Oo]) # Gentoo
--- a/configure.in
+++ b/configure.in
-@@ -156,14 +156,14 @@
+@@ -156,14 +156,14 @@ case ${VIRTUOSO_LAYOUT} in
prefix=/usr
localstatedir=/var
fi
diff --git a/debian/patches/config-universal-variables.patch b/debian/patches/config-universal-variables.patch
index 0d24f9e..0ade81e 100644
--- a/debian/patches/config-universal-variables.patch
+++ b/debian/patches/config-universal-variables.patch
@@ -1,10 +1,10 @@
Description: config universal variables
Eliminate non-universal variables.
Author: Obey Arthur Liu <arthur at milliways.fr>
-Last-Update: 2011-07-28
+Last-Update: 2012-05-23
--- a/binsrc/samples/demo/default-virtuoso.ini
+++ b/binsrc/samples/demo/default-virtuoso.ini
-@@ -117,7 +117,7 @@
+@@ -151,7 +151,7 @@ VDBDisconnectTimeout = 1000
KeepConnectionOnFixedThread = 0
[Replication]
@@ -13,7 +13,7 @@ Last-Update: 2011-07-28
ServerEnable = 1
QueueMax = 50000
-@@ -169,7 +169,7 @@
+@@ -203,7 +203,7 @@ Segment2 = 100M, db-seg2-1.db
[Zero Config]
diff --git a/debian/patches/repack-oat.patch b/debian/patches/repack-oat.patch
index d6d5267..28c322b 100644
--- a/debian/patches/repack-oat.patch
+++ b/debian/patches/repack-oat.patch
@@ -1,10 +1,10 @@
Description: Fix OAT related code after repacking
Fix a few usages of OAT after partial removal through repacking.
Author: Obey Arthur Liu <arthur at milliways.fr>
-Last-Update: 2010-07-11
+Last-Update: 2012-05-23
--- a/binsrc/oat/toolkit/loader.js
+++ b/binsrc/oat/toolkit/loader.js
-@@ -1652,7 +1652,6 @@
+@@ -1661,7 +1661,6 @@ OAT.Loader = {
svgsparql:"geometry",
timeline:["slider","tlscale","resize"],
tree:"ghostdrag",
diff --git a/debian/patches/repack-pcre.patch b/debian/patches/repack-pcre.patch
index bed6421..a749972 100644
--- a/debian/patches/repack-pcre.patch
+++ b/debian/patches/repack-pcre.patch
@@ -1,10 +1,10 @@
Description: Fix PCRE related code after repacking
Fix a few usages of PCRE after total removal through repacking.
Author: Obey Arthur Liu <arthur at milliways.fr>
-Last-Update: 2010-02-17
+Last-Update: 2012-05-23
--- a/configure.in
+++ b/configure.in
-@@ -485,6 +485,8 @@
+@@ -485,6 +485,8 @@ AC_CHECK_LIB(inet, gethostbyname, [VLIBS
AC_CHECK_LIB(socket, socket, [VLIBS="-lsocket $VLIBS"], [], $VLIBS) # SVR4 sockets
fi
AC_CHECK_LIB(m, cos, [VLIBS="-lm $VLIBS"]) # complex math
@@ -41,7 +41,7 @@ Last-Update: 2010-02-17
( ((c) & ~0xFF) ? (ecm_utf8props[(c)] & ECM_ISNAME) : \
--- a/libsrc/util/Makefile.am
+++ b/libsrc/util/Makefile.am
-@@ -85,24 +85,26 @@
+@@ -87,24 +87,26 @@ libutil_la_SOURCES = \
virt_mbsnrtowcs.c \
virt_wcrtomb.c \
virt_wcs_mask.c \
@@ -86,7 +86,7 @@ Last-Update: 2010-02-17
BUILT_SOURCES = getdate.c
-@@ -121,14 +123,16 @@
+@@ -123,14 +125,16 @@ EXTRA_DIST = \
getdate.y \
MSG_BG.bin \
MSG_EN.bin \
diff --git a/debian/patches/use-debian-default-csharp-compiler.patch b/debian/patches/use-debian-default-csharp-compiler.patch
index fcaafbe..34b716b 100644
--- a/debian/patches/use-debian-default-csharp-compiler.patch
+++ b/debian/patches/use-debian-default-csharp-compiler.patch
@@ -1,8 +1,6 @@
-Index: virtuoso-opensource-6.1.3+dfsg1/binsrc/VirtuosoClient.Net/Makefile.mono
-===================================================================
---- virtuoso-opensource-6.1.3+dfsg1.orig/binsrc/VirtuosoClient.Net/Makefile.mono 2012-01-31 18:24:06.626254506 +0000
-+++ virtuoso-opensource-6.1.3+dfsg1/binsrc/VirtuosoClient.Net/Makefile.mono 2012-01-31 18:24:41.062456289 +0000
-@@ -83,7 +83,7 @@
+--- a/binsrc/VirtuosoClient.Net/Makefile.mono
++++ b/binsrc/VirtuosoClient.Net/Makefile.mono
+@@ -86,7 +86,7 @@ RESOURCES= \
ifeq (ADONET2, $(ADONETVERSION))
@@ -11,7 +9,7 @@ Index: virtuoso-opensource-6.1.3+dfsg1/binsrc/VirtuosoClient.Net/Makefile.mono
#CSFLAGS = -debug+ /d:MONO /d:DEBUG /d:DEBUG_IO /d:ADONET2
CSFLAGS = /optimize+ /d:MONO /d:ADONET2
-@@ -98,7 +98,7 @@
+@@ -101,7 +101,7 @@ REFERENCES = /r:System.Data /r:System.En
else
--
Git repository for pkg-virtuoso
More information about the Pkg-virtuoso-commits
mailing list