Merge lp:~jontai/openvista-gtm-integration/bug358242 into lp:openvista-gtm-integration

[Jon Tai]

[Jon Tai (jontai)]

I've lightly tested the RPMs and debs built from this branch and everything seems to work OK - RPC broker, webdav, tied accounts, programmer mode authentication, man pages, and logging. Reviewers (essentially, Jeff) - please do your own testing and be on the lookout for regressions.

[jeff.apple (jeff-apple)]

In scripts/etc/init.d/openvista we have
119 elif function_exists "log_daemon_msg"; then
120 log_progress_msg "$instance"
121 run_hook "$instance" ZSTART || end_msg=1

Shouldn't line 120 be
120 log_progress_msg "Running startup hooks for $instance"

In other places, it appears the messages are different depending on whether log_daemon_msg is available or not. Not a big deal, but it might be nice to have them be the same. In fact, it might be good to make one function for the scripts that does output and do the switching there, if such a thing is possible.

Notes on building debs that seem "off":
1) Had to copy the GTM source to /tmp/ubuntu manually. It's not obvious that it has to be there.
2) Had an old gtm install in /opt/gtm that I had to ln -s /opt/gtm /tmp/gtm. I guess there's no way around that, though.
3) Had to add a group "gtm" just to build. That seems excessive.

Everything eventually did build and install.

review: Approve

[Jon Tai (jontai)]

> In scripts/etc/init.d/openvista we have
> 119 elif function_exists "log_daemon_msg"; then
> 120 log_progress_msg "$instance"
> 121 run_hook "$instance" ZSTART || end_msg=1
>
> Shouldn't line 120 be
> 120 log_progress_msg "Running startup hooks for $instance"

No. The way it works on Debian/Ubuntu is that you print the "main" thing first, then you print additional sub-components as you do them.

The example that the Debian Policy Manual gives in Section 9.4 is

     echo -n "Starting remote file system services:"
     echo -n " nfsd"; start-stop-daemon --start --quiet nfsd
     echo -n " mountd"; start-stop-daemon --start --quiet mountd
     echo -n " ugidd"; start-stop-daemon --start --quiet ugidd
     echo "."

http://www.debian.org/doc/debian-policy/ch-opersys.html#s9.4

We're not using echo directly, but it's the same idea.

> In other places, it appears the messages are different depending on whether
> log_daemon_msg is available or not. Not a big deal, but it might be nice to
> have them be the same.

Again, this is because it's a little different in each of the distros.

> In fact, it might be good to make one function for the
> scripts that does output and do the switching there, if such a thing is
> possible.

I considered this, but it's not just the textual message that is different, but the structure of when to log is different, too. I don't know how to encapsulate that cleanly in a function.

> Notes on building debs that seem "off":
> 1) Had to copy the GTM source to /tmp/ubuntu manually. It's not obvious that
> it has to be there.
> 2) Had an old gtm install in /opt/gtm that I had to ln -s /opt/gtm /tmp/gtm. I
> guess there's no way around that, though.
> 3) Had to add a group "gtm" just to build. That seems excessive.

Yea, these are known issues. Building the RPMs are just as painful. This is mainly because I haven't yet figured out how to install GT.M in a chroot -- I have to install it to the real, final, destination, otherwise the .o files have the wrong path to the corresponding .m files embedded in them.

The next step is to somehow clean up the package building process. For now, I'm happy enough with getting packages that are built from source that cleanly install and uninstall.

> Everything eventually did build and install.

OK that's good. I'm going to merge this.

=== added file 'debuild.sh'
--- debuild.sh	1970-01-01 00:00:00 +0000
+++ debuild.sh	2009-07-30 20:45:36 +0000
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+# build Debian package(s) from the files in this directory
+#
+# specify the name of a package to build as the first argument, or no arguments
+# to build all packages
+
+dir1=`pwd`
+dir2=`dirname "$0"`
+dir=`cd "$dir1/$dir2"; pwd`
+
+if [ -z "$1" ]; then
+    packages=""
+    for package in "$dir/packages/deb/"*; do
+        package=`basename "$package"`
+        packages="$packages $package"
+    done
+else
+    if [ -d "$dir/packages/deb/$1" ]; then
+        packages=$1
+    else
+        echo "debuild.sh: $1: No such package in '$dir/packages/deb'" >&2
+        exit 3
+    fi
+fi
+
+mkdir -p /tmp/ubuntu
+
+for package in $packages; do
+    version=`head -n1 "packages/deb/$package/debian/changelog" | awk '{ print $2 }' | sed 's/[()]//g' | sed 's/-[^\-]\+$//'`
+
+    case $package in
+        openvista-utils|openvista-libs*)
+            # create source tarabll
+            rm -rf "/tmp/ubuntu/${package}-$version"
+            cp -Rp "$dir" "/tmp/ubuntu/${package}-$version"
+            rm -rf "/tmp/ubuntu/${package}-$version/.bzr"
+            rm -f "/tmp/ubuntu/${package}_${version}.orig.tar.gz"
+            tar -c --gzip -f "/tmp/ubuntu/${package}_${version}.orig.tar.gz" -C /tmp/ubuntu "${package}-$version"
+            cp -Rp "/tmp/ubuntu/${package}-$version/packages/deb/$package/debian" "/tmp/ubuntu/${package}-$version/"
+
+            ( cd "/tmp/ubuntu/${package}-$version" && debuild )
+            ;;
+        fis-gtm*)
+            # rename source tarball
+            upstream_version=`echo "$version" | sed 's/\.//'`
+            cp -f "/tmp/ubuntu/gtm_V${upstream_version}_linux_i686_src.tar.gz" "/tmp/ubuntu/${package}_${version}.orig.tar.gz"
+
+            # unpack source tarball
+            rm -rf "/tmp/ubuntu/${package}-${version}"
+            mkdir "/tmp/ubuntu/${package}-${version}"
+            ( cd "/tmp/ubuntu/${package}-${version}" && tar -xzf "/tmp/ubuntu/${package}_${version}.orig.tar.gz" )
+            cp -Rp "$dir/packages/deb/${package}/debian" "/tmp/ubuntu/${package}-${version}/"
+
+            ( cd "/tmp/ubuntu/${package}-$version" && debuild -r sudo )
+            ;;
+    esac
+done
+
 
=== modified file 'docs/man1/ovbackup.1'
--- docs/man1/ovbackup.1	2009-04-21 20:45:44 +0000
+++ docs/man1/ovbackup.1	2009-07-09 23:48:40 +0000
@@ -1,4 +1,4 @@
-.TH ovbackup 1 "18 Apr 2009" Linux "User Manuals"
+.TH ovbackup 1 "9 Jul 2009" Linux "User Manuals"
 .SH NAME
 ovbackup \- backs up routines and globals of an OpenVista instance
 .SH SYNOPSIS
@@ -63,4 +63,4 @@
 Jonathan Tai <[e-mail]>
 .SH "SEE ALSO"
 .BR ovpurgejournals (1)
-.BR ovrestore (1)
+.BR ovrestore (8)
 
=== modified file 'docs/man1/ovimport.1'
--- docs/man1/ovimport.1	2009-04-28 01:22:21 +0000
+++ docs/man1/ovimport.1	2009-07-09 23:48:40 +0000
@@ -1,4 +1,4 @@
-.TH ovimport 1 "20 Apr 2009" Linux "User Manuals"
+.TH ovimport 1 "9 Jul 2009" Linux "User Manuals"
 .SH NAME
 ovimport \- imports routines and globals into a new OpenVista instance
 .SH SYNOPSIS
@@ -74,4 +74,4 @@
 .SH AUTHOR
 Jonathan Tai <[e-mail]>
 .SH "SEE ALSO"
-.BR ovrestore (1)
+.BR ovrestore (8)
 
=== added directory 'docs/man8'
=== added file 'docs/man8/gtmsignal.8'
--- docs/man8/gtmsignal.8	1970-01-01 00:00:00 +0000
+++ docs/man8/gtmsignal.8	2009-08-03 19:22:13 +0000
@@ -0,0 +1,50 @@
+.TH gtmsignal 8 "3 Aug 2009" Linux "User Manuals"
+.SH NAME
+gtmsignal \- send mupip STOP or INTRPT to GT.M processes
+.SH SYNOPSIS
+.B gtmsignal [-a|--all] [-s|--stop] [-h|--help] [-q|--quiet]
+.I \fR[\fIpid\fR...]
+.SH DESCRIPTION
+.B mupip
+can be used to send signals to other GT.M processes if the user calling mupip
+also owns the target process (the one receiving the signal), or if the user
+calling mupip is root.  Sending signals as a non-root user to processes owned
+by a different user is prohibited by Linux.
+.PP
+.B gtmsignal
+is a suid wrapper around  
+.B mupip
+that allow users in the gtm group to bypass this restriction when sending
+signals to GT.M processes, i.e., any user in the gtm group can call 
+.B gtmsignal
+to send a signal to any GT.M process, regardless of the target GT.M process'
+owner.
+.PP
+.B gtmsignal
+relies on mupip to do the actual sending of signals, and will only send signals
+to GT.M processes currently executing the 
+.B mumps
+binary installed in the same directory as 
+.B gtmsignal\fP.
+.SH OPTIONS
+.TP
+\fB\-a\fR, \fB\-\-all\fR
+send signal to all GT.M processes
+.TP
+\fB\-s\fR, \fB\-\-stop\fR
+send STOP instead of INTRPT
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display help text and exit
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+quiet; do not display warnings
+.SH "REPORTING BUGS"
+Please report any bugs you encounter at
+.PP
+https://bugs.launchpad.net/openvista-gtm-integration
+.SH AUTHOR
+.SS "gtmsignal"
+Jeff Apple <[e-mail]>
+.SS "This manual page"
+Jonathan Tai <[e-mail]>
 
=== added file 'docs/man8/ovauth.8'
--- docs/man8/ovauth.8	1970-01-01 00:00:00 +0000
+++ docs/man8/ovauth.8	2009-07-10 00:05:19 +0000
@@ -0,0 +1,48 @@
+.TH ovauth 8 "9 Jul 2009" Linux "User Manuals"
+.SH NAME
+ovauth \- helper application for OpenVista to verify PAM credentials
+.SH SYNOPSIS
+.B ovauth
+.I user
+.SH DESCRIPTION
+.B ovauth
+can be called by the 
+.B openvista
+tied account to verify the PAM credentials of another user in the 
+.B openvista
+group.  If 
+.B ovauth
+is run by a user other than the 
+.B openvista
+user, or if 
+.B ovauth
+is run with a TTY, 
+.B ovauth
+will return an error.  Similarly, if the 
+.B openvista
+user attempts to verify the credentials of a user who is not in the 
+.B openvista
+group,
+.B ovauth
+will return an error.
+.PP
+.B ovauth
+is invoked with a single argument - the username of the user whose credentials
+are being verified.  The user's potential password is read from standard input.
+If the supplied password is valid, 
+.B ovauth
+prints "OK" and exits 0.  Otherwise, 
+.B ovauth
+prints "Authentication failure" and exits 1.
+.SH "REPORTING BUGS"
+Please report any bugs you encounter at
+.PP
+https://bugs.launchpad.net/openvista-gtm-integration
+.SH AUTHOR
+.SS "ovauth"
+Jeff Apple <[e-mail]>
+.SS "This manual page"
+Jonathan Tai <[e-mail]>
+.SH "SEE ALSO"
+.BR ovtied (1)
+.BR pam (3)
 
