commit 0b3dd96d8c61fe57c68c12fa4de0ba4a9958093a
Author: Jan Rękorajski <[email protected]>
Date: Sun Oct 24 21:18:19 2021 +0200
- fix more shebangs, remove duplicate global var, rel 8
duplicate-def.patch | 10 ++++++++++
flow-tools.spec | 9 ++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/flow-tools.spec b/flow-tools.spec
index 1bf4bad..221baaf 100644
--- a/flow-tools.spec
+++ b/flow-tools.spec
@@ -2,7 +2,7 @@ Summary: Collecting and processing NetFlow data
Summary(pl.UTF-8): Gromadzenie i przetwarzanie informacji o przepływie w
sieci
Name: flow-tools
Version: 0.68.5
-Release: 7
+Release: 8
License: BSD
Group: Applications/Networking
Source0:
http://flow-tools.googlecode.com/files/%{name}-%{version}.tar.bz2
@@ -10,6 +10,7 @@ Source0:
http://flow-tools.googlecode.com/files/%{name}-%{version}.tar.bz2
Patch0: %{name}-shebang.patch
Patch1: format-security.patch
Patch2: openssl.patch
+Patch3: duplicate-def.patch
URL: http://code.google.com/p/flow-tools/
BuildRequires: autoconf
BuildRequires: automake
@@ -74,6 +75,12 @@ Statyczna biblioteka flow-tools.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
+ bin/flow-log2rrd \
+ bin/flow-rpt2rrd \
+ bin/flow-rptfmt
%build
%{__libtoolize}
diff --git a/duplicate-def.patch b/duplicate-def.patch
new file mode 100644
index 0000000..f71ea9f
--- /dev/null
+++ b/duplicate-def.patch
@@ -0,0 +1,10 @@
+--- flow-tools-0.68.5/src/acl2.c~ 2008-01-27 21:48:55.000000000 +0100
++++ flow-tools-0.68.5/src/acl2.c 2021-10-24 21:08:47.954287421 +0200
+@@ -46,7 +46,6 @@
+
+ #include "acl2.h"
+
+-struct acl_list acl_list;
+
+ #define E acl_list.acl_ip_ext[index]
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/flow-tools.git/commitdiff/0b3dd96d8c61fe57c68c12fa4de0ba4a9958093a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
