new feature specify dns; check signature after signing

master
Marc Wäckerlin 7 years ago
parent ad6f83e0e4
commit 1975b16af0
  1. 19
      ChangeLog
  2. 1
      ax_init_standard_project.m4
  3. 7
      build-in-docker.sh

@ -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,

@ -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

@ -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"

Loading…
Cancel
Save