[GNUnet-SVN] [ascension] branch master updated: fixed bugs and reactiveated set -e

[gnunet]

This is an automated email from the git hooks/post-receive script.

rexxnor pushed a commit to branch master
in repository ascension.

The following commit(s) were added to refs/heads/master by this push:
     new dfca5e2  fixed bugs and reactiveated set -e
dfca5e2 is described below

commit dfca5e22f19a8de90aa692cba6e389fc9b344ba7
Author: rexxnor <address@hidden>
AuthorDate: Tue Jun 4 11:11:10 2019 +0200

    fixed bugs and reactiveated set -e
---
 .../debian/ascension-bind.config                   |  20 ++++++++-------
 .../debian/ascension-bind/DEBIAN/config            |  20 ++++++++-------
 .../debian/ascension-bind/DEBIAN/prerm             |   2 ++
 debian/ascension-bind_0.0.1-1.debian.tar.xz        | Bin 4096 -> 4172 bytes
 debian/ascension-bind_0.0.1-1.dsc                  |   6 ++---
 debian/ascension-bind_0.0.1-1_amd64.build          |   1 -
 debian/ascension-bind_0.0.1-1_amd64.buildinfo      |  28 ++++++++++-----------
 debian/ascension-bind_0.0.1-1_amd64.changes        |  24 +++++++++---------
 debian/ascension-bind_0.0.1-1_amd64.deb            | Bin 3670 -> 3764 bytes
 9 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/debian/ascension-bind-0.0.1/debian/ascension-bind.config 
b/debian/ascension-bind-0.0.1/debian/ascension-bind.config
index 0e24871..72cc915 100644
--- a/debian/ascension-bind-0.0.1/debian/ascension-bind.config
+++ b/debian/ascension-bind-0.0.1/debian/ascension-bind.config
@@ -9,11 +9,11 @@ DEBIAN_FRONTEND=${DEBIAN_FRONTEND:-noninteractive}
 # load debconf library
 . /usr/share/debconf/confmodule
 
-#set -e
+set -e
 
 zonelist=$(grep "^zone" < /etc/bind/named.conf.local | grep -vE 
"(arpa|localhost|\"\.\")" | cut -d '"' -f2)
 zonelist=$(echo -n "$zonelist" | tr '\n' ',' | sed 's/,/, /g')
-trimmed=$(echo $zonelist | tr -d '\n')
+trimmed=$(echo "$zonelist" | tr -d '\n')
 if [ "$trimmed" = "" ]; then
     echo "There are no zones to migrate"
     exit 0
@@ -31,7 +31,8 @@ db_get ascension-bind/zones
 echo "$RET" | sed 's/ //g' | sed 's/,/\n/g' > selectedzones
 readarray zones < selectedzones
 rm selectedzones
-trimmed=$(echo $zones | tr -d '\n')
+# It is okay to just take the first element here
+trimmed=$(echo "$zones" | tr -d '\n')
 if [ -z $trimmed ]; then
     echo "There are no zones to migrate"
     exit 0
@@ -79,12 +80,12 @@ if ! $zonestatus; then
 fi
 
 echo "Everything okay, templating files"
-mkdir -p /etc/ascension.d/
+mkdir -p /etc/ascension.d/ || true
 for ZONE in "address@hidden"
 do
     ZONE=$( echo "$ZONE" | tr -d '\n')
-    gnunet-identity -C "$ZONE"
-    ZONEPKEYLINE=$(gnunet-identity -dqe "$ZONE")
+    su -s /bin/sh -c "gnunet-identity -C $ZONE || true" ascension
+    ZONEPKEYLINE=$(su -s /bin/sh -c "gnunet-identity -dqe $ZONE" ascension)
     ZONEPKEY=$( echo "$ZONEPKEYLINE" | tr -d '\n')
     FILECONV=$( echo "$ZONE" | tr '.' '_')
     echo "Creating systemd unit file."
@@ -110,11 +111,12 @@ do
     systemctl daemon-reload
     ZONE=$( echo "$ZONE" | tr -d '\n')
     FILECONV=$( echo "$ZONE" | tr '.' '_')
-    ZONEPKEYLINE=$(gnunet-identity -dqe "$ZONE")
+    ZONEPKEYLINE=$(su -s /bin/sh -c "gnunet-identity -dqe $ZONE" ascension)
     ZONEPKEY=$( echo "$ZONEPKEYLINE" | tr -d '\n')
     echo "Starting and enabling ascension-bind-$FILECONV"
