From 1975b16af066b893e2badec8897f060210707436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Tue, 3 Apr 2018 14:28:16 +0000 Subject: [PATCH] new feature specify dns; check signature after signing --- ChangeLog | 19 +++++++++++++++++++ ax_init_standard_project.m4 | 1 + build-in-docker.sh | 7 ++++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9175fc4..7550a81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2018-03-19 10:02 + + * [r408] examples/cardos-demo.cxx: + add new commnds to read CardOS Version + +2018-03-13 13:21 + + * [r407] src/openssl-compatibility.hxx: + fix windows DATADIR bug + +2018-03-12 13:34 + + * [r406] ChangeLog, bootstrap.sh, build-in-docker.sh, + examples/openssl-engine-demo.cxx, src/cryptaux.hxx, + src/cryptoki.cxx, src/makefile.am, + src/openssl-compatibility.hxx[ADD], src/openssl-engine.cxx, + src/openssl-engine.hxx, src/openssl.hxx, template.sh: + support new Op0enSSL 1.1.0 API + 2017-12-21 15:23 * [r405] COPYING, ChangeLog, INSTALL, ax_init_standard_project.m4, diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index d7480dd..c9ddd1b 100644 --- a/ax_init_standard_project.m4 +++ b/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 diff --git a/build-in-docker.sh b/build-in-docker.sh index b341370..2193f34 100755 --- a/build-in-docker.sh +++ b/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 add flag to ./bootstrap.sh or ./configure" echo " -r, --repo add given apt repository" echo " -k, --key add public key from url" + echo " -n, --dns add ip as dns server" echo " -e, --env = set environment variable in docker" echo " -d, --dir access given directory read only" echo " -p, --package 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"