fix postinst to ensure gnunet.conf is owned by grothoff after using gnunet-config

4 files changed, 14 insertions, 14 deletions

diff --git a/contrib/Makefile.inc b/contrib/Makefile.inc
index c737a07f8..a563ef4a1 100644
--- a/contrib/Makefile.inc
+++ b/contrib/Makefile.inc
@@ -8,7 +8,8 @@ BUILDCOMMON_SHLIB_FILES = \
     build-common/sh/lib.sh/existence_python.sh \
     build-common/sh/lib.sh/msg.sh \
     build-common/sh/lib.sh/progname.sh \
-    build-common/sh/lib.sh/version_gnunet.sh
+    build-common/sh/lib.sh/version_gnunet.sh \
+    build-common/LICENSE
 
 BUILDCOMMON_CONF_FILES = \
     build-common/conf/.dir-locals.el \
diff --git a/debian/changelog b/debian/changelog
index 588fa4cf7..f38e54ccd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ gnunet (0.14.0) unstable; urgency=medium
   * Set option to log to /var/log/gnunet.log for logrotate to work as configured.
   * Import into downstream repo.
 
- -- Christian Grothoff <grothoff@gnu.org>  Tue 29 Dec 2020 12:02:10 AM CET
+ -- Christian Grothoff <grothoff@gnu.org>  Tue, 29 Dec 2020 12:02:10 +0100
 
 gnunet (0.13.3-1) unstable; urgency=medium
 
diff --git a/debian/gnunet.postinst b/debian/gnunet.postinst
index 902b93fd7..07e5202e8 100644
--- a/debian/gnunet.postinst
+++ b/debian/gnunet.postinst
@@ -106,7 +106,7 @@ case "${1}" in
                                 fi
                         fi
                         echo " done."
-                fi      
+                fi
 
                 # Install GNUnet configuration for all users provided non exists
                 userlist=$(awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd)
@@ -117,9 +117,9 @@ case "${1}" in
                 for (( i=0; i<${#users[@]}; i++ )); do
                     usermod -aG gnunet ${users[$i]}
                     if [ -n "$i" ]  && [ -d "${homedirs[$i]}" ]; then
-                        mkdir -p ${homedirs[$i]}/.config/systemd/user/
+                                    mkdir -p ${homedirs[$i]}/.config/systemd/user/
 
-                        cat > "${homedirs[$i]}/.config/systemd/user/gnunet-user.service" << EOF
+                                    cat > "${homedirs[$i]}/.config/systemd/user/gnunet-user.service" << EOF
 # Copyright (C) 2019 GNUnet e.V.
 #
 # Copying and distribution of this file, with or without modification,
@@ -140,12 +140,11 @@ ExecStop=/usr/bin/gnunet-arm -e -c ${homedirs[$i]}/.config/gnunet.conf
 WantedBy=multi-user.target
 EOF
 
-                        chown "${users[$i]}":"${users[$i]}" "${homedirs[$i]}/.config/systemd/user/gnunet-user.service"
+                                    chown "${users[$i]}":"${users[$i]}" "${homedirs[$i]}/.config/systemd/user/gnunet-user.service"
                         if [ ! -f "${homedirs[$i]}/.config/gnunet.conf" ]; then
-                                mkdir -p ${homedirs[$i]}/.config/
-                                cp /etc/skel/.config/gnunet.conf "${homedirs[$i]}/.config/gnunet.conf"
-                                chmod 644 "${homedirs[$i]}/.config/gnunet.conf"
-                                chown "${users[$i]}":"${users[$i]}" "${homedirs[$i]}/.config/gnunet.conf"
+                                            mkdir -p ${homedirs[$i]}/.config/
+                                            cp /etc/skel/.config/gnunet.conf "${homedirs[$i]}/.config/gnunet.conf"
+                                            chmod 644 "${homedirs[$i]}/.config/gnunet.conf"
                         fi
                     fi
                     port=$((8000+$(id -u "${users[$i]}")))
@@ -158,12 +157,13 @@ EOF
                          --rewrite \
                          --section=gns-proxy \
                          --option=OPTIONS \
-                         --value="-p $port"
+                                     --value="-p $port"
+                                chown "${users[$i]}":"${users[$i]}" "${homedirs[$i]}/.config/gnunet.conf"
                 done
 
                 # Change the proxy settings for Firefox and Chromium if desired
                 if ${_PROXY}
-                then
+        then
                     mkdir -p /etc/X11/xinit/xinitrc.d/
 cat > "/etc/X11/xinit/xinitrc.d/80-gnunet-user-services" << "EOF"
 #!/bin/bash
@@ -219,7 +219,7 @@ fi
 gnunet-gns-proxy-setup-ca
 EOF
                 fi
-                
+
                 # Update files and directories permissions.
                 # Assuming default values, this *should* not be changed.
                 echo -n "Updating files and directories permissions:"
diff --git a/debian/libgnunet.install b/debian/libgnunet.install
index 14b47188c..60cdebea9 100644
--- a/debian/libgnunet.install
+++ b/debian/libgnunet.install
@@ -1,6 +1,5 @@
 usr/lib/*/*.so.*
 usr/share/locale/
-usr/share/doc/libgnunet/
 usr/share/gnunet/config.d/
 usr/bin/gnunet-bugreport
 usr/bin/gnunet-ecc