-    deb-systemd-helper enable "ascension-bind-$FILECONV"
-    deb-systemd-invoke start "ascension-bind-$FILECONV"
+    # Hacky solution but docker containers return 101 here
+    deb-systemd-helper enable "ascension-bind-$FILECONV" || true
+    deb-systemd-invoke start "ascension-bind-$FILECONV" || true
     systemctl daemon-reload
 done
 
diff --git a/debian/ascension-bind-0.0.1/debian/ascension-bind/DEBIAN/config 
b/debian/ascension-bind-0.0.1/debian/ascension-bind/DEBIAN/config
index 41ecd07..5dd439c 100755
--- a/debian/ascension-bind-0.0.1/debian/ascension-bind/DEBIAN/config
+++ b/debian/ascension-bind-0.0.1/debian/ascension-bind/DEBIAN/config
@@ -9,11 +9,11 @@ DEBIAN_FRONTEND=${DEBIAN_FRONTEND:-noninteractive}
 # load debconf library
 . /usr/share/debconf/confmodule
 
-#set -e
+set -e
 
 zonelist=$(grep "^zone" < /etc/bind/named.conf.local | grep -vE 
"(arpa|localhost|\"\.\")" | cut -d '"' -f2)
 zonelist=$(echo -n "$zonelist" | tr '\n' ',' | sed 's/,/, /g')
-trimmed=$(echo $zonelist | tr -d '\n')
+trimmed=$(echo "$zonelist" | tr -d '\n')
 if [ "$trimmed" = "" ]; then
     echo "There are no zones to migrate"
     exit 0
@@ -31,7 +31,8 @@ db_get ascension-bind/zones
 echo "$RET" | sed 's/ //g' | sed 's/,/\n/g' > selectedzones
 readarray zones < selectedzones
 rm selectedzones
-trimmed=$(echo $zones | tr -d '\n')
+# It is okay to just take the first element here
+trimmed=$(echo "$zones" | tr -d '\n')
 if [ -z $trimmed ]; then
     echo "There are no zones to migrate"
     exit 0
@@ -79,12 +80,12 @@ if ! $zonestatus; then
 fi
 
 echo "Everything okay, templating files"
-mkdir -p /etc/ascension.d/
+mkdir -p /etc/ascension.d/ || true
 for ZONE in "address@hidden"
 do
     ZONE=$( echo "$ZONE" | tr -d '\n')
-    gnunet-identity -C "$ZONE"
-    ZONEPKEYLINE=$(gnunet-identity -dqe "$ZONE")
+    su -s /bin/sh -c "gnunet-identity -C $ZONE || true" ascension
+    ZONEPKEYLINE=$(su -s /bin/sh -c "gnunet-identity -dqe $ZONE" ascension)
     ZONEPKEY=$( echo "$ZONEPKEYLINE" | tr -d '\n')
     FILECONV=$( echo "$ZONE" | tr '.' '_')
     echo "Creating systemd unit file."
@@ -110,11 +111,12 @@ do
     systemctl daemon-reload
     ZONE=$( echo "$ZONE" | tr -d '\n')
     FILECONV=$( echo "$ZONE" | tr '.' '_')
-    ZONEPKEYLINE=$(gnunet-identity -dqe "$ZONE")
+    ZONEPKEYLINE=$(su -s /bin/sh -c "gnunet-identity -dqe $ZONE" ascension)
     ZONEPKEY=$( echo "$ZONEPKEYLINE" | tr -d '\n')
     echo "Starting and enabling ascension-bind-$FILECONV"
-    deb-systemd-helper enable "ascension-bind-$FILECONV"
-    deb-systemd-invoke start "ascension-bind-$FILECONV"
+    # Hacky solution but docker containers return 101 here
+    deb-systemd-helper enable "ascension-bind-$FILECONV" || true
+    deb-systemd-invoke start "ascension-bind-$FILECONV" || true
     systemctl daemon-reload
 done
 
diff --git a/debian/ascension-bind-0.0.1/debian/ascension-bind/DEBIAN/prerm 
b/debian/ascension-bind-0.0.1/debian/ascension-bind/DEBIAN/prerm
index c39e6c6..1be76e9 100755
--- a/debian/ascension-bind-0.0.1/debian/ascension-bind/DEBIAN/prerm
+++ b/debian/ascension-bind-0.0.1/debian/ascension-bind/DEBIAN/prerm
@@ -25,6 +25,7 @@ deb-systemd-invoke restart bind9
 
 for ZONE in "address@hidden"
 do
+    systemctl daemon-reload
     ZONE=$( echo "$ZONE" | tr -d '\n')
     FILECONV=$( echo "$ZONE" | tr '.' '_')
     echo "Stopping and disabling ascension-bind-$FILECONV"
