#---
@@ -123,15 +123,20 @@ function games_create_base_dirs() {
#---
## @Synopsis games_make_proper_binary function to make all
-## @Synopsis binaries in /usr/games chown root.games and
+## @Synopsis binaries in /usr/games chown root:games and
## @Synopsis chmod 0750.
#---
function games_make_proper_binary() {
if ( grep -q "usr/games/" $IW_LOG )
then
- cat $IW_LOG | cut -f 3 | sort | grep "usr/games/" | xargs -n 1 chmod 0750
- cat $IW_LOG | cut -f 3 | sort | grep "usr/games/" | xargs -n 1 chown
root.games
+ cat $IW_LOG | cut -f 3 | sort | grep "usr/games/" | xargs -r -n 1 chmod
0750
+ cat $IW_LOG | cut -f 3 | sort | grep "usr/games/" | xargs -r -n 1 chown
root:games
+elif [[ $STAGED_INSTALL == on ]]
+then
+ echo "doing the stage root thing"
+ find $STAGE_DIRECTORY/TRANSL/ | sed "s#$STAGE_DIRECTORY/##" | grep
'^TRANSL/usr/games' | xargs -r -n 1 chmod -f 0750
+ find $STAGE_DIRECTORY/TRANSL/ | sed "s#$STAGE_DIRECTORY/##" | grep
'^TRANSL/usr/games' | xargs -r -n 1 chown -f root:games
else
message "${QUERY_COLOR}If you see this message and you're not \n \
installing a data spell then report this at the following url: \n \
diff --git a/games-engines/stratagus/DETAILS b/games-engines/stratagus/DETAILS
index d647dd7..5e0b9f5 100755
--- a/games-engines/stratagus/DETAILS
+++ b/games-engines/stratagus/DETAILS
@@ -1,11 +1,11 @@
SPELL=stratagus
- VERSION=061209
+ VERSION=2.2.1
SOURCE=$SPELL-$VERSION-src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/stratagus/$SOURCE
WEB_SITE=http://stratagus.sf.net
ENTERED=20040718
-
SOURCE_HASH=sha512:02972dc63fa1d211aee6eb34aae6457f689064f89c013c6d042547475e88d6bd8899108da5d0ff3cf069428c94026e3c19b546fc8bd12493a9f3c34d419aeed9
+
SOURCE_HASH=sha512:f9ce4165c4cb55fe09d4949bd4be29de25e7225cc9c711bf6dfc53c791f285c74f8bd6cd394ea4ca4980f70b952ca9bcee1d45ee6853df74183a3615ebcd9033
LICENSE[0]=GPL
SHORT='A real-time strategy game engine'
cat << EOF
diff --git a/games-engines/stratagus/HISTORY b/games-engines/stratagus/HISTORY
index 72d659b..82ba6d9 100644
--- a/games-engines/stratagus/HISTORY
+++ b/games-engines/stratagus/HISTORY
@@ -1,3 +1,9 @@
+2006-12-26 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: update to 2.2.1
+ * configure.in: removed
+ * widgets.h.patch: removed
+ * PRE_BUILD: removed
+
2006-12-10 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: update to 2.2 aka 061209
* DEPENDS: re-added zlib, explicit depends
diff --git a/games-engines/stratagus/PRE_BUILD
b/games-engines/stratagus/PRE_BUILD
deleted file mode 100755
index 8aafa36..0000000
--- a/games-engines/stratagus/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-cp $SPELL_DIRECTORY/configure.in \
- $SOURCE_DIRECTORY/configure.in &&
-patch -p0 < $SPELL_DIRECTORY/widgets.h.patch &&
-./autogen.sh
diff --git a/games-engines/stratagus/configure.in
b/games-engines/stratagus/configure.in
deleted file mode 100644
index 44d4ab0..0000000
--- a/games-engines/stratagus/configure.in
+++ /dev/null
@@ -1,255 +0,0 @@
-
-AC_INIT(configure.in)
-AC_PREREQ([2.50])
-
-CXXFLAGS=$CXXFLAGS
-AC_PROG_CXX
-AM_CONFIG_HEADER(config.h)
-
-OBJDIR=obj
-if test "`uname -a | grep -is cygwin`" -o "`uname -a | grep -is mingw`"; then
- ARCH=win32
- OBJDIR=winobj
- CPPFLAGS="$CPPFLAGS -DUSE_WIN32"
-elif test "`uname -a | grep -is bsd`"; then
- ARCH=bsd
- CPPFLAGS="$CPPFLAGS -DBSD"
-elif test "`uname -a | grep -is beos`"; then
- ARCH=beos
- CPPFLAGS="$CPPFLAGS -DUSE_BEOS"
-elif test "`uname -a | grep -is darwin`"; then
- ARCH=macosx
- CPPFLAGS="$CPPFLAGS -DUSE_MAC"
-else
- ARCH=linux
-fi
-
-if test "$ARCH" = "bsd" ; then
- CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include -I/usr/local/include"
- LIBS="$LIBS -L/usr/local/lib"
-fi
-
-if test "$ARCH" = "macosx" ; then
- if test -d /usr/local/include; then
- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
- fi
- if test -d /usr/local/lib; then
- LIBS="$LIBS -L/usr/local/lib"
- fi
-
- if test -d /sw/include; then
- CPPFLAGS="$CPPFLAGS -I/sw/include"
- fi
- if test -d /sw/lib; then
- LIBS="$LIBS -L/sw/lib"
- fi
-
- if test -d /opt/local/include; then
- CPPFLAGS="$CPPFLAGS -I/opt/local/include"
- fi
- if test -d /opt/local/lib; then
- LIBS="$LIBS -L/opt/local/lib"
- fi
-fi
-
-if test -d /usr/include/lua50; then
- CPPFLAGS="$CPPFLAGS -I/usr/include/lua50"
-fi
-
-AC_CHECK_FUNCS(strcasestr)
-AC_CHECK_FUNCS(strnlen)
-
-AC_PATH_X
-if test "$no_x" != "yes"; then
- if test "x$x_includes" != "x"; then
- CPPFLAGS="$CPPFLAGS -I$x_includes"
- fi
- if test "x$x_libraries" != "x"; then
- LDFLAGS="$LDFLAGS -L$x_libraries"
- fi
- AC_DEFINE(HAVE_X, 1, Define to 1 if you have X. Used for pasting from
the clipboard.)
-fi
-
-AC_CHECK_HEADER(zlib.h,, AC_MSG_ERROR(could not find zlib.h))
-AC_CHECK_HEADER(png.h,, AC_MSG_ERROR(could not find png.h))
-
-AC_ARG_ENABLE(win32,
- [ --enable-win32 Force win32, useful for cross-compiling
(default: no)])
-if test "$enable_win32" = "yes"; then
- ARCH=win32
- OBJDIR=winobj
- CPPFLAGS="$CPPFLAGS -DUSE_WIN32"
- PATH="/usr/local/cross/bin:$PATH"
-fi
-
-AC_SUBST(OBJDIR)
-
-AC_ARG_ENABLE(static,
- [ --enable-static Compile a static binary (default: no)])
-if test "$enable_static" = "yes"; then
- LDFLAGS="$LDFLAGS -static"
-fi
-
-AC_ARG_ENABLE(profile,
- [ --enable-profile Enable profiling support, implies
--enable-debug (default: no)])
-if test "$enable_profile" = "yes"; then
- CXXFLAGS="-pg"
-fi
-
-AC_ARG_ENABLE(debug,
- [ --enable-debug [Enable debug (default: no)]])
-if test "$enable_debug" != "yes" -a "$enable_profile" != "yes"; then
- CXXFLAGS="$CXXFLAGS"
-else
- CXXFLAGS="$CXXFLAGS"
- CPPFLAGS="$CPPFLAGS -DDEBUG"
-fi
-
-dnl --- EXTRA DIRS -------------
-AC_ARG_WITH(extra-includes,
- [ --with-extra-includes=DIR [Location of additional include
directiories]], CPPFLAGS="$CPPFLAGS -I$withval")
-AC_ARG_WITH(extra-libs,
- [ --with-extra-libs=DIR [Location of additional library
directories]], LDFLAGS="$LDFLAGS -L$withval")
-
-dnl --- OPENGL -----------------
-AC_ARG_WITH(opengl,
- [ --with-opengl [Use opengl (default: no)]],,
with_opengl="no")
-if test "$with_opengl" != "no"; then
- CPPFLAGS="$CPPFLAGS -DUSE_OPENGL"
-
- if test "$ARCH" = "win32"; then
- AC_CHECK_LIB(opengl32, main, LDFLAGS="$LDFLAGS -lopengl32",
AC_MSG_ERROR(opengl libraries cannot be not found))
- else
- AC_SEARCH_LIBS(glViewport, GL opengl32 sdl, LDFLAGS="$LDFLAGS
$LIBS", AC_MSG_ERROR(opengl libraries cannot be not found))
- fi
-fi
-
-dnl --- BZIP2 ------------------
-AC_ARG_WITH(bzip2,
- [ --with-bzip2 [Use bzip2 (default: yes)]])
-if test "$with_bzip2" != "no"; then
- AC_CHECK_HEADER(bzlib.h,, BZIP2=no)
- if test "$BZIP2" != "no"; then
- AC_CHECK_LIB(bz2, main, CPPFLAGS="$CPPFLAGS -DUSE_BZ2LIB"
LDFLAGS="$LDFLAGS -lbz2", BZIP2=no)
- fi
- if test "$BZIP2" = "no"; then
- AC_MSG_ERROR(libbzip2 headers and/or libraries could not be
found)
- fi
-fi
-
-dnl --- VORBIS -----------------
-AC_ARG_WITH(vorbis,
- [ --with-vorbis [Use vorbis (default: autodetect)]])
-if test "$with_vorbis" != "no"; then
- AC_CHECK_HEADER(ogg/ogg.h,, VORBIS=no)
- AC_CHECK_HEADER(vorbis/codec.h,, VORBIS=no)
- if test "$VORBIS" != "no"; then
- AC_CHECK_LIB(vorbis, vorbis_info_init, CPPFLAGS="$CPPFLAGS
-DUSE_VORBIS" LDFLAGS="$LDFLAGS -lvorbis -logg", VORBIS=no, -logg)
- fi
- if test "x$with_vorbis" != "x" -a "$VORBIS" = "no"; then
- AC_MSG_ERROR(vorbis headers and/or libraries could not be
found)
- fi
-else
- VORBIS=no
-fi
-
-dnl --- THEORA -----------------
-AC_ARG_WITH(theora,
- [ --with-theora [Use theora (default: no)]])
-if test "$with_theora" != "no" -a "x$with_theora" != "x"; then
- if test "$VORBIS" = "no"; then
- AC_MSG_ERROR(vorbis is required for theora support)
- fi
- AC_CHECK_HEADER(ogg/ogg.h,, THEORA=no)
- AC_CHECK_HEADER(theora/theora.h,, THEORA=no)
- if test "$THEORA" != "no"; then
- AC_CHECK_LIB(theora, theora_decode_init, CPPFLAGS="$CPPFLAGS
-DUSE_THEORA" LDFLAGS="$LDFLAGS -ltheora -logg", THEORA=no, -logg)
- fi
- if test "x$with_theora" != "x" -a "$THEORA" = "no"; then
- AC_MSG_ERROR(theora headers and/or libraries could not be
found)
- fi
-fi
-
-dnl --- MIKMOD -----------------
-AC_ARG_WITH(mikmod,
- [ --with-mikmod [Use mikmod (default: autodetect)]])
-if test "$with_mikmod" != "no"; then
- AC_CHECK_HEADER(mikmod.h,, MIKMOD=no)
- if test "$MIKMOD" != "no"; then
- AC_CHECK_LIB(mikmod, MikMod_Init, CPPFLAGS="$CPPFLAGS
-DUSE_MIKMOD" LDFLAGS="$LDFLAGS -lmikmod", MIKMOD=no)
- fi
- if test "x$with_mikmod" != "x" -a "$MIKMOD" = "no"; then
- AC_MSG_ERROR(mikmod headers and/or libraries could not be
found)
- fi
-fi
-
-dnl --- MNG --------------------
-AC_ARG_WITH(mng,
- [ --with-mng [Use mng (default: no)]])
-if test "$with_mng" != "no" -a "x$with_mng" != "x"; then
- AC_CHECK_HEADER(libmng.h,, MNG=no)
- if test "$MNG" != "no"; then
- AC_CHECK_LIB(mng, main, CPPFLAGS="$CPPFLAGS -DUSE_MNG"
LDFLAGS="$LDFLAGS -lmng", MNG=no)
- fi
- if test "$MNG" = "no"; then
- AC_MSG_ERROR(mng headers and/or libraries could not be found)
- fi
-fi
-
-dnl --- LUA --------------------
-if test "$ARCH" = "linux"; then
- LDFLAGS="$LDFLAGS -ldl"
-fi
-AC_CHECK_HEADER(lua.h,, AC_MSG_ERROR(could not find lua.h))
-AC_SEARCH_LIBS(lua_getfenv, lua lua50 lua5.0, LDFLAGS="$LDFLAGS $LIBS",
AC_MSG_ERROR(Lua5 is required))
-AC_SEARCH_LIBS(luaopen_base, lualib lualib50 lualib5.0, LDFLAGS="$LDFLAGS
$LIBS", AC_MSG_ERROR(Lualib5 is required))
-
-dnl --- SDL --------------------
-AC_CHECK_PROGS(SDLCONFIG, sdl-config)
-if test "x$SDLCONFIG" = "x"; then
- AC_CHECK_PROGS(SDLCONFIG, sdl11-config)
-fi
-if test "x$SDLCONFIG" = "x"; then
- echo "*** sdl-config not found";
- exit 1;
-fi
-
-CPPFLAGS="$CPPFLAGS `$SDLCONFIG --cflags`"
-if test "$enable_static" != "yes"; then
- LDFLAGS="$LDFLAGS `$SDLCONFIG --libs`"
-else
- LDFLAGS="$LDFLAGS `$SDLCONFIG --static-libs`"
-fi
-
-
-
-if test "$prefix" = "NONE"; then
- PREFIX=/usr/local
-else
- PREFIX="$prefix"
-fi
-AC_SUBST(PREFIX)
-
-if test "$ARCH" = "win32"; then
- if test "`uname -a | grep -is cygwin`"; then
- LDFLAGS="$LDFLAGS -lwsock32 -lws2_32"
- else
- LDFLAGS="$LDFLAGS -lwsock32 -lws2_32 -lmingwex -lgmon"
- fi
-fi
-
-AC_SUBST(CPPFLAGS)
-AC_SUBST(CXXFLAGS)
-AC_SUBST(LDFLAGS)
-
-if test "$ARCH" = "win32"; then
- if ! test -f Rules.make; then
- echo "include Rules.make.WIN32" >Rules.make
- fi
- AC_CONFIG_FILES(Rules.make.WIN32:Rules.make.in)
-else
- AC_CONFIG_FILES(Rules.make)
-fi
-AC_OUTPUT
-
-# EOF #
diff --git a/games-engines/stratagus/widgets.h.patch
b/games-engines/stratagus/widgets.h.patch
deleted file mode 100644
index d0a9d35..0000000
--- a/games-engines/stratagus/widgets.h.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/include/widgets.h.orig 2006-12-10 23:33:04.000000000 +0100
-+++ src/include/widgets.h 2006-12-10 23:33:19.000000000 +0100
-@@ -10,7 +10,7 @@
- //
- /**@name widgets.h - The widgets headerfile. */
- //
--// (c) Copyright 2005-2006 by Fran?ois Beerten and Jimmy Salmon
-+// (c) Copyright 2005-2006 by Fran?ois Beerten and Jimmy Salmon
- //
- // This program is free software; you can redistribute it and/or modify
- // it under the terms of the GNU General Public License as published by
-@@ -34,7 +34,6 @@
- #include <guichan.h>
- #include <guichan/gsdl.h>
- #ifdef USE_OPENGL
--#include <guichan/opengl.h>
- #endif
- typedef int lua_Object; // from tolua++.h
-
diff --git a/games-strategy-rts/bos/DETAILS b/games-strategy-rts/bos/DETAILS
index a30b0fc..13ce27c 100755
--- a/games-strategy-rts/bos/DETAILS
+++ b/games-strategy-rts/bos/DETAILS
@@ -1,12 +1,11 @@
SPELL=bos
- VERSION=2.0
- SOURCE=${SPELL}_${VERSION/./_}.tar.gz
+ VERSION=2_0_1
+ SOURCE=${SPELL}_${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/data.bos
SOURCE_URL[0]=http://bos.seul.org/files/$SOURCE
WEB_SITE=http://bos.seul.org
ENTERED=20040719
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:076b3c4493c5261e5fe5616e1d1bdd7db28784562d85d9806223a2a130773cd2e98a663c5c9b79520d5fbe827066b92cd5e1c2fc4af913ec7a17373206921927
+
SOURCE_HASH=sha512:3bc3898af030de0a503363259229a79c254f27617d4719fc948a08e1585db83ff21a482d322b6e2e2a4ac93ae0dcb073727ff0b58b5e99c48b5f95f894ca64c2
LICENSE[0]=GPL
SHORT='A game for the stratagus engine'
cat << EOF
diff --git a/games-strategy-rts/bos/HISTORY b/games-strategy-rts/bos/HISTORY
index fb61d80..6f8ea0a 100644
--- a/games-strategy-rts/bos/HISTORY
+++ b/games-strategy-rts/bos/HISTORY
@@ -1,3 +1,6 @@
+2006-12-26 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: update to 2.0.1
+
2006-12-15 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* bos: minor modification of the path
diff --git a/games-strategy-rts/warzone2100/DETAILS
b/games-strategy-rts/warzone2100/DETAILS
index 8974848..f89ec89 100755
--- a/games-strategy-rts/warzone2100/DETAILS
+++ b/games-strategy-rts/warzone2100/DETAILS
@@ -1,5 +1,5 @@
SPELL=warzone2100
- VERSION=2.0.4
+ VERSION=2.0.5
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=${SOURCE}.sig
SOURCE_URL[0]=http://download.gna.org/warzone/releases/2.0/${SOURCE}
diff --git a/games-strategy-rts/warzone2100/HISTORY
b/games-strategy-rts/warzone2100/HISTORY
index a1fb382..e269fdc 100644
--- a/games-strategy-rts/warzone2100/HISTORY
+++ b/games-strategy-rts/warzone2100/HISTORY
@@ -1,3 +1,7 @@
+2006-12-26 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update to 2.0.5
+ * PRE_BUILD: added to run autogen.sh
+
2006-08-27 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: version 2.0.4
diff --git a/games-strategy-rts/warzone2100/PRE_BUILD
b/games-strategy-rts/warzone2100/PRE_BUILD
new file mode 100755
index 0000000..5a7638b
--- /dev/null
+++ b/games-strategy-rts/warzone2100/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+./autogen.sh
diff --git a/games-utils/FUNCTIONS b/games-utils/FUNCTIONS
index abfab9f..f4a3b31 100755
--- a/games-utils/FUNCTIONS
+++ b/games-utils/FUNCTIONS
@@ -39,47 +39,6 @@ function update_desktop_database ()
fi
}
-#---------------------------------------------------------------------
-## this function installs the *.desktop, start* files and qingy links
-## this function is intended to be used by spells for windowmanagers
-#---------------------------------------------------------------------
-function install_wmfiles ()
-{
- local wm_desktopfile_dir="${INSTALL_ROOT}/usr/share/xsessions"
- local wm_startwm_dir="${INSTALL_ROOT}/usr/bin"
-
- # install the start* file for the windowmanager if it's not
- # installed already
- if [ -f ${SCRIPT_DIRECTORY}/start${SPELL} ] ; then
- if ! [ -e ${wm_startwm}/start${SPELL} ] ; then
- install -m 755 ${SCRIPT_DIRECTORY}/start${SPELL} \
- ${wm_startwm_dir}
- fi
- fi
-
- # making sure the destination directory exists
- if ! [ -d ${wm_desktopfile_dir} ] ; then
- mkdir ${wm_desktopfile_dir}
- fi &&
-
- # install the windowmanagers desktop file
- if [ -f ${SCRIPT_DIRECTORY}/${SPELL}.desktop ] ; then
- if ! [ -e ${wm_desktopfile_dir}/${SPELL}.desktop ]; then
- install -m 755 ${SCRIPT_DIRECTORY}/${SPELL}.desktop \
- ${wm_desktopfile_dir}
- fi
- fi
-
- if ( spell_ok qingy ); then
- if [ -x ${wm_startwm_dir}/start${SPELL} ] ; then
- if [ ! -d ${INSTALL_ROOT}/etc/qingy/xsessions ]; then
- install -d -m 755 ${INSTALL_ROOT}/etc/qingy/xsessions
- fi &&
- ln -s ${wm_startwm_dir}/start${SPELL} \
- ${INSTALL_ROOT}/etc/qingy/xsessions/${SPELL}
- fi
- fi
-}
#---------------------------------------------------------------------
## Sets the current script to run only one make job
@@ -100,71 +59,6 @@ function make_normal ()
source $COMPILE_CONFIG
}
-#---------------------------------------------------------------------
-## @param shellname
-## @param full path to shell
-##
-## Adds a shell to /etc/shells and optionally to qingy's sessions
-#---------------------------------------------------------------------
-function install_shell ()
-{
- local qingy_session_dir="${INSTALL_ROOT}/etc/qingy/sessions"
-
- if [ -z "$1" ] ; then
- message "${PROBLEM_COLOR}no shell name specified,
aborting${DEFAULT_COLOR}"
- return 1
- fi &&
- if [ ! -e "$2" ] ; then
- message "${PROBLEM_COLOR} $2 isn't executable, no use adding it as a
shell${DEFAULT_COLOR}"
- return 1
- fi &&
-
- #installing shell into /etc/shells
- message "installing $1 into /etc/shells"
- if ! ( grep -q "${2}" ${INSTALL_ROOT}/etc/shells ) ; then
- echo "$2" >> ${INSTALL_ROOT}/etc/shells
- fi || return 1
-
- #installing shell into qingy's session dir if it's installed
- if ( spell_ok qingy ) && ! [ -f ${qingy_session_dir}/$1 ] ; then
- message "installing $1 into $qingy_session_dir"
- echo "$2" > ${qingy_session_dir}/$1 &&
- chmod 0755 ${qingy_session_dir}/$1
- fi
-}
-
-#---------------------------------------------------------------------
-## @param shellname
-## @param full path to shell
-##
-## Removes a shell from /etc/shells and optionally from qingy's sessions
-#---------------------------------------------------------------------
-function remove_shell ()
-{
- local qingy_session_dir="${INSTALL_ROOT}/etc/qingy/sessions"
-
- if [ -z "$1" ] ; then
- message "${PROBLEM_COLOR}no shell name specified,
aborting${DEFAULT_COLOR}"
- return 1
- fi &&
- if [ -z "$2" ] ; then
- message "${PROBLEM_COLOR}no shell path specified,
aborting${DEFAULT_COLOR}"
- return 1
- fi &&
-
- #removing shell from /etc/shells
- if [ -f /etc/shells ] ; then
- cat /etc/shells|grep -v "$2" > /etc/shells.tmp &&
- mv /etc/shells.tmp /etc/shells
- fi
-
- # and optionally from qingy's session dir
- if [ -f ${qingy_session_dir}/$1 ] ; then
- message "removing $1 from $qingy_session_dir"
- rm -f ${qingy_session_dir}/$1
- fi
-}
-
#---------------------------------------------------------------------
## replacement for config_query_string to work around a short timeout
@@ -230,10 +124,10 @@ function unpack_file() {
#---