=== renamed file 'docs/man1/ovinstanceadd.1' => 'docs/man8/ovinstanceadd.8'
--- docs/man1/ovinstanceadd.1	2009-04-21 23:38:53 +0000
+++ docs/man8/ovinstanceadd.8	2009-07-09 23:48:40 +0000
@@ -1,4 +1,4 @@
-.TH ovinstanceadd 1 "18 Apr 2009" Linux "User Manuals"
+.TH ovinstanceadd 8 "9 Jul 2009" Linux "User Manuals"
 .SH NAME
 ovinstanceadd \- create a new OpenVista instance
 .SH SYNOPSIS
@@ -25,4 +25,4 @@
 .SH AUTHOR
 Jonathan Tai <[e-mail]>
 .SH "SEE ALSO"
-.BR ovinstancedel (1)
+.BR ovinstancedel (8)
 
=== renamed file 'docs/man1/ovinstancedel.1' => 'docs/man8/ovinstancedel.8'
--- docs/man1/ovinstancedel.1	2009-04-21 23:38:53 +0000
+++ docs/man8/ovinstancedel.8	2009-07-09 23:48:40 +0000
@@ -1,4 +1,4 @@
-.TH ovinstancedel 1 "18 Apr 2009" Linux "User Manuals"
+.TH ovinstancedel 8 "9 Jul 2009" Linux "User Manuals"
 .SH NAME
 ovinstancedel \- delete an OpenVista instance
 .SH SYNOPSIS
@@ -26,4 +26,4 @@
 .SH AUTHOR
 Jonathan Tai <[e-mail]>
 .SH "SEE ALSO"
-.BR ovinstanceadd (1)
+.BR ovinstanceadd (8)
 
=== renamed file 'docs/man1/ovrestore.1' => 'docs/man8/ovrestore.8'
--- docs/man1/ovrestore.1	2009-04-21 20:45:44 +0000
+++ docs/man8/ovrestore.8	2009-07-09 23:48:40 +0000
@@ -1,4 +1,4 @@
-.TH ovrestore 1 "18 Apr 2009" Linux "User Manuals"
+.TH ovrestore 8 "9 Jul 2009" Linux "User Manuals"
 .SH NAME
 ovrestore \- restores a backup file into an OpenVista instance
 .SH SYNOPSIS
 
=== added directory 'packages/deb'
=== added directory 'packages/deb/fis-gtm-5.3004'
=== added directory 'packages/deb/fis-gtm-5.3004/debian'
=== added file 'packages/deb/fis-gtm-5.3004/debian/changelog'
--- packages/deb/fis-gtm-5.3004/debian/changelog	1970-01-01 00:00:00 +0000
+++ packages/deb/fis-gtm-5.3004/debian/changelog	2009-07-29 12:27:28 +0000
@@ -0,0 +1,5 @@
+fis-gtm-5.3004 (5.3004-0ubuntu1) jaunty; urgency=low
+
+  * Initial Ubuntu package (Closes: #358242)
+
+ -- Jonathan Tai <[e-mail]>  Fri, 24 Jul 2009 00:34:40 -0700
 
=== added file 'packages/deb/fis-gtm-5.3004/debian/compat'
--- packages/deb/fis-gtm-5.3004/debian/compat	1970-01-01 00:00:00 +0000
+++ packages/deb/fis-gtm-5.3004/debian/compat	2009-07-29 12:27:28 +0000
@@ -0,0 +1,1 @@
+7
 
=== added file 'packages/deb/fis-gtm-5.3004/debian/control'
--- packages/deb/fis-gtm-5.3004/debian/control	1970-01-01 00:00:00 +0000
+++ packages/deb/fis-gtm-5.3004/debian/control	2009-07-30 22:23:13 +0000
@@ -0,0 +1,17 @@
+Source: fis-gtm-5.3004
+Section: misc
+Priority: optional
+Maintainer: Jonathan Tai <[e-mail]>
+Build-Depends: debhelper (>= 7), dpatch, tcsh, gcc-4.1, libicu-dev (>= 3.8), zlib1g-dev, libncurses5-dev, libgpgme11-dev, libgpg-error-dev, libgcrypt11-dev
+Standards-Version: 3.8.0
+Homepage: http://www.fidelityinfoservices.com/FNFIS/Markets/NonFinancialIndustries/Healthcare/GTM/
+
+Package: fis-gtm-5.3004
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libicu38, zlib1g, libncurses5, libgpgme11, libgpg-error0, libgcrypt11
+Suggests: ksh
+Description: High end TP schemaless database
+ GT.M is a vetted, industrial strength, transaction processing application
+ platform consisting of a schema-less database engine optimized for extreme
+ transaction processing throughput & business continuity plus a compiler for the
+ MUMPS language.
 
=== added file 'packages/deb/fis-gtm-5.3004/debian/copyright'
--- packages/deb/fis-gtm-5.3004/debian/copyright	1970-01-01 00:00:00 +0000
+++ packages/deb/fis-gtm-5.3004/debian/copyright	2009-07-29 12:27:28 +0000
@@ -0,0 +1,21 @@
+This package was debianized by Jonathan Tai <[e-mail]> on
+Fri, 24 Jul 2009 00:34:40 -0700.
+
+It was downloaded from <http://www.fidelityinfoservices.com/FNFIS/Markets/NonFinancialIndustries/Healthcare/GTM/>
+
+Upstream Author:
+
+    Fidelity Information Services, Inc.
+
+Copyright:
+
+    Copyright (C) 2009 Fidelity Information Services, Inc.
+
+License:
+
+    GT.M for selected platforms, including GNU/Linux on the popular x86
+    architecture, can be downloaded under the terms of the Affero GNU General
+    Public License (AGPL) version 3.
+
+The Debian packaging is copyright 2009, Medsphere Systems Corporation and
+is licensed under the AGPL.
 
=== added file 'packages/deb/fis-gtm-5.3004/debian/dirs'
--- packages/deb/fis-gtm-5.3004/debian/dirs	1970-01-01 00:00:00 +0000
+++ packages/deb/fis-gtm-5.3004/debian/dirs	2009-07-29 12:27:28 +0000
@@ -0,0 +1,1 @@
+opt/lsb-gtm
 
=== added file 'packages/deb/fis-gtm-5.3004/debian/docs'
--- packages/deb/fis-gtm-5.3004/debian/docs	1970-01-01 00:00:00 +0000
+++ packages/deb/fis-gtm-5.3004/debian/docs	2009-07-30 20:45:36 +0000
@@ -0,0 +1,1 @@
+COPYING
 
=== added directory 'packages/deb/fis-gtm-5.3004/debian/patches'
=== added file 'packages/deb/fis-gtm-5.3004/debian/patches/00list'
--- packages/deb/fis-gtm-5.3004/debian/patches/00list	1970-01-01 00:00:00 +0000
+++ packages/deb/fis-gtm-5.3004/debian/patches/00list	2009-07-29 12:27:28 +0000
@@ -0,0 +1,2 @@
+01-configurable-compiler.dpatch
+02-configure-fix.dpatch
 
=== added file 'packages/deb/fis-gtm-5.3004/debian/patches/01-configurable-compiler.dpatch'
--- packages/deb/fis-gtm-5.3004/debian/patches/01-configurable-compiler.dpatch	1970-01-01 00:00:00 +0000
+++ packages/deb/fis-gtm-5.3004/debian/patches/01-configurable-compiler.dpatch	2009-07-29 12:27:28 +0000
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-configurable-compiler.dpatch by  <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad fis-gtm-5.3004-5.3004~/sr_linux/gtm_env_sp.mk fis-gtm-5.3004-5.3004/sr_linux/gtm_env_sp.mk
+--- fis-gtm-5.3004-5.3004~/sr_linux/gtm_env_sp.mk	2009-06-08 05:08:10.000000000 -0400
++++ fis-gtm-5.3004-5.3004/sr_linux/gtm_env_sp.mk	2009-07-28 22:22:03.000000000 -0400
+@@ -57,7 +57,7 @@
+ gt_as_src_suffix=.s
+ 
+ # C compiler options
+-gt_cc_compiler=gcc
++gt_cc_compiler?=gcc
+ 
+ # Do not lookup the source directory before include directories specified by -I.
+ # gcc complains about -I- being obsolete, but using -iquote cause build errors for gcc and as - ABS 2008.12.09
 
=== added file 'packages/deb/fis-gtm-5.3004/debian/patches/02-configure-fix.dpatch'
--- packages/deb/fis-gtm-5.3004/debian/patches/02-configure-fix.dpatch	1970-01-01 00:00:00 +0000
+++ packages/deb/fis-gtm-5.3004/debian/patches/02-configure-fix.dpatch	2009-07-29 12:27:28 +0000
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-configure-fix.dpatch by  <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad fis-gtm-5.3004-5.3004~/sr_unix/configure.gtc fis-gtm-5.3004-5.3004/sr_unix/configure.gtc
+--- fis-gtm-5.3004-5.3004~/sr_unix/configure.gtc	2009-07-10 11:31:45.000000000 -0400
++++ fis-gtm-5.3004-5.3004/sr_unix/configure.gtc	2009-07-28 22:27:19.000000000 -0400
+@@ -208,9 +208,9 @@
+ 		is64bit_gtm=`file mumps | grep "64-bit" | wc -l`
+ 	fi
+ 	if [ $is64bit_gtm -eq 1 ] ; then
+-		library_path="/usr/local/lib64 /usr/local/lib /usr/lib /usr/lib32"
++		library_path="/usr/local/lib64 /usr/local/lib /usr/lib64 /usr/lib /lib64 /lib"
+ 	else
+-		library_path="/usr/local/lib /usr/lib /usr/lib32"
++		library_path="/usr/local/lib32 /usr/local/lib /usr/lib32 /usr/lib /lib32 /lib"
+ 	fi
+ 	$echo "Should unicode support be installed? (y or n) \c"
+ 	read resp
+@@ -303,7 +303,7 @@
+ 			fi
+ 		done
+ 		if [ "$found_icu" -eq 0 ] ; then
+-			if [ $majmin != "" ] ; then
++			if [ "$majmin" != "" ] ; then
+ 				echo "WARNING: ICU version $gtm_icu_version not found. Not installing Unicode support."
+ 			else
+ 				echo "WARNING: Default ICU version not found. Not installing Unicode support."
 
=== added file 'packages/deb/fis-gtm-5.3004/debian/patches/99-noninteractive-configure.patch'
--- packages/deb/fis-gtm-5.3004/debian/patches/99-noninteractive-configure.patch	1970-01-01 00:00:00 +0000
+++ packages/deb/fis-gtm-5.3004/debian/patches/99-noninteractive-configure.patch	2009-08-01 07:06:06 +0000
@@ -0,0 +1,78 @@
+--- configure	2009-07-16 15:26:02.000000000 -0700
++++ configure	2009-07-16 15:28:00.000000000 -0700
+@@ -112,7 +112,7 @@
+ # create temporary file to test for valid user and group names
+ touch tmp_owngrp
+ $echo "What account should own the files? (bin) \c"
+-read resp
++resp=""
+ if [ "$resp" = "" ] ; then
+ 	owner="bin"
+ else
+@@ -126,10 +126,10 @@
+ fi
+ 
+ $echo "Should execution of GT.M to be restricted to a group? (y or n) \c"
+-read resp
++resp="y"
+ if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
+ 	$echo "Enter group name? \c"
+-	read group
++	group="bin"
+ 	if [ "$group" != "" ] ; then
+ 		chgrp $group tmp_owngrp 2> /dev/null
+ 		if [ 1 = "$?" ] ; then
+@@ -145,7 +145,7 @@
+ rm tmp_owngrp
+ 
+ $echo "In what directory should GT.M be installed? \c"
+-read gtmdist
++gtmdist="@GTM_DIST@"
+ 
+ # if gtmdist is relative then need to make it absolute
+ 
+@@ -171,7 +171,7 @@
+ 	$echo "Directory $gtmdist does not exist. Do you wish to create it as part of"
+ 	$echo "this installation? (y or n) \c"
+ 
+-	read resp
++	resp="y"
+ 	if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
+ 		mkdir -p $gtmdist
+ 		chmod 0755 $gtmdist
+@@ -213,14 +213,14 @@
+ 		library_path="/usr/local/lib32 /usr/local/lib /usr/lib32 /usr/lib /lib32 /lib"
+ 	fi
+ 	$echo "Should unicode support be installed? (y or n) \c"
+-	read resp
++	resp="y"
+ 	if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
+ 		would_like_utf8=1
+ 		$echo "Should an ICU version other than the default be used? (y or n) \c"
+-		read resp
++		resp="y"
+ 		if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
+ 			$echo "Enter ICU version (at least ICU version 3.6 is required. Enter as <minor-ver>.<major-ver>): \c"
+-			read gtm_icu_version
++			gtm_icu_version="@GTM_ICU_VERSION@"
+ 			icu_ver=`$echo $gtm_icu_version | sed 's/\.//'`
+ 			majmin=`$echo $icu_ver | cut -f 1 -d "."`
+ 			if [ "$majmin" -lt "36" ] ; then
+@@ -567,7 +567,7 @@
+ $echo "only the uppercase versions of the files."
+ $echo ""
+ $echo "Do you want uppercase and lowercase versions of the MUMPS routines? (y or n)\c"
+-read resp
++resp="n"
+ if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
+ 	$echo ""
+ 	$echo "Creating lowercase versions of the MUMPS routines."
+@@ -768,7 +768,7 @@
+ $echo ""
+ $echo "Installation completed. Would you like all the temporary files"
+ $echo "removed from this directory? (y or n) \c"
+-read resp
++resp="y"
+ 
+ if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
+ 	\rm -rf $binaries $pathmods $rscripts $nscripts $dirs configure \
 
=== added file 'packages/deb/fis-gtm-5.3004/debian/postinst'
--- packages/deb/fis-gtm-5.3004/debian/postinst	1970-01-01 00:00:00 +0000
+++ packages/deb/fis-gtm-5.3004/debian/postinst	2009-08-01 19:52:55 +0000
@@ -0,0 +1,56 @@
+#!/bin/sh
+# postinst script for fis-gtm-5.3004
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+        if ! getent group gtm >/dev/null; then
+            addgroup --quiet gtm
+        fi
+
+        if [ `dpkg --print-architecture` = "amd64" ]; then
+            gtm_dist=/opt/lsb-gtm/V5.3-004_x86_64
+        else
+            gtm_dist=/opt/lsb-gtm/V5.3-004_i686
+        fi
+
+        suid_files=`find $gtm_dist -perm /4000`
+
+        chgrp -R gtm $gtm_dist
+        chgrp -R bin $gtm_dist/gtmsecshrdir
+
+        # the chgrp commands above may cause files to lose the setuid bit; re-add it here just in case
+        for file in $suid_files; do chmod u+s $file; done
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
 
=== added file 'packages/deb/fis-gtm-5.3004/debian/postrm'
--- packages/deb/fis-gtm-5.3004/debian/postrm	1970-01-01 00:00:00 +0000
+++ packages/deb/fis-gtm-5.3004/debian/postrm	2009-08-01 07:06:06 +0000
@@ -0,0 +1,44 @@
+#!/bin/sh
+# postrm script for fis-gtm-5.3004
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge)
+        # if we were the last GT.M package on the system, remove the gtm group
+        if [ ! -d /opt/lsb-gtm ]; then
+            delgroup --quiet gtm || :
+        fi
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
 
=== added file 'packages/deb/fis-gtm-5.3004/debian/rules'
--- packages/deb/fis-gtm-5.3004/debian/rules	1970-01-01 00:00:00 +0000
+++ packages/deb/fis-gtm-5.3004/debian/rules	2009-08-01 07:06:06 +0000
@@ -0,0 +1,205 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+#enable dpatch
+include /usr/share/dpatch/dpatch.make
+
+GTM_CURPRO = /tmp/gtm
+
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+ifeq ($(DEB_HOST_ARCH),amd64)
+GTM_DIST = /opt/lsb-gtm/V5.3-004_x86_64
+else
+GTM_DIST = /opt/lsb-gtm/V5.3-004_i686
+endif
+
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+GTM_HOSTOS = Linux
+else
+GTM_HOSTOS = $(DEB_HOST_ARCH_OS)
+endif
+
+GT_CC_COMPILER = gcc-4.1
+
+GTM_ICU_VERSION_MAJMIN = $(shell icu-config --version | sed 's/\.//' | cut -f 1 -d '.')
+GTM_ICU_VERSION_MINORVER = $(shell expr $(GTM_ICU_VERSION_MAJMIN) % 10)
+GTM_ICU_VERSION_MAJORVER = $(shell expr $(GTM_ICU_VERSION_MAJMIN) / 10)
+GTM_ICU_VERSION = $(GTM_ICU_VERSION_MAJORVER).$(GTM_ICU_VERSION_MINORVER)
+
+
+
+check-build-env:
+	if [ ! -d "$(GTM_CURPRO)" ]; then \
+		echo "existing binary installation of GT.M not found at $(GTM_CURPRO)"; \
+		exit 1; \
+	fi
+
+	if [ -d "$(GTM_DIST)" ]; then \
+		echo "target GT.M directory $(GTM_DIST) already exists"; \
+		exit 1; \
+	fi
+
+	if ! getent group gtm >/dev/null; then \
+		echo "gtm group not found in /etc/group"; \
+		exit 1; \
+	fi
+
+
+configure:
+	dh_testdir
+
+	# GT.M needs to be built with tcsh, and with a bunch of environmental variables
+	# set.  Since we can't run tcsh interactively, we put all the setenv commands
+	# and the build command itself into a temporary script, then execute it with
+	# tcsh.
+	echo 'setenv gtm_curpro $(GTM_CURPRO)' > build.csh
+	echo 'setenv gtm_exe $(GTM_CURPRO)' >> build.csh
+	echo 'setenv HOSTOS $(GTM_HOSTOS)' >> build.csh
+	echo 'setenv gtm_tools $(CURDIR)/sr_linux' >> build.csh
+	echo 'setenv gtm_inc $(CURDIR)/sr_linux' >> build.csh
+	if [ "$(DEB_HOST_ARCH)" = "amd64" ]; then \
+		echo 'setenv OBJECT_MODE 64' >> build.csh ; \
+	fi
+	echo 'setenv distro ubuntu' >> build.csh
+	echo 'setenv gtm_icu_version $(GTM_ICU_VERSION)' >> build.csh
+	echo 'setenv gtm_version_change 1' >> build.csh
+	cat sr_unix/gtm_env.csh >> build.csh
+
+	# GT.M 5.3004 requires gcc-4.1, Jaunty's default (gcc 4.3) doesn't work
+	echo 'setenv gt_cc_compiler $(GT_CC_COMPILER)' >> build.csh
+
+	# GT.M's makefiles get confused if this isn't reset back to 0
+	echo 'setenv MAKELEVEL 0' >> build.csh
+
+
+#Architecture
+build: patch-stamp build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: check-build-env configure
+	echo '$(MAKE) -f sr_unix/comlist.mk -I./sr_unix -I./sr_linux buildtypes=pro gtm_ver=$(CURDIR)' >> build.csh
+	tcsh -b build.csh
+
+	touch $@
+
+build-indep: build-indep-stamp
+build-indep-stamp: check-build-env configure
+
+	# Add here commands to compile the indep part of the package.
+	#$(MAKE) doc
+	touch $@
+
+clean: unpatch configure
+	dh_testdir
+	dh_testroot
+	rm -f build-arch-stamp build-indep-stamp
+
+	echo '$(MAKE) -f sr_unix/comlist.mk -I./sr_unix -I./sr_linux buildtypes=pro gtm_ver=$(CURDIR) clean' >> build.csh
+	tcsh -b build.csh
+	rm -f build.csh
+
+	if [ -f install-arch-stamp ]; then \
+		rm -rf $(GTM_DIST); \
+		rm install-arch-stamp; \
+	fi
+
+	dh_clean 
+
+install: install-indep install-arch
+install-indep:
+	dh_testdir
+	dh_testroot
+	dh_prep -i 
+	dh_installdirs -i
+
+	# Add here commands to install the indep part of the package into
+	# debian/<package>-doc.
+	#INSTALLDOC#
+
+	dh_install -i
+
+install-arch:
+	dh_testdir
+	dh_testroot
+	dh_prep -s 
+	dh_installdirs -s
+
+	mkdir -p `dirname $(GTM_DIST)`
+
+	# We need to patch the configure script to pre-answer all of the prompts and
+	# set the installation directory
+	cd pro ; \
+	cat ../debian/patches/99-noninteractive-configure.patch | \
+		sed 's,@GTM_DIST@,$(GTM_DIST),' | \
+		sed 's,@GTM_ICU_VERSION@,$(GTM_ICU_VERSION),' | \
+		patch -p0 -b ; \
+	chmod +x configure ; \
+	./configure
+
+	cp -a $(GTM_DIST) debian/fis-gtm-5.3004`dirname $(GTM_DIST)`/
+
+	touch install-arch-stamp
+
+	dh_install -s
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	# re-copy files to ensure permissions are correct.  files are owned by
+	# group bin for now; will change to group gtm in postinst
+	rm -rf debian/fis-gtm-5.3004$(GTM_DIST)
+	cp -a $(GTM_DIST) debian/fis-gtm-5.3004`dirname $(GTM_DIST)`/
+#	dh_perl
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
 