@@ -32,6 +33,7 @@ do
     deb-systemd-invoke stop "ascension-bind-$FILECONV"
     unlink "/lib/systemd/system/ascension-bind-$FILECONV.service" || true
     rm "/etc/ascension.d/ascension-bind-$FILECONV.service" || true
+    systemctl daemon-reload
 done
 
 exit 0
diff --git a/debian/ascension-bind_0.0.1-1.debian.tar.xz 
b/debian/ascension-bind_0.0.1-1.debian.tar.xz
index 8b8bda4..b675fc7 100644
Binary files a/debian/ascension-bind_0.0.1-1.debian.tar.xz and 
b/debian/ascension-bind_0.0.1-1.debian.tar.xz differ
diff --git a/debian/ascension-bind_0.0.1-1.dsc 
b/debian/ascension-bind_0.0.1-1.dsc
index 4b7903b..b0cf74e 100644
--- a/debian/ascension-bind_0.0.1-1.dsc
+++ b/debian/ascension-bind_0.0.1-1.dsc
@@ -11,10 +11,10 @@ Package-List:
  ascension-bind deb net optional arch=any
 Checksums-Sha1:
  0a7953cf5bf7616ff1c2171789fab736e199e769 3860 ascension-bind_0.0.1.orig.tar.xz
- 201d35046273e6ec4f8824e8a9cd7ad2af367fa4 4096 
ascension-bind_0.0.1-1.debian.tar.xz
+ 44649ab74a5db833986003c589df1146024d85eb 4172 
ascension-bind_0.0.1-1.debian.tar.xz
 Checksums-Sha256:
  e21b0672b6d9932d03541c13e9350546542d9dd86373bf6bc78f61a1c79586b4 3860 
ascension-bind_0.0.1.orig.tar.xz
- 172b825cba6d3779f149b97223258c7fa8277e897353c811f34710dfb8b28523 4096 
ascension-bind_0.0.1-1.debian.tar.xz
+ ef17982cf31dc187f6238291d51765d88eddb1de85fb2c4882a960a8e543d1b0 4172 
ascension-bind_0.0.1-1.debian.tar.xz
 Files:
  3e51a0f28a46eff44e0366ab9185b840 3860 ascension-bind_0.0.1.orig.tar.xz
- c65c2da0b75ae846eafbbd5c86fd85f4 4096 ascension-bind_0.0.1-1.debian.tar.xz
+ 4bb0cf9f2de563859d43f5434c1419b5 4172 ascension-bind_0.0.1-1.debian.tar.xz
diff --git a/debian/ascension-bind_0.0.1-1_amd64.build 
b/debian/ascension-bind_0.0.1-1_amd64.build
index 66ad9b7..756f0af 100644
--- a/debian/ascension-bind_0.0.1-1_amd64.build
+++ b/debian/ascension-bind_0.0.1-1_amd64.build
@@ -135,5 +135,4 @@ dpkg-genchanges: info: including full source code in upload
 dpkg-buildpackage: info: full upload (original source is included)
 Now running lintian ascension-bind_0.0.1-1_amd64.changes ...
 warning: the authors of lintian do not recommend running it with root 
privileges!
-W: ascension-bind: maintainer-script-ignores-errors config
 Finished running lintian.
diff --git a/debian/ascension-bind_0.0.1-1_amd64.buildinfo 
b/debian/ascension-bind_0.0.1-1_amd64.buildinfo
index 77f0892..f70bf0e 100644
--- a/debian/ascension-bind_0.0.1-1_amd64.buildinfo
+++ b/debian/ascension-bind_0.0.1-1_amd64.buildinfo
@@ -4,23 +4,23 @@ Binary: ascension-bind
 Architecture: amd64 source
 Version: 0.0.1-1
 Checksums-Md5:
- e9ac407190a85dbf45ba95d3da3d4e62 904 ascension-bind_0.0.1-1.dsc
- f4ec58ea97674eae54e782656337acde 3670 ascension-bind_0.0.1-1_amd64.deb
+ abbb161d35d233cc7ce3dc0491d89281 904 ascension-bind_0.0.1-1.dsc
+ da3d08ae921870012b14d7a2ab7b4932 3764 ascension-bind_0.0.1-1_amd64.deb
 Checksums-Sha1:
- 493d1a06babde0d3a526960867cb9b8c2aa235ad 904 ascension-bind_0.0.1-1.dsc
- 61a10e7026191cbad949839de50fd114fd3512de 3670 ascension-bind_0.0.1-1_amd64.deb
+ 9b2d665ccb0a42745b329f1a59d17edc9b9c5a5f 904 ascension-bind_0.0.1-1.dsc
+ d12038ba1154aee65e0c19726ea0fb725a3c3d4e 3764 ascension-bind_0.0.1-1_amd64.deb
 Checksums-Sha256:
