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

Proposed by Jon Tai
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jontai/openvista-gtm-integration/bug358242
Merge into: lp:openvista-gtm-integration
Diff against target: None lines
To merge this branch: bzr merge lp:~jontai/openvista-gtm-integration/bug358242
Reviewer Review Type Date Requested Status
jeff.apple Approve
Review via email: mp+9669@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jon Tai (jontai) wrote :

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.

Revision history for this message
jeff.apple (jeff-apple) wrote :

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
Revision history for this message
Jon Tai (jontai) wrote :

> 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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debuild.sh'
2--- debuild.sh 1970-01-01 00:00:00 +0000
3+++ debuild.sh 2009-07-30 20:45:36 +0000
4@@ -0,0 +1,59 @@
5+#!/bin/sh
6+
7+# build Debian package(s) from the files in this directory
8+#
9+# specify the name of a package to build as the first argument, or no arguments
10+# to build all packages
11+
12+dir1=`pwd`
13+dir2=`dirname "$0"`
14+dir=`cd "$dir1/$dir2"; pwd`
15+
16+if [ -z "$1" ]; then
17+ packages=""
18+ for package in "$dir/packages/deb/"*; do
19+ package=`basename "$package"`
20+ packages="$packages $package"
21+ done
22+else
23+ if [ -d "$dir/packages/deb/$1" ]; then
24+ packages=$1
25+ else
26+ echo "debuild.sh: $1: No such package in '$dir/packages/deb'" >&2
27+ exit 3
28+ fi
29+fi
30+
31+mkdir -p /tmp/ubuntu
32+
33+for package in $packages; do
34+ version=`head -n1 "packages/deb/$package/debian/changelog" | awk '{ print $2 }' | sed 's/[()]//g' | sed 's/-[^\-]\+$//'`
35+
36+ case $package in
37+ openvista-utils|openvista-libs*)
38+ # create source tarabll
39+ rm -rf "/tmp/ubuntu/${package}-$version"
40+ cp -Rp "$dir" "/tmp/ubuntu/${package}-$version"
41+ rm -rf "/tmp/ubuntu/${package}-$version/.bzr"
42+ rm -f "/tmp/ubuntu/${package}_${version}.orig.tar.gz"
43+ tar -c --gzip -f "/tmp/ubuntu/${package}_${version}.orig.tar.gz" -C /tmp/ubuntu "${package}-$version"
44+ cp -Rp "/tmp/ubuntu/${package}-$version/packages/deb/$package/debian" "/tmp/ubuntu/${package}-$version/"
45+
46+ ( cd "/tmp/ubuntu/${package}-$version" && debuild )
47+ ;;
48+ fis-gtm*)
49+ # rename source tarball
50+ upstream_version=`echo "$version" | sed 's/\.//'`
51+ cp -f "/tmp/ubuntu/gtm_V${upstream_version}_linux_i686_src.tar.gz" "/tmp/ubuntu/${package}_${version}.orig.tar.gz"
52+
53+ # unpack source tarball
54+ rm -rf "/tmp/ubuntu/${package}-${version}"
55+ mkdir "/tmp/ubuntu/${package}-${version}"
56+ ( cd "/tmp/ubuntu/${package}-${version}" && tar -xzf "/tmp/ubuntu/${package}_${version}.orig.tar.gz" )
57+ cp -Rp "$dir/packages/deb/${package}/debian" "/tmp/ubuntu/${package}-${version}/"
58+
59+ ( cd "/tmp/ubuntu/${package}-$version" && debuild -r sudo )
60+ ;;
61+ esac
62+done
63+
64
65=== modified file 'docs/man1/ovbackup.1'
66--- docs/man1/ovbackup.1 2009-04-21 20:45:44 +0000
67+++ docs/man1/ovbackup.1 2009-07-09 23:48:40 +0000
68@@ -1,4 +1,4 @@
69-.TH ovbackup 1 "18 Apr 2009" Linux "User Manuals"
70+.TH ovbackup 1 "9 Jul 2009" Linux "User Manuals"
71 .SH NAME
72 ovbackup \- backs up routines and globals of an OpenVista instance
73 .SH SYNOPSIS
74@@ -63,4 +63,4 @@
75 Jonathan Tai <jon.tai@medsphere.com>
76 .SH "SEE ALSO"
77 .BR ovpurgejournals (1)
78-.BR ovrestore (1)
79+.BR ovrestore (8)
80
81=== modified file 'docs/man1/ovimport.1'
82--- docs/man1/ovimport.1 2009-04-28 01:22:21 +0000
83+++ docs/man1/ovimport.1 2009-07-09 23:48:40 +0000
84@@ -1,4 +1,4 @@
85-.TH ovimport 1 "20 Apr 2009" Linux "User Manuals"
86+.TH ovimport 1 "9 Jul 2009" Linux "User Manuals"
87 .SH NAME
88 ovimport \- imports routines and globals into a new OpenVista instance
89 .SH SYNOPSIS
90@@ -74,4 +74,4 @@
91 .SH AUTHOR
92 Jonathan Tai <jon.tai@medsphere.com>
93 .SH "SEE ALSO"
94-.BR ovrestore (1)
95+.BR ovrestore (8)
96
97=== added directory 'docs/man8'
98=== added file 'docs/man8/gtmsignal.8'
99--- docs/man8/gtmsignal.8 1970-01-01 00:00:00 +0000
100+++ docs/man8/gtmsignal.8 2009-08-03 19:22:13 +0000
101@@ -0,0 +1,50 @@
102+.TH gtmsignal 8 "3 Aug 2009" Linux "User Manuals"
103+.SH NAME
104+gtmsignal \- send mupip STOP or INTRPT to GT.M processes
105+.SH SYNOPSIS
106+.B gtmsignal [-a|--all] [-s|--stop] [-h|--help] [-q|--quiet]
107+.I \fR[\fIpid\fR...]
108+.SH DESCRIPTION
109+.B mupip
110+can be used to send signals to other GT.M processes if the user calling mupip
111+also owns the target process (the one receiving the signal), or if the user
112+calling mupip is root. Sending signals as a non-root user to processes owned
113+by a different user is prohibited by Linux.
114+.PP
115+.B gtmsignal
116+is a suid wrapper around
117+.B mupip
118+that allow users in the gtm group to bypass this restriction when sending
119+signals to GT.M processes, i.e., any user in the gtm group can call
120+.B gtmsignal
121+to send a signal to any GT.M process, regardless of the target GT.M process'
122+owner.
123+.PP
124+.B gtmsignal
125+relies on mupip to do the actual sending of signals, and will only send signals
126+to GT.M processes currently executing the
127+.B mumps
128+binary installed in the same directory as
129+.B gtmsignal\fP.
130+.SH OPTIONS
131+.TP
132+\fB\-a\fR, \fB\-\-all\fR
133+send signal to all GT.M processes
134+.TP
135+\fB\-s\fR, \fB\-\-stop\fR
136+send STOP instead of INTRPT
137+.TP
138+\fB\-h\fR, \fB\-\-help\fR
139+display help text and exit
140+.TP
141+\fB\-q\fR, \fB\-\-quiet\fR
142+quiet; do not display warnings
143+.SH "REPORTING BUGS"
144+Please report any bugs you encounter at
145+.PP
146+https://bugs.launchpad.net/openvista-gtm-integration
147+.SH AUTHOR
148+.SS "gtmsignal"
149+Jeff Apple <jeff.apple@medsphere.com>
150+.SS "This manual page"
151+Jonathan Tai <jon.tai@medsphere.com>
152
153=== added file 'docs/man8/ovauth.8'
154--- docs/man8/ovauth.8 1970-01-01 00:00:00 +0000
155+++ docs/man8/ovauth.8 2009-07-10 00:05:19 +0000
156@@ -0,0 +1,48 @@
157+.TH ovauth 8 "9 Jul 2009" Linux "User Manuals"
158+.SH NAME
159+ovauth \- helper application for OpenVista to verify PAM credentials
160+.SH SYNOPSIS
161+.B ovauth
162+.I user
163+.SH DESCRIPTION
164+.B ovauth
165+can be called by the
166+.B openvista
167+tied account to verify the PAM credentials of another user in the
168+.B openvista
169+group. If
170+.B ovauth
171+is run by a user other than the
172+.B openvista
173+user, or if
174+.B ovauth
175+is run with a TTY,
176+.B ovauth
177+will return an error. Similarly, if the
178+.B openvista
179+user attempts to verify the credentials of a user who is not in the
180+.B openvista
181+group,
182+.B ovauth
183+will return an error.
184+.PP
185+.B ovauth
186+is invoked with a single argument - the username of the user whose credentials
187+are being verified. The user's potential password is read from standard input.
188+If the supplied password is valid,
189+.B ovauth
190+prints "OK" and exits 0. Otherwise,
191+.B ovauth
192+prints "Authentication failure" and exits 1.
193+.SH "REPORTING BUGS"
194+Please report any bugs you encounter at
195+.PP
196+https://bugs.launchpad.net/openvista-gtm-integration
197+.SH AUTHOR
198+.SS "ovauth"
199+Jeff Apple <jeff.apple@medsphere.com>
200+.SS "This manual page"
201+Jonathan Tai <jon.tai@medsphere.com>
202+.SH "SEE ALSO"
203+.BR ovtied (1)
204+.BR pam (3)
205
206=== renamed file 'docs/man1/ovinstanceadd.1' => 'docs/man8/ovinstanceadd.8'
207--- docs/man1/ovinstanceadd.1 2009-04-21 23:38:53 +0000
208+++ docs/man8/ovinstanceadd.8 2009-07-09 23:48:40 +0000
209@@ -1,4 +1,4 @@
210-.TH ovinstanceadd 1 "18 Apr 2009" Linux "User Manuals"
211+.TH ovinstanceadd 8 "9 Jul 2009" Linux "User Manuals"
212 .SH NAME
213 ovinstanceadd \- create a new OpenVista instance
214 .SH SYNOPSIS
215@@ -25,4 +25,4 @@
216 .SH AUTHOR
217 Jonathan Tai <jon.tai@medsphere.com>
218 .SH "SEE ALSO"
219-.BR ovinstancedel (1)
220+.BR ovinstancedel (8)
221
222=== renamed file 'docs/man1/ovinstancedel.1' => 'docs/man8/ovinstancedel.8'
223--- docs/man1/ovinstancedel.1 2009-04-21 23:38:53 +0000
224+++ docs/man8/ovinstancedel.8 2009-07-09 23:48:40 +0000
225@@ -1,4 +1,4 @@
226-.TH ovinstancedel 1 "18 Apr 2009" Linux "User Manuals"
227+.TH ovinstancedel 8 "9 Jul 2009" Linux "User Manuals"
228 .SH NAME
229 ovinstancedel \- delete an OpenVista instance
230 .SH SYNOPSIS
231@@ -26,4 +26,4 @@
232 .SH AUTHOR
233 Jonathan Tai <jon.tai@medsphere.com>
234 .SH "SEE ALSO"
235-.BR ovinstanceadd (1)
236+.BR ovinstanceadd (8)
237
238=== renamed file 'docs/man1/ovrestore.1' => 'docs/man8/ovrestore.8'
239--- docs/man1/ovrestore.1 2009-04-21 20:45:44 +0000
240+++ docs/man8/ovrestore.8 2009-07-09 23:48:40 +0000
241@@ -1,4 +1,4 @@
242-.TH ovrestore 1 "18 Apr 2009" Linux "User Manuals"
243+.TH ovrestore 8 "9 Jul 2009" Linux "User Manuals"
244 .SH NAME
245 ovrestore \- restores a backup file into an OpenVista instance
246 .SH SYNOPSIS
247
248=== added directory 'packages/deb'
249=== added directory 'packages/deb/fis-gtm-5.3004'
250=== added directory 'packages/deb/fis-gtm-5.3004/debian'
251=== added file 'packages/deb/fis-gtm-5.3004/debian/changelog'
252--- packages/deb/fis-gtm-5.3004/debian/changelog 1970-01-01 00:00:00 +0000
253+++ packages/deb/fis-gtm-5.3004/debian/changelog 2009-07-29 12:27:28 +0000
254@@ -0,0 +1,5 @@
255+fis-gtm-5.3004 (5.3004-0ubuntu1) jaunty; urgency=low
256+
257+ * Initial Ubuntu package (Closes: #358242)
258+
259+ -- Jonathan Tai <jon.tai@medsphere.com> Fri, 24 Jul 2009 00:34:40 -0700
260
261=== added file 'packages/deb/fis-gtm-5.3004/debian/compat'
262--- packages/deb/fis-gtm-5.3004/debian/compat 1970-01-01 00:00:00 +0000
263+++ packages/deb/fis-gtm-5.3004/debian/compat 2009-07-29 12:27:28 +0000
264@@ -0,0 +1,1 @@
265+7
266
267=== added file 'packages/deb/fis-gtm-5.3004/debian/control'
268--- packages/deb/fis-gtm-5.3004/debian/control 1970-01-01 00:00:00 +0000
269+++ packages/deb/fis-gtm-5.3004/debian/control 2009-07-30 22:23:13 +0000
270@@ -0,0 +1,17 @@
271+Source: fis-gtm-5.3004
272+Section: misc
273+Priority: optional
274+Maintainer: Jonathan Tai <jon.tai@medsphere.com>
275+Build-Depends: debhelper (>= 7), dpatch, tcsh, gcc-4.1, libicu-dev (>= 3.8), zlib1g-dev, libncurses5-dev, libgpgme11-dev, libgpg-error-dev, libgcrypt11-dev
276+Standards-Version: 3.8.0
277+Homepage: http://www.fidelityinfoservices.com/FNFIS/Markets/NonFinancialIndustries/Healthcare/GTM/
278+
279+Package: fis-gtm-5.3004
280+Architecture: any
281+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libicu38, zlib1g, libncurses5, libgpgme11, libgpg-error0, libgcrypt11
282+Suggests: ksh
283+Description: High end TP schemaless database
284+ GT.M is a vetted, industrial strength, transaction processing application
285+ platform consisting of a schema-less database engine optimized for extreme
286+ transaction processing throughput & business continuity plus a compiler for the
287+ MUMPS language.
288
289=== added file 'packages/deb/fis-gtm-5.3004/debian/copyright'
290--- packages/deb/fis-gtm-5.3004/debian/copyright 1970-01-01 00:00:00 +0000
291+++ packages/deb/fis-gtm-5.3004/debian/copyright 2009-07-29 12:27:28 +0000
292@@ -0,0 +1,21 @@
293+This package was debianized by Jonathan Tai <jon.tai@medsphere.com> on
294+Fri, 24 Jul 2009 00:34:40 -0700.
295+
296+It was downloaded from <http://www.fidelityinfoservices.com/FNFIS/Markets/NonFinancialIndustries/Healthcare/GTM/>
297+
298+Upstream Author:
299+
300+ Fidelity Information Services, Inc.
301+
302+Copyright:
303+
304+ Copyright (C) 2009 Fidelity Information Services, Inc.
305+
306+License:
307+
308+ GT.M for selected platforms, including GNU/Linux on the popular x86
309+ architecture, can be downloaded under the terms of the Affero GNU General
310+ Public License (AGPL) version 3.
311+
312+The Debian packaging is copyright 2009, Medsphere Systems Corporation and
313+is licensed under the AGPL.
314
315=== added file 'packages/deb/fis-gtm-5.3004/debian/dirs'
316--- packages/deb/fis-gtm-5.3004/debian/dirs 1970-01-01 00:00:00 +0000
317+++ packages/deb/fis-gtm-5.3004/debian/dirs 2009-07-29 12:27:28 +0000
318@@ -0,0 +1,1 @@
319+opt/lsb-gtm
320
321=== added file 'packages/deb/fis-gtm-5.3004/debian/docs'
322--- packages/deb/fis-gtm-5.3004/debian/docs 1970-01-01 00:00:00 +0000
323+++ packages/deb/fis-gtm-5.3004/debian/docs 2009-07-30 20:45:36 +0000
324@@ -0,0 +1,1 @@
325+COPYING
326
327=== added directory 'packages/deb/fis-gtm-5.3004/debian/patches'
328=== added file 'packages/deb/fis-gtm-5.3004/debian/patches/00list'
329--- packages/deb/fis-gtm-5.3004/debian/patches/00list 1970-01-01 00:00:00 +0000
330+++ packages/deb/fis-gtm-5.3004/debian/patches/00list 2009-07-29 12:27:28 +0000
331@@ -0,0 +1,2 @@
332+01-configurable-compiler.dpatch
333+02-configure-fix.dpatch
334
335=== added file 'packages/deb/fis-gtm-5.3004/debian/patches/01-configurable-compiler.dpatch'
336--- packages/deb/fis-gtm-5.3004/debian/patches/01-configurable-compiler.dpatch 1970-01-01 00:00:00 +0000
337+++ packages/deb/fis-gtm-5.3004/debian/patches/01-configurable-compiler.dpatch 2009-07-29 12:27:28 +0000
338@@ -0,0 +1,19 @@
339+#! /bin/sh /usr/share/dpatch/dpatch-run
340+## 01-configurable-compiler.dpatch by <jon.tai@medsphere.com>
341+##
342+## All lines beginning with `## DP:' are a description of the patch.
343+## DP: No description.
344+
345+@DPATCH@
346+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
347+--- fis-gtm-5.3004-5.3004~/sr_linux/gtm_env_sp.mk 2009-06-08 05:08:10.000000000 -0400
348++++ fis-gtm-5.3004-5.3004/sr_linux/gtm_env_sp.mk 2009-07-28 22:22:03.000000000 -0400
349+@@ -57,7 +57,7 @@
350+ gt_as_src_suffix=.s
351+
352+ # C compiler options
353+-gt_cc_compiler=gcc
354++gt_cc_compiler?=gcc
355+
356+ # Do not lookup the source directory before include directories specified by -I.
357+ # gcc complains about -I- being obsolete, but using -iquote cause build errors for gcc and as - ABS 2008.12.09
358
359=== added file 'packages/deb/fis-gtm-5.3004/debian/patches/02-configure-fix.dpatch'
360--- packages/deb/fis-gtm-5.3004/debian/patches/02-configure-fix.dpatch 1970-01-01 00:00:00 +0000
361+++ packages/deb/fis-gtm-5.3004/debian/patches/02-configure-fix.dpatch 2009-07-29 12:27:28 +0000
362@@ -0,0 +1,31 @@
363+#! /bin/sh /usr/share/dpatch/dpatch-run
364+## 02-configure-fix.dpatch by <jon.tai@medsphere.com>
365+##
366+## All lines beginning with `## DP:' are a description of the patch.
367+## DP: No description.
368+
369+@DPATCH@
370+diff -urNad fis-gtm-5.3004-5.3004~/sr_unix/configure.gtc fis-gtm-5.3004-5.3004/sr_unix/configure.gtc
371+--- fis-gtm-5.3004-5.3004~/sr_unix/configure.gtc 2009-07-10 11:31:45.000000000 -0400
372++++ fis-gtm-5.3004-5.3004/sr_unix/configure.gtc 2009-07-28 22:27:19.000000000 -0400
373+@@ -208,9 +208,9 @@
374+ is64bit_gtm=`file mumps | grep "64-bit" | wc -l`
375+ fi
376+ if [ $is64bit_gtm -eq 1 ] ; then
377+- library_path="/usr/local/lib64 /usr/local/lib /usr/lib /usr/lib32"
378++ library_path="/usr/local/lib64 /usr/local/lib /usr/lib64 /usr/lib /lib64 /lib"
379+ else
380+- library_path="/usr/local/lib /usr/lib /usr/lib32"
381++ library_path="/usr/local/lib32 /usr/local/lib /usr/lib32 /usr/lib /lib32 /lib"
382+ fi
383+ $echo "Should unicode support be installed? (y or n) \c"
384+ read resp
385+@@ -303,7 +303,7 @@
386+ fi
387+ done
388+ if [ "$found_icu" -eq 0 ] ; then
389+- if [ $majmin != "" ] ; then
390++ if [ "$majmin" != "" ] ; then
391+ echo "WARNING: ICU version $gtm_icu_version not found. Not installing Unicode support."
392+ else
393+ echo "WARNING: Default ICU version not found. Not installing Unicode support."
394
395=== added file 'packages/deb/fis-gtm-5.3004/debian/patches/99-noninteractive-configure.patch'
396--- packages/deb/fis-gtm-5.3004/debian/patches/99-noninteractive-configure.patch 1970-01-01 00:00:00 +0000
397+++ packages/deb/fis-gtm-5.3004/debian/patches/99-noninteractive-configure.patch 2009-08-01 07:06:06 +0000
398@@ -0,0 +1,78 @@
399+--- configure 2009-07-16 15:26:02.000000000 -0700
400++++ configure 2009-07-16 15:28:00.000000000 -0700
401+@@ -112,7 +112,7 @@
402+ # create temporary file to test for valid user and group names
403+ touch tmp_owngrp
404+ $echo "What account should own the files? (bin) \c"
405+-read resp
406++resp=""
407+ if [ "$resp" = "" ] ; then
408+ owner="bin"
409+ else
410+@@ -126,10 +126,10 @@
411+ fi
412+
413+ $echo "Should execution of GT.M to be restricted to a group? (y or n) \c"
414+-read resp
415++resp="y"
416+ if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
417+ $echo "Enter group name? \c"
418+- read group
419++ group="bin"
420+ if [ "$group" != "" ] ; then
421+ chgrp $group tmp_owngrp 2> /dev/null
422+ if [ 1 = "$?" ] ; then
423+@@ -145,7 +145,7 @@
424+ rm tmp_owngrp
425+
426+ $echo "In what directory should GT.M be installed? \c"
427+-read gtmdist
428++gtmdist="@GTM_DIST@"
429+
430+ # if gtmdist is relative then need to make it absolute
431+
432+@@ -171,7 +171,7 @@
433+ $echo "Directory $gtmdist does not exist. Do you wish to create it as part of"
434+ $echo "this installation? (y or n) \c"
435+
436+- read resp
437++ resp="y"
438+ if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
439+ mkdir -p $gtmdist
440+ chmod 0755 $gtmdist
441+@@ -213,14 +213,14 @@
442+ library_path="/usr/local/lib32 /usr/local/lib /usr/lib32 /usr/lib /lib32 /lib"
443+ fi
444+ $echo "Should unicode support be installed? (y or n) \c"
445+- read resp
446++ resp="y"
447+ if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
448+ would_like_utf8=1
449+ $echo "Should an ICU version other than the default be used? (y or n) \c"
450+- read resp
451++ resp="y"
452+ if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
453+ $echo "Enter ICU version (at least ICU version 3.6 is required. Enter as <minor-ver>.<major-ver>): \c"
454+- read gtm_icu_version
455++ gtm_icu_version="@GTM_ICU_VERSION@"
456+ icu_ver=`$echo $gtm_icu_version | sed 's/\.//'`
457+ majmin=`$echo $icu_ver | cut -f 1 -d "."`
458+ if [ "$majmin" -lt "36" ] ; then
459+@@ -567,7 +567,7 @@
460+ $echo "only the uppercase versions of the files."
461+ $echo ""
462+ $echo "Do you want uppercase and lowercase versions of the MUMPS routines? (y or n)\c"
463+-read resp
464++resp="n"
465+ if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
466+ $echo ""
467+ $echo "Creating lowercase versions of the MUMPS routines."
468+@@ -768,7 +768,7 @@
469+ $echo ""
470+ $echo "Installation completed. Would you like all the temporary files"
471+ $echo "removed from this directory? (y or n) \c"
472+-read resp
473++resp="y"
474+
475+ if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
476+ \rm -rf $binaries $pathmods $rscripts $nscripts $dirs configure \
477
478=== added file 'packages/deb/fis-gtm-5.3004/debian/postinst'
479--- packages/deb/fis-gtm-5.3004/debian/postinst 1970-01-01 00:00:00 +0000
480+++ packages/deb/fis-gtm-5.3004/debian/postinst 2009-08-01 19:52:55 +0000
481@@ -0,0 +1,56 @@
482+#!/bin/sh
483+# postinst script for fis-gtm-5.3004
484+#
485+# see: dh_installdeb(1)
486+
487+set -e
488+
489+# summary of how this script can be called:
490+# * <postinst> `configure' <most-recently-configured-version>
491+# * <old-postinst> `abort-upgrade' <new version>
492+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
493+# <new-version>
494+# * <postinst> `abort-remove'
495+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
496+# <failed-install-package> <version> `removing'
497+# <conflicting-package> <version>
498+# for details, see http://www.debian.org/doc/debian-policy/ or
499+# the debian-policy package
500+
501+
502+case "$1" in
503+ configure)
504+ if ! getent group gtm >/dev/null; then
505+ addgroup --quiet gtm
506+ fi
507+
508+ if [ `dpkg --print-architecture` = "amd64" ]; then
509+ gtm_dist=/opt/lsb-gtm/V5.3-004_x86_64
510+ else
511+ gtm_dist=/opt/lsb-gtm/V5.3-004_i686
512+ fi
513+
514+ suid_files=`find $gtm_dist -perm /4000`
515+
516+ chgrp -R gtm $gtm_dist
517+ chgrp -R bin $gtm_dist/gtmsecshrdir
518+
519+ # the chgrp commands above may cause files to lose the setuid bit; re-add it here just in case
520+ for file in $suid_files; do chmod u+s $file; done
521+ ;;
522+
523+ abort-upgrade|abort-remove|abort-deconfigure)
524+ ;;
525+
526+ *)
527+ echo "postinst called with unknown argument \`$1'" >&2
528+ exit 1
529+ ;;
530+esac
531+
532+# dh_installdeb will replace this with shell code automatically
533+# generated by other debhelper scripts.
534+
535+#DEBHELPER#
536+
537+exit 0
538
539=== added file 'packages/deb/fis-gtm-5.3004/debian/postrm'
540--- packages/deb/fis-gtm-5.3004/debian/postrm 1970-01-01 00:00:00 +0000
541+++ packages/deb/fis-gtm-5.3004/debian/postrm 2009-08-01 07:06:06 +0000
542@@ -0,0 +1,44 @@
543+#!/bin/sh
544+# postrm script for fis-gtm-5.3004
545+#
546+# see: dh_installdeb(1)
547+
548+set -e
549+
550+# summary of how this script can be called:
551+# * <postrm> `remove'
552+# * <postrm> `purge'
553+# * <old-postrm> `upgrade' <new-version>
554+# * <new-postrm> `failed-upgrade' <old-version>
555+# * <new-postrm> `abort-install'
556+# * <new-postrm> `abort-install' <old-version>
557+# * <new-postrm> `abort-upgrade' <old-version>
558+# * <disappearer's-postrm> `disappear' <overwriter>
559+# <overwriter-version>
560+# for details, see http://www.debian.org/doc/debian-policy/ or
561+# the debian-policy package
562+
563+
564+case "$1" in
565+ purge)
566+ # if we were the last GT.M package on the system, remove the gtm group
567+ if [ ! -d /opt/lsb-gtm ]; then
568+ delgroup --quiet gtm || :
569+ fi
570+ ;;
571+
572+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
573+ ;;
574+
575+ *)
576+ echo "postrm called with unknown argument \`$1'" >&2
577+ exit 1
578+ ;;
579+esac
580+
581+# dh_installdeb will replace this with shell code automatically
582+# generated by other debhelper scripts.
583+
584+#DEBHELPER#
585+
586+exit 0
587
588=== added file 'packages/deb/fis-gtm-5.3004/debian/rules'
589--- packages/deb/fis-gtm-5.3004/debian/rules 1970-01-01 00:00:00 +0000
590+++ packages/deb/fis-gtm-5.3004/debian/rules 2009-08-01 07:06:06 +0000
591@@ -0,0 +1,205 @@
592+#!/usr/bin/make -f
593+# -*- makefile -*-
594+# Sample debian/rules that uses debhelper.
595+#
596+# This file was originally written by Joey Hess and Craig Small.
597+# As a special exception, when this file is copied by dh-make into a
598+# dh-make output file, you may use that output file without restriction.
599+# This special exception was added by Craig Small in version 0.37 of dh-make.
600+#
601+# Modified to make a template file for a multi-binary package with separated
602+# build-arch and build-indep targets by Bill Allombert 2001
603+
604+# Uncomment this to turn on verbose mode.
605+#export DH_VERBOSE=1
606+
607+# This has to be exported to make some magic below work.
608+export DH_OPTIONS
609+
610+#enable dpatch
611+include /usr/share/dpatch/dpatch.make
612+
613+GTM_CURPRO = /tmp/gtm
614+
615+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
616+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
617+
618+ifeq ($(DEB_HOST_ARCH),amd64)
619+GTM_DIST = /opt/lsb-gtm/V5.3-004_x86_64
620+else
621+GTM_DIST = /opt/lsb-gtm/V5.3-004_i686
622+endif
623+
624+ifeq ($(DEB_HOST_ARCH_OS),linux)
625+GTM_HOSTOS = Linux
626+else
627+GTM_HOSTOS = $(DEB_HOST_ARCH_OS)
628+endif
629+
630+GT_CC_COMPILER = gcc-4.1
631+
632+GTM_ICU_VERSION_MAJMIN = $(shell icu-config --version | sed 's/\.//' | cut -f 1 -d '.')
633+GTM_ICU_VERSION_MINORVER = $(shell expr $(GTM_ICU_VERSION_MAJMIN) % 10)
634+GTM_ICU_VERSION_MAJORVER = $(shell expr $(GTM_ICU_VERSION_MAJMIN) / 10)
635+GTM_ICU_VERSION = $(GTM_ICU_VERSION_MAJORVER).$(GTM_ICU_VERSION_MINORVER)
636+
637+
638+
639+check-build-env:
640+ if [ ! -d "$(GTM_CURPRO)" ]; then \
641+ echo "existing binary installation of GT.M not found at $(GTM_CURPRO)"; \
642+ exit 1; \
643+ fi
644+
645+ if [ -d "$(GTM_DIST)" ]; then \
646+ echo "target GT.M directory $(GTM_DIST) already exists"; \
647+ exit 1; \
648+ fi
649+
650+ if ! getent group gtm >/dev/null; then \
651+ echo "gtm group not found in /etc/group"; \
652+ exit 1; \
653+ fi
654+
655+
656+configure:
657+ dh_testdir
658+
659+ # GT.M needs to be built with tcsh, and with a bunch of environmental variables
660+ # set. Since we can't run tcsh interactively, we put all the setenv commands
661+ # and the build command itself into a temporary script, then execute it with
662+ # tcsh.
663+ echo 'setenv gtm_curpro $(GTM_CURPRO)' > build.csh
664+ echo 'setenv gtm_exe $(GTM_CURPRO)' >> build.csh
665+ echo 'setenv HOSTOS $(GTM_HOSTOS)' >> build.csh
666+ echo 'setenv gtm_tools $(CURDIR)/sr_linux' >> build.csh
667+ echo 'setenv gtm_inc $(CURDIR)/sr_linux' >> build.csh
668+ if [ "$(DEB_HOST_ARCH)" = "amd64" ]; then \
669+ echo 'setenv OBJECT_MODE 64' >> build.csh ; \
670+ fi
671+ echo 'setenv distro ubuntu' >> build.csh
672+ echo 'setenv gtm_icu_version $(GTM_ICU_VERSION)' >> build.csh
673+ echo 'setenv gtm_version_change 1' >> build.csh
674+ cat sr_unix/gtm_env.csh >> build.csh
675+
676+ # GT.M 5.3004 requires gcc-4.1, Jaunty's default (gcc 4.3) doesn't work
677+ echo 'setenv gt_cc_compiler $(GT_CC_COMPILER)' >> build.csh
678+
679+ # GT.M's makefiles get confused if this isn't reset back to 0
680+ echo 'setenv MAKELEVEL 0' >> build.csh
681+
682+
683+#Architecture
684+build: patch-stamp build-arch build-indep
685+
686+build-arch: build-arch-stamp
687+build-arch-stamp: check-build-env configure
688+ echo '$(MAKE) -f sr_unix/comlist.mk -I./sr_unix -I./sr_linux buildtypes=pro gtm_ver=$(CURDIR)' >> build.csh
689+ tcsh -b build.csh
690+
691+ touch $@
692+
693+build-indep: build-indep-stamp
694+build-indep-stamp: check-build-env configure
695+
696+ # Add here commands to compile the indep part of the package.
697+ #$(MAKE) doc
698+ touch $@
699+
700+clean: unpatch configure
701+ dh_testdir
702+ dh_testroot
703+ rm -f build-arch-stamp build-indep-stamp
704+
705+ echo '$(MAKE) -f sr_unix/comlist.mk -I./sr_unix -I./sr_linux buildtypes=pro gtm_ver=$(CURDIR) clean' >> build.csh
706+ tcsh -b build.csh
707+ rm -f build.csh
708+
709+ if [ -f install-arch-stamp ]; then \
710+ rm -rf $(GTM_DIST); \
711+ rm install-arch-stamp; \
712+ fi
713+
714+ dh_clean
715+
716+install: install-indep install-arch
717+install-indep:
718+ dh_testdir
719+ dh_testroot
720+ dh_prep -i
721+ dh_installdirs -i
722+
723+ # Add here commands to install the indep part of the package into
724+ # debian/<package>-doc.
725+ #INSTALLDOC#
726+
727+ dh_install -i
728+
729+install-arch:
730+ dh_testdir
731+ dh_testroot
732+ dh_prep -s
733+ dh_installdirs -s
734+
735+ mkdir -p `dirname $(GTM_DIST)`
736+
737+ # We need to patch the configure script to pre-answer all of the prompts and
738+ # set the installation directory
739+ cd pro ; \
740+ cat ../debian/patches/99-noninteractive-configure.patch | \
741+ sed 's,@GTM_DIST@,$(GTM_DIST),' | \
742+ sed 's,@GTM_ICU_VERSION@,$(GTM_ICU_VERSION),' | \
743+ patch -p0 -b ; \
744+ chmod +x configure ; \
745+ ./configure
746+
747+ cp -a $(GTM_DIST) debian/fis-gtm-5.3004`dirname $(GTM_DIST)`/
748+
749+ touch install-arch-stamp
750+
751+ dh_install -s
752+# Must not depend on anything. This is to be called by
753+# binary-arch/binary-indep
754+# in another 'make' thread.
755+binary-common:
756+ dh_testdir
757+ dh_testroot
758+ dh_installchangelogs
759+ dh_installdocs
760+ dh_installexamples
761+# dh_installmenu
762+# dh_installdebconf
763+# dh_installlogrotate
764+# dh_installemacsen
765+# dh_installpam
766+# dh_installmime
767+# dh_python
768+# dh_installinit
769+# dh_installcron
770+# dh_installinfo
771+ dh_installman
772+ dh_link
773+ dh_strip
774+ dh_compress
775+ dh_fixperms
776+ # re-copy files to ensure permissions are correct. files are owned by
777+ # group bin for now; will change to group gtm in postinst
778+ rm -rf debian/fis-gtm-5.3004$(GTM_DIST)
779+ cp -a $(GTM_DIST) debian/fis-gtm-5.3004`dirname $(GTM_DIST)`/
780+# dh_perl
781+ dh_makeshlibs
782+ dh_installdeb
783+ dh_shlibdeps
784+ dh_gencontrol
785+ dh_md5sums
786+ dh_builddeb
787+# Build architecture independant packages using the common target.
788+binary-indep: build-indep install-indep
789+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
790+
791+# Build architecture dependant packages using the common target.
792+binary-arch: build-arch install-arch
793+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
794+
795+binary: binary-arch binary-indep
796+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
797
798=== added directory 'packages/deb/openvista-libs-5.3004'
799=== added directory 'packages/deb/openvista-libs-5.3004/debian'
800=== added file 'packages/deb/openvista-libs-5.3004/debian/changelog'
801--- packages/deb/openvista-libs-5.3004/debian/changelog 1970-01-01 00:00:00 +0000
802+++ packages/deb/openvista-libs-5.3004/debian/changelog 2009-07-26 07:07:12 +0000
803@@ -0,0 +1,5 @@
804+openvista-libs-5.3004 (0.8.4-0ubuntu1) jaunty; urgency=low
805+
806+ * Initial Ubuntu package (Closes: #358242)
807+
808+ -- Jonathan Tai <jon.tai@medsphere.com> Sat, 25 Jul 2009 23:44:28 -0700
809
810=== added file 'packages/deb/openvista-libs-5.3004/debian/changelogs'
811--- packages/deb/openvista-libs-5.3004/debian/changelogs 1970-01-01 00:00:00 +0000
812+++ packages/deb/openvista-libs-5.3004/debian/changelogs 2009-07-26 07:07:12 +0000
813@@ -0,0 +1,1 @@
814+ChangeLog
815
816=== added file 'packages/deb/openvista-libs-5.3004/debian/compat'
817--- packages/deb/openvista-libs-5.3004/debian/compat 1970-01-01 00:00:00 +0000
818+++ packages/deb/openvista-libs-5.3004/debian/compat 2009-07-26 07:07:12 +0000
819@@ -0,0 +1,1 @@
820+7
821
822=== added file 'packages/deb/openvista-libs-5.3004/debian/control'
823--- packages/deb/openvista-libs-5.3004/debian/control 1970-01-01 00:00:00 +0000
824+++ packages/deb/openvista-libs-5.3004/debian/control 2009-07-30 21:37:58 +0000
825@@ -0,0 +1,21 @@
826+Source: openvista-libs-5.3004
827+Section: misc
828+Priority: optional
829+Maintainer: Jonathan Tai <jon.tai@medsphere.com>
830+Build-Depends: debhelper (>= 7), fis-gtm-5.3004
831+Standards-Version: 3.8.0
832+Homepage: https://medsphere.org/community/project/gtm
833+
834+Package: openvista-libs-5.3004
835+Architecture: any
836+Depends: ${shlibs:Depends}, ${misc:Depends}, fis-gtm-5.3004
837+Provides: openvista-libs
838+Description: GT.M External Calls for OpenVista
839+ OpenVista is a cost-effective, open, trusted and complete EHR which enhances
840+ patient safety, increases clinical and operational efficiency and provides an
841+ opportunity to improve quality of care delivery.
842+ .
843+ This package provides a shared library that OpenVista code running in GT.M
844+ calls out to for PAM authentication and duplicating a device onto a spawned
845+ child's stdin/stdout. This package also provides an suid wrapper around GT.M
846+ utilities used to send signals to other GT.M processes.
847
848=== added file 'packages/deb/openvista-libs-5.3004/debian/copyright'
849--- packages/deb/openvista-libs-5.3004/debian/copyright 1970-01-01 00:00:00 +0000
850+++ packages/deb/openvista-libs-5.3004/debian/copyright 2009-07-26 07:07:12 +0000
851@@ -0,0 +1,50 @@
852+This package was debianized by Jonathan Tai <jon.tai@medsphere.com> on
853+Sat, 25 Jul 2009 23:44:28 -0700
854+
855+It was downloaded from <https://medsphere.org/community/project/gtm>
856+
857+Upstream Author:
858+
859+ Medsphere Systems Corporation
860+
861+Copyright:
862+
863+ Copyright (C) 2009 Medsphere Systems Corporation
864+
865+License:
866+
867+ The utilities provided by the OpenVista/GT.M Integration Project simplify
868+ installation, configuration, and operation of OpenVista Server when running on
869+ GT.M on Linux.
870+
871+ Copyright (C) 2009 Medsphere Systems Corporation
872+
873+ This program is free software; you can redistribute it and/or modify it solely
874+ under the terms of the GNU Affero General Public License version 3 as published
875+ by the Free Software Foundation.
876+
877+ This program is distributed in the hope that it will be useful, but WITHOUT
878+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
879+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
880+ for more details.
881+
882+ You should have received a copy of the GNU Affero General Public License along
883+ with this program; if not, see http://www.gnu.org/licenses or write to the Free
884+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
885+ 02110-1301 USA.
886+
887+ You can contact Medsphere Systems Corporation headquarters at 1917 Palomar Oaks Way,
888+ Carlsbad, Ca. 92008 or at legal@medsphere.com.
889+
890+ The interactive user interfaces in modified source and object code versions
891+ of this program must display Appropriate Legal Notices, as required under
892+ Section 5 of the GNU Affero General Public License version 3.
893+
894+ In accordance with Section 7(b) of the GNU Affero General Public License
895+ version 3, these Appropriate Legal Notices must retain the display of the
896+ "Powered by Medsphere" logo. If the display of the logo is not reasonably
897+ feasible for technical reasons, the Appropriate Legal Notices must display
898+ the words "Powered by Medsphere".
899+
900+The Debian packaging is copyright 2009, Medsphere Systems Corporation and
901+is licensed under the AGPL.
902
903=== added file 'packages/deb/openvista-libs-5.3004/debian/dirs'
904--- packages/deb/openvista-libs-5.3004/debian/dirs 1970-01-01 00:00:00 +0000
905+++ packages/deb/openvista-libs-5.3004/debian/dirs 2009-07-30 21:56:37 +0000
906@@ -0,0 +1,1 @@
907+usr/share/doc/openvista-libs-5.3004
908
909=== added file 'packages/deb/openvista-libs-5.3004/debian/docs'
910--- packages/deb/openvista-libs-5.3004/debian/docs 1970-01-01 00:00:00 +0000
911+++ packages/deb/openvista-libs-5.3004/debian/docs 2009-07-26 07:07:12 +0000
912@@ -0,0 +1,2 @@
913+NEWS
914+README
915
916=== added file 'packages/deb/openvista-libs-5.3004/debian/manpages'
917--- packages/deb/openvista-libs-5.3004/debian/manpages 1970-01-01 00:00:00 +0000
918+++ packages/deb/openvista-libs-5.3004/debian/manpages 2009-08-03 19:22:13 +0000
919@@ -0,0 +1,1 @@
920+docs/man8/gtmsignal.8
921
922=== added file 'packages/deb/openvista-libs-5.3004/debian/postinst'
923--- packages/deb/openvista-libs-5.3004/debian/postinst 1970-01-01 00:00:00 +0000
924+++ packages/deb/openvista-libs-5.3004/debian/postinst 2009-08-01 19:52:55 +0000
925@@ -0,0 +1,49 @@
926+#!/bin/sh
927+# postinst script for openvista-libs-5.3004
928+#
929+# see: dh_installdeb(1)
930+
931+set -e
932+
933+# summary of how this script can be called:
934+# * <postinst> `configure' <most-recently-configured-version>
935+# * <old-postinst> `abort-upgrade' <new version>
936+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
937+# <new-version>
938+# * <postinst> `abort-remove'
939+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
940+# <failed-install-package> <version> `removing'
941+# <conflicting-package> <version>
942+# for details, see http://www.debian.org/doc/debian-policy/ or
943+# the debian-policy package
944+
945+
946+case "$1" in
947+ configure)
948+ if [ `dpkg --print-architecture` = "amd64" ]; then
949+ gtm_dist=/opt/lsb-gtm/V5.3-004_x86_64
950+ else
951+ gtm_dist=/opt/lsb-gtm/V5.3-004_i686
952+ fi
953+
954+ chgrp gtm $gtm_dist/libopenvista.so $gtm_dist/openvista.xc $gtm_dist/gtmsignal
955+
956+ # the chgrp command above may cause gtmsignal to lose the setuid bit; re-add it here just in case
957+ chmod u+s $gtm_dist/gtmsignal
958+ ;;
959+
960+ abort-upgrade|abort-remove|abort-deconfigure)
961+ ;;
962+
963+ *)
964+ echo "postinst called with unknown argument \`$1'" >&2
965+ exit 1
966+ ;;
967+esac
968+
969+# dh_installdeb will replace this with shell code automatically
970+# generated by other debhelper scripts.
971+
972+#DEBHELPER#
973+
974+exit 0
975
976=== added file 'packages/deb/openvista-libs-5.3004/debian/rules'
977--- packages/deb/openvista-libs-5.3004/debian/rules 1970-01-01 00:00:00 +0000
978+++ packages/deb/openvista-libs-5.3004/debian/rules 2009-08-01 07:06:06 +0000
979@@ -0,0 +1,138 @@
980+#!/usr/bin/make -f
981+# -*- makefile -*-
982+# Sample debian/rules that uses debhelper.
983+#
984+# This file was originally written by Joey Hess and Craig Small.
985+# As a special exception, when this file is copied by dh-make into a
986+# dh-make output file, you may use that output file without restriction.
987+# This special exception was added by Craig Small in version 0.37 of dh-make.
988+#
989+# Modified to make a template file for a multi-binary package with separated
990+# build-arch and build-indep targets by Bill Allombert 2001
991+
992+# Uncomment this to turn on verbose mode.
993+#export DH_VERBOSE=1
994+
995+# This has to be exported to make some magic below work.
996+export DH_OPTIONS
997+
998+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
999+
1000+ifeq ($(DEB_HOST_ARCH),amd64)
1001+GTM_DIST = /opt/lsb-gtm/V5.3-004_x86_64
1002+else
1003+GTM_DIST = /opt/lsb-gtm/V5.3-004_i686
1004+endif
1005+
1006+
1007+
1008+configure: configure-stamp
1009+configure-stamp:
1010+ dh_testdir
1011+ # Add here commands to configure the package.
1012+
1013+ touch configure-stamp
1014+
1015+
1016+#Architecture
1017+build: build-arch build-indep
1018+
1019+build-arch: build-arch-stamp
1020+build-arch-stamp: configure-stamp
1021+ cd src/libopenvista && gtm_dist="$(GTM_DIST)" ./compile.sh
1022+ cd src/gtmsignal && ./compile.sh
1023+ touch $@
1024+
1025+build-indep: build-indep-stamp
1026+build-indep-stamp: configure-stamp
1027+
1028+ # Add here commands to compile the indep part of the package.
1029+ #$(MAKE) doc
1030+ touch $@
1031+
1032+clean:
1033+ dh_testdir
1034+ dh_testroot
1035+ rm -f build-arch-stamp build-indep-stamp configure-stamp
1036+
1037+ rm -f src/libopenvista/libopenvista.so
1038+ rm -f src/libopenvista/openvista.xc
1039+ rm -f src/gtmsignal/gtmsignal
1040+
1041+ dh_clean
1042+
1043+install: install-indep install-arch
1044+install-indep:
1045+ dh_testdir
1046+ dh_testroot
1047+ dh_prep -i
1048+ dh_installdirs -i
1049+
1050+ # Add here commands to install the indep part of the package into
1051+ # debian/<package>-doc.
1052+ #INSTALLDOC#
1053+
1054+ dh_install -i
1055+
1056+install-arch:
1057+ dh_testdir
1058+ dh_testroot
1059+ dh_prep -s
1060+ dh_installdirs -s
1061+
1062+ install COPYING.AGPL debian/openvista-libs-5.3004/usr/share/doc/openvista-libs-5.3004/AGPL
1063+
1064+ mkdir -p debian/openvista-libs-5.3004$(GTM_DIST)
1065+
1066+ install src/libopenvista/libopenvista.so debian/openvista-libs-5.3004$(GTM_DIST)
1067+ install -m 644 src/libopenvista/openvista.xc debian/openvista-libs-5.3004$(GTM_DIST)
1068+
1069+ install src/gtmsignal/gtmsignal debian/openvista-libs-5.3004$(GTM_DIST)
1070+
1071+ dh_install -s
1072+# Must not depend on anything. This is to be called by
1073+# binary-arch/binary-indep
1074+# in another 'make' thread.
1075+binary-common:
1076+ dh_testdir
1077+ dh_testroot
1078+ dh_installchangelogs
1079+ dh_installdocs
1080+ dh_installexamples
1081+# dh_installmenu
1082+# dh_installdebconf
1083+# dh_installlogrotate
1084+# dh_installemacsen
1085+# dh_installpam
1086+# dh_installmime
1087+# dh_python
1088+# dh_installinit
1089+# dh_installcron
1090+# dh_installinfo
1091+ dh_installman
1092+ dh_link
1093+ dh_strip
1094+ dh_compress
1095+ dh_fixperms
1096+ # use group bin for now; will change to group gtm in postinst
1097+ chown bin:bin debian/openvista-libs-5.3004$(GTM_DIST)/*
1098+ chmod 440 debian/openvista-libs-5.3004$(GTM_DIST)/*
1099+ chown root debian/openvista-libs-5.3004$(GTM_DIST)/gtmsignal
1100+ chmod 4550 debian/openvista-libs-5.3004$(GTM_DIST)/gtmsignal
1101+# dh_perl
1102+ dh_makeshlibs
1103+ dh_installdeb
1104+ dh_shlibdeps
1105+ dh_gencontrol
1106+ dh_md5sums
1107+ dh_builddeb
1108+# Build architecture independant packages using the common target.
1109+binary-indep: build-indep install-indep
1110+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
1111+
1112+# Build architecture dependant packages using the common target.
1113+binary-arch: build-arch install-arch
1114+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
1115+
1116+binary: binary-arch binary-indep
1117+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
1118
1119=== added directory 'packages/deb/openvista-utils'
1120=== added directory 'packages/deb/openvista-utils/debian'
1121=== added file 'packages/deb/openvista-utils/debian/changelog'
1122--- packages/deb/openvista-utils/debian/changelog 1970-01-01 00:00:00 +0000
1123+++ packages/deb/openvista-utils/debian/changelog 2009-07-20 18:10:21 +0000
1124@@ -0,0 +1,11 @@
1125+openvista-utils (0.8.4-0ubuntu1) jaunty; urgency=low
1126+
1127+ * Sync with upstream
1128+
1129+ -- Jonathan Tai <jon.tai@medsphere.com> Mon, 20 Jul 2009 11:01:18 -0700
1130+
1131+openvista-utils (0.8.3-0ubuntu1) jaunty; urgency=low
1132+
1133+ * Initial Ubuntu package (Closes: #358242)
1134+
1135+ -- Jonathan Tai <jon.tai@medsphere.com> Wed, 08 Jul 2009 21:26:33 -0700
1136
1137=== added file 'packages/deb/openvista-utils/debian/changelogs'
1138--- packages/deb/openvista-utils/debian/changelogs 1970-01-01 00:00:00 +0000
1139+++ packages/deb/openvista-utils/debian/changelogs 2009-07-09 07:59:00 +0000
1140@@ -0,0 +1,1 @@
1141+ChangeLog
1142
1143=== added file 'packages/deb/openvista-utils/debian/compat'
1144--- packages/deb/openvista-utils/debian/compat 1970-01-01 00:00:00 +0000
1145+++ packages/deb/openvista-utils/debian/compat 2009-07-09 07:59:00 +0000
1146@@ -0,0 +1,1 @@
1147+7
1148
1149=== added file 'packages/deb/openvista-utils/debian/control'
1150--- packages/deb/openvista-utils/debian/control 1970-01-01 00:00:00 +0000
1151+++ packages/deb/openvista-utils/debian/control 2009-08-03 22:58:57 +0000
1152@@ -0,0 +1,20 @@
1153+Source: openvista-utils
1154+Section: admin
1155+Priority: optional
1156+Maintainer: Jonathan Tai <jon.tai@medsphere.com>
1157+Build-Depends: debhelper (>= 7), libpam0g-dev
1158+Standards-Version: 3.8.0
1159+Homepage: https://medsphere.org/community/project/gtm
1160+
1161+Package: openvista-utils
1162+Architecture: any
1163+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, rsync, bzip2 | pbzip2 (>= 1.0.5), cron, openssh-client, apache2.2-common, openvista-libs
1164+Recommends: openssh-server, apache2
1165+Suggests: putty-tools, bash-completion, pbzip2 (>= 1.0.5)
1166+Description: Utilities for configuring and managing OpenVista
1167+ OpenVista is a cost-effective, open, trusted and complete EHR which enhances
1168+ patient safety, increases clinical and operational efficiency and provides an
1169+ opportunity to improve quality of care delivery.
1170+ .
1171+ This package provides command-line utilities that aid in configuring and
1172+ managing OpenVista instances.
1173
1174=== added file 'packages/deb/openvista-utils/debian/copyright'
1175--- packages/deb/openvista-utils/debian/copyright 1970-01-01 00:00:00 +0000
1176+++ packages/deb/openvista-utils/debian/copyright 2009-07-12 04:53:43 +0000
1177@@ -0,0 +1,50 @@
1178+This package was debianized by Jonathan Tai <jon.tai@medsphere.com> on
1179+Wed, 08 Jul 2009 21:26:33 -0700.
1180+
1181+It was downloaded from <https://medsphere.org/community/project/gtm>
1182+
1183+Upstream Author:
1184+
1185+ Medsphere Systems Corporation
1186+
1187+Copyright:
1188+
1189+ Copyright (C) 2009 Medsphere Systems Corporation
1190+
1191+License:
1192+
1193+ The utilities provided by the OpenVista/GT.M Integration Project simplify
1194+ installation, configuration, and operation of OpenVista Server when running on
1195+ GT.M on Linux.
1196+
1197+ Copyright (C) 2009 Medsphere Systems Corporation
1198+
1199+ This program is free software; you can redistribute it and/or modify it solely
1200+ under the terms of the GNU Affero General Public License version 3 as published
1201+ by the Free Software Foundation.
1202+
1203+ This program is distributed in the hope that it will be useful, but WITHOUT
1204+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
1205+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
1206+ for more details.
1207+
1208+ You should have received a copy of the GNU Affero General Public License along
1209+ with this program; if not, see http://www.gnu.org/licenses or write to the Free
1210+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
1211+ 02110-1301 USA.
1212+
1213+ You can contact Medsphere Systems Corporation headquarters at 1917 Palomar Oaks Way,
1214+ Carlsbad, Ca. 92008 or at legal@medsphere.com.
1215+
1216+ The interactive user interfaces in modified source and object code versions
1217+ of this program must display Appropriate Legal Notices, as required under
1218+ Section 5 of the GNU Affero General Public License version 3.
1219+
1220+ In accordance with Section 7(b) of the GNU Affero General Public License
1221+ version 3, these Appropriate Legal Notices must retain the display of the
1222+ "Powered by Medsphere" logo. If the display of the logo is not reasonably
1223+ feasible for technical reasons, the Appropriate Legal Notices must display
1224+ the words "Powered by Medsphere".
1225+
1226+The Debian packaging is copyright 2009, Medsphere Systems Corporation and
1227+is licensed under the AGPL.
1228
1229=== added file 'packages/deb/openvista-utils/debian/dirs'
1230--- packages/deb/openvista-utils/debian/dirs 1970-01-01 00:00:00 +0000
1231+++ packages/deb/openvista-utils/debian/dirs 2009-07-12 08:33:40 +0000
1232@@ -0,0 +1,9 @@
1233+etc/apache2/conf.d
1234+etc/bash_completion.d
1235+opt/openvista
1236+sbin
1237+usr/bin
1238+usr/lib/openvista
1239+usr/sbin
1240+usr/share/doc/openvista-utils
1241+var/www/webdav
1242
1243=== added file 'packages/deb/openvista-utils/debian/docs'
1244--- packages/deb/openvista-utils/debian/docs 1970-01-01 00:00:00 +0000
1245+++ packages/deb/openvista-utils/debian/docs 2009-07-12 08:33:40 +0000
1246@@ -0,0 +1,2 @@
1247+NEWS
1248+README
1249
1250=== added file 'packages/deb/openvista-utils/debian/manpages'
1251--- packages/deb/openvista-utils/debian/manpages 1970-01-01 00:00:00 +0000
1252+++ packages/deb/openvista-utils/debian/manpages 2009-07-10 00:05:19 +0000
1253@@ -0,0 +1,11 @@
1254+docs/man8/ovinstanceadd.8
1255+docs/man8/ovinstancedel.8
1256+docs/man8/ovrestore.8
1257+docs/man8/ovauth.8
1258+docs/man1/openvista.1
1259+docs/man1/ovtied.1
1260+docs/man1/ovcc.1
1261+docs/man1/ovbackup.1
1262+docs/man1/ovpurgejournals.1
1263+docs/man1/ovswitchjournals.1
1264+docs/man1/ovimport.1
1265
1266=== added file 'packages/deb/openvista-utils/debian/openvista-utils.openvista.pam'
1267--- packages/deb/openvista-utils/debian/openvista-utils.openvista.pam 1970-01-01 00:00:00 +0000
1268+++ packages/deb/openvista-utils/debian/openvista-utils.openvista.pam 2009-07-09 08:28:58 +0000
1269@@ -0,0 +1,4 @@
1270+@include common-auth
1271+@include common-account
1272+@include common-password
1273+@include common-session
1274
1275=== added file 'packages/deb/openvista-utils/debian/postinst'
1276--- packages/deb/openvista-utils/debian/postinst 1970-01-01 00:00:00 +0000
1277+++ packages/deb/openvista-utils/debian/postinst 2009-08-03 20:13:57 +0000
1278@@ -0,0 +1,74 @@
1279+#!/bin/sh
1280+# postinst script for openvista-utils
1281+#
1282+# see: dh_installdeb(1)
1283+
1284+set -e
1285+
1286+# summary of how this script can be called:
1287+# * <postinst> `configure' <most-recently-configured-version>
1288+# * <old-postinst> `abort-upgrade' <new version>
1289+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
1290+# <new-version>
1291+# * <postinst> `abort-remove'
1292+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
1293+# <failed-install-package> <version> `removing'
1294+# <conflicting-package> <version>
1295+# for details, see http://www.debian.org/doc/debian-policy/ or
1296+# the debian-policy package
1297+
1298+
1299+case "$1" in
1300+ configure)
1301+ if ! getent group openvista >/dev/null; then
1302+ addgroup --quiet openvista
1303+ fi
1304+
1305+ if ! getent passwd openvista >/dev/null; then
1306+ adduser --quiet --disabled-password --ingroup openvista --gecos "OpenVista tied account" openvista
1307+ fi
1308+
1309+ if ! groups openvista | grep gtm >/dev/null; then
1310+ adduser --quiet openvista gtm > /dev/null
1311+ fi
1312+
1313+ chgrp openvista /opt/openvista /sbin/ovauth
1314+
1315+ # the chgrp command above may cause ovauth to lose the setuid bit; re-add it here just in case
1316+ chmod u+s /sbin/ovauth
1317+
1318+ if [ -x /usr/sbin/a2enmod ]; then
1319+ a2enmod dav_fs > /dev/null
1320+ a2enmod ssl > /dev/null
1321+ fi
1322+
1323+ if [ -x /usr/sbin/a2ensite ]; then
1324+ a2ensite default-ssl > /dev/null
1325+ fi
1326+
1327+ # FIXME: disable access to the webdav directory via regular HTTP
1328+
1329+ if [ -x /etc/init.d/apache2 ]; then
1330+ if [ -x /usr/sbin/invoke-rc.d ]; then
1331+ invoke-rc.d apache2 restart
1332+ else
1333+ /etc/init.d/apache2 restart
1334+ fi
1335+ fi
1336+ ;;
1337+
1338+ abort-upgrade|abort-remove|abort-deconfigure)
1339+ ;;
1340+
1341+ *)
1342+ echo "postinst called with unknown argument \`$1'" >&2
1343+ exit 1
1344+ ;;
1345+esac
1346+
1347+# dh_installdeb will replace this with shell code automatically
1348+# generated by other debhelper scripts.
1349+
1350+#DEBHELPER#
1351+
1352+exit 0
1353
1354=== added file 'packages/deb/openvista-utils/debian/postrm'
1355--- packages/deb/openvista-utils/debian/postrm 1970-01-01 00:00:00 +0000
1356+++ packages/deb/openvista-utils/debian/postrm 2009-08-01 07:06:06 +0000
1357@@ -0,0 +1,55 @@
1358+#!/bin/sh
1359+# postrm script for openvista-utils
1360+#
1361+# see: dh_installdeb(1)
1362+
1363+set -e
1364+
1365+# summary of how this script can be called:
1366+# * <postrm> `remove'
1367+# * <postrm> `purge'
1368+# * <old-postrm> `upgrade' <new-version>
1369+# * <new-postrm> `failed-upgrade' <old-version>
1370+# * <new-postrm> `abort-install'
1371+# * <new-postrm> `abort-install' <old-version>
1372+# * <new-postrm> `abort-upgrade' <old-version>
1373+# * <disappearer's-postrm> `disappear' <overwriter>
1374+# <overwriter-version>
1375+# for details, see http://www.debian.org/doc/debian-policy/ or
1376+# the debian-policy package
1377+
1378+
1379+case "$1" in
1380+ purge)
1381+ deluser --quiet openvista || :
1382+
1383+ # if there are no users in the openvista group (other than the openvista
1384+ # user), deluser will delete the group, but if there *are* other users, we
1385+ # need to explicitly call delgroup
1386+ delgroup --quiet openvista || :
1387+
1388+ # FIXME: does this need to happen even on remove?
1389+ if [ -x /etc/init.d/apache2 ]; then
1390+ if [ -x /usr/sbin/invoke-rc.d ]; then
1391+ invoke-rc.d apache2 reload
1392+ else
1393+ /etc/init.d/apache2 reload
1394+ fi
1395+ fi
1396+ ;;
1397+
1398+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
1399+ ;;
1400+
1401+ *)
1402+ echo "postrm called with unknown argument \`$1'" >&2
1403+ exit 1
1404+ ;;
1405+esac
1406+
1407+# dh_installdeb will replace this with shell code automatically
1408+# generated by other debhelper scripts.
1409+
1410+#DEBHELPER#
1411+
1412+exit 0
1413
1414=== added file 'packages/deb/openvista-utils/debian/rules'
1415--- packages/deb/openvista-utils/debian/rules 1970-01-01 00:00:00 +0000
1416+++ packages/deb/openvista-utils/debian/rules 2009-08-03 21:07:36 +0000
1417@@ -0,0 +1,154 @@
1418+#!/usr/bin/make -f
1419+# -*- makefile -*-
1420+# Sample debian/rules that uses debhelper.
1421+#
1422+# This file was originally written by Joey Hess and Craig Small.
1423+# As a special exception, when this file is copied by dh-make into a
1424+# dh-make output file, you may use that output file without restriction.
1425+# This special exception was added by Craig Small in version 0.37 of dh-make.
1426+#
1427+# Modified to make a template file for a multi-binary package with separated
1428+# build-arch and build-indep targets by Bill Allombert 2001
1429+
1430+# Uncomment this to turn on verbose mode.
1431+#export DH_VERBOSE=1
1432+
1433+# This has to be exported to make some magic below work.
1434+export DH_OPTIONS
1435+
1436+
1437+
1438+
1439+
1440+
1441+configure: configure-stamp
1442+configure-stamp:
1443+ dh_testdir
1444+ # Add here commands to configure the package.
1445+
1446+ touch configure-stamp
1447+
1448+
1449+#Architecture
1450+build: build-arch build-indep
1451+
1452+build-arch: build-arch-stamp
1453+build-arch-stamp: configure-stamp
1454+ cd src/ovauth && ./compile.sh
1455+ touch $@
1456+
1457+build-indep: build-indep-stamp
1458+build-indep-stamp: configure-stamp
1459+
1460+ # Add here commands to compile the indep part of the package.
1461+ #$(MAKE) doc
1462+ touch $@
1463+
1464+clean:
1465+ dh_testdir
1466+ dh_testroot
1467+ rm -f build-arch-stamp build-indep-stamp configure-stamp
1468+
1469+ rm -f debian/openvista-utils.openvista-databases.init
1470+ rm -f debian/openvista-utils.openvista.init
1471+ rm -f debian/openvista-utils.openvista.cron.d
1472+ rm -f debian/openvista-utils.openvista.cron.daily
1473+ rm -f src/ovauth/ovauth
1474+
1475+ dh_clean
1476+
1477+install: install-indep install-arch
1478+install-indep:
1479+ dh_testdir
1480+ dh_testroot
1481+ dh_prep -i
1482+ dh_installdirs -i
1483+
1484+ # Add here commands to install the indep part of the package into
1485+ # debian/<package>-doc.
1486+ #INSTALLDOC#
1487+
1488+ dh_install -i
1489+
1490+install-arch:
1491+ dh_testdir
1492+ dh_testroot
1493+ dh_prep -s
1494+ dh_installdirs -s
1495+
1496+ install COPYING.AGPL debian/openvista-utils/usr/share/doc/openvista-utils/AGPL
1497+
1498+ install -m 644 scripts/usr/lib/openvista/functions debian/openvista-utils/usr/lib/openvista/
1499+
1500+ install scripts/usr/sbin/ovinstanceadd debian/openvista-utils/usr/sbin/
1501+ install scripts/usr/sbin/ovinstancedel debian/openvista-utils/usr/sbin/
1502+ install scripts/usr/sbin/ovrestore debian/openvista-utils/usr/sbin/
1503+
1504+ install scripts/usr/bin/openvista debian/openvista-utils/usr/bin/
1505+ install scripts/usr/bin/ovtied debian/openvista-utils/usr/bin/
1506+ install scripts/usr/bin/ovcc debian/openvista-utils/usr/bin/
1507+ install scripts/usr/bin/ovbackup debian/openvista-utils/usr/bin/
1508+ install scripts/usr/bin/ovpurgejournals debian/openvista-utils/usr/bin/
1509+ install scripts/usr/bin/ovswitchjournals debian/openvista-utils/usr/bin/
1510+ install scripts/usr/bin/ovimport debian/openvista-utils/usr/bin/
1511+
1512+ install scripts/etc/init.d/openvista-databases debian/openvista-utils.openvista-databases.init
1513+ install scripts/etc/init.d/openvista debian/openvista-utils.openvista.init
1514+
1515+ install -m 644 scripts/etc/bash_completion.d/openvista debian/openvista-utils/etc/bash_completion.d/
1516+
1517+ install scripts/etc/cron.d/openvista debian/openvista-utils.openvista.cron.d
1518+ install scripts/etc/cron.daily/openvista debian/openvista-utils.openvista.cron.daily
1519+
1520+ install -m 644 debian/webdav.conf debian/openvista-utils/etc/apache2/conf.d/
1521+
1522+ touch debian/openvista-utils/etc/apache2/webdav.htpasswd
1523+
1524+ install src/ovauth/ovauth debian/openvista-utils/sbin/
1525+
1526+ dh_install -s
1527+# Must not depend on anything. This is to be called by
1528+# binary-arch/binary-indep
1529+# in another 'make' thread.
1530+binary-common:
1531+ dh_testdir
1532+ dh_testroot
1533+ dh_installchangelogs
1534+ dh_installdocs
1535+ dh_installexamples
1536+# dh_installmenu
1537+# dh_installdebconf
1538+# dh_installlogrotate
1539+# dh_installemacsen
1540+ dh_installpam --name=openvista
1541+# dh_installmime
1542+# dh_python
1543+ dh_installinit -r --no-start --name=openvista-databases -- defaults 28 10
1544+ dh_installinit -r --no-start --name=openvista -- defaults 98 01
1545+ dh_installcron --name=openvista
1546+# dh_installinfo
1547+ dh_installman
1548+ dh_link
1549+ dh_strip
1550+ dh_compress
1551+ dh_fixperms
1552+ # use group root for now; will change to group openvista in postinst
1553+ chmod 2750 debian/openvista-utils/opt/openvista
1554+ chmod 4754 debian/openvista-utils/sbin/ovauth
1555+# dh_perl
1556+ dh_makeshlibs
1557+ dh_installdeb
1558+ dh_shlibdeps
1559+ dh_gencontrol
1560+ dh_md5sums
1561+ dh_builddeb
1562+# Build architecture independant packages using the common target.
1563+binary-indep: build-indep install-indep
1564+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
1565+
1566+# Build architecture dependant packages using the common target.
1567+binary-arch: build-arch install-arch
1568+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
1569+
1570+binary: binary-arch binary-indep
1571+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
1572
1573=== added file 'packages/deb/openvista-utils/debian/webdav.conf'
1574--- packages/deb/openvista-utils/debian/webdav.conf 1970-01-01 00:00:00 +0000
1575+++ packages/deb/openvista-utils/debian/webdav.conf 2009-08-03 22:58:57 +0000
1576@@ -0,0 +1,14 @@
1577+# OpenVista document imaging repository
1578+<IfModule mod_dav_fs.c>
1579+<Directory "/var/www/webdav">
1580+ Dav On
1581+
1582+ AllowOverride None
1583+ Options Indexes FollowSymLinks
1584+
1585+ AuthType Basic
1586+ AuthName "OpenVista document imaging repository"
1587+ AuthUserFile "/etc/apache2/webdav.htpasswd"
1588+ Require valid-user
1589+</Directory>
1590+</IfModule>
1591
1592=== modified file 'packages/rpm/fis-gtm-5.3003.spec'
1593--- packages/rpm/fis-gtm-5.3003.spec 2009-07-18 00:45:57 +0000
1594+++ packages/rpm/fis-gtm-5.3003.spec 2009-08-04 04:31:03 +0000
1595@@ -1,8 +1,8 @@
1596 # FIXME: this is a pretty bad RPM:
1597 # - It requires that gtm_curpro already exists on the build box
1598 # - It requires that gtm_dist does not already exist on the build box
1599+# - It requires that the gtm group already exist on the build box
1600 # - It requires the RPM be built as root
1601-# - The arch is wrong (?) - GT.M requires i686 but this package is marked i386
1602
1603 # This must point to an existing binary installation of GT.M because GT.M
1604 # requires GT.M to build
1605@@ -16,7 +16,7 @@
1606
1607 Name: fis-gtm-5.3003
1608 Version: 5.3003
1609-Release: 3
1610+Release: 4
1611 Summary: High end TP schemaless database
1612 License: AGPL
1613 Vendor: Fidelity Information Services
1614@@ -67,7 +67,7 @@
1615 exit 1
1616 fi
1617
1618-if ! grep '^gtm:' /etc/group > /dev/null; then
1619+if ! getent group gtm >/dev/null; then
1620 echo "gtm group not found in /etc/group"
1621 exit 1
1622 fi
1623@@ -106,10 +106,10 @@
1624
1625 mkdir -p $(dirname %{gtm_dist})
1626
1627-cd pro
1628 # We need to patch the configure script to pre-answer all of the prompts and
1629 # set the installation directory
1630-sed 's,@GTMDIST@,%{gtm_dist},' < %{PATCH1} | patch -p0 -b
1631+cd pro
1632+cat %{PATCH1} | sed 's,@GTM_DIST@,%{gtm_dist},' | patch -p0 -b
1633 chmod +x configure
1634 ./configure
1635
1636
1637=== modified file 'packages/rpm/fis-gtm-5.3003_noninteractive-configure.patch'
1638--- packages/rpm/fis-gtm-5.3003_noninteractive-configure.patch 2009-02-22 08:42:50 +0000
1639+++ packages/rpm/fis-gtm-5.3003_noninteractive-configure.patch 2009-08-04 04:31:03 +0000
1640@@ -27,7 +27,7 @@
1641
1642 $echo "In what directory should GT.M be installed? \c"
1643 -read gtmdist
1644-+gtmdist="@GTMDIST@"
1645++gtmdist="@GTM_DIST@"
1646
1647 $echo ""
1648
1649
1650=== modified file 'packages/rpm/fis-gtm-5.3004.spec'
1651--- packages/rpm/fis-gtm-5.3004.spec 2009-07-20 07:47:58 +0000
1652+++ packages/rpm/fis-gtm-5.3004.spec 2009-08-04 04:17:19 +0000
1653@@ -1,8 +1,8 @@
1654 # FIXME: this is a pretty bad RPM:
1655 # - It requires that gtm_curpro already exists on the build box
1656 # - It requires that gtm_dist does not already exist on the build box
1657+# - It requires that the gtm group already exist on the build box
1658 # - It requires the RPM be built as root
1659-# - The arch is wrong (?) - GT.M requires i686 but this package is marked i386
1660
1661 # This must point to an existing binary installation of GT.M because GT.M
1662 # requires GT.M to build
1663@@ -16,7 +16,7 @@
1664
1665 Name: fis-gtm-5.3004
1666 Version: 5.3004
1667-Release: 4
1668+Release: 5
1669 Summary: High end TP schemaless database
1670 License: AGPL
1671 Vendor: Fidelity Information Services
1672@@ -66,7 +66,7 @@
1673 exit 1
1674 fi
1675
1676-if ! grep '^gtm:' /etc/group > /dev/null; then
1677+if ! getent group gtm >/dev/null; then
1678 echo "gtm group not found in /etc/group"
1679 exit 1
1680 fi
1681@@ -85,13 +85,13 @@
1682 # tcsh.
1683 echo 'setenv gtm_curpro %{gtm_curpro}' > build.csh
1684 echo 'setenv gtm_exe %{gtm_curpro}' >> build.csh
1685-echo 'setenv HOSTOS `uname -s`' >> build.csh
1686+echo 'setenv HOSTOS '$(uname -s) >> build.csh
1687 echo 'setenv gtm_tools '$(pwd)'/sr_linux' >> build.csh
1688 echo 'setenv gtm_inc '$(pwd)'/sr_linux' >> build.csh
1689 %ifarch x86_64
1690 echo 'setenv OBJECT_MODE 64' >> build.csh
1691 %endif
1692-echo 'setenv gtm_icu_version `icu-config --version`' >> build.csh
1693+echo 'setenv gtm_icu_version '$(icu-config --version) >> build.csh
1694 echo 'setenv gtm_version_change 1' >> build.csh
1695 cat sr_unix/gtm_env.csh >> build.csh
1696 echo 'make -f sr_unix/comlist.mk -I./sr_unix -I./sr_linux buildtypes=pro gtm_ver='$(pwd) >> build.csh
1697@@ -107,10 +107,10 @@
1698
1699 mkdir -p $(dirname %{gtm_dist})
1700
1701-cd pro
1702 # We need to patch the configure script to pre-answer all of the prompts and
1703 # set the installation directory
1704-sed 's,@GTMDIST@,%{gtm_dist},' < %{PATCH1} | patch -p0 -b
1705+cd pro
1706+cat %{PATCH1} | sed 's,@GTM_DIST@,%{gtm_dist},' | sed 's,@GTM_ICU_VERSION@,'$(icu-config --version)',' | patch -p0 -b
1707 chmod +x configure
1708 ./configure
1709
1710
1711=== modified file 'packages/rpm/fis-gtm-5.3004_noninteractive-configure.patch'
1712--- packages/rpm/fis-gtm-5.3004_noninteractive-configure.patch 2009-07-16 23:02:21 +0000
1713+++ packages/rpm/fis-gtm-5.3004_noninteractive-configure.patch 2009-07-30 21:06:57 +0000
1714@@ -27,7 +27,7 @@
1715
1716 $echo "In what directory should GT.M be installed? \c"
1717 -read gtmdist
1718-+gtmdist="@GTMDIST@"
1719++gtmdist="@GTM_DIST@"
1720
1721 # if gtmdist is relative then need to make it absolute
1722
1723@@ -54,7 +54,7 @@
1724 if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
1725 $echo "Enter ICU version (at least ICU version 3.6 is required. Enter as <minor-ver>.<major-ver>): \c"
1726 - read gtm_icu_version
1727-+ gtm_icu_version="3.6"
1728++ gtm_icu_version="@GTM_ICU_VERSION@"
1729 icu_ver=`$echo $gtm_icu_version | sed 's/\.//'`
1730 majmin=`$echo $icu_ver | cut -f 1 -d "."`
1731 if [ "$majmin" -lt "36" ] ; then
1732
1733=== modified file 'packages/rpm/openvista-libs-5.3003.spec'
1734--- packages/rpm/openvista-libs-5.3003.spec 2009-07-17 08:17:11 +0000
1735+++ packages/rpm/openvista-libs-5.3003.spec 2009-08-04 04:27:16 +0000
1736@@ -6,7 +6,7 @@
1737
1738 Name: openvista-libs-5.3003
1739 Version: 0.8.4
1740-Release: 1
1741+Release: 2
1742 Summary: GT.M External Calls for OpenVista
1743 License: AGPL
1744 Vendor: Medsphere Systems Corporation
1745@@ -54,6 +54,10 @@
1746 %install
1747 rm -rf %{buildroot}
1748
1749+install -d %{buildroot}%{_mandir}/man8/
1750+install -m 644 docs/man8/gtmsignal.8 %{buildroot}%{_mandir}/man8/
1751+gzip %{buildroot}%{_mandir}/man8/gtmsignal.8
1752+
1753 install -d %{buildroot}%{gtm_dist}
1754 install -m 550 src/libopenvista/libopenvista.so %{buildroot}%{gtm_dist}
1755 install -m 440 src/libopenvista/openvista.xc %{buildroot}%{gtm_dist}
1756@@ -68,6 +72,7 @@
1757 %doc COPYING
1758 %doc COPYING.AGPL
1759 %doc NEWS
1760+%{_mandir}/man8/gtmsignal.8*
1761 %defattr(-,bin,gtm)
1762 %{gtm_dist}/libopenvista.so
1763 %{gtm_dist}/openvista.xc
1764
1765=== modified file 'packages/rpm/openvista-libs-5.3004.spec'
1766--- packages/rpm/openvista-libs-5.3004.spec 2009-07-18 03:03:33 +0000
1767+++ packages/rpm/openvista-libs-5.3004.spec 2009-08-04 04:27:16 +0000
1768@@ -6,7 +6,7 @@
1769
1770 Name: openvista-libs-5.3004
1771 Version: 0.8.4
1772-Release: 1
1773+Release: 2
1774 Summary: GT.M External Calls for OpenVista
1775 License: AGPL
1776 Vendor: Medsphere Systems Corporation
1777@@ -54,6 +54,10 @@
1778 %install
1779 rm -rf %{buildroot}
1780
1781+install -d %{buildroot}%{_mandir}/man8/
1782+install -m 644 docs/man8/gtmsignal.8 %{buildroot}%{_mandir}/man8/
1783+gzip %{buildroot}%{_mandir}/man8/gtmsignal.8
1784+
1785 install -d %{buildroot}%{gtm_dist}
1786 install -m 550 src/libopenvista/libopenvista.so %{buildroot}%{gtm_dist}
1787 install -m 440 src/libopenvista/openvista.xc %{buildroot}%{gtm_dist}
1788@@ -68,6 +72,7 @@
1789 %doc COPYING
1790 %doc COPYING.AGPL
1791 %doc NEWS
1792+%{_mandir}/man8/gtmsignal.8*
1793 %defattr(-,bin,gtm)
1794 %{gtm_dist}/libopenvista.so
1795 %{gtm_dist}/openvista.xc
1796
1797=== modified file 'packages/rpm/openvista-utils.spec'
1798--- packages/rpm/openvista-utils.spec 2009-07-20 17:23:59 +0000
1799+++ packages/rpm/openvista-utils.spec 2009-08-03 19:26:46 +0000
1800@@ -1,6 +1,6 @@
1801 Name: openvista-utils
1802 Version: 0.8.4
1803-Release: 3
1804+Release: 4
1805 Summary: Utilities for configuring and managing OpenVista
1806 License: AGPL
1807 Vendor: Medsphere Systems Corporation
1808@@ -14,7 +14,7 @@
1809 Requires(postun): /usr/sbin/userdel, /sbin/service
1810
1811 Requires: /bin/bash, coreutils, openssh, /usr/bin/logger, /usr/bin/rsync, /bin/tar, /usr/bin/bzip2, /usr/bin/find, vixie-cron
1812-Requires: fis-gtm, openvista-libs
1813+Requires: openvista-libs
1814 Requires: httpd, mod_ssl, pam
1815 BuildRequires: pam-devel
1816
1817@@ -63,10 +63,12 @@
1818 install scripts/usr/bin/ovswitchjournals %{buildroot}%{_bindir}/
1819 install scripts/usr/bin/ovimport %{buildroot}%{_bindir}/
1820
1821+install -d %{buildroot}%{_mandir}/man8/
1822+install -m 644 docs/man8/ovinstanceadd.8 %{buildroot}%{_mandir}/man8/
1823+install -m 644 docs/man8/ovinstancedel.8 %{buildroot}%{_mandir}/man8/
1824+install -m 644 docs/man8/ovrestore.8 %{buildroot}%{_mandir}/man8/
1825+install -m 644 docs/man8/ovauth.8 %{buildroot}%{_mandir}/man8/
1826 install -d %{buildroot}%{_mandir}/man1/
1827-install -m 644 docs/man1/ovinstanceadd.1 %{buildroot}%{_mandir}/man1/
1828-install -m 644 docs/man1/ovinstancedel.1 %{buildroot}%{_mandir}/man1/
1829-install -m 644 docs/man1/ovrestore.1 %{buildroot}%{_mandir}/man1/
1830 install -m 644 docs/man1/openvista.1 %{buildroot}%{_mandir}/man1/
1831 install -m 644 docs/man1/ovtied.1 %{buildroot}%{_mandir}/man1/
1832 install -m 644 docs/man1/ovcc.1 %{buildroot}%{_mandir}/man1/
1833@@ -74,9 +76,10 @@
1834 install -m 644 docs/man1/ovpurgejournals.1 %{buildroot}%{_mandir}/man1/
1835 install -m 644 docs/man1/ovswitchjournals.1 %{buildroot}%{_mandir}/man1/
1836 install -m 644 docs/man1/ovimport.1 %{buildroot}%{_mandir}/man1/
1837-gzip %{buildroot}%{_mandir}/man1/ovinstanceadd.1
1838-gzip %{buildroot}%{_mandir}/man1/ovinstancedel.1
1839-gzip %{buildroot}%{_mandir}/man1/ovrestore.1
1840+gzip %{buildroot}%{_mandir}/man8/ovinstanceadd.8
1841+gzip %{buildroot}%{_mandir}/man8/ovinstancedel.8
1842+gzip %{buildroot}%{_mandir}/man8/ovrestore.8
1843+gzip %{buildroot}%{_mandir}/man8/ovauth.8
1844 gzip %{buildroot}%{_mandir}/man1/openvista.1
1845 gzip %{buildroot}%{_mandir}/man1/ovtied.1
1846 gzip %{buildroot}%{_mandir}/man1/ovcc.1
1847@@ -134,9 +137,10 @@
1848 %{_bindir}/ovpurgejournals
1849 %{_bindir}/ovswitchjournals
1850 %{_bindir}/ovimport
1851-%{_mandir}/man1/ovinstanceadd.1*
1852-%{_mandir}/man1/ovinstancedel.1*
1853-%{_mandir}/man1/ovrestore.1*
1854+%{_mandir}/man8/ovinstanceadd.8*
1855+%{_mandir}/man8/ovinstancedel.8*
1856+%{_mandir}/man8/ovrestore.8*
1857+%{_mandir}/man8/ovauth.8*
1858 %{_mandir}/man1/openvista.1*
1859 %{_mandir}/man1/ovtied.1*
1860 %{_mandir}/man1/ovcc.1*
1861
1862=== modified file 'packages/rpm/webdav.conf'
1863--- packages/rpm/webdav.conf 2009-04-22 04:16:31 +0000
1864+++ packages/rpm/webdav.conf 2009-08-03 22:58:57 +0000
1865@@ -1,4 +1,5 @@
1866 # OpenVista document imaging repository
1867+<IfModule mod_dav_fs.c>
1868 <Directory "/var/www/html/webdav">
1869 Dav On
1870
1871@@ -10,3 +11,4 @@
1872 AuthUserFile "/etc/httpd/conf/webdav.htpasswd"
1873 Require valid-user
1874 </Directory>
1875+</IfModule>
1876
1877=== modified file 'scripts/etc/init.d/openvista'
1878--- scripts/etc/init.d/openvista 2009-06-11 04:58:31 +0000
1879+++ scripts/etc/init.d/openvista 2009-08-03 21:07:36 +0000
1880@@ -19,6 +19,15 @@
1881 #
1882 # chkconfig: 2345 98 01
1883 # description: Application-level startup/shutdown script for OpenVista Server
1884+#
1885+### BEGIN INIT INFO
1886+# Provides: openvista
1887+# Required-Start: $all openvista-databases
1888+# Required-Stop: $all openvista-databases
1889+# Default-Start: 2 3 4 5
1890+# Default-Stop: 0 1 6
1891+# Short-Description: Application-level startup/shutdown script for OpenVista Server
1892+### END INIT INFO
1893
1894
1895 # Copyright (C) 2009 Medsphere Systems Corporation
1896@@ -39,8 +48,15 @@
1897 # Oaks Way, Suite 200, Carlsbad, CA 92008 or at legal@medsphere.com.
1898
1899
1900+# Check the package is still installed. Traditionally, the test is for a
1901+# program that is executed later in this script, but it's not trivial to find
1902+# the location of the mumps binary because multiple verisons could be
1903+# installed, so look for the functions script instead.
1904+[ -f /usr/lib/openvista/functions ] || exit 0
1905+
1906 # Source function library.
1907-. /etc/rc.d/init.d/functions
1908+[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions
1909+[ -f /lib/lsb/init-functions ] && . /lib/lsb/init-functions
1910 . /usr/lib/openvista/functions
1911
1912 root="/opt/openvista"
1913@@ -98,35 +114,85 @@
1914 case $1 in
1915 start)
1916 if [ -z "$2" ]; then
1917- echo "Starting OpenVista..."
1918+ if function_exists "action"; then
1919+ echo "Starting OpenVista..."
1920+ elif function_exists "log_daemon_msg"; then
1921+ log_daemon_msg "Running startup hooks for OpenVista databases"
1922+ fi
1923
1924 for instance in `ls $root`; do
1925 [ -L "$root/$instance/gtm" ] || continue
1926
1927- action $" Running startup hooks for $instance: " run_hook "$instance" ZSTART
1928+ if function_exists "action"; then
1929+ action $" Running startup hooks for $instance: " run_hook "$instance" ZSTART
1930+ elif function_exists "log_daemon_msg"; then
1931+ log_progress_msg "$instance"
1932+ run_hook "$instance" ZSTART || end_msg=1
1933+ else
1934+ run_hook "$instance" ZSTART
1935+ fi
1936 done
1937+
1938+ if function_exists "log_daemon_msg"; then
1939+ log_end_msg ${end_msg:-0}
1940+ fi
1941 else
1942- action $"Running startup hooks for $instance: " run_hook "$instance" ZSTART
1943+ if function_exists "action"; then
1944+ action $"Running startup hooks for $instance: " run_hook "$instance" ZSTART
1945+ elif function_exists "log_daemon_msg"; then
1946+ log_daemon_msg "Running startup hooks for OpenVista databases" "$instance"
1947+ run_hook "$instance" ZSTART
1948+ log_end_msg $?
1949+ else
1950+ run_hook "$instance" ZSTART
1951+ fi
1952 fi
1953 ;;
1954 stop)
1955 if [ -z "$2" ]; then
1956- echo "Stopping OpenVista..."
1957+ if function_exists "action"; then
1958+ echo "Stopping OpenVista..."
1959+ elif function_exists "log_daemon_msg"; then
1960+ log_daemon_msg "Running shutdown hooks for OpenVista databases"
1961+ fi
1962
1963 for instance in `ls $root`; do
1964 [ -L "$root/$instance/gtm" ] || continue
1965
1966- action $" Running shutdown hooks for $instance: " run_hook "$instance" ZSTOP
1967+ if function_exists "action"; then
1968+ action $" Running shutdown hooks for $instance: " run_hook "$instance" ZSTOP
1969+ elif function_exists "log_daemon_msg"; then
1970+ log_progress_msg "$instance"
1971+ run_hook "$instance" ZSTOP || end_msg=1
1972+ else
1973+ run_hook "$instance" ZSTOP
1974+ fi
1975 done
1976+
1977+ if function_exists "log_daemon_msg"; then
1978+ log_end_msg ${end_msg:-0}
1979+ fi
1980 else
1981- action $"Running shutdown hooks for $instance: " run_hook "$instance" ZSTOP
1982+ if function_exists "action"; then
1983+ action $"Running shutdown hooks for $instance: " run_hook "$instance" ZSTOP
1984+ elif function_exists "log_daemon_msg"; then
1985+ log_daemon_msg "Running shutdown hooks for OpenVista databases" "$instance"
1986+ run_hook "$instance" ZSTOP
1987+ log_end_msg $?
1988+ else
1989+ run_hook "$instance" ZSTOP
1990+ fi
1991 fi
1992
1993 # give background jobs (e.g., TaskMan) some time to wake up and realize they've been asked to shut down
1994 sleep 5
1995 ;;
1996+ restart|force-reload)
1997+ $0 stop $2
1998+ $0 start $2
1999+ ;;
2000 *)
2001- echo "Usage: openvista {start|stop} [INSTANCE_NAME]" >&2
2002+ echo "Usage: openvista {start|stop|restart|force-reload} [INSTANCE_NAME]" >&2
2003 exit 1
2004 ;;
2005 esac
2006
2007=== modified file 'scripts/etc/init.d/openvista-databases'
2008--- scripts/etc/init.d/openvista-databases 2009-04-23 16:33:14 +0000
2009+++ scripts/etc/init.d/openvista-databases 2009-08-03 21:07:36 +0000
2010@@ -26,6 +26,15 @@
2011 #
2012 # chkconfig: 2345 50 30
2013 # description: Database-level startup/shutdown script for OpenVista Server
2014+#
2015+### BEGIN INIT INFO
2016+# Provides: openvista-databases
2017+# Required-Start: $local_fs $syslog $time
2018+# Required-Stop: $local_fs $syslog $time
2019+# Default-Start: 2 3 4 5
2020+# Default-Stop: 0 1 6
2021+# Short-Description: Database-level startup/shutdown script for OpenVista Server
2022+### END INIT INFO
2023
2024
2025 # Copyright (C) 2009 Medsphere Systems Corporation
2026@@ -46,8 +55,15 @@
2027 # Oaks Way, Suite 200, Carlsbad, CA 92008 or at legal@medsphere.com.
2028
2029
2030+# Check the package is still installed. Traditionally, the test is for a
2031+# program that is executed later in this script, but it's not trivial to find
2032+# the location of the mupip binary because multiple verisons could be
2033+# installed, so look for the functions script instead.
2034+[ -f /usr/lib/openvista/functions ] || exit 0
2035+
2036 # Source function library.
2037-. /etc/rc.d/init.d/functions
2038+[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions
2039+[ -f /lib/lsb/init-functions ] && . /lib/lsb/init-functions
2040 . /usr/lib/openvista/functions
2041
2042 root="/opt/openvista"
2043@@ -149,32 +165,82 @@
2044 case $1 in
2045 start)
2046 if [ -z "$2" ]; then
2047- echo "Performing backward journal recovery on OpenVista databases..."
2048-
2049+ if function_exists "action"; then
2050+ echo "Performing backward journal recovery on OpenVista databases..."
2051+ elif function_exists "log_daemon_msg"; then
2052+ log_daemon_msg "Performing backward journal recovery on OpenVista databases"
2053+ fi
2054+
2055 for instance in `ls $root`; do
2056 [ -L "$root/$instance/gtm" ] || continue
2057
2058- action $" Performing recovery on $instance database: " recover_backward "$instance"
2059+ if function_exists "action"; then
2060+ action $" Performing recovery on $instance database: " recover_backward "$instance"
2061+ elif function_exists "log_daemon_msg"; then
2062+ log_progress_msg "$instance"
2063+ recover_backward "$instance" || end_msg=1
2064+ else
2065+ recover_backward "$instance"
2066+ fi
2067 done
2068+
2069+ if function_exists "log_daemon_msg"; then
2070+ log_end_msg ${end_msg:-0}
2071+ fi
2072 else
2073- action $"Performing recovery on $instance database: " recover_backward "$instance"
2074+ if function_exists "action"; then
2075+ action $"Performing recovery on $instance database: " recover_backward "$instance"
2076+ elif function_exists "log_daemon_msg"; then
2077+ log_daemon_msg "Performing backward journal recovery on OpenVista databases" "$instance"
2078+ recover_backward "$instance"
2079+ log_end_msg $?
2080+ else
2081+ recover_backward "$instance"
2082+ fi
2083 fi
2084 ;;
2085 stop)
2086 if [ -z "$2" ]; then
2087- echo "Terminating remaining mumps processes..."
2088+ if function_exists "action"; then
2089+ echo "Terminating remaining mumps processes..."
2090+ elif function_exists "log_daemon_msg"; then
2091+ log_daemon_msg "Terminating remaining mumps processes"
2092+ fi
2093
2094 for instance in `ls $root`; do
2095 [ -L "$root/$instance/gtm" ] || continue
2096
2097- action $" Terminating mumps processes in $instance: " terminate_processes "$instance"
2098+ if function_exists "action"; then
2099+ action $" Terminating mumps processes in $instance: " terminate_processes "$instance"
2100+ elif function_exists "log_daemon_msg"; then
2101+ log_progress_msg "$instance"
2102+ terminate_processes "$instance" || end_msg=1
2103+ else
2104+ terminate_processes "$instance"
2105+ fi
2106 done
2107+
2108+ if function_exists "log_daemon_msg"; then
2109+ log_end_msg ${end_msg:-0}
2110+ fi
2111 else
2112- action $"Terminating mumps processes in $instance: " terminate_processes "$instance"
2113+ if function_exists "action"; then
2114+ action $"Terminating mumps processes in $instance: " terminate_processes "$instance"
2115+ elif function_exists "log_daemon_msg"; then
2116+ log_daemon_msg "Terminating remaining mumps processes" "$instance"
2117+ terminate_processes "$instance"
2118+ log_end_msg $?
2119+ else
2120+ terminate_processes "$instance"
2121+ fi
2122 fi
2123 ;;
2124+ restart|force-reload)
2125+ $0 stop $2
2126+ $0 start $2
2127+ ;;
2128 *)
2129- echo "Usage: openvista-databases {start|stop} [INSTANCE_NAME]" >&2
2130+ echo "Usage: openvista-databases {start|stop|restart|force-reload} [INSTANCE_NAME]" >&2
2131 exit 1
2132 ;;
2133 esac
2134
2135=== modified file 'scripts/usr/lib/openvista/functions'
2136--- scripts/usr/lib/openvista/functions 2009-04-30 06:48:24 +0000
2137+++ scripts/usr/lib/openvista/functions 2009-08-03 18:23:59 +0000
2138@@ -128,3 +128,8 @@
2139 fi
2140 }
2141
2142+function function_exists()
2143+{
2144+ type "$1" 2> /dev/null | grep -q 'function'
2145+}
2146+
2147
2148=== modified file 'scripts/usr/sbin/ovinstanceadd'
2149--- scripts/usr/sbin/ovinstanceadd 2009-07-17 08:17:11 +0000
2150+++ scripts/usr/sbin/ovinstanceadd 2009-07-20 17:57:12 +0000
2151@@ -94,17 +94,17 @@
2152 exit 1
2153 fi
2154
2155-grep "^$user:" /etc/passwd > /dev/null || {
2156+if ! getent passwd "$user" > /dev/null; then
2157 echo "ovinstanceadd: user '$user' not found in /etc/passwd" >&2
2158 exit 1
2159-}
2160+fi
2161
2162-grep "^$user:" /etc/group > /dev/null || {
2163+if ! getent group "$user" > /dev/null; then
2164 echo "ovinstanceadd: group '$user' not found in /etc/group" >&2
2165 exit 1
2166-}
2167+fi
2168
2169-home=`grep "^$user:" /etc/passwd | awk -F : '{ print $6 }'`
2170+home=`getent passwd "$user" | awk -F : '{ print $6 }'`
2171
2172 if [ ! -d "$home" ]; then
2173 echo "ovinstanceadd: $user user's home directory does not exist" >&2
2174@@ -119,18 +119,28 @@
2175 exit 1
2176 fi
2177
2178-grep "^apache:" /etc/passwd > /dev/null || {
2179- echo "ovinstanceadd: user 'apache' not found in /etc/passwd" >&2
2180- exit 1
2181-}
2182-
2183-if [ ! -d "/var/www/html/webdav" ]; then
2184- echo "ovinstanceadd: /var/www/html/webdav does not exist" >&2
2185- exit 1
2186-fi
2187-
2188-if [ ! -f "/etc/httpd/conf/webdav.htpasswd" ]; then
2189- echo "ovinstanceadd: /etc/httpd/conf/webdav.htpasswd does not exist" >&2
2190+if getent passwd apache > /dev/null; then
2191+ apache_user=apache
2192+ apache_conf=/etc/httpd/conf
2193+ docroot=/var/www/html
2194+elif getent passwd www-data > /dev/null; then
2195+ apache_user=www-data
2196+ apache_conf=/etc/apache2
2197+ docroot=/var/www
2198+fi
2199+
2200+if [ -z "$apache_user" ]; then
2201+ echo "ovinstanceadd: apache user not found in /etc/passwd" >&2
2202+ exit 1
2203+fi
2204+
2205+if [ ! -d "$docroot/webdav" ]; then
2206+ echo "ovinstanceadd: $docroot/webdav does not exist" >&2
2207+ exit 1
2208+fi
2209+
2210+if [ ! -f "$apache_conf/webdav.htpasswd" ]; then
2211+ echo "ovinstanceadd: $apache_conf/webdav.htpasswd does not exist" >&2
2212 exit 1
2213 fi
2214
2215@@ -311,12 +321,12 @@
2216 exit 1
2217 }
2218
2219-install -o apache -g apache -m 755 -d "/var/www/html/webdav/$instance" || {
2220+install -o "$apache_user" -g "$apache_user" -m 755 -d "$docroot/webdav/$instance" || {
2221 echo "ovinstanceadd: Unable to create webdav root" >&2
2222 exit 1
2223 }
2224
2225-ln -s "/var/www/html/webdav/$instance" "$root/$instance/images"
2226+ln -s "$docroot/webdav/$instance" "$root/$instance/images"
2227
2228 (
2229 umask 077
2230@@ -327,8 +337,8 @@
2231 exit 1
2232 }
2233
2234-htpasswd -b -m "/etc/httpd/conf/webdav.htpasswd" "$instance" "`cat \"$root/$instance/etc/$instance-webdav_password\"`" > /dev/null 2>&1 || {
2235- echo "ovinstanceadd: Unable to update /etc/httpd/conf/webdav.htpasswd" >&2
2236+htpasswd -b -m "$apache_conf/webdav.htpasswd" "$instance" "`cat \"$root/$instance/etc/$instance-webdav_password\"`" > /dev/null 2>&1 || {
2237+ echo "ovinstanceadd: Unable to update $apache_conf/webdav.htpasswd" >&2
2238 exit 1
2239 }
2240
2241
2242=== modified file 'scripts/usr/sbin/ovinstancedel'
2243--- scripts/usr/sbin/ovinstancedel 2009-07-17 08:17:11 +0000
2244+++ scripts/usr/sbin/ovinstancedel 2009-07-20 17:57:12 +0000
2245@@ -80,20 +80,35 @@
2246 }
2247
2248 # check for other requirements
2249-grep "^$user:" /etc/passwd > /dev/null || {
2250+if ! getent passwd "$user" > /dev/null; then
2251 echo "ovinstancedel: user '$user' not found in /etc/passwd" >&2
2252 exit 1
2253-}
2254+fi
2255
2256-home=`grep "^$user:" /etc/passwd | awk -F : '{ print $6 }'`
2257+home=`getent passwd "$user" | awk -F : '{ print $6 }'`
2258
2259 if [ ! -d "$home" ]; then
2260 echo "ovinstancedel: $user user's home directory does not exist" >&2
2261 exit 1
2262 fi
2263
2264-if [ ! -f "/etc/httpd/conf/webdav.htpasswd" ]; then
2265- echo "ovinstancedel: /etc/httpd/conf/webdav.htpasswd does not exist" >&2
2266+if getent passwd apache > /dev/null; then
2267+ apache_user=apache
2268+ apache_conf=/etc/httpd/conf
2269+ docroot=/var/www/html
2270+elif getent passwd www-data > /dev/null; then
2271+ apache_user=www-data
2272+ apache_conf=/etc/apache2
2273+ docroot=/var/www
2274+fi
2275+
2276+if [ -z "$apache_user" ]; then
2277+ echo "ovinstancedel: apache user not found in /etc/passwd" >&2
2278+ exit 1
2279+fi
2280+
2281+if [ ! -f "$apache_conf/webdav.htpasswd" ]; then
2282+ echo "ovinstancedel: $apache_conf/webdav.htpasswd does not exist" >&2
2283 exit 1
2284 fi
2285
2286@@ -122,7 +137,7 @@
2287 command="grep -v ' $instance\$' '$home/.ssh/authorized_keys' > '$home/.ssh/authorized_keys'.\$\$"
2288 command=$command"; mv -f '$home/.ssh/authorized_keys'.\$\$ '$home/.ssh/authorized_keys'"
2289 su -c "$command" "$user" || {
2290- echo "ovinstanceadd: Unable to update $home/.ssh/authorized_keys" >&2
2291+ echo "ovinstancedel: Unable to update $home/.ssh/authorized_keys" >&2
2292 exit 1
2293 }
2294
2295@@ -148,12 +163,12 @@
2296 exit 1
2297 }
2298
2299-htpasswd -D "/etc/httpd/conf/webdav.htpasswd" "$instance" > /dev/null 2>&1 || {
2300- echo "ovinstancedel: Unable to update /etc/httpd/conf/webdav.htpasswd" >&2
2301+htpasswd -D "$apache_conf/webdav.htpasswd" "$instance" > /dev/null 2>&1 || {
2302+ echo "ovinstancedel: Unable to update $apache_conf/webdav.htpasswd" >&2
2303 exit 1
2304 }
2305
2306-rm -rf "/var/www/html/webdav/$instance" || {
2307+rm -rf "$docroot/webdav/$instance" || {
2308 echo "ovinstancedel: Unable to remove WebDAV root" >&2
2309 exit 1
2310 }

Subscribers

People subscribed via source and target branches