new feature specify dns; check signature after signing

ChangeLog

@@ -1,3 +1,14 @@
+2018-02-09 10:24  
+
+	* [r479] mrw-c++.spec.in:
+	  fixed build in fedora
+
+2017-12-21 15:13  
+
+	* [r478] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
+	  mac-create-app-bundle.sh, template.sh:
+	  update of build system
+
 2017-12-06 15:39  
 
 	* [r477] ChangeLog, bootstrap.sh:

ax_init_standard_project.m4

@@ -578,6 +578,7 @@ clean-debian-targets:
 	-rm -rf \${PACKAGE_NAME}_\${PACKAGE_VERSION}~\${DISTRO}.\${BUILD_NUMBER}.{dsc,tar.gz} \${PACKAGE_NAME}_\${PACKAGE_VERSION}~\${DISTRO}.\${BUILD_NUMBER}*.changes \$\$(sed -n 's,Package: \(.*\),\1_${PACKAGE_VERSION}~${DISTRO}.${BUILD_NUMBER}*.deb,p;' debian/control)
 deb: distdir
 	cd \${PACKAGE_NAME}-\${PACKAGE_VERSION} && ( export CFLAGS="\${CFLAGS}"; export CPPFLAGS="\${CPPFLAGS}"; export CXXFLAGS="\${CXXFLAGS}"; export LDFLAGS="\${LDFLAGS}"; export DEB_CFLAGS_APPEND="\${CFLAGS}"; export DEB_CPPFLAGS_APPEND="\${CPPFLAGS}"; export  DEB_CXXFLAGS_APPEND="\${CXXFLAGS}"; export DEB_LDFLAGS_APPEND="\${LDFLAGS}"; dpkg-buildpackage )
+	gpg --verify \${PACKAGE_NAME}_\${PACKAGE_VERSION}~\${DISTRO}.\${BUILD_NUMBER}.dsc
 distclean-debian-targets:
 	-rm debian/changelog debian/control
 #### End: $0

bootstrap.sh

@@ -1708,6 +1708,7 @@ $(
 BuildRequires: rpm-sign, lsb-release
 %else
 BuildRequires: rpm-sign, redhat-lsb
+%global debug_package %{nil}
 %endif
 %endif
 $(

build-in-docker.sh

@@ -10,6 +10,7 @@ mode="deb"
 img="mwaeckerlin/ubuntu:latest"
 repos=()
 keys=()
+dns=()
 envs=("-e LANG=${LANG}" "-e HOME=${HOME}" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
 dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:${HOME}/.gnupg")
 packages=()
@@ -41,6 +42,7 @@ while test $# -gt 0; do
             echo "  -f, --flag <flag>     add flag to ./bootstrap.sh or ./configure"
             echo "  -r, --repo <url>      add given apt repository"
             echo "  -k, --key <url>       add public key from url"
+            echo "  -n, --dns <ip>        add ip as dns server"
             echo "  -e, --env <var>=<val> set environment variable in docker"
             echo "  -d, --dir <dir>       access given directory read only"
             echo "  -p, --package <pkg>   install extra debian packages"
@@ -128,6 +130,9 @@ while test $# -gt 0; do
         (-e|--env) shift;
             envs+=("-e $1")
             ;;
+        (-n|--dns) shift;
+            dns+=("--dns $1")
+            ;;
         (-d|--dirs) shift;
             dirs+=("-v $1:$1:ro")
             ;;
@@ -223,7 +228,7 @@ function ifthenelse() {
 set -x
 
 docker pull $img
-DOCKER_ID=$(docker create ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
+DOCKER_ID=$(docker create ${dns[@]} ${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"
@@ -250,16 +255,16 @@ case $mode in
         done
         docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
         docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}
-        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release || \
-            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release || \
-            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release;
-        for repo in "${repos[@]}"; do
-            ifthenelse "${repo}" "apt-add-repository 'ARG'"
-        done
+        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release wget;
         for key in "${keys[@]}"; do
             wget -O- "$key" \
                 | docker exec -i ${DOCKER_ID} apt-key add -
         done
+        for repo in "${repos[@]}"; do
+            ifthenelse "${repo}" "apt-add-repository 'ARG'"
+        done
         docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
         for package in "${packages[@]}"; do
             ifthenelse "${package}" "apt-get install ${OPTIONS} ARG"

template.sh

@@ -39,7 +39,7 @@ message() {
     if test $# -eq 0; then
         return
     fi
-    echo "${bold}${while}$*${normal}" 1>&2
+    echo "${bold}${white}$*${normal}" 1>&2
 }
 
 # write a success message