=== added directory 'packages/deb/openvista-libs-5.3004'
=== added directory 'packages/deb/openvista-libs-5.3004/debian'
=== added file 'packages/deb/openvista-libs-5.3004/debian/changelog'
--- packages/deb/openvista-libs-5.3004/debian/changelog	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-libs-5.3004/debian/changelog	2009-07-26 07:07:12 +0000
@@ -0,0 +1,5 @@
+openvista-libs-5.3004 (0.8.4-0ubuntu1) jaunty; urgency=low
+
+  * Initial Ubuntu package (Closes: #358242)
+
+ -- Jonathan Tai <[e-mail]>  Sat, 25 Jul 2009 23:44:28 -0700
 
=== added file 'packages/deb/openvista-libs-5.3004/debian/changelogs'
--- packages/deb/openvista-libs-5.3004/debian/changelogs	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-libs-5.3004/debian/changelogs	2009-07-26 07:07:12 +0000
@@ -0,0 +1,1 @@
+ChangeLog 
 
=== added file 'packages/deb/openvista-libs-5.3004/debian/compat'
--- packages/deb/openvista-libs-5.3004/debian/compat	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-libs-5.3004/debian/compat	2009-07-26 07:07:12 +0000
@@ -0,0 +1,1 @@
+7
 
=== added file 'packages/deb/openvista-libs-5.3004/debian/control'
--- packages/deb/openvista-libs-5.3004/debian/control	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-libs-5.3004/debian/control	2009-07-30 21:37:58 +0000
@@ -0,0 +1,21 @@
+Source: openvista-libs-5.3004
+Section: misc
+Priority: optional
+Maintainer: Jonathan Tai <[e-mail]>
+Build-Depends: debhelper (>= 7), fis-gtm-5.3004
+Standards-Version: 3.8.0
+Homepage: https://medsphere.org/community/project/gtm
+
+Package: openvista-libs-5.3004
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, fis-gtm-5.3004
+Provides: openvista-libs
+Description: GT.M External Calls for OpenVista
+ OpenVista is a cost-effective, open, trusted and complete EHR which enhances
+ patient safety, increases clinical and operational efficiency and provides an
+ opportunity to improve quality of care delivery.
+ .
+ This package provides a shared library that OpenVista code running in GT.M
+ calls out to for PAM authentication and duplicating a device onto a spawned
+ child's stdin/stdout.  This package also provides an suid wrapper around GT.M
+ utilities used to send signals to other GT.M processes.
 
=== added file 'packages/deb/openvista-libs-5.3004/debian/copyright'
--- packages/deb/openvista-libs-5.3004/debian/copyright	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-libs-5.3004/debian/copyright	2009-07-26 07:07:12 +0000
@@ -0,0 +1,50 @@
+This package was debianized by Jonathan Tai <[e-mail]> on
+Sat, 25 Jul 2009 23:44:28 -0700
+
+It was downloaded from <https://medsphere.org/community/project/gtm>
+
+Upstream Author:
+
+    Medsphere Systems Corporation
+
+Copyright:
+
+    Copyright (C) 2009 Medsphere Systems Corporation
+
+License:
+
+    The utilities provided by the OpenVista/GT.M Integration Project simplify
+    installation, configuration, and operation of OpenVista Server when running on
+    GT.M on Linux.
+    
+    Copyright (C) 2009 Medsphere Systems Corporation
+    
+    This program  is free software; you can redistribute it and/or modify it solely
+    under the terms of the GNU Affero General Public License version 3 as published
+    by the Free Software Foundation.
+    
+    This program is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+    for more details.
+    
+    You should have received a copy of the GNU Affero General Public License along
+    with this program; if not, see http://www.gnu.org/licenses or write to the Free
+    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301 USA.
+    
+    You can contact Medsphere Systems Corporation headquarters at 1917 Palomar Oaks Way,
+    Carlsbad, Ca. 92008 or at [e-mail].
+    
+    The interactive user interfaces in modified source and object code versions
+    of this program must display Appropriate Legal Notices, as required under
+    Section 5 of the GNU Affero General Public License version 3.
+    
+    In accordance with Section 7(b) of the GNU Affero General Public License
+    version 3, these Appropriate Legal Notices must retain the display of the
+    "Powered by Medsphere" logo. If the display of the logo is not reasonably
+    feasible for technical reasons, the Appropriate Legal Notices must display
+    the words "Powered by Medsphere".
+
+The Debian packaging is copyright 2009, Medsphere Systems Corporation and
+is licensed under the AGPL.
 
=== added file 'packages/deb/openvista-libs-5.3004/debian/dirs'
--- packages/deb/openvista-libs-5.3004/debian/dirs	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-libs-5.3004/debian/dirs	2009-07-30 21:56:37 +0000
@@ -0,0 +1,1 @@
+usr/share/doc/openvista-libs-5.3004
 
=== added file 'packages/deb/openvista-libs-5.3004/debian/docs'
--- packages/deb/openvista-libs-5.3004/debian/docs	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-libs-5.3004/debian/docs	2009-07-26 07:07:12 +0000
@@ -0,0 +1,2 @@
+NEWS
+README
 
=== added file 'packages/deb/openvista-libs-5.3004/debian/manpages'
--- packages/deb/openvista-libs-5.3004/debian/manpages	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-libs-5.3004/debian/manpages	2009-08-03 19:22:13 +0000
@@ -0,0 +1,1 @@
+docs/man8/gtmsignal.8
 
=== added file 'packages/deb/openvista-libs-5.3004/debian/postinst'
--- packages/deb/openvista-libs-5.3004/debian/postinst	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-libs-5.3004/debian/postinst	2009-08-01 19:52:55 +0000
@@ -0,0 +1,49 @@
+#!/bin/sh
+# postinst script for openvista-libs-5.3004
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+        if [ `dpkg --print-architecture` = "amd64" ]; then
+            gtm_dist=/opt/lsb-gtm/V5.3-004_x86_64
+        else
+            gtm_dist=/opt/lsb-gtm/V5.3-004_i686
+        fi
+
+        chgrp gtm $gtm_dist/libopenvista.so $gtm_dist/openvista.xc $gtm_dist/gtmsignal
+
+        # the chgrp command above may cause gtmsignal to lose the setuid bit; re-add it here just in case
+        chmod u+s $gtm_dist/gtmsignal
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
 
=== added file 'packages/deb/openvista-libs-5.3004/debian/rules'
--- packages/deb/openvista-libs-5.3004/debian/rules	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-libs-5.3004/debian/rules	2009-08-01 07:06:06 +0000
@@ -0,0 +1,138 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifeq ($(DEB_HOST_ARCH),amd64)
+GTM_DIST = /opt/lsb-gtm/V5.3-004_x86_64
+else
+GTM_DIST = /opt/lsb-gtm/V5.3-004_i686
+endif
+
+
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+
+#Architecture
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp  
+	cd src/libopenvista && gtm_dist="$(GTM_DIST)" ./compile.sh
+	cd src/gtmsignal && ./compile.sh
+	touch $@
+
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp  
+
+	# Add here commands to compile the indep part of the package.
+	#$(MAKE) doc
+	touch $@
+
+clean: 
+	dh_testdir
+	dh_testroot
+	rm -f build-arch-stamp build-indep-stamp configure-stamp
+
+	rm -f src/libopenvista/libopenvista.so
+	rm -f src/libopenvista/openvista.xc
+	rm -f src/gtmsignal/gtmsignal
+
+	dh_clean 
+
+install: install-indep install-arch
+install-indep:
+	dh_testdir
+	dh_testroot
+	dh_prep -i 
+	dh_installdirs -i
+
+	# Add here commands to install the indep part of the package into
+	# debian/<package>-doc.
+	#INSTALLDOC#
+
+	dh_install -i
+
+install-arch:
+	dh_testdir
+	dh_testroot
+	dh_prep -s 
+	dh_installdirs -s
+
+	install COPYING.AGPL debian/openvista-libs-5.3004/usr/share/doc/openvista-libs-5.3004/AGPL
+
+	mkdir -p debian/openvista-libs-5.3004$(GTM_DIST)
+
+	install src/libopenvista/libopenvista.so debian/openvista-libs-5.3004$(GTM_DIST)
+	install -m 644 src/libopenvista/openvista.xc debian/openvista-libs-5.3004$(GTM_DIST)
+
+	install src/gtmsignal/gtmsignal debian/openvista-libs-5.3004$(GTM_DIST)
+
+	dh_install -s
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	# use group bin for now; will change to group gtm in postinst
+	chown bin:bin debian/openvista-libs-5.3004$(GTM_DIST)/*
+	chmod 440 debian/openvista-libs-5.3004$(GTM_DIST)/*
+	chown root debian/openvista-libs-5.3004$(GTM_DIST)/gtmsignal
+	chmod 4550 debian/openvista-libs-5.3004$(GTM_DIST)/gtmsignal
+#	dh_perl
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
 
=== added directory 'packages/deb/openvista-utils'
=== added directory 'packages/deb/openvista-utils/debian'
=== added file 'packages/deb/openvista-utils/debian/changelog'
--- packages/deb/openvista-utils/debian/changelog	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-utils/debian/changelog	2009-07-20 18:10:21 +0000
@@ -0,0 +1,11 @@
+openvista-utils (0.8.4-0ubuntu1) jaunty; urgency=low
+
+  * Sync with upstream
+
+ -- Jonathan Tai <[e-mail]>  Mon, 20 Jul 2009 11:01:18 -0700
+
+openvista-utils (0.8.3-0ubuntu1) jaunty; urgency=low
+
+  * Initial Ubuntu package (Closes: #358242)
+
+ -- Jonathan Tai <[e-mail]>  Wed, 08 Jul 2009 21:26:33 -0700
 
=== added file 'packages/deb/openvista-utils/debian/changelogs'
--- packages/deb/openvista-utils/debian/changelogs	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-utils/debian/changelogs	2009-07-09 07:59:00 +0000
@@ -0,0 +1,1 @@
+ChangeLog 
 
=== added file 'packages/deb/openvista-utils/debian/compat'
--- packages/deb/openvista-utils/debian/compat	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-utils/debian/compat	2009-07-09 07:59:00 +0000
@@ -0,0 +1,1 @@
+7
 
=== added file 'packages/deb/openvista-utils/debian/control'
--- packages/deb/openvista-utils/debian/control	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-utils/debian/control	2009-08-03 22:58:57 +0000
@@ -0,0 +1,20 @@
+Source: openvista-utils
+Section: admin
+Priority: optional
+Maintainer: Jonathan Tai <[e-mail]>
+Build-Depends: debhelper (>= 7), libpam0g-dev
+Standards-Version: 3.8.0
+Homepage: https://medsphere.org/community/project/gtm
+
+Package: openvista-utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, rsync, bzip2 | pbzip2 (>= 1.0.5), cron, openssh-client, apache2.2-common, openvista-libs
+Recommends: openssh-server, apache2
+Suggests: putty-tools, bash-completion, pbzip2 (>= 1.0.5)
+Description: Utilities for configuring and managing OpenVista
+ OpenVista is a cost-effective, open, trusted and complete EHR which enhances
+ patient safety, increases clinical and operational efficiency and provides an
+ opportunity to improve quality of care delivery.
+ .
+ This package provides command-line utilities that aid in configuring and
+ managing OpenVista instances.
 
=== added file 'packages/deb/openvista-utils/debian/copyright'
--- packages/deb/openvista-utils/debian/copyright	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-utils/debian/copyright	2009-07-12 04:53:43 +0000
@@ -0,0 +1,50 @@
+This package was debianized by Jonathan Tai <[e-mail]> on
+Wed, 08 Jul 2009 21:26:33 -0700.
+
+It was downloaded from <https://medsphere.org/community/project/gtm>
+
+Upstream Author:
+
+    Medsphere Systems Corporation
+
+Copyright:
+
+    Copyright (C) 2009 Medsphere Systems Corporation
+
+License:
+
+    The utilities provided by the OpenVista/GT.M Integration Project simplify
+    installation, configuration, and operation of OpenVista Server when running on
+    GT.M on Linux.
+    
+    Copyright (C) 2009 Medsphere Systems Corporation
+    
+    This program  is free software; you can redistribute it and/or modify it solely
+    under the terms of the GNU Affero General Public License version 3 as published
+    by the Free Software Foundation.
+    
+    This program is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+    for more details.
+    
+    You should have received a copy of the GNU Affero General Public License along
+    with this program; if not, see http://www.gnu.org/licenses or write to the Free
+    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301 USA.
+    
+    You can contact Medsphere Systems Corporation headquarters at 1917 Palomar Oaks Way,
+    Carlsbad, Ca. 92008 or at [e-mail].
+    
+    The interactive user interfaces in modified source and object code versions
+    of this program must display Appropriate Legal Notices, as required under
+    Section 5 of the GNU Affero General Public License version 3.
+    
+    In accordance with Section 7(b) of the GNU Affero General Public License
+    version 3, these Appropriate Legal Notices must retain the display of the
+    "Powered by Medsphere" logo. If the display of the logo is not reasonably
+    feasible for technical reasons, the Appropriate Legal Notices must display
+    the words "Powered by Medsphere".
+
+The Debian packaging is copyright 2009, Medsphere Systems Corporation and
+is licensed under the AGPL.
 
=== added file 'packages/deb/openvista-utils/debian/dirs'
--- packages/deb/openvista-utils/debian/dirs	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-utils/debian/dirs	2009-07-12 08:33:40 +0000
@@ -0,0 +1,9 @@
+etc/apache2/conf.d
+etc/bash_completion.d
+opt/openvista
+sbin
+usr/bin
+usr/lib/openvista
+usr/sbin
+usr/share/doc/openvista-utils
+var/www/webdav
 
=== added file 'packages/deb/openvista-utils/debian/docs'
--- packages/deb/openvista-utils/debian/docs	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-utils/debian/docs	2009-07-12 08:33:40 +0000
@@ -0,0 +1,2 @@
+NEWS
+README
 
=== added file 'packages/deb/openvista-utils/debian/manpages'
--- packages/deb/openvista-utils/debian/manpages	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-utils/debian/manpages	2009-07-10 00:05:19 +0000
@@ -0,0 +1,11 @@
+docs/man8/ovinstanceadd.8
+docs/man8/ovinstancedel.8
+docs/man8/ovrestore.8
+docs/man8/ovauth.8
+docs/man1/openvista.1
+docs/man1/ovtied.1
+docs/man1/ovcc.1
+docs/man1/ovbackup.1
+docs/man1/ovpurgejournals.1
+docs/man1/ovswitchjournals.1
+docs/man1/ovimport.1
 
=== added file 'packages/deb/openvista-utils/debian/openvista-utils.openvista.pam'
--- packages/deb/openvista-utils/debian/openvista-utils.openvista.pam	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-utils/debian/openvista-utils.openvista.pam	2009-07-09 08:28:58 +0000
@@ -0,0 +1,4 @@
+@include common-auth
+@include common-account
+@include common-password
+@include common-session
 
=== added file 'packages/deb/openvista-utils/debian/postinst'
--- packages/deb/openvista-utils/debian/postinst	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-utils/debian/postinst	2009-08-03 20:13:57 +0000
@@ -0,0 +1,74 @@
+#!/bin/sh
+# postinst script for openvista-utils
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+        if ! getent group openvista >/dev/null; then
+            addgroup --quiet openvista
+        fi
+
+        if ! getent passwd openvista >/dev/null; then
+            adduser --quiet --disabled-password --ingroup openvista --gecos "OpenVista tied account" openvista
+        fi
+
+        if ! groups openvista | grep gtm >/dev/null; then
+            adduser --quiet openvista gtm > /dev/null
+        fi
+
+        chgrp openvista /opt/openvista /sbin/ovauth
+
+        # the chgrp command above may cause ovauth to lose the setuid bit; re-add it here just in case
+        chmod u+s /sbin/ovauth
+
+        if [ -x /usr/sbin/a2enmod ]; then
+            a2enmod dav_fs > /dev/null
+            a2enmod ssl > /dev/null
+        fi
+
+        if [ -x /usr/sbin/a2ensite ]; then
+            a2ensite default-ssl > /dev/null
+        fi
+
+        # FIXME: disable access to the webdav directory via regular HTTP
+
+        if [ -x /etc/init.d/apache2 ]; then
+            if [ -x /usr/sbin/invoke-rc.d ]; then
+                invoke-rc.d apache2 restart
+            else
+                /etc/init.d/apache2 restart
+            fi
+        fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
 
=== added file 'packages/deb/openvista-utils/debian/postrm'
--- packages/deb/openvista-utils/debian/postrm	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-utils/debian/postrm	2009-08-01 07:06:06 +0000
@@ -0,0 +1,55 @@
+#!/bin/sh
+# postrm script for openvista-utils
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge)
+        deluser --quiet openvista || :
+
+        # if there are no users in the openvista group (other than the openvista
+        # user), deluser will delete the group, but if there *are* other users, we
+        # need to explicitly call delgroup
+        delgroup --quiet openvista || :
+
+        # FIXME: does this need to happen even on remove?
+        if [ -x /etc/init.d/apache2 ]; then
+            if [ -x /usr/sbin/invoke-rc.d ]; then
+                invoke-rc.d apache2 reload
+            else
+                /etc/init.d/apache2 reload
+            fi
+        fi
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
 
=== added file 'packages/deb/openvista-utils/debian/rules'
--- packages/deb/openvista-utils/debian/rules	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-utils/debian/rules	2009-08-03 21:07:36 +0000
@@ -0,0 +1,154 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+
+
+
+
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+
+#Architecture
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp  
+	cd src/ovauth && ./compile.sh
+	touch $@
+
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp  
+
+	# Add here commands to compile the indep part of the package.
+	#$(MAKE) doc
+	touch $@
+
+clean: 
+	dh_testdir
+	dh_testroot
+	rm -f build-arch-stamp build-indep-stamp configure-stamp
+
+	rm -f debian/openvista-utils.openvista-databases.init
+	rm -f debian/openvista-utils.openvista.init
+	rm -f debian/openvista-utils.openvista.cron.d
+	rm -f debian/openvista-utils.openvista.cron.daily
+	rm -f src/ovauth/ovauth
+
+	dh_clean 
+
+install: install-indep install-arch
+install-indep:
+	dh_testdir
+	dh_testroot
+	dh_prep -i 
+	dh_installdirs -i
+
+	# Add here commands to install the indep part of the package into
+	# debian/<package>-doc.
+	#INSTALLDOC#
+
+	dh_install -i
+
+install-arch:
+	dh_testdir
+	dh_testroot
+	dh_prep -s 
+	dh_installdirs -s
+
+	install COPYING.AGPL debian/openvista-utils/usr/share/doc/openvista-utils/AGPL
+
+	install -m 644 scripts/usr/lib/openvista/functions debian/openvista-utils/usr/lib/openvista/
+
+	install scripts/usr/sbin/ovinstanceadd debian/openvista-utils/usr/sbin/
+	install scripts/usr/sbin/ovinstancedel debian/openvista-utils/usr/sbin/
+	install scripts/usr/sbin/ovrestore debian/openvista-utils/usr/sbin/
+
+	install scripts/usr/bin/openvista debian/openvista-utils/usr/bin/
+	install scripts/usr/bin/ovtied debian/openvista-utils/usr/bin/
+	install scripts/usr/bin/ovcc debian/openvista-utils/usr/bin/
+	install scripts/usr/bin/ovbackup debian/openvista-utils/usr/bin/
+	install scripts/usr/bin/ovpurgejournals debian/openvista-utils/usr/bin/
+	install scripts/usr/bin/ovswitchjournals debian/openvista-utils/usr/bin/
+	install scripts/usr/bin/ovimport debian/openvista-utils/usr/bin/
+
+	install scripts/etc/init.d/openvista-databases debian/openvista-utils.openvista-databases.init
+	install scripts/etc/init.d/openvista debian/openvista-utils.openvista.init
+
+	install -m 644 scripts/etc/bash_completion.d/openvista debian/openvista-utils/etc/bash_completion.d/
+
+	install scripts/etc/cron.d/openvista debian/openvista-utils.openvista.cron.d
+	install scripts/etc/cron.daily/openvista debian/openvista-utils.openvista.cron.daily
+
+	install -m 644 debian/webdav.conf debian/openvista-utils/etc/apache2/conf.d/
+
+	touch debian/openvista-utils/etc/apache2/webdav.htpasswd
+
+	install src/ovauth/ovauth debian/openvista-utils/sbin/
+
+	dh_install -s
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+	dh_installpam --name=openvista
+#	dh_installmime
+#	dh_python
+	dh_installinit -r --no-start --name=openvista-databases -- defaults 28 10
+	dh_installinit -r --no-start --name=openvista -- defaults 98 01
+	dh_installcron --name=openvista
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	# use group root for now; will change to group openvista in postinst
+	chmod 2750 debian/openvista-utils/opt/openvista
+	chmod 4754 debian/openvista-utils/sbin/ovauth
+#	dh_perl
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
 
=== added file 'packages/deb/openvista-utils/debian/webdav.conf'
--- packages/deb/openvista-utils/debian/webdav.conf	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-utils/debian/webdav.conf	2009-08-03 22:58:57 +0000
@@ -0,0 +1,14 @@
+# OpenVista document imaging repository
+<IfModule mod_dav_fs.c>
+<Directory "/var/www/webdav">
+        Dav On
+
+        AllowOverride None
+        Options Indexes FollowSymLinks
+
+        AuthType Basic
+        AuthName "OpenVista document imaging repository"
+        AuthUserFile "/etc/apache2/webdav.htpasswd"
+        Require valid-user
+</Directory>
+</IfModule>
 
=== modified file 'packages/rpm/fis-gtm-5.3003.spec'
--- packages/rpm/fis-gtm-5.3003.spec	2009-07-18 00:45:57 +0000
+++ packages/rpm/fis-gtm-5.3003.spec	2009-08-04 04:31:03 +0000
@@ -1,8 +1,8 @@
 # FIXME: this is a pretty bad RPM:
 #  - It requires that gtm_curpro already exists on the build box
 #  - It requires that gtm_dist does not already exist on the build box
+#  - It requires that the gtm group already exist on the build box
 #  - It requires the RPM be built as root
-#  - The arch is wrong (?) - GT.M requires i686 but this package is marked i386
 
 # This must point to an existing binary installation of GT.M because GT.M
 # requires GT.M to build
@@ -16,7 +16,7 @@
 
 Name:		fis-gtm-5.3003
 Version:	5.3003
-Release:	3
+Release:	4
 Summary:	High end TP schemaless database
 License:	AGPL
 Vendor:		Fidelity Information Services
@@ -67,7 +67,7 @@
     exit 1
 fi
 
-if ! grep '^gtm:' /etc/group > /dev/null; then
+if ! getent group gtm >/dev/null; then
     echo "gtm group not found in /etc/group"
     exit 1
 fi
@@ -106,10 +106,10 @@
 
 mkdir -p $(dirname %{gtm_dist})
 
-cd pro
 # We need to patch the configure script to pre-answer all of the prompts and
 # set the installation directory
-sed 's,@GTMDIST@,%{gtm_dist},' < %{PATCH1} | patch -p0 -b
+cd pro
+cat %{PATCH1} | sed 's,@GTM_DIST@,%{gtm_dist},' | patch -p0 -b
 chmod +x configure
 ./configure
 
 
=== modified file 'packages/rpm/fis-gtm-5.3003_noninteractive-configure.patch'
--- packages/rpm/fis-gtm-5.3003_noninteractive-configure.patch	2009-02-22 08:42:50 +0000
+++ packages/rpm/fis-gtm-5.3003_noninteractive-configure.patch	2009-08-04 04:31:03 +0000
@@ -27,7 +27,7 @@
  
  $echo "In what directory should GT.M be installed? \c"
 -read gtmdist
-+gtmdist="@GTMDIST@"
++gtmdist="@GTM_DIST@"
  
  $echo ""
  
 
=== modified file 'packages/rpm/fis-gtm-5.3004.spec'
--- packages/rpm/fis-gtm-5.3004.spec	2009-07-20 07:47:58 +0000
+++ packages/rpm/fis-gtm-5.3004.spec	2009-08-04 04:17:19 +0000
@@ -1,8 +1,8 @@
 # FIXME: this is a pretty bad RPM:
 #  - It requires that gtm_curpro already exists on the build box
 #  - It requires that gtm_dist does not already exist on the build box
+#  - It requires that the gtm group already exist on the build box
 #  - It requires the RPM be built as root
-#  - The arch is wrong (?) - GT.M requires i686 but this package is marked i386
 
 # This must point to an existing binary installation of GT.M because GT.M
 # requires GT.M to build
@@ -16,7 +16,7 @@
 
 Name:		fis-gtm-5.3004
 Version:	5.3004
-Release:	4
+Release:	5
 Summary:	High end TP schemaless database
 License:	AGPL
 Vendor:		Fidelity Information Services
@@ -66,7 +66,7 @@
     exit 1
 fi
 
-if ! grep '^gtm:' /etc/group > /dev/null; then
+if ! getent group gtm >/dev/null; then
     echo "gtm group not found in /etc/group"
     exit 1
 fi
@@ -85,13 +85,13 @@
 # tcsh.
 echo 'setenv gtm_curpro %{gtm_curpro}' > build.csh
 echo 'setenv gtm_exe %{gtm_curpro}' >> build.csh
-echo 'setenv HOSTOS `uname -s`' >> build.csh
+echo 'setenv HOSTOS '$(uname -s) >> build.csh
 echo 'setenv gtm_tools '$(pwd)'/sr_linux' >> build.csh
 echo 'setenv gtm_inc '$(pwd)'/sr_linux' >> build.csh
 %ifarch x86_64
 echo 'setenv OBJECT_MODE 64' >> build.csh
 %endif
-echo 'setenv gtm_icu_version `icu-config --version`' >> build.csh
+echo 'setenv gtm_icu_version '$(icu-config --version) >> build.csh
 echo 'setenv gtm_version_change 1' >> build.csh
 cat sr_unix/gtm_env.csh >> build.csh
 echo 'make -f sr_unix/comlist.mk -I./sr_unix -I./sr_linux buildtypes=pro gtm_ver='$(pwd) >> build.csh
@@ -107,10 +107,10 @@
 
 mkdir -p $(dirname %{gtm_dist})
 
-cd pro
 # We need to patch the configure script to pre-answer all of the prompts and
 # set the installation directory
-sed 's,@GTMDIST@,%{gtm_dist},' < %{PATCH1} | patch -p0 -b
+cd pro
+cat %{PATCH1} | sed 's,@GTM_DIST@,%{gtm_dist},' | sed 's,@GTM_ICU_VERSION@,'$(icu-config --version)',' | patch -p0 -b
 chmod +x configure
 ./configure
 
 
=== modified file 'packages/rpm/fis-gtm-5.3004_noninteractive-configure.patch'
--- packages/rpm/fis-gtm-5.3004_noninteractive-configure.patch	2009-07-16 23:02:21 +0000
+++ packages/rpm/fis-gtm-5.3004_noninteractive-configure.patch	2009-07-30 21:06:57 +0000
@@ -27,7 +27,7 @@
  
  $echo "In what directory should GT.M be installed? \c"
 -read gtmdist
-+gtmdist="@GTMDIST@"
++gtmdist="@GTM_DIST@"
  
  # if gtmdist is relative then need to make it absolute
  
@@ -54,7 +54,7 @@
  		if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
  			$echo "Enter ICU version (at least ICU version 3.6 is required. Enter as <minor-ver>.<major-ver>): \c"
 -			read gtm_icu_version
-+			gtm_icu_version="3.6"
++			gtm_icu_version="@GTM_ICU_VERSION@"
  			icu_ver=`$echo $gtm_icu_version | sed 's/\.//'`
  			majmin=`$echo $icu_ver | cut -f 1 -d "."`
  			if [ "$majmin" -lt "36" ] ; then
 
=== modified file 'packages/rpm/openvista-libs-5.3003.spec'
--- packages/rpm/openvista-libs-5.3003.spec	2009-07-17 08:17:11 +0000
+++ packages/rpm/openvista-libs-5.3003.spec	2009-08-04 04:27:16 +0000
@@ -6,7 +6,7 @@
 
 Name:		openvista-libs-5.3003
 Version:	0.8.4
-Release:	1
+Release:	2
 Summary:	GT.M External Calls for OpenVista
 License:	AGPL
 Vendor:		Medsphere Systems Corporation
@@ -54,6 +54,10 @@
 %install
 rm -rf %{buildroot}
 
+install -d %{buildroot}%{_mandir}/man8/
+install -m 644 docs/man8/gtmsignal.8 %{buildroot}%{_mandir}/man8/
+gzip %{buildroot}%{_mandir}/man8/gtmsignal.8
+
 install -d %{buildroot}%{gtm_dist}
 install -m 550 src/libopenvista/libopenvista.so %{buildroot}%{gtm_dist}
 install -m 440 src/libopenvista/openvista.xc %{buildroot}%{gtm_dist}
@@ -68,6 +72,7 @@
 %doc COPYING
 %doc COPYING.AGPL
 %doc NEWS
+%{_mandir}/man8/gtmsignal.8*
 %defattr(-,bin,gtm)
 %{gtm_dist}/libopenvista.so
 %{gtm_dist}/openvista.xc
 
=== modified file 'packages/rpm/openvista-libs-5.3004.spec'
--- packages/rpm/openvista-libs-5.3004.spec	2009-07-18 03:03:33 +0000
+++ packages/rpm/openvista-libs-5.3004.spec	2009-08-04 04:27:16 +0000
@@ -6,7 +6,7 @@
 
 Name:		openvista-libs-5.3004
 Version:	0.8.4
-Release:	1
+Release:	2
 Summary:	GT.M External Calls for OpenVista
 License:	AGPL
 Vendor:		Medsphere Systems Corporation
@@ -54,6 +54,10 @@
 %install
 rm -rf %{buildroot}
 
+install -d %{buildroot}%{_mandir}/man8/
+install -m 644 docs/man8/gtmsignal.8 %{buildroot}%{_mandir}/man8/
+gzip %{buildroot}%{_mandir}/man8/gtmsignal.8
+
 install -d %{buildroot}%{gtm_dist}
 install -m 550 src/libopenvista/libopenvista.so %{buildroot}%{gtm_dist}
 install -m 440 src/libopenvista/openvista.xc %{buildroot}%{gtm_dist}
@@ -68,6 +72,7 @@
 %doc COPYING
 %doc COPYING.AGPL
 %doc NEWS
+%{_mandir}/man8/gtmsignal.8*
 %defattr(-,bin,gtm)
 %{gtm_dist}/libopenvista.so
 %{gtm_dist}/openvista.xc
 
=== modified file 'packages/rpm/openvista-utils.spec'
--- packages/rpm/openvista-utils.spec	2009-07-20 17:23:59 +0000
+++ packages/rpm/openvista-utils.spec	2009-08-03 19:26:46 +0000
@@ -1,6 +1,6 @@
 Name:		openvista-utils
 Version:	0.8.4
-Release:	3
+Release:	4
 Summary:	Utilities for configuring and managing OpenVista
 License:	AGPL
 Vendor:		Medsphere Systems Corporation
@@ -14,7 +14,7 @@
 Requires(postun):	/usr/sbin/userdel, /sbin/service
 
 Requires:	/bin/bash, coreutils, openssh, /usr/bin/logger, /usr/bin/rsync, /bin/tar, /usr/bin/bzip2, /usr/bin/find, vixie-cron
-Requires:	fis-gtm, openvista-libs
+Requires:	openvista-libs
 Requires:	httpd, mod_ssl, pam
 BuildRequires:	pam-devel
 
@@ -63,10 +63,12 @@
 install scripts/usr/bin/ovswitchjournals %{buildroot}%{_bindir}/
 install scripts/usr/bin/ovimport %{buildroot}%{_bindir}/
 
+install -d %{buildroot}%{_mandir}/man8/
+install -m 644 docs/man8/ovinstanceadd.8 %{buildroot}%{_mandir}/man8/
+install -m 644 docs/man8/ovinstancedel.8 %{buildroot}%{_mandir}/man8/
+install -m 644 docs/man8/ovrestore.8 %{buildroot}%{_mandir}/man8/
+install -m 644 docs/man8/ovauth.8 %{buildroot}%{_mandir}/man8/
 install -d %{buildroot}%{_mandir}/man1/
-install -m 644 docs/man1/ovinstanceadd.1 %{buildroot}%{_mandir}/man1/
-install -m 644 docs/man1/ovinstancedel.1 %{buildroot}%{_mandir}/man1/
-install -m 644 docs/man1/ovrestore.1 %{buildroot}%{_mandir}/man1/
 install -m 644 docs/man1/openvista.1 %{buildroot}%{_mandir}/man1/
 install -m 644 docs/man1/ovtied.1 %{buildroot}%{_mandir}/man1/
 install -m 644 docs/man1/ovcc.1 %{buildroot}%{_mandir}/man1/
@@ -74,9 +76,10 @@
 install -m 644 docs/man1/ovpurgejournals.1 %{buildroot}%{_mandir}/man1/
 install -m 644 docs/man1/ovswitchjournals.1 %{buildroot}%{_mandir}/man1/
 install -m 644 docs/man1/ovimport.1 %{buildroot}%{_mandir}/man1/
-gzip %{buildroot}%{_mandir}/man1/ovinstanceadd.1
-gzip %{buildroot}%{_mandir}/man1/ovinstancedel.1
-gzip %{buildroot}%{_mandir}/man1/ovrestore.1
+gzip %{buildroot}%{_mandir}/man8/ovinstanceadd.8
+gzip %{buildroot}%{_mandir}/man8/ovinstancedel.8
+gzip %{buildroot}%{_mandir}/man8/ovrestore.8
+gzip %{buildroot}%{_mandir}/man8/ovauth.8
 gzip %{buildroot}%{_mandir}/man1/openvista.1
 gzip %{buildroot}%{_mandir}/man1/ovtied.1
 gzip %{buildroot}%{_mandir}/man1/ovcc.1
@@ -134,9 +137,10 @@
 %{_bindir}/ovpurgejournals
 %{_bindir}/ovswitchjournals
 %{_bindir}/ovimport
-%{_mandir}/man1/ovinstanceadd.1*
-%{_mandir}/man1/ovinstancedel.1*
-%{_mandir}/man1/ovrestore.1*
+%{_mandir}/man8/ovinstanceadd.8*
+%{_mandir}/man8/ovinstancedel.8*
+%{_mandir}/man8/ovrestore.8*
+%{_mandir}/man8/ovauth.8*
 %{_mandir}/man1/openvista.1*
 %{_mandir}/man1/ovtied.1*
 %{_mandir}/man1/ovcc.1*
 
=== modified file 'packages/rpm/webdav.conf'
--- packages/rpm/webdav.conf	2009-04-22 04:16:31 +0000
+++ packages/rpm/webdav.conf	2009-08-03 22:58:57 +0000
@@ -1,4 +1,5 @@
 # OpenVista document imaging repository
+<IfModule mod_dav_fs.c>
 <Directory "/var/www/html/webdav">
         Dav On
 
@@ -10,3 +11,4 @@
         AuthUserFile "/etc/httpd/conf/webdav.htpasswd"
         Require valid-user
 </Directory>
+</IfModule>
 
=== modified file 'scripts/etc/init.d/openvista'
--- scripts/etc/init.d/openvista	2009-06-11 04:58:31 +0000
+++ scripts/etc/init.d/openvista	2009-08-03 21:07:36 +0000
@@ -19,6 +19,15 @@
 #
 # chkconfig: 2345 98 01
 # description: Application-level startup/shutdown script for OpenVista Server
+#
+### BEGIN INIT INFO
+# Provides:          openvista
+# Required-Start:    $all openvista-databases
+# Required-Stop:     $all openvista-databases
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Application-level startup/shutdown script for OpenVista Server
+### END INIT INFO
 
 
 # Copyright (C) 2009 Medsphere Systems Corporation
@@ -39,8 +48,15 @@
 # Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
 
 
+# Check the package is still installed.  Traditionally, the test is for a
+# program that is executed later in this script, but it's not trivial to find
+# the location of the mumps binary because multiple verisons could be
+# installed, so look for the functions script instead.
+[ -f /usr/lib/openvista/functions ] || exit 0
+
 # Source function library.
-. /etc/rc.d/init.d/functions
+[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions
+[ -f /lib/lsb/init-functions ] && . /lib/lsb/init-functions
 . /usr/lib/openvista/functions
 
 root="/opt/openvista"
@@ -98,35 +114,85 @@
 case $1 in
     start)
         if [ -z "$2" ]; then
-            echo "Starting OpenVista..."
+            if function_exists "action"; then
+                echo "Starting OpenVista..."
+            elif function_exists "log_daemon_msg"; then
+                log_daemon_msg "Running startup hooks for OpenVista databases"
+            fi
     
             for instance in `ls $root`; do
                 [ -L "$root/$instance/gtm" ] || continue
 
-                action $"  Running startup hooks for $instance: " run_hook "$instance" ZSTART
+                if function_exists "action"; then
+                    action $"  Running startup hooks for $instance: " run_hook "$instance" ZSTART
+                elif function_exists "log_daemon_msg"; then
+                    log_progress_msg "$instance"
+                    run_hook "$instance" ZSTART || end_msg=1
+                else
+                    run_hook "$instance" ZSTART
+                fi
             done
+
+            if function_exists "log_daemon_msg"; then
+                log_end_msg ${end_msg:-0}
+            fi
         else
-            action $"Running startup hooks for $instance: " run_hook "$instance" ZSTART
+            if function_exists "action"; then
+                action $"Running startup hooks for $instance: " run_hook "$instance" ZSTART
+            elif function_exists "log_daemon_msg"; then
+                log_daemon_msg "Running startup hooks for OpenVista databases" "$instance"
+                run_hook "$instance" ZSTART
+                log_end_msg $?
+            else
+                run_hook "$instance" ZSTART
+            fi
         fi
         ;;
     stop)
         if [ -z "$2" ]; then
-            echo "Stopping OpenVista..."
+            if function_exists "action"; then
+                echo "Stopping OpenVista..."
+            elif function_exists "log_daemon_msg"; then
+                log_daemon_msg "Running shutdown hooks for OpenVista databases"
+            fi
 
             for instance in `ls $root`; do
                 [ -L "$root/$instance/gtm" ] || continue
 
-                action $"  Running shutdown hooks for $instance: " run_hook "$instance" ZSTOP
+                if function_exists "action"; then
+                    action $"  Running shutdown hooks for $instance: " run_hook "$instance" ZSTOP
+                elif function_exists "log_daemon_msg"; then
+                    log_progress_msg "$instance"
+                    run_hook "$instance" ZSTOP || end_msg=1
+                else
+                    run_hook "$instance" ZSTOP
+                fi
             done
+
+            if function_exists "log_daemon_msg"; then
+                log_end_msg ${end_msg:-0}
+            fi
         else
-            action $"Running shutdown hooks for $instance: " run_hook "$instance" ZSTOP
+            if function_exists "action"; then
+                action $"Running shutdown hooks for $instance: " run_hook "$instance" ZSTOP
+            elif function_exists "log_daemon_msg"; then
+                log_daemon_msg "Running shutdown hooks for OpenVista databases" "$instance"
+                run_hook "$instance" ZSTOP
+                log_end_msg $?
+            else
+                run_hook "$instance" ZSTOP
+            fi
         fi
 
         # give background jobs (e.g., TaskMan) some time to wake up and realize they've been asked to shut down
         sleep 5
         ;;
+    restart|force-reload)
+        $0 stop $2
+        $0 start $2
+        ;;
     *)
-        echo "Usage: openvista {start|stop} [INSTANCE_NAME]" >&2
+        echo "Usage: openvista {start|stop|restart|force-reload} [INSTANCE_NAME]" >&2
         exit 1
         ;;
 esac
 
=== modified file 'scripts/etc/init.d/openvista-databases'
--- scripts/etc/init.d/openvista-databases	2009-04-23 16:33:14 +0000
+++ scripts/etc/init.d/openvista-databases	2009-08-03 21:07:36 +0000
@@ -26,6 +26,15 @@
 #
 # chkconfig: 2345 50 30
 # description: Database-level startup/shutdown script for OpenVista Server
+#
+### BEGIN INIT INFO
+# Provides:          openvista-databases
+# Required-Start:    $local_fs $syslog $time
+# Required-Stop:     $local_fs $syslog $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Database-level startup/shutdown script for OpenVista Server
+### END INIT INFO
 
 
 # Copyright (C) 2009 Medsphere Systems Corporation
@@ -46,8 +55,15 @@
 # Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
 
 
+# Check the package is still installed.  Traditionally, the test is for a
+# program that is executed later in this script, but it's not trivial to find
+# the location of the mupip binary because multiple verisons could be
+# installed, so look for the functions script instead.
+[ -f /usr/lib/openvista/functions ] || exit 0
+
 # Source function library.
-. /etc/rc.d/init.d/functions
+[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions
+[ -f /lib/lsb/init-functions ] && . /lib/lsb/init-functions
 . /usr/lib/openvista/functions
 
 root="/opt/openvista"
@@ -149,32 +165,82 @@
 case $1 in
     start)
         if [ -z "$2" ]; then
-            echo "Performing backward journal recovery on OpenVista databases..."
-    
+            if function_exists "action"; then
+                echo "Performing backward journal recovery on OpenVista databases..."
+            elif function_exists "log_daemon_msg"; then
+                log_daemon_msg "Performing backward journal recovery on OpenVista databases"
+            fi
+
             for instance in `ls $root`; do
                 [ -L "$root/$instance/gtm" ] || continue
 
-                action $"  Performing recovery on $instance database: " recover_backward "$instance"
+                if function_exists "action"; then
+                    action $"  Performing recovery on $instance database: " recover_backward "$instance"
+                elif function_exists "log_daemon_msg"; then
+                    log_progress_msg "$instance"
+                    recover_backward "$instance" || end_msg=1
+                else
+                    recover_backward "$instance"
+                fi
             done
+
+            if function_exists "log_daemon_msg"; then
+                log_end_msg ${end_msg:-0}
+            fi
         else
-            action $"Performing recovery on $instance database: " recover_backward "$instance"
+            if function_exists "action"; then
+                action $"Performing recovery on $instance database: " recover_backward "$instance"
+            elif function_exists "log_daemon_msg"; then
+                log_daemon_msg "Performing backward journal recovery on OpenVista databases" "$instance"
+                recover_backward "$instance"
+                log_end_msg $?
+            else
+                recover_backward "$instance"
+            fi
         fi
         ;;
     stop)
         if [ -z "$2" ]; then
-            echo "Terminating remaining mumps processes..."
+            if function_exists "action"; then
+                echo "Terminating remaining mumps processes..."
+            elif function_exists "log_daemon_msg"; then
+                log_daemon_msg "Terminating remaining mumps processes"
+            fi
     
             for instance in `ls $root`; do
                 [ -L "$root/$instance/gtm" ] || continue
 
-                action $"  Terminating mumps processes in $instance: " terminate_processes "$instance"
+                if function_exists "action"; then
+                    action $"  Terminating mumps processes in $instance: " terminate_processes "$instance"
+                elif function_exists "log_daemon_msg"; then
+                    log_progress_msg "$instance"
+                    terminate_processes "$instance" || end_msg=1
+                else
+                    terminate_processes "$instance"
+                fi
             done
+
+            if function_exists "log_daemon_msg"; then
+                log_end_msg ${end_msg:-0}
+            fi
         else
-            action $"Terminating mumps processes in $instance: " terminate_processes "$instance"
+            if function_exists "action"; then
+                action $"Terminating mumps processes in $instance: " terminate_processes "$instance"
+            elif function_exists "log_daemon_msg"; then
+                log_daemon_msg "Terminating remaining mumps processes" "$instance"
+                terminate_processes "$instance"
+                log_end_msg $?
+            else
+                terminate_processes "$instance"
+            fi
         fi
         ;;
+    restart|force-reload)
+        $0 stop $2
+        $0 start $2
+        ;;
     *)
-        echo "Usage: openvista-databases {start|stop} [INSTANCE_NAME]" >&2
+        echo "Usage: openvista-databases {start|stop|restart|force-reload} [INSTANCE_NAME]" >&2
         exit 1
         ;;
 esac
 
=== modified file 'scripts/usr/lib/openvista/functions'
--- scripts/usr/lib/openvista/functions	2009-04-30 06:48:24 +0000
+++ scripts/usr/lib/openvista/functions	2009-08-03 18:23:59 +0000
@@ -128,3 +128,8 @@
     fi
 }
 
+function function_exists()
+{
+    type "$1" 2> /dev/null | grep -q 'function'
+}
+
 
=== modified file 'scripts/usr/sbin/ovinstanceadd'
--- scripts/usr/sbin/ovinstanceadd	2009-07-17 08:17:11 +0000
+++ scripts/usr/sbin/ovinstanceadd	2009-07-20 17:57:12 +0000
@@ -94,17 +94,17 @@
     exit 1
 fi
 
-grep "^$user:" /etc/passwd > /dev/null || {
+if ! getent passwd "$user" > /dev/null; then
     echo "ovinstanceadd: user '$user' not found in /etc/passwd" >&2
     exit 1
-}
+fi
 
-grep "^$user:" /etc/group > /dev/null || {
+if ! getent group "$user" > /dev/null; then
     echo "ovinstanceadd: group '$user' not found in /etc/group" >&2
     exit 1
-}
+fi
 
-home=`grep "^$user:" /etc/passwd | awk -F : '{ print $6 }'`
+home=`getent passwd "$user" | awk -F : '{ print $6 }'`
 
 if [ ! -d "$home" ]; then
     echo "ovinstanceadd: $user user's home directory does not exist" >&2
@@ -119,18 +119,28 @@
     exit 1
 fi
 
-grep "^apache:" /etc/passwd > /dev/null || {
-    echo "ovinstanceadd: user 'apache' not found in /etc/passwd" >&2
-    exit 1
-}
-
-if [ ! -d "/var/www/html/webdav" ]; then
-    echo "ovinstanceadd: /var/www/html/webdav does not exist" >&2
-    exit 1
-fi
-
-if [ ! -f "/etc/httpd/conf/webdav.htpasswd" ]; then
-    echo "ovinstanceadd: /etc/httpd/conf/webdav.htpasswd does not exist" >&2
+if getent passwd apache > /dev/null; then
+    apache_user=apache
+    apache_conf=/etc/httpd/conf
+    docroot=/var/www/html
+elif getent passwd www-data > /dev/null; then
+    apache_user=www-data
+    apache_conf=/etc/apache2
+    docroot=/var/www
+fi
+
+if [ -z "$apache_user" ]; then
+    echo "ovinstanceadd: apache user not found in /etc/passwd" >&2
+    exit 1
+fi
+
+if [ ! -d "$docroot/webdav" ]; then
+    echo "ovinstanceadd: $docroot/webdav does not exist" >&2
+    exit 1
+fi
+
+if [ ! -f "$apache_conf/webdav.htpasswd" ]; then
+    echo "ovinstanceadd: $apache_conf/webdav.htpasswd does not exist" >&2
     exit 1
 fi
 
@@ -311,12 +321,12 @@
     exit 1
 }
 
-install -o apache -g apache -m 755 -d "/var/www/html/webdav/$instance" || {
+install -o "$apache_user" -g "$apache_user" -m 755 -d "$docroot/webdav/$instance" || {
     echo "ovinstanceadd: Unable to create webdav root" >&2
     exit 1
 }
 
-ln -s "/var/www/html/webdav/$instance" "$root/$instance/images"
+ln -s "$docroot/webdav/$instance" "$root/$instance/images"
 
 (
     umask 077
@@ -327,8 +337,8 @@
     exit 1
 }
 
-htpasswd -b -m "/etc/httpd/conf/webdav.htpasswd" "$instance" "`cat \"$root/$instance/etc/$instance-webdav_password\"`" > /dev/null 2>&1 || {
-    echo "ovinstanceadd: Unable to update /etc/httpd/conf/webdav.htpasswd" >&2
+htpasswd -b -m "$apache_conf/webdav.htpasswd" "$instance" "`cat \"$root/$instance/etc/$instance-webdav_password\"`" > /dev/null 2>&1 || {
+    echo "ovinstanceadd: Unable to update $apache_conf/webdav.htpasswd" >&2
     exit 1
 }
 
 
=== modified file 'scripts/usr/sbin/ovinstancedel'
--- scripts/usr/sbin/ovinstancedel	2009-07-17 08:17:11 +0000
+++ scripts/usr/sbin/ovinstancedel	2009-07-20 17:57:12 +0000
@@ -80,20 +80,35 @@
 }
 
 # check for other requirements
-grep "^$user:" /etc/passwd > /dev/null || {
+if ! getent passwd "$user" > /dev/null; then
     echo "ovinstancedel: user '$user' not found in /etc/passwd" >&2
     exit 1
-}
+fi
 
-home=`grep "^$user:" /etc/passwd | awk -F : '{ print $6 }'`
+home=`getent passwd "$user" | awk -F : '{ print $6 }'`
 
 if [ ! -d "$home" ]; then
     echo "ovinstancedel: $user user's home directory does not exist" >&2
     exit 1
 fi
 
-if [ ! -f "/etc/httpd/conf/webdav.htpasswd" ]; then
-    echo "ovinstancedel: /etc/httpd/conf/webdav.htpasswd does not exist" >&2
+if getent passwd apache > /dev/null; then
+    apache_user=apache
+    apache_conf=/etc/httpd/conf
+    docroot=/var/www/html
+elif getent passwd www-data > /dev/null; then
+    apache_user=www-data
+    apache_conf=/etc/apache2
+    docroot=/var/www
+fi
+
+if [ -z "$apache_user" ]; then
+    echo "ovinstancedel: apache user not found in /etc/passwd" >&2
+    exit 1
+fi
+
+if [ ! -f "$apache_conf/webdav.htpasswd" ]; then
+    echo "ovinstancedel: $apache_conf/webdav.htpasswd does not exist" >&2
     exit 1
 fi
 
@@ -122,7 +137,7 @@
 command="grep -v ' $instance\$' '$home/.ssh/authorized_keys' > '$home/.ssh/authorized_keys'.\$\$"
 command=$command"; mv -f '$home/.ssh/authorized_keys'.\$\$ '$home/.ssh/authorized_keys'"
 su -c "$command" "$user" || {
-    echo "ovinstanceadd: Unable to update $home/.ssh/authorized_keys" >&2
+    echo "ovinstancedel: Unable to update $home/.ssh/authorized_keys" >&2
     exit 1
 }
 
@@ -148,12 +163,12 @@
     exit 1
 }
 
-htpasswd -D "/etc/httpd/conf/webdav.htpasswd" "$instance" > /dev/null 2>&1 || {
-    echo "ovinstancedel: Unable to update /etc/httpd/conf/webdav.htpasswd" >&2
+htpasswd -D "$apache_conf/webdav.htpasswd" "$instance" > /dev/null 2>&1 || {
+    echo "ovinstancedel: Unable to update $apache_conf/webdav.htpasswd" >&2
     exit 1
 }
 
-rm -rf "/var/www/html/webdav/$instance" || {
+rm -rf "$docroot/webdav/$instance" || {
     echo "ovinstancedel: Unable to remove WebDAV root" >&2
     exit 1
 }