Merge branch 'master' of ssh://gnunet.org/gnunet

6 files changed, 153 insertions, 213 deletions

diff --git a/debian/changelog b/debian/changelog
index f27aba2af..b78688984 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnunet (0.14.1-12) unstable; urgency=low
+
+  * Lower debhelper compatibility level to 12.
+  * Do not inject user units in postinst for now.
+  * Tweaks to packaging.
+
+ -- Florian Dold <florian@dold.me>  Sat, 31 Jul 2021 20:04:42 +0200
+
 gnunet (0.14.1-11) unstable; urgency=low
 
   * Make configuration parsing more permissive.
diff --git a/debian/control b/debian/control
index 01b549286..57acc6e1e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends:
  autoconf (>=2.59),
  automake (>=1.11.1),
  autopoint,
- debhelper-compat (= 13),
+ debhelper-compat (= 12),
  gettext,
  iptables,
  libbluetooth-dev,
diff --git a/debian/gnunet.postinst b/debian/gnunet.postinst
index b6317f5be..091feb223 100644
--- a/debian/gnunet.postinst
+++ b/debian/gnunet.postinst
@@ -108,114 +108,63 @@ case "${1}" in
                         echo " done."
                 fi
 
-                # Install GNUnet configuration for all users provided non exists
-                userlist=$(awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd)
-                users=($userlist)
-                homedirlist=$(awk -F ':' '$3>=1000 && $3<2000 {print $6}' /etc/passwd)
-                homedirs=($homedirlist)
-
-                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/
-
-                                    cat > "${homedirs[$i]}/.config/systemd/user/gnunet-user.service" << EOF
-# Copyright (C) 2019 GNUnet e.V.
+#       # Change the proxy settings for Firefox and Chromium if desired
+#               if ${_PROXY}
+#        then
+#                   mkdir -p /etc/X11/xinit/xinitrc.d/
+#cat > "/etc/X11/xinit/xinitrc.d/80-gnunet-user-services" << "EOF"
+##!/bin/bash
+#systemctl --user daemon-reload
+#systemctl --user start gnunet-user
+#systemctl --user enable gnunet-user
+#user=$(whoami)
+#gnunet_proxy=$(gnunet-config -c /etc/skel/.config/gnunet.conf -s gns-proxy | grep 'IMMEDIATE_START = YES')
 #
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.  This file is offered as-is,
-# without any warranty.
-
-[Unit]
-Description=Service that runs a GNUnet for the user gnunet
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/gnunet-arm -s -c ${homedirs[$i]}/.config/gnunet.conf
-ExecStop=/usr/bin/gnunet-arm -e -c ${homedirs[$i]}/.config/gnunet.conf
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-                                    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"
-                        fi
-                    fi
-                    port=$((8000+$(id -u "${users[$i]}")))
-                    gnunet-config -c "${homedirs[$i]}/.config/gnunet.conf" \
-                         --section=gns-proxy \
-                         --option=IMMEDIATE_START \
-                         --value=YES
-                    gnunet-config -c "${homedirs[$i]}/.config/gnunet.conf" \
-                         --section=gns-proxy \
-                         --option=OPTIONS \
-                                     --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
-                    mkdir -p /etc/X11/xinit/xinitrc.d/
-cat > "/etc/X11/xinit/xinitrc.d/80-gnunet-user-services" << "EOF"
-#!/bin/bash
-systemctl --user daemon-reload
-systemctl --user start gnunet-user
-systemctl --user enable gnunet-user
-user=$(whoami)
-gnunet_proxy=$(gnunet-config -c /etc/skel/.config/gnunet.conf -s gns-proxy | grep 'IMMEDIATE_START = YES')
-
-# Enable GNS proxy for new users informed by /etc/skel.
-if [ "$gnunet_proxy" ]; then
-
-        # Calculate user specific port
-        port=$((8000+$(id -u $user)))
-
-        gnunet-config -c $HOME/.config/gnunet.conf \
-                --section=gns-proxy \
-                --option=OPTIONS \
-                --value="-p $port"
-
-        # Firefox
-        defaultprofile=$(ls $HOME/.mozilla/firefox/*.default)
-        if [ ! "$defaultprofile" ];then
-                timeout 3s firefox --headless # dirty: create profile if not existent
-        fi
-        for ffprofile in $HOME/.mozilla/firefox/*.*/; do
-                js=$ffprofile/user.js
-                if [ -f "$js" ]; then
-                        sed -i '/Preferences for using the GNU Name System/d' "$js"
-                        sed -i '/network.proxy.socks/d' "$js"
-                        sed -i '/network.proxy.socks_port/d' "$js"
-                        sed -i '/network.proxy.socks_remote_dns/d' "$js"
-                        sed -i '/network.proxy.type/d' "$js"
-                fi
-                echo "// Preferences for using the GNU Name System" >> "$js"
-                echo "user_pref(\"network.proxy.socks\", \"localhost\");" >> "$js"
-                echo "user_pref(\"network.proxy.socks_port\", $port);" >> "$js"
-                echo "user_pref(\"network.proxy.socks_remote_dns\", true);" >> "$js"
-                echo "user_pref(\"network.proxy.type\", 1);" >> "$js"
-        done
-
-        # Chromium
-        profile="$HOME/.profile"
-        if [ -f "$profile" ]; then
-                sed -i '/CHROMIUM_USER_FLAGS/d' "$profile"
-        fi
-        echo "export CHROMIUM_USER_FLAGS=--proxy-server=socks5://localhost:$port" \
-                >> "$profile"
-fi
-
-# Create/Renew GNS certificate authority (CA) per user.
-gnunet-gns-proxy-setup-ca
-EOF
-                fi
+## Enable GNS proxy for new users informed by /etc/skel.
+#if [ "$gnunet_proxy" ]; then
+#
+#        # Calculate user specific port
+#        port=$((8000+$(id -u $user)))
+#
+#        gnunet-config -c $HOME/.config/gnunet.conf \
+#                --section=gns-proxy \
+#                --option=OPTIONS \
+#                --value="-p $port"
+#
+#        # Firefox
+#        defaultprofile=$(ls $HOME/.mozilla/firefox/*.default)
+#        if [ ! "$defaultprofile" ];then
+#                timeout 3s firefox --headless # dirty: create profile if not existent
+#        fi
+#        for ffprofile in $HOME/.mozilla/firefox/*.*/; do
+#                js=$ffprofile/user.js
+#                if [ -f "$js" ]; then
+#                        sed -i '/Preferences for using the GNU Name System/d' "$js"
+#                        sed -i '/network.proxy.socks/d' "$js"
+#                        sed -i '/network.proxy.socks_port/d' "$js"
+#                        sed -i '/network.proxy.socks_remote_dns/d' "$js"
+#                        sed -i '/network.proxy.type/d' "$js"
+#                fi
+#                echo "// Preferences for using the GNU Name System" >> "$js"
+#                echo "user_pref(\"network.proxy.socks\", \"localhost\");" >> "$js"
+#                echo "user_pref(\"network.proxy.socks_port\", $port);" >> "$js"
+#                echo "user_pref(\"network.proxy.socks_remote_dns\", true);" >> "$js"
+#                echo "user_pref(\"network.proxy.type\", 1);" >> "$js"
+#        done
+#
+#        # Chromium
+#        profile="$HOME/.profile"
+#        if [ -f "$profile" ]; then
+#                sed -i '/CHROMIUM_USER_FLAGS/d' "$profile"
+#        fi
+#        echo "export CHROMIUM_USER_FLAGS=--proxy-server=socks5://localhost:$port" \
+#                >> "$profile"
+#fi
+#
+## Create/Renew GNS certificate authority (CA) per user.
+#gnunet-gns-proxy-setup-ca
+#EOF
+#                fi
 
                 # Update files and directories permissions.
                 # Assuming default values, this *should* not be changed.
@@ -267,21 +216,6 @@ GNUNET_GROUP=${_GROUPNAME}
 GNUNET_AUTOSTART="${_AUTOSTART}"
 EOF
 
-cat > "/etc/systemd/system/gnunet.service" <<EOF
-[Unit]
-Description=A framework for secure peer-to-peer networking
-
-[Service]
-EnvironmentFile=/etc/default/gnunet
-User=${_USERNAME}
-Type=forking
-ExecStart=/usr/bin/gnunet-arm -s -c /etc/gnunet.conf
-ExecStop=/usr/bin/gnunet-arm -e -c /etc/gnunet.conf
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
                 cp -f "${CONFIG_NEW}" "${CONFIG_FILE}"
                 echo " done."
 
diff --git a/src/include/gnunet_db_lib.h b/src/include/gnunet_db_lib.h
index 85ad13e31..63c45112d 100644
--- a/src/include/gnunet_db_lib.h
+++ b/src/include/gnunet_db_lib.h
@@ -61,4 +61,47 @@ enum GNUNET_DB_QueryStatus
                                            that returned more than one result. */
 };
 
