Merging debian version 3.17.1-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 24 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index ff33323..62ee29d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+iperf3 (3.17.1-1) unstable; urgency=medium
+
+  * New upstream version. Includes fix for CVE-2024-26306. (Closes: #1071751)
+  * Updated standards.
+
+ -- Roberto Lumbreras <rover@debian.org>  Mon, 27 May 2024 15:39:18 +0200
+
+iperf3 (3.16-2) unstable; urgency=low
+
+  * Try to fix Ubuntu bug 1996617.
+
+ -- Roberto Lumbreras <rover@debian.org>  Tue, 30 Jan 2024 15:43:45 +0100
+
 iperf3 (3.16-1~progress7.99u1) graograman-backports; urgency=low
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index bbd84ba..9933411 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ XSBC-Original-Maintainer: Roberto Lumbreras <rover@debian.org>
 Bugs: mailto:maintainers@lists.progress-linux.org
 Build-Depends: debhelper-compat (= 13), libssl-dev, libsctp-dev [linux-any], po-debconf
 Rules-Requires-Root: no
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Homepage: http://software.es.net/iperf/
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/iperf3
 Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/iperf3
diff --git a/debian/copyright b/debian/copyright
index 453454b..9a49adb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: iperf3
 Source: http://software.es.net/iperf/
 
 Files: *
-Copyright: 2014-2023, The Regents of the University of California,
+Copyright: 2014-2024, The Regents of the University of California,
  through Lawrence Berkeley National Laboratory (subject to receipt of any
  required approvals from the U.S. Dept. of Energy).  All rights reserved.
 License: BSD-3-clause-iperf
@@ -120,7 +120,7 @@ License: FSF-permissive1
  PARTICULAR PURPOSE.
 
 Files: configure
-Copyright: 1992-2021 Free Software Foundation, Inc.
+Copyright: 1992-2023 Free Software Foundation, Inc.
 License: FSF-permissive2
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
@@ -185,7 +185,7 @@ Copyright: 2008 Steven G. Johnson <stevenj@alum.mit.edu>, 2011 Daniel Richard G.
 License: GPL-3+
 
 Files: config/config.*
-Copyright: 1992-2021 Free Software Foundation, Inc.
+Copyright: 1992-2023 Free Software Foundation, Inc.
 License: GPL-3+
 
 Files: docs/*
diff --git a/debian/iperf3.config b/debian/iperf3.config
index 17f62c2..3673940 100755
--- a/debian/iperf3.config
+++ b/debian/iperf3.config
@@ -35,8 +35,10 @@ else
 	db_set iperf3/start_daemon false
 fi
 
-db_input high iperf3/start_daemon || true
-db_go
+if [ "$TERM" ]; then
+	db_input high iperf3/start_daemon || true
+	db_go || true
+fi
 
 # fetch data from debconf if any
 db_get iperf3/start_daemon
@@ -59,5 +61,6 @@ else
 		invoke-rc.d iperf3 stop || true
 	fi
 fi
+db_stop || true
 
 exit 0
diff --git a/debian/libiperf0.symbols b/debian/libiperf0.symbols
index f209132..0cb458b 100644
--- a/debian/libiperf0.symbols
+++ b/debian/libiperf0.symbols
@@ -176,6 +176,7 @@ libiperf.so.0 libiperf0 #MINVER#
  iperf_get_test_idle_timeout@Base 3.11
  iperf_get_test_json_output@Base 3.0.7
  iperf_get_test_json_output_string@Base 3.1.3
+ iperf_get_test_json_stream@Base 3.17.1
  iperf_get_test_mss@Base 3.12
  iperf_get_test_no_delay@Base 3.7
  iperf_get_test_num_streams@Base 3.0.7
@@ -268,6 +269,7 @@ libiperf.so.0 libiperf0 #MINVER#
  iperf_set_test_get_server_output@Base 3.0.7
  iperf_set_test_idle_timeout@Base 3.11
  iperf_set_test_json_output@Base 3.0.7
+ iperf_set_test_json_stream@Base 3.17.1
  iperf_set_test_logfile@Base 3.7
  iperf_set_test_mss@Base 3.12
  iperf_set_test_no_delay@Base 3.7