Package: opendht
Version: 2.3.1-1.1
Severity: wishlist

I have just uploaded a NMU for opendht to the 7 day delayed queue fixing
a few long pending fixes sent to the salsa project.  This upload is part
of an effort coordinated on #debian-voip to improve the jami package in
Debian.

This is the patch used.  It is also commited to the salsa project, which
is under of the Debian team umbrella.

diff --git a/debian/changelog b/debian/changelog
index e8d06fe..4333e4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+opendht (2.3.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload using salsa Debian team git repo.
+
+  [ Amin Bandali ]
+  * d/watch: Tweak opts to use newly-suggested format in the current
+    uscan(1) manual for GitHub repositories, helping correctly detect
+    new releases again (partly fixes #1016489).
+
+  [ Federico Ceratto ]
+  * Configure service sandbox (Closes: #1007163).
+  * Bump up Standards-Version from 4.0.0 to 4.5.0.
+  * Switch to debhelper-compat 12.
+
+  [ Petter Reinholdtsen ]
+  * Switched build and binary dependency for libargon2-0-dev to libargon2-dev
+    (Closes: #1005699).
+
+ -- Petter Reinholdtsen <[email protected]>  Thu, 22 Dec 2022 22:33:19 +0100
+
 opendht (2.3.1-1) unstable; urgency=medium
 
   [ Amin Bandali ]
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index b9b532a..b511cb4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: opendht
 Section: libs
 Priority: optional
 Maintainer: Alexandre Viau <[email protected]>
-Build-Depends: debhelper (>= 9.20160709),
+Build-Depends: debhelper-compat (= 12),
                cmake,
                dh-exec,
                pkg-config,
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9.20160709),
                libmsgpack-dev (>= 1.2),
                libreadline6-dev,
                libncurses5-dev,
-               libargon2-0-dev,
+               libargon2-dev,
                librestinio-dev,
                libasio-dev,
                libjsoncpp-dev,
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 9.20160709),
                libssl-dev,
                libfmt-dev,
                nettle-dev
-Standards-Version: 4.0.0
+Standards-Version: 4.5.0
 Homepage: https://github.com/savoirfairelinux/opendht
 Vcs-Git: https://salsa.debian.org/debian/opendht.git
 Vcs-Browser: https://salsa.debian.org/debian/opendht
@@ -32,7 +32,7 @@ Depends: ${misc:Depends},
          libmsgpack-dev (>= 1.2),
          libreadline6-dev,
          libncurses5-dev,
-         libargon2-0-dev,
+         libargon2-dev,
          librestinio-dev,
          libasio-dev,
          libjsoncpp-dev,
diff --git a/debian/dhtnode.service b/debian/dhtnode.service
index a8e7644..90198f3 100644
--- a/debian/dhtnode.service
+++ b/debian/dhtnode.service
@@ -1,14 +1,43 @@
 [Unit]
 Description=OpenDHT standalone node
-After=network.target
 Documentation=man:dhtnode(1)
+After=network.target
+ConditionPathExists=/etc/default/dhtnode
 
 [Service]
+Type=simple
 User=opendht
 Group=opendht
 EnvironmentFile=/etc/default/dhtnode
 ExecStart=/usr/bin/dhtnode -s $DHT_ARGS
 Restart=on-failure
+RestartSec=2s
+LimitNOFILE=65536
+WorkingDirectory=/tmp
+
+# Hardening
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+LockPersonality=yes
+NoNewPrivileges=yes
+PrivateDevices=yes
+PrivateTmp=yes
+PrivateUsers=yes
+ProtectClock=yes
+ProtectControlGroups=yes
+ProtectHome=yes
+ProtectHostname=yes
+ProtectKernelLogs=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+ProtectSystem=strict
+ReadOnlyDirectories=/
+ReadWriteDirectories=-/proc/self
+ReadWriteDirectories=-/var/run
+RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
+RestrictNamespaces=yes
+RestrictRealtime=yes
+SystemCallArchitectures=native
+SystemCallFilter=@system-service
 
 [Install]
 WantedBy=multi-user.target
diff --git a/debian/watch b/debian/watch
index b42aa67..31ca925 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=4
-opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%" \
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*@ARCHIVE_EXT@)%@PACKAGE@-$1%" \
   https://github.com/savoirfairelinux/opendht/tags \
-  (?:.*?/)?@ANY_VERSION@@ARCHIVE_EXT@
+  (?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@

-- 
Happy hacking
Petter Reinholdtsen

Reply via email to