Bug#1052561: bookworm-pu: package nfdump/1.7.3-1 (pre-discussion)
Am 07.10.23 um 13:14 schrieb Jonathan Wiltshire:
Hi,
On Sun, Sep 24, 2023 at 09:36:00PM +0200, Bernhard Schmidt wrote:
[ Other info ]
I did not attach the debdiff because it would be too large and only consist
of upstream changes. No changes to debian/ (except dropping a backported fix
already in 12.1) are necessary.
What does diffstat look like, possibly with translations and tests
excluded? Let's see what sort of scale we're talking here.
Plain debdiff
185 files changed, 25810 insertions(+), 28068 deletions(-)
There are no translation changes and not many tests to exclude, but a
few things stand out. Dropping quite a bit from m4 buildfiles as part of
commits
https://github.com/phaag/nfdump/commit/488e2136bb97f5ae45900fd93e390e1be25cb91e
https://github.com/phaag/nfdump/commit/93f1af69d15dec0600d7ac311bd33c15556dee25
(remove autogen m4 files from repo)
m4/libtool.m4 | 8400
-------------------------------------------------------------------------------------------------------------------
m4/ltoptions.m4 | 437 ------
m4/ltsugar.m4 | 124 --
m4/ltversion.m4 | 24 -
m4/lt~obsolete.m4 | 99 --
a few renames
src/lib/{ => compress}/lzoconf.h | 0
src/lib/{ => compress}/lzodefs.h | 0
src/lib/{ => compress}/minilzo.c | 0
src/lib/{ => compress}/minilzo.h | 0
src/{ => lib}/conf/nfconf.c | 38 +-
src/{ => lib}/conf/nfconf.h | 2 +
src/{ => lib}/conf/nfdump.conf.dist | 19 +-
src/{ => lib}/conf/toml.c | 2 +-
src/{ => lib}/conf/toml.h | 0
src/{nfcapd/netflow_pcapd.c => netflow/nfd_raw.c} | 96 +-
src/{include/netflow_pcapd.h => netflow/nfd_raw.h} | 18 +-
and the move and update of the embedded lz4 code
https://github.com/phaag/nfdump/commit/99dc96e8433637ef1d62edbf13f26655a3815982
src/lib/compress/lz4.c | 2751
++++++++++++++++++++++++++++++++++++++
src/lib/compress/lz4.h | 862 ++++++++++++
src/lib/lz4.c | 1564
----------------------
src/lib/lz4.h | 483 -------
and the addition of the High Compression Mode of LZ4
src/lib/compress/lz4hc.c | 1637
+++++++++++++++++++++++
src/lib/compress/lz4hc.h | 413 ++++++
https://github.com/phaag/nfdump/commit/cb254b1730b3abc39627b16d4c04b97cdcd62de0
I'll reach out to upstream about those embedded lz4 copy, right now it
does not look like one could build against an external library, in
contrast to zstd and bz2 support.
If you exclude all
git diff upstream/1.7.1 upstream/1.7.3 --stat -- . ':!*.m4'
':!src/lib/compress/lz4.*' ':!src/lib/compress/lz4hc.*' ':!src/lib/lz4.*'
that you get down to
.github/FUNDING.yml | 1 +
.github/workflows/c-cpp.yml | 23 +
.gitignore | 1 +
ChangeLog | 171 ++++++
Makefile.am | 2 +-
README.md | 112 +++-
configure.ac | 64 +-
extra/CreateSubHierarchy.pl | 6 +-
extra/docker/Dockerfile.alpine | 2 +-
extra/docker/Dockerfile.ubuntu | 2 +-
extra/nfsen/nfsen-1.6-stats-influxdb.patch | 2 +-
extra/nfsen/nfsen-trunk-stats-influxdb.patch | 2 +-
man/geolookup.1 | 2 +-
man/nfanon.1 | 4 +-
man/nfcapd.1 | 49 +-
man/nfdump.1 | 97 ++-
man/nfexpire.1 | 6 +-
man/nfpcapd.1 | 32 +-
man/nfreplay.1 | 5 +-
man/sfcapd.1 | 35 +-
src/collector/Makefile.am | 5 +-
src/collector/bookkeeper.c | 28 +-
src/collector/bookkeeper.h | 15 +-
src/collector/collector.c | 74 ++-
src/collector/collector.h | 30 +-
src/collector/expire.c | 23 +-
src/collector/launch.c | 329 ++++++----
src/collector/launch.h | 11 +-
src/collector/metric.c | 8 +-
src/collector/nfnet.c | 92 ++-
src/collector/nfnet.h | 26 +-
src/collector/pcap_reader.c | 412 +++++++++----
src/collector/pcap_reader.h | 63 +-
src/collector/privsep.c | 276 +++++++++
src/collector/privsep.h | 81 +++
src/collector/repeater.c | 319 ++++++++++
src/collector/repeater.h | 63 ++
src/conf/Makefile.am | 13 -
src/ft2nfdump/ft2nfdump.c | 13 +-
src/include/Makefile.am | 3 +-
src/include/exporter.h | 160 +++--
src/include/nfdump.h | 96 +--
src/inline/applybits_inline.c | 3 +-
src/inline/nffile_inline.c | 23 +-
src/lib/Makefile.am | 26 +-
src/lib/{ => compress}/lzoconf.h | 0
src/lib/{ => compress}/lzodefs.h | 0
src/lib/{ => compress}/minilzo.c | 0
src/lib/{ => compress}/minilzo.h | 0
src/{ => lib}/conf/nfconf.c | 38 +-
src/{ => lib}/conf/nfconf.h | 2 +
src/{ => lib}/conf/nfdump.conf.dist | 19 +-
src/{ => lib}/conf/toml.c | 2 +-
src/{ => lib}/conf/toml.h | 0
src/lib/daemon.c | 19 +-
src/lib/daemon.h | 14 +-
src/lib/filter.h | 4 +-
src/lib/flist.c | 28 +-
src/lib/gen_version.sh | 54 ++
src/lib/grammar.y | 94 ++-
src/lib/id.h | 2 +-
src/lib/ipconv.h | 56 +-
src/lib/nffile.c | 678
+++++++++++++++------
src/lib/nffile.h | 42 +-
src/lib/nffileV2.h | 41 +-
src/lib/nftree.c | 13 +-
src/lib/nftree.h | 110 ++--
src/lib/nfx.c | 4 +-
src/lib/nfx.h | 4 +-
src/lib/nfxV3.c | 53 ++
src/lib/nfxV3.h | 77 ++-
src/lib/output_short.c | 179 ++++--
src/lib/output_util.c | 54 +-
src/lib/output_util.h | 12 +
src/lib/scanner.l | 6 +
src/lib/util.c | 37 +-
src/lib/util.h | 2 +-
src/lib/version.c | 57 ++
src/lib/version.h | 36 ++
src/maxmind/Makefile.am | 6 +-
src/maxmind/geolookup.c | 8 +-
src/maxmind/maxmind.c | 263 +++++---
src/maxmind/maxmind.h | 130 ++--
src/netflow/Makefile.am | 2 +-
src/netflow/fnf.h | 24 +-
src/netflow/ipfix.c | 308 ++++++----
src/netflow/ipfix.h | 20 +-
src/netflow/netflow_v1.c | 17 +-
src/netflow/netflow_v5_v7.c | 23 +-
src/netflow/netflow_v9.c | 255 ++++----
src/netflow/netflow_v9.h | 4 +-
src/{nfcapd/netflow_pcapd.c => netflow/nfd_raw.c} | 96 +--
src/{include/netflow_pcapd.h => netflow/nfd_raw.h} | 18 +-
src/nfanon/nfanon.c | 10 +-
src/nfanon/panonymizer.c | 6 +-
src/nfanon/rijndael.c | 4 +-
src/nfcapd/Makefile.am | 9 +-
src/nfcapd/nfcapd.c | 424 +++++++------
src/nfdump/Makefile.am | 4 +-
src/nfdump/blocksort.c | 2 +-
src/nfdump/exporter.c | 22 +-
src/nfdump/nbar.c | 2 +-
src/nfdump/nfdump.c | 143 ++---
src/nfdump/nffile_compat.c | 13 +-
src/nfdump/nflowcache.c | 25 +-
src/nfdump/nfstat.c | 52 +-
src/nfdump/nfstat.h | 4 +-
src/nfexpire/nfexpire.c | 14 +-
src/nfpcapd/Makefile.am | 9 +-
src/nfpcapd/flowdump.c | 6 +-
src/nfpcapd/flowdump.h | 1 +
src/nfpcapd/flowsend.c | 18 +-
src/nfpcapd/flowtree.c | 8 +-
src/nfpcapd/flowtree.h | 3 +-
src/nfpcapd/nfpcapd.c | 72 ++-
src/nfpcapd/packet_bpf.c | 13 +-
src/nfpcapd/packet_linux.c | 637
++++++++++---------
src/nfpcapd/packet_pcap.c | 622
+++++++++----------
src/nfpcapd/packet_pcap.h | 117 ++--
src/nfpcapd/pcapdump.c | 43 ++
src/nfpcapd/pcaproc.c | 117 ++--
src/nfpcapd/pcaproc.h | 11 +-
src/nfreplay/Makefile.am | 2 +-
src/nfreplay/nfreplay.c | 173 ++++--
src/nfreplay/send_net.c | 65 +-
src/nfreplay/send_net.h | 16 +-
src/nfreplay/send_v5.c | 6 +-
src/nfreplay/send_v9.c | 6 +-
src/nfsen/nfprofile.c | 172 +++---
src/nfsen/nftrack.c | 16 +-
src/nfsen/nftrack_stat.c | 4 +-
src/nfsen/profile.c | 93 ++-
src/nfsen/profile.h | 6 +-
src/output/Makefile.am | 2 +-
src/output/content_dns.c | 6 +-
src/output/output.c | 10 +-
src/output/output_fmt.c | 152 +++--
src/output/output_fmt.h | 4 +-
src/output/output_json.c | 198 +++---
src/output/output_pipe.c | 2 +-
src/output/output_raw.c | 129 ++--
src/sflow/Makefile.am | 4 +-
src/sflow/sfcapd.c | 405 ++++++------
src/sflow/sflow.h | 12 +-
src/sflow/sflow_nfdump.c | 15 +-
src/sflow/sflow_nfdump.h | 54 +-
src/sflow/sflow_process.c | 8 +-
src/sflow/sflow_v2v4.h | 2 +-
src/test/Makefile.am | 2 +-
src/test/nfgen.c | 6 +-
src/test/nftest.1.out | 67 +-
src/test/nftest.2.out | 67 +-
src/test/nftest.c | 65 +-
src/test/runtest.sh | 51 +-
154 files changed, 6497 insertions(+), 3455 deletions(-)
Bernhard
Reply to: