Replace included static bash by dash shell.

git-svn-id: https://secure.a-eskwadraat.nl/svn/domjudge/trunk@2359 caf94f87-7bd6-0310-88dc-dee8202e2269

COPYING.BSD

@@ -0,0 +1,26 @@
+Copyright (c) The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.

ChangeLog

@@ -2,6 +2,7 @@ DOMjudge Programming Contest Judging System
 
 Version 3.0.0 - SVN
 -------------------
+ - Replace included static bash by dash shell.
  - Revise team manual.
  - Add missing link to add testcases to a new problem.
  - Fix bug causing segfaults of submitdaemon. (Closes: #2046031)

README

@@ -40,11 +40,11 @@ are covered by other copyrights. This will be noted in the files
 themselves and these copyrights/attributions can also be found in the
 administrator manual.
 
-Furthermore, a binary version of the bash shell (statically compiled)
-is distributed with DOMjudge. This program is copyright by the Free
-Software Foundation and distributed under the GPL version 2 or later.
-Sources can be downloaded from:
-http://domjudge.sourceforge.net/bash-sources/
+Furthermore, a binary version of the dash shell (statically compiled)
+is distributed with DOMjudge. This program is copyright by various
+people under the BSD licence and a part under the GNU GPL version 2,
+see doc/dash.copyright for more details.
+Sources can be downloaded from: http://domjudge.sourceforge.net/sources/
 
 
 Contact

bin/sh-static

@@ -1 +1 @@
-bash-static
+dash-static

doc/admin/admin-manual.sgml

@@ -108,8 +108,8 @@ to name them here too:
 
 <itemize>
 <item> beep.c is made by Johnathan Nightingale.
-<item> bash is included from the Debian `bash-static' (i386) package
-(copyright Free Software Foundation).
+<item> dash is included from the Debian `dash-udeb' (i386) package
+(copyright various people, see <tt>doc/dash.copyright</tt>).
 <item> mkstemps.h and basename.h are modified versions from the
 GNU libiberty library (copyright Free Software Foundation).
 <item> lib.database.php by Jeroen van Wolffelaar et al.
@@ -121,11 +121,12 @@ Coroner's Toolkit by Wietse Venema.
 Erik van Sebille.
 </itemize>
 
-A binary version of the bash shell (statically compiled)
-is distributed with DOMjudge. This program is copyright by the Free
-Software Foundation and distributed under the GPL version 2 or later.
+A binary version of the dash shell (statically compiled)
+is distributed with DOMjudge. This program is copyright by various
+people under the BSD licence and a part under the GNU GPL version 2,
+see doc/dash.copyright for more details.
 Sources can be downloaded from:
-<url url="http://domjudge.sourceforge.net/bash-sources/">
+<url url="http://domjudge.sourceforge.net/sources/">
 
 <sect>Contact
 <p>
@@ -320,7 +321,7 @@ The requirements for the deployment of this jury-system are:
 <item> A POSIX compliant shell in <tt>/bin/sh</tt> (e.g. bash or ash)
 
 <item> A statically compiled POSIX shell, located in
-       <tt>SYSTEM_ROOT/bin/sh-static</tt> (bash 3 is included for
+       <tt>SYSTEM_ROOT/bin/sh-static</tt> (dash is included for
        Linux IA32)
 
 <item> glibc &gt;= 2.1
@@ -389,7 +390,7 @@ will have the bulk of these packages installed already.
 apt-get install gcc g++ make libcurl3-dev sudo mysql-server ntp \
 	apache2 php5 php5-cli libapache2-mod-php5 php5-mysql \
 	hostname coreutils procps grep diff mount sharutils \
-	openssh-server openssh-client bash-static phpmyadmin xsltproc \
+	openssh-server openssh-client phpmyadmin xsltproc \
 	wget linuxdoc-tools unzip tetex-bin tetex-extra transfig
 </code>
 
@@ -404,7 +405,7 @@ the list as appropriate.
 
 <code>
 apt-get install make sudo php5-cli php5-mysql ntp xsltproc \
-	hostname coreutils procps grep diff mount bash-static \
+	hostname coreutils procps grep diff mount \
 	gcc g++ gcj sun-java5-jdk ghc fp-compiler
 </code>
 

doc/dash.copyright

@@ -0,0 +1,39 @@
+The dash shell was taken from the Debian package dash-udeb version
+0.5.3-7, see http://packages.debian.org/etch/dash-udeb. The sources
+can be (re-)obtained from: http://domjudge.sourceforce.net/sources/
+
+Copyright (from the Debian copyright file):
+
+Copyright (c) 1989-1994
+        The Regents of the University of California.  All rights reserved.
+Copyright (c) 1997 Christos Zoulas.  All rights reserved.
+Copyright (c) 1997-2005
+        Herbert Xu <[email protected]>.  All rights reserved.
+
+This code is derived from software contributed to Berkeley by Kenneth Almquist.
+
+Please refer to ../COPYING.BSD for details.
+
+mksignames.c:
+
+This file is not directly linked with dash.  However, its output is.
+
+Copyright (C) 1992 Free Software Foundation, Inc.
+
+This file is part of GNU Bash, the Bourne Again SHell.
+
+Bash is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Bash 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 General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License with
+your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with the
+Debian GNU/Linux hello source package as the file COPYING.  If not,
+write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+Boston, MA 02111 USA.