should compile for yaketty and trusty

COPYING

@@ -1 +1 @@
-/usr/share/automake-1.15/COPYING
+/usr/share/automake-1.14/COPYING

ChangeLog

@@ -1,22 +1,37 @@
+2016-11-25 18:25  marc
+
+	* [r45] COPYING, ChangeLog, INSTALL, nodejs/makefile.am:
+	  fix systemd init file
+
+2016-11-25 15:04  marc
+
+	* [r44] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
+	  build-in-docker.conf, build-in-docker.sh,
+	  nodejs/public/javascripts/servicedock.js:
+	  fixed display of username; fixed nodejs build on old systems
+
 2016-11-24 16:00  marc
 
-	* nodejs/public/javascripts/servicedock.js, nodejs/servicedock.js:
+	* [r43] nodejs/public/javascripts/servicedock.js,
+	  nodejs/servicedock.js:
 	  fixed typos
 
 2016-11-24 14:52  marc
 
-	* nodejs/package.json.in, nodejs/public/javascripts/servicedock.js,
+	* [r42] nodejs/package.json.in,
-	  nodejs/servicedock.js, nodejs/sockets/index.js,
+	  nodejs/public/javascripts/servicedock.js, nodejs/servicedock.js,
-	  nodejs/views/index.ejs: most docker client parts have been moved
+	  nodejs/sockets/index.js, nodejs/views/index.ejs:
-	  to docker.js; this version works
+	  most docker client parts have been moved to docker.js; this
+	  version works
 
 2016-11-23 15:58  marc
 
-	* COPYING, ChangeLog, INSTALL, nodejs/docker, nodejs/makefile.am,
+	* [r41] COPYING, ChangeLog, INSTALL, nodejs/docker[DEL],
-	  nodejs/package.json.in, nodejs/public/javascripts/servicedock.js,
+	  nodejs/makefile.am, nodejs/package.json.in,
-	  nodejs/servicedock.js, nodejs/sockets/index.js,
+	  nodejs/public/javascripts/servicedock.js, nodejs/servicedock.js,
-	  nodejs/views/index.ejs: fixed login issue on chromium; moved
+	  nodejs/sockets/index.js, nodejs/views/index.ejs:
-	  docker into mwaeckerlin/docker.js on github
+	  fixed login issue on chromium; moved docker into
+	  mwaeckerlin/docker.js on github
 
 2016-11-22 22:22  marc
 

INSTALL

@@ -1 +1 @@
-/usr/share/automake-1.15/INSTALL
+/usr/share/automake-1.14/INSTALL

ax_init_standard_project.m4