- b9d25d4abfb3a4d46c52a3bdcb544d37b700f7cca42e9ff7f315e8eca83ac675 904 
ascension-bind_0.0.1-1.dsc
- 5934cc7e52f923fd72687ff302e629f4f2b239254322f673fbc171177b1b1afa 3670 
ascension-bind_0.0.1-1_amd64.deb
+ 3025db92d17d3c377edb3fdf23138f09a43cc7e50fe2ccb030b4736b35b301af 904 
ascension-bind_0.0.1-1.dsc
+ 04bd41e44a77efd8878e2a3b887e22e9553a50ded96e7d20271b0255a53b4d1a 3764 
ascension-bind_0.0.1-1_amd64.deb
 Build-Origin: Debian
 Build-Architecture: amd64
-Build-Date: Fri, 31 May 2019 20:17:25 +0000
+Build-Date: Tue, 04 Jun 2019 09:07:50 +0000
 Installed-Build-Depends:
  autoconf (= 2.69-10),
  automake (= 1:1.15-6),
  autopoint (= 0.19.8.1-2),
  autotools-dev (= 20161112.1),
- base-files (= 9.9+deb9u9),
+ base-files (= 9.9+deb9u4),
  base-passwd (= 3.5.43),
  bash (= 4.4-5),
  binutils (= 2.28-5),
@@ -39,7 +39,7 @@ Installed-Build-Depends:
  dh-python (= 2.20170125),
  dh-strip-nondeterminism (= 0.034-1),
  diffutils (= 1:3.5-3),
- dpkg (= 1.18.25),
+ dpkg (= 1.18.24),
  dpkg-dev (= 1.18.25),
  dwz (= 0.12-1+b1),
  e2fslibs (= 1.43.4-2),
@@ -69,7 +69,7 @@ Installed-Build-Depends:
  libblkid1 (= 2.29.2-1+deb9u1),
  libbsd0 (= 0.8.3-1),
  libbz2-1.0 (= 1.0.6-8.1),
- libc-bin (= 2.24-11+deb9u4),
+ libc-bin (= 2.24-11+deb9u3),
  libc-dev-bin (= 2.24-11+deb9u4),
  libc6 (= 2.24-11+deb9u4),
  libc6-dev (= 2.24-11+deb9u4),
@@ -129,7 +129,7 @@ Installed-Build-Depends:
  libsmartcols1 (= 2.29.2-1+deb9u1),
  libsqlite3-0 (= 3.27.2-2~bpo9+1),
  libss2 (= 1.43.4-2),
- libssl1.1 (= 1.1.0j-1~deb9u1),
+ libssl1.1 (= 1.1.0f-3+deb9u1),
  libstdc++-6-dev (= 6.3.0-18+deb9u1),
  libstdc++6 (= 6.3.0-18+deb9u1),
  libsystemd0 (= 237-3~bpo9+1),
@@ -151,17 +151,17 @@ Installed-Build-Depends:
  mawk (= 1.3.3-17+b3),
  mime-support (= 3.60),
  mount (= 2.29.2-1+deb9u1),
- multiarch-support (= 2.24-11+deb9u4),
+ multiarch-support (= 2.24-11+deb9u3),
  ncurses-base (= 6.0+20161126-1+deb9u2),
  ncurses-bin (= 6.0+20161126-1+deb9u2),
  passwd (= 1:4.4-4.1),
- patch (= 2.7.5-1+deb9u1),
+ patch (= 2.7.5-1+b2),
  perl (= 5.24.1-3+deb9u5),
  perl-base (= 5.24.1-3+deb9u5),
  perl-modules-5.24 (= 5.24.1-3+deb9u5),
  po-debconf (= 1.0.20),
  python3 (= 3.5.3-1),
- python3-ascension (= 0.6.1-1),
+ python3-ascension (= 0.11.5-1),
  python3-coverage (= 4.2+dfsg.1-2),
  python3-dnspython (= 1.15.0-1+deb9u1),
  python3-docopt (= 0.6.2-1),
diff --git a/debian/ascension-bind_0.0.1-1_amd64.changes 
b/debian/ascension-bind_0.0.1-1_amd64.changes
index 74704e1..2c5ed67 100644
--- a/debian/ascension-bind_0.0.1-1_amd64.changes
+++ b/debian/ascension-bind_0.0.1-1_amd64.changes
@@ -16,20 +16,20 @@ Changes:
  .
    * Initial release Closes: #123123
 Checksums-Sha1:
