- up to 1.4.5

diff --git a/0003-fixed-handling-of-fputc.patch b/0003-fixed-handling-of-fputc.patch
deleted file mode 100644 (file)
index 048b08f..0000000
--- a/0003-fixed-handling-of-fputc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Simson Garfinkel <simsong@acm.org>
-Date: Sun, 16 Feb 2014 11:24:01 -0500
-Subject: fixed handling of fputc
-Forwarded: yes. merged upstream at https://github.com/simsong/tcpflow/commit/6cfe1a4905b8801084ecff00ae794388128501af
-
----
- src/tcpip.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/tcpip.cpp b/src/tcpip.cpp
-index 603c127..ecad602 100644
---- a/src/tcpip.cpp
-+++ b/src/tcpip.cpp
-@@ -262,7 +262,13 @@ void tcpip::print_packet(const u_char *data, uint32_t length)
-     else if(demux.opt.output_strip_nonprint){
-       for(const u_char *cc = data;cc<data+length;cc++){
-           if(isprint(*cc) || (*cc=='\n') || (*cc=='\r')){
--              written += fputc(*cc,stdout);
-+                int ret = fputc(*cc,stdout);
-+                if(ret==EOF){
-+                    std::cerr << "EOF on write to stdout\n";
-+                    exit(1);
-+                
-+                }
-+                written += ret;
-           }
-       }
-     }

diff --git a/0004-fixed-handling-of-fputc.patch b/0004-fixed-handling-of-fputc.patch
deleted file mode 100644 (file)
index 8265207..0000000
--- a/0004-fixed-handling-of-fputc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Simson Garfinkel <simsong@acm.org>
-Date: Sun, 16 Feb 2014 13:48:41 -0500
-Subject: fixed handling of fputc
-Forwarded: yes. merged upstream at https://github.com/simsong/tcpflow/commit/1aa7d8e5072175859b0a3c41264c84de14b25e55
----
- src/tcpip.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tcpip.cpp b/src/tcpip.cpp
-index ecad602..86ad6df 100644
---- a/src/tcpip.cpp
-+++ b/src/tcpip.cpp
-@@ -268,7 +268,7 @@ void tcpip::print_packet(const u_char *data, uint32_t length)
-                     exit(1);
-                 
-                 }
--                written += ret;
-+                written += 1;
-           }
-       }
-     }

diff --git a/0005-fixed-per-https-bugs.debian.org-cgi-bin-bugreport.cg.patch b/0005-fixed-per-https-bugs.debian.org-cgi-bin-bugreport.cg.patch
deleted file mode 100644 (file)
index cb06824..0000000
--- a/0005-fixed-per-https-bugs.debian.org-cgi-bin-bugreport.cg.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Simson Garfinkel <simsong@acm.org>
-Date: Fri, 30 May 2014 07:07:50 -0400
-Subject: fixed per https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=736417
-Forwarded: yes. merged upstream at https://github.com/simsong/tcpflow/commit/7df3db6874fb1a596c1e9673eabaf15be81e59be
-
----
- src/tcpip.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/tcpip.cpp b/src/tcpip.cpp
-index 86ad6df..8a37413 100644
---- a/src/tcpip.cpp
-+++ b/src/tcpip.cpp
-@@ -268,8 +268,9 @@ void tcpip::print_packet(const u_char *data, uint32_t length)
-                     exit(1);
-                 
-                 }
--                written += 1;
-           }
-+            written += 1; // treat even unprintable characters as "written". It
-+                          // really means "processed"
-       }
-     }
-     else {

diff --git a/0006-fixed-so-that-it-properly-gets-default-device-if-no-.patch b/0006-fixed-so-that-it-properly-gets-default-device-if-no-.patch
deleted file mode 100644 (file)
index eba860d..0000000
--- a/0006-fixed-so-that-it-properly-gets-default-device-if-no-.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Simson Garfinkel <simsong@acm.org>
-Date: Sun, 2 Feb 2014 16:18:45 -0500
-Subject: fixed so that it properly gets default device if no -i is given
-Forwarded: yes. merged upstream at https://github.com/simsong/tcpflow/commit/9abeb43451fff5543efdac769d1efea52d4dd084
-
----
- src/tcpflow.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/tcpflow.cpp b/src/tcpflow.cpp
-index 96bd38e..f5bd746 100644
---- a/src/tcpflow.cpp
-+++ b/src/tcpflow.cpp
-@@ -25,9 +25,6 @@
- #include <sys/types.h>
- #include <dirent.h>
- 
--
--
--
- /* bring in inet_ntop if it is not present */
- #define ETH_ALEN 6
- #ifndef HAVE_INET_NTOP
-@@ -388,7 +385,7 @@ int main(int argc, char *argv[])
- #endif
- 
-     bool force_binary_output = false;
--    const char *device = "<default>";
-+    const char *device = 0;             // default device
-     const char *lockname = 0;
-     int need_usage = 0;
-     std::string reportfilename;
-@@ -649,7 +646,10 @@ int main(int argc, char *argv[])
-     be13::plugin::get_scanner_feature_file_names(feature_file_names);
-     feature_recorder_set fs(0);
- 
--    fs.init(feature_file_names,input_fname.size()>0 ? input_fname : device,demux.outdir);
-+    const char *name = device;
-+    if(input_fname.size()>0) name=input_fname.c_str();
-+    if(name==0) name="<default>";
-+    fs.init(feature_file_names,name,demux.outdir);
-     the_fs   = &fs;
-     demux.fs = &fs;
- 

diff --git a/tcpflow.spec b/tcpflow.spec
index 9983e36796388f6d4d1d83210589f8ed1b44ae8e..6f306d14b1fcdec5c844eb902ca6dfc3fbe0177a 100644 (file)
--- a/tcpflow.spec
+++ b/tcpflow.spec
@@ -1,17 +1,14 @@
 Summary:       TCP Flow Recorder
 Summary(pl.UTF-8):     Program zapisujący ruch TCP
 Name:          tcpflow
-Version:       1.4.4
-Release:       2
+Version:       1.4.5
+Release:       1
 License:       GPL v3
 Group:         Applications/Networking
-Source0:       http://www.digitalcorpora.org/downloads/tcpflow/%{name}-%{version}.tar.gz
-# Source0-md5: f395fea6f5fe136543f4c982beff9cba
+# Source0:     http://www.digitalcorpora.org/downloads/tcpflow/%{name}-%{version}.tar.gz
+Source0:       %{name}-%{version}.tar.gz
+# Source0-md5: 002da34f43552946299e89c176a48da3
 Patch0:                0001-using-the-debian-package-of-libhttp-parser-instead-o.patch
-Patch1:                0003-fixed-handling-of-fputc.patch
-Patch2:                0004-fixed-handling-of-fputc.patch
-Patch3:                0005-fixed-per-https-bugs.debian.org-cgi-bin-bugreport.cg.patch
-Patch4:                0006-fixed-so-that-it-properly-gets-default-device-if-no-.patch
 URL:           http://www.circlemud.org/~jelson/software/tcpflow/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -49,10 +46,6 @@ połączenie.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %{__aclocal} -I m4