Patch maintenance

debian/patches/20-allow-any-interface.patch

@@ -1,15 +0,0 @@
-From: Christoph Biedl <debian.packages.hhqj@manchmal.in-ulm.de>
-Subject: Do not leave main loop while listening on "any" interface
-Forwarded: http://lists.mindrot.org/pipermail/netflow-tools/2011-February/000488.html
-
---- a/softflowd.c
-+++ b/softflowd.c
-@@ -1924,7 +1924,7 @@ main(int argc, char **argv)
- 				logit(LOG_ERR, "Exiting on pcap_dispatch: %s", 
- 				    pcap_geterr(pcap));
- 				break;
--			} else if (r == 0) {
-+			} else if (r == 0 && capfile != NULL) {
- 				logit(LOG_NOTICE, "Shutting down after "
- 				    "pcap EOF");
- 				graceful_shutdown_request = 1;

debian/patches/21-fix-ipv6-v9-flow-creation.patch

@@ -1,30 +0,0 @@
-From: Christoph Biedl <debian.packages.hhqj@manchmal.in-ulm.de>
-Subject: Fix broken v9 flow creation for IPv6
-Forwarded: http://lists.mindrot.org/pipermail/netflow-tools/2011-February/000489.html
-
---- a/netflow9.c
-+++ b/netflow9.c
-@@ -79,7 +79,7 @@ struct NF9_DATA_FLOWSET_HEADER {
- #define NF9_IP_PROTOCOL_VERSION		60
-
- /* Stuff pertaining to the templates that softflowd uses */
--#define NF9_SOFTFLOWD_TEMPLATE_NRECORDS	11
-+#define NF9_SOFTFLOWD_TEMPLATE_NRECORDS	13
- struct NF9_SOFTFLOWD_TEMPLATE {
- 	struct NF9_TEMPLATE_FLOWSET_HEADER h;
- 	struct NF9_TEMPLATE_FLOWSET_RECORD r[NF9_SOFTFLOWD_TEMPLATE_NRECORDS];
-@@ -167,10 +167,10 @@ nf9_init_template(void)
- 	v6_template.r[4].length = htons(4);
- 	v6_template.r[5].type = htons(NF9_IN_PACKETS);
- 	v6_template.r[5].length = htons(4);
--	v4_template.r[6].type = htons(NF9_IF_INDEX_IN);
--	v4_template.r[6].length = htons(4);
--	v4_template.r[7].type = htons(NF9_IF_INDEX_OUT);
--	v4_template.r[7].length = htons(4);
-+	v6_template.r[6].type = htons(NF9_IF_INDEX_IN);
-+	v6_template.r[6].length = htons(4);
-+	v6_template.r[7].type = htons(NF9_IF_INDEX_OUT);
-+	v6_template.r[7].length = htons(4);
- 	v6_template.r[8].type = htons(NF9_L4_SRC_PORT);
- 	v6_template.r[8].length = htons(2);
- 	v6_template.r[9].type = htons(NF9_L4_DST_PORT);

debian/patches/40-manpage-fixes.patch

@@ -1,65 +0,0 @@
-From: Christoph Biedl <debian.packages.hhqj@manchmal.in-ulm.de>
-Subject: Fix nroff errors and typos in manpage
-Forwarded: http://lists.mindrot.org/pipermail/netflow-tools/2011-February/000484.html
-Last-Update: 2011-02-04
-
---- a/softflowd.8
-+++ b/softflowd.8
-@@ -35,14 +35,14 @@
- .Op Fl L Ar hoplimit
- .Op Fl T Ar track_level
- .Op Fl c Ar ctl_sock
--.Ek
-+.Bk -words
- .Oo Fl i\ \&
- .Sm off
- .Oo Ar if_ndx : Oc
- .Ar interface
- .Sm on
- .Oc
--.Bk words
-+.Ek
- .Op Fl m Ar max_flows
- .Op Fl n Ar host:port
- .Op Fl p Ar pidfile
-@@ -161,7 +161,7 @@ Specify an alternate location for the remote control socket in daemon mode.
- Default is
- .Pa /var/run/softflowd.ctl
- .It Fl m Ar max_flows
--Specify the maximum number of flow to concurrently track.
-+Specify the maximum number of flows to concurrently track.
- If this limit is exceeded, the flows which have least recently seen traffic
- are forcibly expired.
- In practice, the actual maximum may briefly exceed this limit by a
-@@ -173,7 +173,7 @@ than 800k of working data.
- Set the timeout names
- .Ar timeout_name
- to
--.Ar time
-+.Ar time .
- Refer to the
- .Sx Timeouts
- section for the valid timeout names and their meanings.
-@@ -189,7 +189,7 @@ should not fork and daemonise itself.
- .It Fl 6
- Force
- .Nm
--To track IPv6 flows even if the NetFlow export protocol does not support
-+to track IPv6 flows even if the NetFlow export protocol does not support
- reporting them.
- This is useful for debugging and statistics gathering only.
- .It Fl D
-@@ -336,11 +336,10 @@
- command.
- This interface allows one to shut down the daemon, force expiry of
- all tracked flows and extract debugging and summary data.
--Also, upon receipt of a
-+Also, receipt of a
- .Dv SIGTERM
- or
--.DV SIGINT
--.Nm
-+.Dv SIGINT
- will cause
- .Nm
- to exit, after expiring all flows (and thus sending flow export packets

debian/patches/41-manpage-drop-url.patch

@@ -1,13 +0,0 @@
-From: Christoph Biedl <debian.packages.hhqj@manchmal.in-ulm.de>
-Subject: Drop broken URL from manpage
-Forwarded: http://lists.mindrot.org/pipermail/netflow-tools/2011-February/000486.html
-
---- a/softflowd.8
-+++ b/softflowd.8
-@@ -414,6 +414,3 @@
- .Xr tcpdump 8 ,
- .Xr pcap 3 ,
- .Xr bpf 4
--.Bd -literal
--http://www.cisco.com/univercd/cc/td/doc/product/rtrmgmt/nfc/nfc_3_0/nfc_ug/nfcform.htm
--.Ed

debian/patches/60-change-chroot-dir.patch

@@ -2,11 +2,13 @@ From: Christoph Biedl <debian.packages.hhqj@manchmal.in-ulm.de>
 Subject: Change PRIVDROP_CHROOT_DIR to a real location
 Forwarded: not-needed
 
+diff --git a/softflowd.h b/softflowd.h
+index b000214..82a5d9e 100644
 --- a/softflowd.h
 +++ b/softflowd.h
 @@ -36,7 +36,7 @@
  #endif
-
+ 
  #ifndef PRIVDROP_CHROOT_DIR
 -# define PRIVDROP_CHROOT_DIR	"/var/empty"
 +# define PRIVDROP_CHROOT_DIR	"/var/run/softflowd/chroot"

debian/patches/series

@@ -1,5 +1 @@
-20-allow-any-interface.patch
-21-fix-ipv6-v9-flow-creation.patch
-40-manpage-fixes.patch
-41-manpage-drop-url.patch
 60-change-chroot-dir.patch