diff -Nru fstrm-0.6.0/ChangeLog fstrm-0.6.1/ChangeLog
--- fstrm-0.6.0/ChangeLog	2019-10-14 16:25:11.000000000 +0000
+++ fstrm-0.6.1/ChangeLog	2021-04-05 17:06:59.000000000 +0000
@@ -1,3 +1,12 @@
+fstrm (0.6.1)
+
+  * fstrm_capture: ignore SIGPIPE, which will cause the
+    interrupted connections to generate an EPIPE instead.
+
+  * Fix truncation in snprintf calls in argument processing.
+
+  * fstrm_capture: Fix output printf format.
+
 fstrm (0.6.0)
 
   * fstrm_capture: Perform output file rotation when a SIGUSR1 signal
diff -Nru fstrm-0.6.0/configure.ac fstrm-0.6.1/configure.ac
--- fstrm-0.6.0/configure.ac	2019-10-14 16:25:11.000000000 +0000
+++ fstrm-0.6.1/configure.ac	2021-04-05 17:06:59.000000000 +0000
@@ -1,7 +1,7 @@
 AC_PREREQ(2.64)
 
 AC_INIT([fstrm],
-        [0.6.0],
+        [0.6.1],
         [https://github.com/farsightsec/fstrm/issues],
         [fstrm],
         [https://github.com/farsightsec/fstrm])
diff -Nru fstrm-0.6.0/debian/changelog fstrm-0.6.1/debian/changelog
--- fstrm-0.6.0/debian/changelog	2019-10-17 21:19:17.000000000 +0000
+++ fstrm-0.6.1/debian/changelog	2022-01-19 00:16:12.000000000 +0000
@@ -1,3 +1,13 @@
+fstrm (0.6.1-1) unstable; urgency=medium
+
+  * New upstream version 0.6.1 (Closes: #1003960)
+  * debian/control: Bump Standards-Version to 4.6.0 (no changes)
+  * debian/: Bump debhelper compat level to 13
+  * debian/not-installed: Ignore libfstrm.la (debhelper compat 13)
+  * debian/fstrm-bin.manpages: dh_missing --fail-missing fix
+
+ -- Robert Edmonds <edmonds@debian.org>  Tue, 18 Jan 2022 19:16:12 -0500
+
 fstrm (0.6.0-1) unstable; urgency=medium
 
   * New upstream version 0.6.0
diff -Nru fstrm-0.6.0/debian/compat fstrm-0.6.1/debian/compat
--- fstrm-0.6.0/debian/compat	2019-10-17 21:19:17.000000000 +0000
+++ fstrm-0.6.1/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-10
diff -Nru fstrm-0.6.0/debian/control fstrm-0.6.1/debian/control
--- fstrm-0.6.0/debian/control	2019-10-17 21:19:17.000000000 +0000
+++ fstrm-0.6.1/debian/control	2022-01-19 00:16:12.000000000 +0000
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Robert Edmonds <edmonds@debian.org>
 Build-Depends:
- , debhelper (>= 10~)
+ , debhelper-compat (= 13)
  , pkg-config
  , libevent-dev
-Standards-Version: 4.4.1
+Standards-Version: 4.6.0
 Homepage: https://github.com/farsightsec/fstrm
 Vcs-Browser: https://salsa.debian.org/edmonds/fstrm
 Vcs-Git: https://salsa.debian.org/edmonds/fstrm.git
diff -Nru fstrm-0.6.0/debian/fstrm-bin.manpages fstrm-0.6.1/debian/fstrm-bin.manpages
--- fstrm-0.6.0/debian/fstrm-bin.manpages	2019-10-17 21:19:17.000000000 +0000
+++ fstrm-0.6.1/debian/fstrm-bin.manpages	2022-01-19 00:16:12.000000000 +0000
@@ -1 +1 @@
-man/*.1
+usr/share/man/man1/*.1
diff -Nru fstrm-0.6.0/debian/not-installed fstrm-0.6.1/debian/not-installed
--- fstrm-0.6.0/debian/not-installed	1970-01-01 00:00:00.000000000 +0000
+++ fstrm-0.6.1/debian/not-installed	2022-01-19 00:16:12.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libfstrm.la
diff -Nru fstrm-0.6.0/libmy/argv.c fstrm-0.6.1/libmy/argv.c
--- fstrm-0.6.0/libmy/argv.c	2019-10-14 16:25:11.000000000 +0000
+++ fstrm-0.6.1/libmy/argv.c	2021-04-05 17:06:59.000000000 +0000
@@ -479,11 +479,11 @@
     
     /* did we find one? */
     if (*(spec_p - 1) != '\0') {
-      if (out_p + 2 >= max_p) {
+      if (out_p + 3 >= max_p) { /* make sure that snprintf has room to terminate its output */
 	break;
       }
-      LOC_SNPRINTF(SNP_ARG(out_p, 2), "\\%c", *(spec_p - 1));
-      out_p += 2;
+      LOC_SNPRINTF(SNP_ARG(out_p, 3), "\\%c", *(spec_p - 1)); /* outputing a backslash, a char, and a nul */
+      out_p += 2; /* don't include the nul in the final length */
       continue;
     }
     
@@ -496,10 +496,10 @@
       out_p += 1;
     }
     else {
-      if (out_p + 4 >= max_p) {
+      if (out_p + 5 >= max_p) {
 	break;
       }
-      LOC_SNPRINTF(SNP_ARG(out_p, 4), "\\%03o", *buf_p);
+      LOC_SNPRINTF(SNP_ARG(out_p, 5), "\\%03o", *buf_p); /* outputing a backslash, three digits, and a nul */
       out_p += 4;
     }
   }
diff -Nru fstrm-0.6.0/src/fstrm_capture.c fstrm-0.6.1/src/fstrm_capture.c
--- fstrm-0.6.0/src/fstrm_capture.c	2019-10-14 16:25:11.000000000 +0000
+++ fstrm-0.6.1/src/fstrm_capture.c	2021-04-05 17:06:59.000000000 +0000
@@ -998,7 +998,7 @@
 			 conn->len_buf, conn->len_frame_total);
 		if (conn->len_frame_total > conn->ctx->capture_highwater) {
 			conn_log(CONN_WARNING, conn,
-				"Skipping %zd byte message (%zd buffer)",
+				"Skipping %u byte message (%zd buffer)",
 				conn->len_frame_total,
 				conn->ctx->capture_highwater);
 			conn->bytes_skip = conn->len_frame_total;
@@ -1201,6 +1201,10 @@
 	if (sigaction(SIGINT, &sa, NULL) != 0)
 		return false;
 
+	sa.sa_handler = SIG_IGN;
+	if (sigaction(SIGPIPE, &sa, NULL) != 0)
+		return false;
+
 	/* Success. */
 	return true;
 }