FreeBSD Bugzilla – Attachment 219570 Details for
Bug 251054
net-mgmt/flow-tools: errors with Python 3.7
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for the port maintainer
flow-tools.patch (text/plain), 6.76 KB, created by
Andrew
on 2020-11-11 18:24:30 UTC
(
hide
)
Description:
Patch for the port maintainer
Filename:
MIME Type:
Creator:
Andrew
Created:
2020-11-11 18:24:30 UTC
Size:
6.76 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 554896) >+++ Makefile (working copy) >@@ -4,7 +4,7 @@ > PORTNAME= flow-tools > PORTVERSION= 0.68.6 > DISTVERSIONPREFIX= v >-PORTREVISION= 3 >+PORTREVISION= 4 > CATEGORIES= net-mgmt > > MAINTAINER= bofh@FreeBSD.org >Index: files/patch-flow-log2rrd >=================================================================== >--- files/patch-flow-log2rrd (nonexistent) >+++ files/patch-flow-log2rrd (working copy) >@@ -0,0 +1,10 @@ >+--- bin/flow-log2rrd.orig 2020-11-11 19:37:41.210787000 +0200 >++++ bin/flow-log2rrd 2020-11-11 19:37:55.603659000 +0200 >+@@ -4,7 +4,6 @@ >+ import os >+ import rrdtool >+ import sys >+-import string >+ >+ # >+ # process syslog output from flow-capture and flow-fanout into a rrd > >Property changes on: files/patch-flow-log2rrd >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-flow-rpt2rrd >=================================================================== >--- files/patch-flow-rpt2rrd (nonexistent) >+++ files/patch-flow-rpt2rrd (working copy) >@@ -0,0 +1,89 @@ >+--- bin/flow-rpt2rrd.orig 2020-11-11 19:41:29.441587000 +0200 >++++ bin/flow-rpt2rrd 2020-11-11 19:48:11.498009000 +0200 >+@@ -4,7 +4,6 @@ >+ import os >+ import rrdtool >+ import sys >+-import string >+ >+ # >+ # flow-rpt2rrd - convert flow-report output to rrd format >+@@ -28,7 +27,7 @@ >+ keys.append(line) >+ line = f.readline().strip() >+ f.close() >+- return string.join(keys, ',') >++ return keys.join(',') >+ >+ # >+ # Class: ftsym >+@@ -117,13 +116,13 @@ >+ >+ def set_use_fields(self,f): >+ self.use_fields = {} >+- for i in string.split(f, ','): >++ for i in f.split(','): >+ self.use_fields[i] = 1 >+ >+ def set_use_key_names(self,f): >+ self.use_key_names = {} >+ self.use_key_names_special = {} >+- for i in string.split(f, ','): >++ for i in f.split(','): >+ if i[:6] == 'total_': >+ self.use_key_names_special[i] = 1 >+ else: >+@@ -141,7 +140,7 @@ >+ >+ def setrrd(self, storage, path, postfix): >+ (self.rrd_5min, self.rrd_30min, self.rrd_2hr, self.rrd_1day) = \ >+- string.split(storage,':') >++ storage.split(':') >+ self.rrd_path = path >+ self.rrd_postfix = postfix >+ >+@@ -179,7 +178,7 @@ >+ >+ rrdtool.create(rrdFile, *rrdParams) >+ if self.debug: >+- print >>sys.stderr, string.join(rrdParams,' ') >++ print >>sys.stderr, rrdParams.join(' ') >+ >+ # foreach value >+ >+@@ -208,14 +207,14 @@ >+ if (not self.in_data) : >+ >+ if line[:13] == '# first-flow:': >+- self.start_time = (string.split(line[14:]))[0] >++ self.start_time = line[14:].split()[0] >+ >+ # handle the totals record differently >+ if line[:53] == '# rec1: records,ignores,flows,octets,packets,duration': >+- tmp = string.split(line[8:], ',') >++ tmp = line[8:].split(',') >+ line = f.readline().strip() >+ tmp_use_fields_index = {} >+- tmp_splt = string.split(line, ',') >++ tmp_splt = line.split(',') >+ x = 0 >+ ds = 0 >+ for i in tmp: >+@@ -232,7 +231,7 @@ >+ self.in_data = 1 >+ >+ # foreach element in field names >+- for i in string.split(line[8:],','): >++ for i in line[8:].split(','): >+ >+ # remove key designators >+ if i[-1:] == '*': >+@@ -267,7 +266,7 @@ >+ # if in the data area and not a comment, store it >+ if self.in_data and line [:1] != '#': >+ >+- splt = string.split(line, ',') >++ splt = line.split(',') >+ >+ # combine the key fields to form one key >+ k = '' > >Property changes on: files/patch-flow-rpt2rrd >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-flow-rptfmt >=================================================================== >--- files/patch-flow-rptfmt (nonexistent) >+++ files/patch-flow-rptfmt (working copy) >@@ -0,0 +1,70 @@ >+--- bin/flow-rptfmt 2020-11-11 19:29:38.512763000 +0200 >++++ bin/flow-rptfmt 2020-11-11 19:37:17.616419000 +0200 >+@@ -1,7 +1,6 @@ >+ #!/usr/bin/env python >+ >+ import sys >+-import string >+ import getopt >+ import signal >+ >+@@ -294,10 +293,10 @@ >+ self.got_totals = 1 >+ line2 = f.readline() >+ line2 = line2.strip() >+- splt = string.split(line2,',') >++ splt = line2.split(',') >+ >+ x = 0 >+- for i in string.split(line[8:],','): >++ for i in line[8:].split(','): >+ self.field_vals[i] = splt[x] >+ x += 1 >+ >+@@ -306,10 +305,10 @@ >+ >+ line2 = f.readline() >+ line2 = line2.strip() >+- splt = string.split(line2,',') >++ splt = line2.split(',') >+ >+ x = 0 >+- for i in string.split(line[8:],','): >++ for i in line[8:].split(','): >+ self.field_vals[i] = splt[x] >+ self.field_vals[x] = splt[x] >+ x += 1 >+@@ -321,13 +320,13 @@ >+ >+ # foreach element in field names >+ x = 0 >+- for i in string.split(line[8:],','): >++ for i in line[8:].split(','): >+ >+ # remove key designators >+ if i[-1:] == '*': >+ i = i[:-1] >+ self.field_keys[self.field_total] = 1 >+- i = string.lower(i) >++ i = i.lower() >+ self.field_idx[i] = self.field_total >+ >+ # default to the length of the header >+@@ -346,7 +345,7 @@ >+ # if in the data area and not a comment, store it >+ if self.in_data and line [:1] != '#': >+ >+- splt = string.split(line, ',') >++ splt = line.split(',') >+ >+ for i in xrange(self.field_total): >+ >+@@ -373,7 +372,7 @@ >+ def pickdisplay(self, f): >+ >+ self.field_use['all'] = 0 >+- for i in string.split(f, ','): >++ for i in f.split(','): >+ self.field_use[i] = 1 >+ >+ # figure out which fields are okay to print > >Property changes on: files/patch-flow-rptfmt >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 251054
:
219567
|
219568
|
219569
|
219570
|
221834
|
222203