+
+/**
+ * Handle for an active LISTENer to a database.
+ */
+struct GNUNET_DB_EventHandler;
+
+/**
+ * Function called on events received from Postgres.
+ *
+ * @param cls closure
+ * @param extra additional event data provided
+ * @param extra_size number of bytes in @a extra
+ */
+typedef void
+(*GNUNET_DB_EventCallback)(void *cls,
+                           const void *extra,
+                           size_t extra_size);
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+
+/**
+ * Header of a structure that describes an
+ * event channel we may subscribe to or notify on.
+ */
+struct GNUNET_DB_EventHeaderP
+{
+  /**
+   * The length of the struct (in bytes, including the length field itself),
+   * in big-endian format.
+   */
+  uint16_t size GNUNET_PACKED;
+
+  /**
+   * The type of the message (GNUNET_DB_EVENT_TYPE_XXXX), in big-endian format.
+   */
+  uint16_t type GNUNET_PACKED;
+
+};
+
+GNUNET_NETWORK_STRUCT_END
+
+
 #endif
diff --git a/src/include/gnunet_pq_lib.h b/src/include/gnunet_pq_lib.h
index 1f2915165..ecc2b9719 100644
--- a/src/include/gnunet_pq_lib.h
+++ b/src/include/gnunet_pq_lib.h
@@ -853,7 +853,7 @@ GNUNET_PQ_reconnect (struct GNUNET_PQ_Context *db);
 
 
 /**
- * Function called whenever the socket needed for 
+ * Function called whenever the socket needed for
  * notifications from postgres changes.
  *
  * @param cls closure
@@ -868,7 +868,7 @@ typedef void
  * Obtain the file descriptor to poll on for notifications.
  * Useful if the GNUnet scheduler is NOT to be used for
  * such notifications.
- * 
+ *
  * @param db database handle
  * @param sc function to call with the socket
  * @param sc_cls closure for @a sc
@@ -911,55 +911,8 @@ GNUNET_PQ_event_scheduler_stop (struct GNUNET_PQ_Context *db);
 
 
 /**
- * Handle for an active LISTENer to the database.
- */ 
-struct GNUNET_PQ_EventHandler;
-
-/**
- * Function called on events received from Postgres.
- *
- * @param cls closure
- * @param extra additional event data provided
- * @param extra_size number of bytes in @a extra
- */
-typedef void
-(*GNUNET_PQ_EventCallback)(void *cls,
-                           const void *extra,
-                           size_t extra_size);
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-
-/**
- * Header of a structure that describes an
- * event channel we may subscribe to or notify on.
- */
-struct GNUNET_PQ_EventHeaderP
-{
-  /**
-   * The length of the struct (in bytes, including the length field itself),
-   * in big-endian format.
-   */
-  uint16_t size GNUNET_PACKED;
-
-  /**
-   * The type of the message (GNUNET_PQ_EVENT_TYPE_XXXX), in big-endian format.
-   */
-  uint16_t type GNUNET_PACKED;
-
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-
-/**
- * Handle for an active LISTENer to the database.
- */ 
-struct GNUNET_PQ_EventHandler;
-
-/**
  * Register callback to be invoked on events of type @a es.
- * 
+ *
  * Unlike many other calls, this function is thread-safe
  * and may be called from threads that are different
  * from the one that setup @a db. However, the @a cb
@@ -973,16 +926,16 @@ struct GNUNET_PQ_EventHandler;
  * @param cb_cls closure for @a cb
  * @return handle useful to cancel the listener
  */
-struct GNUNET_PQ_EventHandler *
+struct GNUNET_DB_EventHandler *
 GNUNET_PQ_event_listen (struct GNUNET_PQ_Context *db,
-                        const struct GNUNET_PQ_EventHeaderP *es,
-                        GNUNET_PQ_EventCallback cb,
+                        const struct GNUNET_DB_EventHeaderP *es,
+                        GNUNET_DB_EventCallback cb,
                         void *cb_cls);
 
 
 /**
  * Stop notifications.
- * 
+ *
  * Unlike many other calls, this function is thread-safe
  * and may be called from threads that are different
  * from the one that setup @a db. However, the @a cb
@@ -992,12 +945,12 @@ GNUNET_PQ_event_listen (struct GNUNET_PQ_Context *db,
  * @param eh handle to unregister.
  */
 void
-GNUNET_PQ_event_listen_cancel (struct GNUNET_PQ_EventHandler *eh);
+GNUNET_PQ_event_listen_cancel (struct GNUNET_DB_EventHandler *eh);
 
 
 /**
  * Notify all that listen on @a es of an event.
- * 
+ *
  * Unlike many other calls, this function is thread-safe
  * and may be called from threads that are different
  * from the one that setup @a db. However, the @a cb
@@ -1011,7 +964,7 @@ GNUNET_PQ_event_listen_cancel (struct GNUNET_PQ_EventHandler *eh);
  */
 void
 GNUNET_PQ_event_notify (struct GNUNET_PQ_Context *db,
-                        const struct GNUNET_PQ_EventHeaderP *es,
+                        const struct GNUNET_DB_EventHeaderP *es,
                         const void *extra,
                         size_t extra_size);
 
diff --git a/src/pq/pq_event.c b/src/pq/pq_event.c
index 74b8b3653..bf845db18 100644
--- a/src/pq/pq_event.c
+++ b/src/pq/pq_event.c
@@ -29,8 +29,8 @@
 
 /**
  * Handle for an active LISTENer to the database.
- */ 
-struct GNUNET_PQ_EventHandler
+ */
+struct GNUNET_DB_EventHandler
 {
   /**
    * Channel name.
@@ -40,7 +40,7 @@ struct GNUNET_PQ_EventHandler
   /**
    * Function to call on events.
    */
-  GNUNET_PQ_EventCallback cb;
+  GNUNET_DB_EventCallback cb;
 
   /**
    * Closure for @e cb.
@@ -54,8 +54,6 @@ struct GNUNET_PQ_EventHandler
 };
 
 
-
-
 /**
  * Convert @a es to a short hash.
  *
@@ -63,7 +61,7 @@ struct GNUNET_PQ_EventHandler
  * @param[out] sh short hash to set
  */
 static void
-es_to_sh (const struct GNUNET_PQ_EventHeaderP *es,
+es_to_sh (const struct GNUNET_DB_EventHeaderP *es,
           struct GNUNET_ShortHashCode *sh)
 {
   struct GNUNET_HashCode h_channel;
@@ -111,7 +109,7 @@ sh_to_channel (struct GNUNET_ShortHashCode *sh,
  * @return end position of the identifier
  */
 static char *
-es_to_channel (const struct GNUNET_PQ_EventHeaderP *es,
+es_to_channel (const struct GNUNET_DB_EventHeaderP *es,
                char identifier[64])
 {
   struct GNUNET_ShortHashCode sh;
@@ -141,12 +139,12 @@ struct NotifyContext
 
 
 /**
- * Function called on every event handler that 
+ * Function called on every event handler that
  * needs to be triggered.
  *
  * @param cls a `struct NotifyContext`
  * @param sh channel name
- * @param value a `struct GNUNET_PQ_EventHandler`
+ * @param value a `struct GNUNET_DB_EventHandler`
  * @return #GNUNET_OK continue to iterate
  */
 static int
@@ -155,13 +153,13 @@ do_notify (void *cls,
            void *value)
 {
   struct NotifyContext *ctx = cls;
-  struct GNUNET_PQ_EventHandler *eh = value;
+  struct GNUNET_DB_EventHandler *eh = value;
 
   eh->cb (eh->cb_cls,
           ctx->extra,
           ctx->extra_size);
   return GNUNET_OK;
-} 
+}
 
 
 void
@@ -194,6 +192,7 @@ GNUNET_PQ_event_do_poll (struct GNUNET_PQ_Context *db)
 
   GNUNET_assert (0 ==
                  pthread_mutex_lock (&db->notify_lock));
+  PQconsumeInput (db->conn);
   while (NULL != (n = PQnotifies (db->conn)))
   {
     struct GNUNET_ShortHashCode sh;
@@ -210,6 +209,7 @@ GNUNET_PQ_event_do_poll (struct GNUNET_PQ_Context *db)
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   "Ignoring notification for unsupported channel identifier `%s'\n",
                   n->relname);
+      PQfreemem (n);
       continue;
     }
     if ( (NULL != n->extra) &&
@@ -223,12 +223,14 @@ GNUNET_PQ_event_do_poll (struct GNUNET_PQ_Context *db)
                   "Ignoring notification for unsupported extra data `%s' on channel `%s'\n",
                   n->extra,
                   n->relname);
+      PQfreemem (n);
       continue;
     }
     GNUNET_CONTAINER_multishortmap_iterate (db->channel_map,
                                             &do_notify,
                                             &ctx);
     GNUNET_free (ctx.extra);
+    PQfreemem (n);
   }
   GNUNET_assert (0 ==
                  pthread_mutex_unlock (&db->notify_lock));
@@ -265,7 +267,7 @@ do_scheduler_notify (void *cls)
     = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_ZERO,
                                      db->rfd,
                                      &do_scheduler_notify,
-                                     db);  
+                                     db);
 }
 
 
