<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d64831538cf8cbfaf2a908aa8226ee191f100888">https://github.com/macports/macports-ports/commit/d64831538cf8cbfaf2a908aa8226ee191f100888</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d648315 flow-tools: update to version 0.68.5.1, dependencies
</span>d648315 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d64831538cf8cbfaf2a908aa8226ee191f100888
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Apr 8 13:56:55 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> flow-tools: update to version 0.68.5.1, dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * use github repository
</span><span style='display:block; white-space:pre;color:#404040;'> * remove outdated patchfiles
</span><span style='display:block; white-space:pre;color:#404040;'> * don't build outdated docbook 3.0 sgml docs that break build (no DTD available)
</span><span style='display:block; white-space:pre;color:#404040;'> * requires old openssl 1.0 to build, use PortGroup
</span><span style='display:block; white-space:pre;color:#404040;'> * replace old +mysql5 variant with +mysql57 including appropriate configuration
</span><span style='display:block; white-space:pre;color:#404040;'> * update livecheck to skip release candidates
</span>---
net/flow-tools/Portfile | 79 ++++++---------
net/flow-tools/files/flow_capture.in | 110 ---------------------
net/flow-tools/files/patch-configs_Makefile | 26 -----
net/flow-tools/files/patch-configure | 59 -----------
.../files/patch-disable-broken-docs.diff | 7 ++
net/flow-tools/files/patch-flow-header.c | 10 --
net/flow-tools/files/patch-ftpaths.h | 62 ------------
net/flow-tools/files/patch-lib-ftfile.c | 100 -------------------
net/flow-tools/files/patch-lib_Makefile.in | 11 ---
net/flow-tools/files/patch-lib_ftchash.c | 11 ---
net/flow-tools/files/patch-lib_ftio.c | 20 ----
net/flow-tools/files/patch-lib_ftsym.c | 10 --
net/flow-tools/files/patch-lib_fttlv.c | 100 -------------------
net/flow-tools/files/patch-lib_ftxlate.c | 11 ---
net/flow-tools/files/patch-lib_support.c | 10 --
net/flow-tools/files/patch-src_Makefile.in | 11 ---
net/flow-tools/files/patch-src_flow-fanout.c | 10 --
net/flow-tools/files/pkg-deinstall.in | 37 -------
net/flow-tools/files/pkg-install.in | 81 ---------------
19 files changed, 36 insertions(+), 729 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/Portfile b/net/flow-tools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c9ec055..298135f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/flow-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup old_openssl 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name flow-tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.68
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup adsr flow-tools 0.68.5.1 v
</span> categories net
maintainers nomaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,65 +13,44 @@ license BSD
</span> description Suite of tools and library to work with netflow data
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.splintered.net/sw/flow-tools/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ftp://ftp.eng.oar.net/pub/flow-tools/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 c9e0a8b53c79611b6bffcb9d510a5a38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e0b72c2c35911c40db6abacd317590ac74a17d68 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 03eac277958d401a9319ae1ed0dee9c0ed7a70f446b0f0f95d2df40fb6792deb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1083011
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configs_Makefile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-flow-header.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ftpaths.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lib_ftchash.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lib_ftio.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lib_ftsym.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lib_fttlv.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lib_Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lib_support.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lib-ftfile.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lib_ftxlate.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_flow-fanout.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# skip building of outdated docbook 3.0 sgml docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# macports no longer provides the required DTD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-disable-broken-docs.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:zlib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX__|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/lib/ftpaths.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# requires old openssl 1.0 to build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.configure build_flags
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\$WHERE_MYSQL/lib/mysql|\$WHERE_MYSQL/lib/mysql5|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\$WHERE_MYSQL/include/mysql|\$WHERE_MYSQL/include/mysql5|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "s|@localstatedir@/sym/|${prefix}/share/flow-tools/|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob ${worksrcpath}/docs/flow-*.1.in] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob ${worksrcpath}/docs/flow-*.html.in]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "s|@localstatedir@/cfg/|${prefix}/etc/flow-tools/|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob ${worksrcpath}/docs/flow-*.1.in] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob ${worksrcpath}/docs/flow-*.html.in]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # http://trac.macports.org/ticket/34358
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {/CFLAGS="-g -Wall"/d} ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args -fvi
</span>
# http://trac.macports.org/ticket/34358
configure.cflags-append -std=gnu89
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-openssl=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --localstatedir=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-postgresql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-silent-rules
</span>
post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} INSTALL README ChangeLog TODO \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING INSTALL README NEWS SECURITY TODO \
</span> ${destroot}${prefix}/share/doc/${name}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql5 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:bin/mysql_config5:mysql5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# replace old +mysql5 with +mysql57 variant with appropriate configuration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: add additional versioned mysql and postgresql variants as needed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql57 description {Build with mysql57 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mysql57
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append -I${prefix}/include/mysql57/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -L${prefix}/lib/mysql57/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-mysql=yes
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\[0-9.\]+)\\.tar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# skip release candidates in livecheck
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.livecheck.regex {(\d+(?:\.\d+)*)}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/flow_capture.in b/net/flow-tools/files/flow_capture.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 631b781..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/flow_capture.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,110 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# $FreeBSD: ports/net-mgmt/flow-tools/files/flow_capture.in,v 1.3 2006/12/19 22:44:25 stas Exp $
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# PROVIDE: flow_capture
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# REQUIRE: LOGIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# KEYWORD: shutdown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Add the following line to /etc/rc.conf to enable flow-capture:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_enable (bool): Set it to "YES" to enable flow-capture daemon.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Set to "NO" by default.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_datadir (str): Base flow data directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Default is "/var/db/flows"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_localip (str): IP address to bind to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Default to "0.0.0.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_remoteip (str): IP address to accept flows from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Default to "0.0.0.0" or all IPs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_port (int): Port to accept flow data on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Default is "8787"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_flags (str): Custom additional arguments to be passed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# to flow-collector (default "-E 128M").
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_profiles (str): A list of configuration profiles to enable.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This allows you to run several instances of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow-capture with different parameters.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Consider the following example:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_enable="YES"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_localip="85.172.168.9"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_profiles="r1 r2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_r1_datadir="/var/db/flows/r1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_r1_port="4444"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_r1_flags="-E20G -n287 -N-2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_r2_datadir="/var/db/flows/r2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_r2_port="4445"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_r2_flags="-E5G -n287 -N-2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This will run two instances of the flow-capture
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# with parameters taken from appropriate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flow_capture_PROFILENAME_xxx variables. For
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# unspecified parameters flow_capture_xxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# varialbes will be used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-. /etc/rc.subr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name="flow_capture"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-rcvar=`set_rcvar`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-setup_profile_vars()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name=flow_capture_$1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval ": \${flow_capture_${1}_datadir=${flow_capture_datadir}}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval ": \${flow_capture_${1}_localip=${flow_capture_localip}}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval ": \${flow_capture_${1}_remoteip=${flow_capture_remoteip}}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval ": \${flow_capture_${1}_port=${flow_capture_port}}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval ": \${flow_capture_${1}_user=${flow_capture_user}}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval ": \${flow_capture_${1}_group=${flow_capture_group}}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval ": \${flow_capture_${1}_flags=${flow_capture_flags}}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval "pidfile=${flow_capture_pid}.\${flow_capture_${1}_port}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval "command_args=\"-w \${flow_capture_${1}_datadir} -p ${flow_capture_pid} \${flow_capture_${1}_localip}/\${flow_capture_${1}_remoteip}/\${flow_capture_${1}_port}\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-start_profiles()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset start_cmd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for _profile in ${flow_capture_profiles}; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setup_profile_vars $_profile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run_rc_command "${rc_arg}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-stop_profiles()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset stop_cmd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for _profile in ${flow_capture_profiles}; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setup_profile_vars $_profile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run_rc_command "${rc_arg}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-load_rc_config $name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-: ${flow_capture_enable="NO"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-: ${flow_capture_datadir="%%FLOW_CAPTURE_SPOOL%%"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-: ${flow_capture_localip="0.0.0.0"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-: ${flow_capture_remoteip="0.0.0.0"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-: ${flow_capture_port="8787"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-: ${flow_capture_pid="%%FLOW_CAPTURE_PIDDIR%%/flow-capture.pid"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-: ${flow_capture_user="flowtools"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-: ${flow_capture_group="flowtools"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-: ${flow_capture_flags="-E 128M"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pidfile="${flow_capture_pid}.${flow_capture_port}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-command="%%PREFIX%%/bin/flow-capture"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-command_args="-w ${flow_capture_datadir} -p ${flow_capture_pid} ${flow_capture_localip}/${flow_capture_remoteip}/${flow_capture_port}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmd="$1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ $# -gt 0 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shift
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[ -n "$*" ] && flow_capture_profiles="$*"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ "${flow_capture_profiles}" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- start_cmd="start_profiles"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stop_cmd="stop_profiles"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-run_rc_command "$cmd"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/patch-configs_Makefile b/net/flow-tools/files/patch-configs_Makefile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 64d1231..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/patch-configs_Makefile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configs/Makefile.am.orig Tue Jun 7 22:43:47 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configs/Makefile.am Tue Jun 7 22:44:44 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ftsymdir=$(localstatedir)/sym
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ftsymdir=$(localstatedir)/share/flow-tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ftcfgdir=$(localstatedir)/cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ftcfgdir=$(localstatedir)/etc/flow-tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configs/Makefile.in.orig Tue Jun 7 22:44:14 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configs/Makefile.in Tue Jun 7 22:45:10 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,10 +88,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__include = @am__include@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__quote = @am__quote@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install_sh = @install_sh@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ftsymdir = $(localstatedir)/sym
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ftsymdir = $(localstatedir)/share/flow-tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ftcfgdir = $(localstatedir)/cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ftcfgdir = $(localstatedir)/etc/flow-tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subdir = configs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/patch-configure b/net/flow-tools/files/patch-configure
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 141f5e9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/patch-configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,59 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig Wed May 11 18:15:55 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure Wed Dec 20 01:34:55 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1662,7 +1662,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS="-g -Wall"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS="-fPIC"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_ext=c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cpp='$CPP $CPPFLAGS'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2254,7 +2254,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC=`test $ac_compiler_gnu = yes && echo yes`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_test_CFLAGS=${CFLAGS+set}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_save_CFLAGS=$CFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS="-g"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${ac_cv_prog_cc_g+set}" = set; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2299,21 +2298,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "$ac_test_CFLAGS" = set; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS=$ac_save_CFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elif test $ac_cv_prog_cc_g = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$GCC" = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="-g -O2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="-g"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$GCC" = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="-O2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${ac_cv_prog_cc_stdc+set}" = set; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3345,7 +3329,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$WHERE_PGSQL" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS="-L$WHERE_PGSQL/lib/pgsql"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS="-L$WHERE_PGSQL/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$as_me:$LINENO: checking for PQsetdbLogin in -lpq" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $ECHO_N "checking for PQsetdbLogin in -lpq... $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${ac_cv_lib_pq_PQsetdbLogin+set}" = set; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3402,7 +3386,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "${ECHO_T}$ac_cv_lib_pq_PQsetdbLogin" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $ac_cv_lib_pq_PQsetdbLogin = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PGSQLCFLAGS="-L$WHERE_PGSQL/lib -I$WHERE_PGSQL/include/pgsql"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PGSQLCFLAGS="-L$WHERE_PGSQL/lib -I$WHERE_PGSQL/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PGSQLLIB="-lpq"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>confdefs.h <<\_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HAVE_PGSQL 1
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/patch-disable-broken-docs.diff b/net/flow-tools/files/patch-disable-broken-docs.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..137468c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/flow-tools/files/patch-disable-broken-docs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.am.orig 2020-04-08 00:15:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.am 2020-04-08 00:15:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SUBDIRS = lib src bin configs docs utils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SUBDIRS = lib src bin configs utils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTRA_DIST = SECURITY contrib README.fork ChangeLog.old release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ACLOCAL_AMFLAGS = -I m4 --install
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/patch-flow-header.c b/net/flow-tools/files/patch-flow-header.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e2fe645..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/patch-flow-header.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/flow-header.c.orig Mon Jul 26 13:21:36 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/flow-header.c Mon Jul 26 13:21:45 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void usage(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/patch-ftpaths.h b/net/flow-tools/files/patch-ftpaths.h
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fd3bd47..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/patch-ftpaths.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,62 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/ftpaths.h.orig Wed Dec 3 22:19:47 2003
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/ftpaths.h Wed Jul 7 15:06:42 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,17 +29,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef FTPATHS_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FTPATHS_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_CFG_MAP "/usr/local/netflow/var/cfg/map.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_CFG_TAG "/usr/local/netflow/var/cfg/tag.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_CFG_FILTER "/usr/local/netflow/var/cfg/filter.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_CFG_STAT "/usr/local/netflow/var/cfg/stat.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_CFG_MASK "/usr/local/netflow/var/cfg/mask.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_CFG_XLATE "/usr/local/netflow/var/cfg/xlate.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_CFG_MAP "__PREFIX__/etc/flow-tools/map.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_CFG_TAG "__PREFIX__/etc/flow-tools/tag.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_CFG_FILTER "__PREFIX__/etc/flow-tools/filter.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_CFG_STAT "__PREFIX__/etc/flow-tools/stat.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_CFG_MASK "__PREFIX__/etc/flow-tools/mask.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_CFG_XLATE "__PREFIX__/etc/flow-tools/xlate.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_SYM_IP_PROT "/usr/local/netflow/var/sym/ip-prot.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_SYM_IP_TYPE "/usr/local/netflow/var/sym/ip-type.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_SYM_TCP_PORT "/usr/local/netflow/var/sym/tcp-port.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_SYM_ASN "/usr/local/netflow/var/sym/asn.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_SYM_TAG "/usr/local/netflow/var/sym/tag.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_SYM_IP_PROT "__PREFIX__/share/flow-tools/ip-prot.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_SYM_IP_TYPE "__PREFIX__/share/flow-tools/ip-type.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_SYM_TCP_PORT "__PREFIX__/share/flow-tools/tcp-port.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_SYM_ASN "__PREFIX__/share/flow-tools/asn.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_SYM_TAG "__PREFIX__/share/flow-tools/tag.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* FTPATHS_H */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/ftpaths.h.in.orig Tue Nov 11 08:49:14 2003
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/ftpaths.h.in Wed Jul 7 15:05:45 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,17 +29,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef FTPATHS_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FTPATHS_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_CFG_MAP "@localstatedir@/cfg/map.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_CFG_TAG "@localstatedir@/cfg/tag.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_CFG_FILTER "@localstatedir@/cfg/filter.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_CFG_STAT "@localstatedir@/cfg/stat.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_CFG_MASK "@localstatedir@/cfg/mask.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_CFG_XLATE "@localstatedir@/cfg/xlate.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_CFG_MAP "@localstatedir@/etc/flow-tools/map.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_CFG_TAG "@localstatedir@/etc/flow-tools/tag.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_CFG_FILTER "@localstatedir@/etc/flow-tools/filter.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_CFG_STAT "@localstatedir@/etc/flow-tools/stat.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_CFG_MASK "@localstatedir@/etc/flow-tools/mask.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_CFG_XLATE "@localstatedir@/etc/flow-tools/xlate.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_SYM_IP_PROT "@localstatedir@/sym/ip-prot.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_SYM_IP_TYPE "@localstatedir@/sym/ip-type.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_SYM_TCP_PORT "@localstatedir@/sym/tcp-port.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_SYM_ASN "@localstatedir@/sym/asn.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FT_PATH_SYM_TAG "@localstatedir@/sym/tag.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_SYM_IP_PROT "@localstatedir@/share/flow-tools/ip-prot.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_SYM_IP_TYPE "@localstatedir@/share/flow-tools/ip-type.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_SYM_TCP_PORT "@localstatedir@/share/flow-tools/tcp-port.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_SYM_ASN "@localstatedir@/share/flow-tools/asn.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FT_PATH_SYM_TAG "@localstatedir@/share/flow-tools/tag.sym"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* FTPATHS_H */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/patch-lib-ftfile.c b/net/flow-tools/files/patch-lib-ftfile.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0418caa..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/patch-lib-ftfile.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,100 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/ftfile.c.orig Thu Feb 13 05:38:42 2003
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/ftfile.c Fri Feb 10 10:39:40 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -311,7 +311,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int ftfile_expire (struct ftfile_entries *fte, int doit, int curbytes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- u_int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct ftfile_entry *n1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct ftfile_entry *n1, *n2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- u_int64 bytes;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -323,15 +323,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bytes = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fte->max_files && (fte->num_files > fte->max_files)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ n2 = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FT_TAILQ_FOREACH(n1, &fte->head, chain) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (n2 != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ftfile_entry_free(n2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ n2 = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fterr_info("remove/1 %s", n1->name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bytes += n1->size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ++i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (doit) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ n2 = n1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FT_TAILQ_REMOVE(&fte->head, n1, chain);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (unlink(n1->name) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fterr_warn("unlink(%s)", n1->name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ftfile_entry_free(n1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } /* doit */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((fte->num_files - i) <= fte->max_files)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -340,6 +345,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fte->num_files -= i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fte->num_bytes -= bytes;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } /* doit */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (n2 != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ftfile_entry_free(n2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ n2 = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } /* if */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (debug)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -354,15 +363,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fte->max_bytes && (fte->num_bytes+curbytes > fte->max_bytes)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ n2 = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FT_TAILQ_FOREACH(n1, &fte->head, chain) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (n2 != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ftfile_entry_free(n2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ n2 = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fterr_info("remove/2 %s", n1->name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bytes += n1->size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ++i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (doit) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ n2 = n1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FT_TAILQ_REMOVE(&fte->head, n1, chain);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (unlink(n1->name) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fterr_warn("unlink(%s)", n1->name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ftfile_entry_free(n1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } /* doit */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((fte->num_bytes+curbytes - bytes) <= fte->max_bytes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -371,6 +385,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fte->num_files -= i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fte->num_bytes -= bytes;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } /* doit */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (n2 != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ftfile_entry_free(n2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ n2 = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } /* if */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (debug)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -762,13 +780,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct ftfile_entry *n1, *n2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ n2 = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FT_TAILQ_FOREACH(n1, &fte->head, chain) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (n2 != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ftfile_entry_free(n2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ n2 = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FT_TAILQ_REMOVE(&fte->head, n1, chain);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- n2 = n1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- n1 = FT_TAILQ_NEXT(n1, chain);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (n2 != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftfile_entry_free(n2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!n1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ n2 = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } /* ftfile_free */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/patch-lib_Makefile.in b/net/flow-tools/files/patch-lib_Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 21aea46..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/patch-lib_Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Makefile.in.orig Wed Dec 20 01:38:19 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Makefile.in Wed Dec 20 01:38:25 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,7 +91,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #AM_CFLAGS=-O2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AM_CFLAGS = -g -Wall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#AM_CFLAGS = -g -Wall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFS = -I. -I$(srcdir)/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/patch-lib_ftchash.c b/net/flow-tools/files/patch-lib_ftchash.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 57ae258..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/patch-lib_ftchash.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/ftchash.c.orig Mon Oct 2 12:30:55 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/ftchash.c Mon Oct 2 12:31:29 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -326,7 +326,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = ftch->traverse_rec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)ftch->traverse_rec += ftch->d_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ftch->traverse_rec = (char *)ftch->traverse_rec + ftch->d_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/patch-lib_ftio.c b/net/flow-tools/files/patch-lib_ftio.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cfd0025..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/patch-lib_ftio.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/ftio.c.orig Mon Oct 2 12:26:19 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/ftio.c Mon Oct 2 12:27:53 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2267,7 +2267,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nleft -= nread;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)ptr += nread;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ptr = (char *)ptr + nread;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (nbytes - nleft);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } /* readn */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2292,7 +2292,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(nwritten); /* error */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nleft -= nwritten;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)ptr += nwritten;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ptr = (char *)ptr + nwritten;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(nbytes - nleft);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } /* writen */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/patch-lib_ftsym.c b/net/flow-tools/files/patch-lib_ftsym.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dc9d444..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/patch-lib_ftsym.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/ftsym.c.orig Wed Nov 8 03:51:51 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/ftsym.c Wed Nov 8 03:51:56 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,6 +35,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stddef.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if HAVE_STRINGS_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <strings.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/patch-lib_fttlv.c b/net/flow-tools/files/patch-lib_fttlv.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 03ba232..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/patch-lib_fttlv.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,100 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/fttlv.c.orig Mon Oct 2 12:27:59 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/fttlv.c Mon Oct 2 12:30:50 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,10 +68,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&t, buf, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf+= 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&len, buf, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf+= 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&v, buf, 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -107,10 +107,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&t, buf, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf+= 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&len, buf, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf+= 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&v, buf, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,10 +145,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&t, buf, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf+= 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&len, buf, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf+= 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&v, buf, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -183,10 +183,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&t, buf, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf+= 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&len, buf, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf+= 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(v, buf, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -230,16 +230,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&t, buf, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf+= 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&len, buf, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf+= 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&ip, buf, 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf += 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&ifIndex, buf, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf += 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(name, buf, n);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -287,19 +287,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&t, buf, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf+= 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&len, buf, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf+= 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&ip, buf, 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf += 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(&entries, buf, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf += 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(ifIndex_list, buf, esize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (char*)buf += esize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf = (char *)buf + esize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bcopy(name, buf, n);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/patch-lib_ftxlate.c b/net/flow-tools/files/patch-lib_ftxlate.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5922d00..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/patch-lib_ftxlate.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/ftxlate.c.orig 2005-05-12 00:03:30.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/ftxlate.c 2020-01-28 12:50:16.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2033,7 +2033,7 @@ static int cryptopan_init(struct cryptop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* init crypto */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!(cp->cipher_ctx = (EVP_CIPHER_CTX*) malloc(sizeof(EVP_CIPHER_CTX)))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!(cp->cipher_ctx = EVP_CIPHER_CTX_new())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/patch-lib_support.c b/net/flow-tools/files/patch-lib_support.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index efbe83f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/patch-lib_support.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/support.c.orig Wed Nov 8 03:50:31 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/support.c Wed Nov 8 03:51:27 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,6 +40,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <syslog.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/patch-src_Makefile.in b/net/flow-tools/files/patch-src_Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7e414cb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/patch-src_Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in.orig Wed Dec 20 01:37:38 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in Wed Dec 20 01:37:57 2006
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,7 +97,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #AM_CFLAGS=-O2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AM_CFLAGS = -g -Wall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#AM_CFLAGS = -g -Wall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin_PROGRAMS = flow-capture flow-cat flow-stat flow-print flow-dscan \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flow-send flow-receive flow-gen flow-expire \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/patch-src_flow-fanout.c b/net/flow-tools/files/patch-src_flow-fanout.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f9e6b6b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/patch-src_flow-fanout.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/flow-fanout.c.orig Tue Jun 7 22:52:16 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/flow-fanout.c Tue Jun 7 22:52:39 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -855,6 +855,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } /* if FD_ISSET */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- skip1:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (sig_quit_flag) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fterr_info("SIGQUIT");
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/pkg-deinstall.in b/net/flow-tools/files/pkg-deinstall.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 63d1cef..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/pkg-deinstall.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# $FreeBSD: ports/net-mgmt/flow-tools/files/pkg-deinstall.in,v 1.1 2006/11/08 01:06:16 stas Exp $
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PATH=/bin:/usr/sbin:/usr/bin:/usr/sbin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FLOW_CAPTURE_SPOOL="%%FLOW_CAPTURE_SPOOL%%"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FLOW_CAPTURE_USER="%%FLOW_CAPTURE_USER%%"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FLOW_CAPTURE_GROUP="%%FLOW_CAPTURE_GROUP%%"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FLOW_CAPTURE_PIDDIR="%%FLOW_CAPTURE_PIDDIR%%"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-deinstall() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmdir ${FLOW_CAPTURE_SPOOL} > /dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $? -ne 0 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "WARNING: If you will NOT use this package anymore, please"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " remove the following directory manually:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " ${FLOW_CAPTURE_SPOOL}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Also flow-tools related user accounts and groups were not"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "removed (${FLOW_CAPTURE_USER}:${FLOW_CAPTURE_GROUP})."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Do it manually, if needed."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remove pid directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -rf ${FLOW_CAPTURE_PIDDIR} > /dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-case $2 in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POST-DEINSTALL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-deinstall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-esac
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/flow-tools/files/pkg-install.in b/net/flow-tools/files/pkg-install.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 82e8ab9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/flow-tools/files/pkg-install.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,81 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# $FreeBSD: ports/net-mgmt/flow-tools/files/pkg-install.in,v 1.2 2007/04/10 19:32:35 stas Exp $
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PATH=/bin:/usr/sbin:/usr/bin:/usr/sbin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FLOW_CAPTURE_SPOOL="%%FLOW_CAPTURE_SPOOL%%"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FLOW_CAPTURE_USER="%%FLOW_CAPTURE_USER%%"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FLOW_CAPTURE_GROUP="%%FLOW_CAPTURE_GROUP%%"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FLOW_CAPTURE_UID="%%FLOW_CAPTURE_UID%%"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FLOW_CAPTURE_GID="%%FLOW_CAPTURE_GID%%"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FLOW_CAPTURE_PIDDIR="%%FLOW_CAPTURE_PIDDIR%%"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -x /usr/sbin/nologin ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NOLOGIN=/usr/sbin/nologin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NOLOGIN=/sbin/nologin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-install() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Create group
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pw groupshow ${FLOW_CAPTURE_GROUP} > /dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $? -ne 0 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo -n "Creating '${FLOW_CAPTURE_GROUP}' group... "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pw groupadd -n ${FLOW_CAPTURE_GROUP} -g ${FLOW_CAPTURE_GID} -q
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $? -eq 0 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "ok"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "failed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Cannot create group '${FLOW_CAPTURE_GROUP}'" >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Please, create it manually." >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Using existing group '${FLOW_CAPTURE_GROUP}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Create user
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pw usershow ${FLOW_CAPTURE_USER} > /dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $? -ne 0 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo -n "Creating '${FLOW_CAPTURE_USER}' user... "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pw useradd -n ${FLOW_CAPTURE_USER} -g ${FLOW_CAPTURE_GROUP} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -u ${FLOW_CAPTURE_UID} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -c "Flow-tools collector pseudo-user" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -d "/var/empty" -s "${NOLOGIN}" -h - -q
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $? -eq 0 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "ok"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "failed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Cannot create user '${FLOW_CAPTURE_USER}'" >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Please, create it manually." >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Using existing group '${FLOW_CAPTURE_USER}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-install() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /usr/bin/install -d -m 700 -o ${FLOW_CAPTURE_USER} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -g ${FLOW_CAPTURE_GROUP} ${FLOW_CAPTURE_PIDDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /usr/bin/install -d -m 1700 -o ${FLOW_CAPTURE_USER} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -g ${FLOW_CAPTURE_GROUP} ${FLOW_CAPTURE_SPOOL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-case $2 in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRE-INSTALL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POST-INSTALL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-esac
</span></pre><pre style='margin:0'>
</pre>