@@ -646,7 +646,7 @@ AC_DEFUN([AX_USE_PERLDOC], [
   PERL_SOURCES="m4_default([$1], [perl])"
   AX_SUBST(PERL_SOURCES)
   if test -z "$PERL_SOURCES"; then
-    AC_MSG_ERROR([You must specify the path to per files
+    AC_MSG_ERROR([You must specify the path to perl files
      - use [AX]_[USE]_PERLDOC([[pathes to perldoc]])]); fi
   AC_CHECK_PROG(have_perldoc, pods2html, yes, no)
   if test "$have_doxygen" = "no"; then

build-in-docker.conf

@@ -8,8 +8,4 @@ if test -n "${ANDROID_HOME}"; then
     repos+=("wheezy:::'deb http://ftp.is.debian.org/debian wheezy-backports main'")
     commands+=("update-alternatives --install /usr/bin/node nodejs /usr/bin/nodejs 100")
     commands+=("curl https://www.npmjs.com/install.sh | sh")
-    commands+=("rm -r ${HOME}/.npm")
-    envs+=("-e HOME=${HOME}")
-    envs+=("-e TERM=xterm")
-    dirs+=("-v ${HOME}/.gnupg:${HOME}/.gnupg:ro")
 fi

build-in-docker.sh

@@ -10,8 +10,8 @@ mode="apt"
 img="ubuntu:latest"
 repos=()
 keys=()
-envs=()
+envs=("-e HOME=/home/$(id -un)" "-e TERM=xterm")
-dirs=("-v $(pwd):/workdir")
+dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:/home/$(id -un)/.gnupg:ro")
 packages=()
 targets="all check distcheck"
 commands=()
@@ -30,7 +30,7 @@ while test $# -gt 0; do
             echo "OPTIONS:"
             echo
             echo "  -h, --help            show this help"
-            echo "  -m, --mode <type>     mode: apt or yum, default: ${mode}"
+            echo "  -m, --mode <type>     mode: apt, yum, dnf, default: ${mode}"
             echo "  -i, --image <image>   use given docker image instead of ${img}"
             echo "  -a, --arch <arch>     build for given hardware architecture"
             echo "  -t, --targets targets specify build targets, default: ${targets}"
@@ -75,6 +75,7 @@ while test $# -gt 0; do
             case "$mode" in
                 (apt) img="ubuntu:latest";;
                 (yum) img="centos:latest";;
+                (dnf) img="fedora:latest";;
                 (*)
                     echo "**** ERROR: unknown mode '$1', try --help" 1>&2
                     exit 1
@@ -192,13 +193,18 @@ function ifthenelse() {
 set -x
 
 docker pull $img
-DOCKER_ID=$(docker create ${dirs[@]} ${envs[@]} -e HOME="${HOME}" -w /workdir $img sleep infinity)
+DOCKER_ID=$(docker create ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
 trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT
 if ! [[ $arch =~ $myarch ]]; then
     docker cp "/usr/bin/qemu-${arch}-static" "${DOCKER_ID}:/usr/bin/qemu-${arch}-static"
 fi
 docker start "${DOCKER_ID}"
-docker exec ${DOCKER_ID} useradd -u$(id -u) -m -d"${HOME}" $(id -un)
+if docker exec ${DOCKER_ID} getent passwd > /dev/null 2>&1; then
+    docker exec ${DOCKER_ID} groupadd -g $(id -g) build
+    docker exec ${DOCKER_ID} useradd -g $(id -g) -u $(id -u) build
+else
+    docker exec ${DOCKER_ID} useradd -m -u $(id -u) -g $(id -u) -d"${HOME}" build
+fi
 case $mode in
     (apt)
         OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
@@ -240,11 +246,26 @@ EOF
             docker exec -i ${DOCKER_ID} bash -c 'cat >> /etc/yum.repos.d/wandisco-svn.repo' <<EOF
 enabled=1
 gpgcheck=0
+EOF
+        fi
+        docker exec ${DOCKER_ID} yum install -y rpm-build automake
+        docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh || true
+        ;;
+    (dnf)
+        ./bootstrap.sh -t dist
+        if [[ "$img" =~ "centos" ]]; then
+            docker exec ${DOCKER_ID} yum install -y redhat-lsb
+            docker exec -i ${DOCKER_ID} bash -c 'cat > /etc/yum.repos.d/wandisco-svn.repo' <<EOF
+[WandiscoSVN]
+name=Wandisco SVN Repo
+EOF
+            docker exec -i ${DOCKER_ID} bash -c 'echo "baseurl=http://opensource.wandisco.com/centos/$(lsb_release -sr | sed '"'"'s,[^0-9].*,,'"'"')/svn-'$(svn --version | head -1 | sed 's,[^0-9]*\([0-9]\+\.[0-9]\+\).*,\1,')'/RPMS/$(uname -i)/" >> /etc/yum.repos.d/wandisco-svn.repo'
+            docker exec -i ${DOCKER_ID} bash -c 'cat >> /etc/yum.repos.d/wandisco-svn.repo' <<EOF
+enabled=1
+gpgcheck=0
 EOF
         fi
         docker exec ${DOCKER_ID} yum install -y rpm-build 
-        docker exec ${DOCKER_ID} groupadd -g $(id -g) build
-        docker exec ${DOCKER_ID} useradd -g $(id -g) -u $(id -u) build
         docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh || true
         ;;
 esac