@@ -281,7 +283,7 @@ scheduler_fd_cb (void *cls,
                  int fd)
 {
   struct GNUNET_PQ_Context *db = cls;
-  
+
   if (NULL != db->event_task)
   {
     GNUNET_SCHEDULER_cancel (db->event_task);
@@ -305,7 +307,7 @@ void
 GNUNET_PQ_event_scheduler_start (struct GNUNET_PQ_Context *db)
 {
   int fd;
-  
+
   GNUNET_assert (! db->scheduler_on);
   GNUNET_assert (NULL == db->sc);
   db->scheduler_on = true;
@@ -335,7 +337,7 @@ GNUNET_PQ_event_scheduler_stop (struct GNUNET_PQ_Context *db)
 static void
 manage_subscribe (struct GNUNET_PQ_Context *db,
                   const char *cmd,
-                  struct GNUNET_PQ_EventHandler *eh)
+                  struct GNUNET_DB_EventHandler *eh)
 {
   char sql[16 + 64];
   char *end;
@@ -379,13 +381,13 @@ register_notify (void *cls,
                  void *value)
 {
   struct GNUNET_PQ_Context *db = cls;
-  struct GNUNET_PQ_EventHandler *eh = value;
-  
+  struct GNUNET_DB_EventHandler *eh = value;
+
   manage_subscribe (db,
                     "LISTEN ",
                     eh);
   return GNUNET_OK;
-} 
+}
 
 
 void
@@ -401,16 +403,16 @@ GNUNET_PQ_event_reconnect_ (struct GNUNET_PQ_Context *db)
 }
 
 
-struct GNUNET_PQ_EventHandler *
+struct GNUNET_DB_EventHandler *
 GNUNET_PQ_event_listen (struct GNUNET_PQ_Context *db,
-                        const struct GNUNET_PQ_EventHeaderP *es,
-                        GNUNET_PQ_EventCallback cb,
+                        const struct GNUNET_DB_EventHeaderP *es,
+                        GNUNET_DB_EventCallback cb,
                         void *cb_cls)
 {
-  struct GNUNET_PQ_EventHandler *eh;
+  struct GNUNET_DB_EventHandler *eh;
   bool was_zero;
 
-  eh = GNUNET_new (struct GNUNET_PQ_EventHandler);
+  eh = GNUNET_new (struct GNUNET_DB_EventHandler);
   eh->db = db;
   es_to_sh (es,
             &eh->sh);
@@ -421,14 +423,14 @@ GNUNET_PQ_event_listen (struct GNUNET_PQ_Context *db,
   was_zero = (0 == GNUNET_CONTAINER_multishortmap_size (db->channel_map));
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_CONTAINER_multishortmap_put (db->channel_map,
-                                                         &eh->sh,
-                                                         eh,
-                                                         GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
+                                                     &eh->sh,
+                                                     eh,
+                                                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
   if ( (NULL != db->sc) &&
        was_zero)
   {
     int fd = PQsocket (db->conn);
-    
+
     if (-1 != fd)
       db->sc (db->sc_cls,
               fd);
@@ -443,7 +445,7 @@ GNUNET_PQ_event_listen (struct GNUNET_PQ_Context *db,
 
 
 void
-GNUNET_PQ_event_listen_cancel (struct GNUNET_PQ_EventHandler *eh)
+GNUNET_PQ_event_listen_cancel (struct GNUNET_DB_EventHandler *eh)
 {
   struct GNUNET_PQ_Context *db = eh->db;
 
@@ -451,9 +453,9 @@ GNUNET_PQ_event_listen_cancel (struct GNUNET_PQ_EventHandler *eh)
                  pthread_mutex_lock (&db->notify_lock));
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_CONTAINER_multishortmap_remove (db->channel_map,
-                                                    &eh->sh,
-                                                    eh));
-    
+                                                        &eh->sh,
+                                                        eh));
+
   manage_subscribe (db,
                     "UNLISTEN ",
                     eh);
@@ -471,7 +473,7 @@ GNUNET_PQ_event_listen_cancel (struct GNUNET_PQ_EventHandler *eh)
 
 void
 GNUNET_PQ_event_notify (struct GNUNET_PQ_Context *db,
-                        const struct GNUNET_PQ_EventHeaderP *es,
+                        const struct GNUNET_DB_EventHeaderP *es,
                         const void *extra,
                         size_t extra_size)
 {
@@ -512,5 +514,5 @@ GNUNET_PQ_event_notify (struct GNUNET_PQ_Context *db,
   PQclear (result);
 }
 
-/* end of pq_event.c */
 
+/* end of pq_event.c */