- 493d1a06babde0d3a526960867cb9b8c2aa235ad 904 ascension-bind_0.0.1-1.dsc
+ 9b2d665ccb0a42745b329f1a59d17edc9b9c5a5f 904 ascension-bind_0.0.1-1.dsc
  0a7953cf5bf7616ff1c2171789fab736e199e769 3860 ascension-bind_0.0.1.orig.tar.xz
- 201d35046273e6ec4f8824e8a9cd7ad2af367fa4 4096 
ascension-bind_0.0.1-1.debian.tar.xz
- 847a45a9c232e3fbb9e3e6a8760c1eef056d6a27 5640 
ascension-bind_0.0.1-1_amd64.buildinfo
- 61a10e7026191cbad949839de50fd114fd3512de 3670 ascension-bind_0.0.1-1_amd64.deb
+ 44649ab74a5db833986003c589df1146024d85eb 4172 
ascension-bind_0.0.1-1.debian.tar.xz
+ 2db011ee675f83bfd165f4889d24090c96e62c4a 5637 
ascension-bind_0.0.1-1_amd64.buildinfo
+ d12038ba1154aee65e0c19726ea0fb725a3c3d4e 3764 ascension-bind_0.0.1-1_amd64.deb
 Checksums-Sha256:
- b9d25d4abfb3a4d46c52a3bdcb544d37b700f7cca42e9ff7f315e8eca83ac675 904 
ascension-bind_0.0.1-1.dsc
+ 3025db92d17d3c377edb3fdf23138f09a43cc7e50fe2ccb030b4736b35b301af 904 
ascension-bind_0.0.1-1.dsc
  e21b0672b6d9932d03541c13e9350546542d9dd86373bf6bc78f61a1c79586b4 3860 
ascension-bind_0.0.1.orig.tar.xz
- 172b825cba6d3779f149b97223258c7fa8277e897353c811f34710dfb8b28523 4096 
ascension-bind_0.0.1-1.debian.tar.xz
- 81ba483167be7ad7e40cededebff1baff1e91ad72c299f7899d87cad40e6b352 5640 
ascension-bind_0.0.1-1_amd64.buildinfo
- 5934cc7e52f923fd72687ff302e629f4f2b239254322f673fbc171177b1b1afa 3670 
ascension-bind_0.0.1-1_amd64.deb
+ ef17982cf31dc187f6238291d51765d88eddb1de85fb2c4882a960a8e543d1b0 4172 
ascension-bind_0.0.1-1.debian.tar.xz
+ 79af0062512582a8e530abed8f3b875ff70fb9ed5fa0747d201edb52c5d22c03 5637 
ascension-bind_0.0.1-1_amd64.buildinfo
+ 04bd41e44a77efd8878e2a3b887e22e9553a50ded96e7d20271b0255a53b4d1a 3764 
ascension-bind_0.0.1-1_amd64.deb
 Files:
- e9ac407190a85dbf45ba95d3da3d4e62 904 net optional ascension-bind_0.0.1-1.dsc
+ abbb161d35d233cc7ce3dc0491d89281 904 net optional ascension-bind_0.0.1-1.dsc
  3e51a0f28a46eff44e0366ab9185b840 3860 net optional 
ascension-bind_0.0.1.orig.tar.xz
- c65c2da0b75ae846eafbbd5c86fd85f4 4096 net optional 
ascension-bind_0.0.1-1.debian.tar.xz
- c61924d68aaeff644510b347ef819975 5640 net optional 
ascension-bind_0.0.1-1_amd64.buildinfo
- f4ec58ea97674eae54e782656337acde 3670 net optional 
ascension-bind_0.0.1-1_amd64.deb
+ 4bb0cf9f2de563859d43f5434c1419b5 4172 net optional 
ascension-bind_0.0.1-1.debian.tar.xz
+ 60dbed3315cdb7dec3b05529a2ac8f8b 5637 net optional 
ascension-bind_0.0.1-1_amd64.buildinfo
+ da3d08ae921870012b14d7a2ab7b4932 3764 net optional 
ascension-bind_0.0.1-1_amd64.deb
diff --git a/debian/ascension-bind_0.0.1-1_amd64.deb 
b/debian/ascension-bind_0.0.1-1_amd64.deb
index 7af493c..fb8b1bb 100644
Binary files a/debian/ascension-bind_0.0.1-1_amd64.deb and 
b/debian/ascension-bind_0.0.1-1_amd64.deb differ

-- 
To stop receiving notification emails like this one, please contact
address@hidden