1 --- flow-tools-0.67/lib/Makefile.am.orig 2003-07-28 22:25:30.000000000 +0200
2 +++ flow-tools-0.67/lib/Makefile.am 2004-05-08 21:49:34.239085364 +0200
5 #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
10 DEFS=-I. -I$(srcdir)/lib
12 include_HEADERS = ftlib.h ftqueue.h radix.h ftpaths.h ftconfig.h
13 -lib_LIBRARIES = libft.a
14 +lib_LTLIBRARIES = libft.la
16 -libft_a_SOURCES = ftio.c ftswap.c ftencode.c ftdecode.c ftprof.c bit1024.c \
17 +libft_la_SOURCES = ftio.c ftswap.c ftencode.c ftdecode.c ftprof.c bit1024.c \
18 fmt.c support.c ftfile.c fttlv.c ftmap.c ftrec.c fterr.c \
19 ftchash.c ftsym.c radix.c fttag.c ftfil.c ftstat.c getdate.c ftxfield.c\
20 ftmask.c ftvar.c ftxlate.c
22 -libft_a_LIBADD = @LIBOBJS@
23 +libft_la_LIBADD = @LTLIBOBJS@
25 --- flow-tools-0.67/src/Makefile.am.orig 2003-12-04 06:42:33.000000000 +0100
26 +++ flow-tools-0.67/src/Makefile.am 2004-05-08 21:53:13.561470532 +0200
29 #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
34 bin_PROGRAMS = flow-capture flow-cat flow-stat flow-print flow-dscan \
35 flow-send flow-receive flow-gen flow-expire \
39 flow_mask_SOURCES = flow-mask.c ftbuild.h
40 -flow_mask_LDFLAGS = -L../lib
41 -flow_mask_LDADD = -lft
42 +flow_mask_LDADD = ../lib/libft.la
43 flow_mask_DEPENDENCIES = ftbuild.h
45 flow_report_SOURCES = flow-report.c ftbuild.h
46 -flow_report_LDFLAGS = -L../lib
47 -flow_report_LDADD = -lft
48 +flow_report_LDADD = ../lib/libft.la
49 flow_report_DEPENDENCIES = ftbuild.h
51 flow_nfilter_SOURCES = flow-nfilter.c ftbuild.h
52 -flow_nfilter_LDFLAGS = -L../lib
53 -flow_nfilter_LDADD = -lft
54 +flow_nfilter_LDADD = ../lib/libft.la
55 flow_nfilter_DEPENDENCIES = ftbuild.h
57 flow_import_SOURCES = flow-import.c ftbuild.h
58 -flow_import_LDFLAGS = -L../lib
59 -flow_import_LDADD = -lft
60 +flow_import_LDADD = ../lib/libft.la
61 flow_import_DEPENDENCIES = ftbuild.h
63 flow_merge_SOURCES = flow-merge.c
64 -flow_merge_LDFLAGS = -L../lib
65 -flow_merge_LDADD = -lft
66 +flow_merge_LDADD = ../lib/libft.la
67 flow_merge_DEPENDENCIES = ftbuild.h
69 flow_capture_SOURCES = flow-capture.c
70 -flow_capture_LDFLAGS = -L../lib
71 -flow_capture_LDADD = -lft
72 +flow_capture_LDADD = ../lib/libft.la $(LIBWRAP)
73 flow_capture_DEPENDENCIES = ftbuild.h
75 flow_cat_SOURCES = flow-cat.c
76 -flow_cat_LDFLAGS = -L../lib
77 -flow_cat_LDADD = -lft
78 +flow_cat_LDADD = ../lib/libft.la
79 flow_cat_DEPENDENCIES = ftbuild.h
81 flow_stat_SOURCES = flow-stat.c
82 -flow_stat_LDFLAGS = -L../lib
83 -flow_stat_LDADD = -lft
84 +flow_stat_LDADD = ../lib/libft.la
85 flow_stat_DEPENDENCIES = ftbuild.h
87 flow_print_SOURCES = flow-print.c
88 -flow_print_LDFLAGS = -L../lib
89 -flow_print_LDADD = -lft
90 +flow_print_LDADD = ../lib/libft.la
91 flow_print_DEPENDENCIES = ftbuild.h
93 flow_dscan_SOURCES = flow-dscan.c
94 -flow_dscan_LDFLAGS = -L../lib
95 -flow_dscan_LDADD = -lft
96 +flow_dscan_LDADD = ../lib/libft.la
97 flow_dscan_DEPENDENCIES = ftbuild.h
99 flow_fanout_SOURCES = flow-fanout.c
100 -flow_fanout_LDFLAGS = -L../lib
101 -flow_fanout_LDADD = -lft
102 +flow_fanout_LDADD = ../lib/libft.la
103 flow_fanout_DEPENDENCIES = ftbuild.h
105 flow_send_SOURCES = flow-send.c
106 -flow_send_LDFLAGS = -L../lib
107 -flow_send_LDADD = -lft
108 +flow_send_LDADD = ../lib/libft.la
109 flow_send_DEPENDENCIES = ftbuild.h
111 flow_receive_SOURCES = flow-receive.c
112 -flow_receive_LDFLAGS = -L../lib
113 -flow_receive_LDADD = -lft
114 +flow_receive_LDADD = ../lib/libft.la
115 flow_receive_DEPENDENCIES = ftbuild.h
117 flow_gen_SOURCES = flow-gen.c
118 -flow_gen_LDFLAGS = -L../lib
119 -flow_gen_LDADD = -lft
120 +flow_gen_LDADD = ../lib/libft.la
121 flow_gen_DEPENDENCIES = ftbuild.h
123 flow_expire_SOURCES = flow-expire.c
124 -flow_expire_LDFLAGS = -L../lib
125 -flow_expire_LDADD = -lft
126 +flow_expire_LDADD = ../lib/libft.la
127 flow_expire_DEPENDENCIES = ftbuild.h
129 flow_filter_SOURCES = flow-filter.c aclyacc.y acllex.l acl2.c
130 -flow_filter_LDFLAGS = -L../lib
131 -flow_filter_LDADD = -lft @LEXLIB@ @YLIB@
132 +flow_filter_LDADD = ../lib/libft.la @LEXLIB@ @YLIB@
133 flow_filter_DEPENDENCIES = ftbuild.h
135 flow_export_SOURCES = flow-export.c
136 -flow_export_LDFLAGS = -L../lib
137 flow_export_CFLAGS = @MYSQLCFLAGS@ @PGSQLCFLAGS@
138 -flow_export_LDADD = -lft @MYSQLLIB@ @PGSQLLIB@
139 +flow_export_LDADD = ../lib/libft.la @MYSQLLIB@ @PGSQLLIB@
140 flow_export_DEPENDENCIES = ftbuild.h
142 flow_header_SOURCES = flow-header.c
143 -flow_header_LDFLAGS = -L../lib
144 -flow_header_LDADD = -lft
145 +flow_header_LDADD = ../lib/libft.la
146 flow_header_DEPENDENCIES = ftbuild.h
148 flow_split_SOURCES = flow-split.c
149 -flow_split_LDFLAGS = -L../lib
150 -flow_split_LDADD = -lft
151 +flow_split_LDADD = ../lib/libft.la
152 flow_split_DEPENDENCIES = ftbuild.h
154 flow_xlate_SOURCES = flow-xlate.c
155 -flow_xlate_LDFLAGS = -L../lib
156 -flow_xlate_LDADD = -lft
157 +flow_xlate_LDADD = ../lib/libft.la
158 flow_xlate_DEPENDENCIES = ftbuild.h
160 flow_tag_SOURCES = flow-tag.c
161 -flow_tag_LDFLAGS = -L../lib
162 -flow_tag_LDADD = -lft
163 +flow_tag_LDADD = ../lib/libft.la
164 flow_tag_DEPENDENCIES = ftbuild.h
166 --- flow-tools-0.67/configure.in.orig 2003-12-04 07:18:15.000000000 +0100
167 +++ flow-tools-0.67/configure.in 2004-05-08 21:54:57.247598155 +0200
169 AM_INIT_AUTOMAKE(flow-tools, 0.67)
170 AM_CONFIG_HEADER(lib/ftconfig.h:lib/ftconfig.h.in)
173 +CFLAGS="$CFLAGS -Wall"
175 dnl Checks for programs.
187 AC_MSG_ERROR(Link with "-lz" (zlib >= 1.0.2) failed!)
190 -AC_CHECK_LIB(wrap,allow_severity)
192 +AC_CHECK_LIB(wrap,allow_severity,[
193 + AC_DEFINE([HAVE_LIBWRAP],,[have libwrap])
198 dnl Checks for header files.
204 -AC_CHECK_LIB(nsl,gethostbyname)
205 -AC_CHECK_LIB(socket,socket)
206 +AC_SEARCH_LIBS(gethostbyname,nsl)
207 +AC_SEARCH_LIBS(socket,socket)
208 AC_CHECK_FUNCS(gethostname gettimeofday select socket strdup strtoul)
209 AC_CHECK_FUNCS(timelocal)
210 AC_CHECK_FUNCS(sigaction)
211 --- flow-tools-0.67/src/flow-print.c.orig 2003-04-02 20:03:02.000000000 +0200
212 +++ flow-tools-0.67/src/flow-print.c 2004-05-08 22:15:17.825792214 +0200
225 int i, format_index, set_format, ret;
226 - int print_header, options, debug;
227 + int print_header, options;
228 char cc; /* comment character */
231 --- flow-tools-0.67/src/flow-export.c.orig 2003-12-04 06:55:31.000000000 +0100
232 +++ flow-tools-0.67/src/flow-export.c 2004-05-08 22:16:01.125405034 +0200
233 @@ -115,13 +115,14 @@
234 struct jump format[] = {{format0}, {format1}, {format2}, {format3},
235 {format4}, {format5}};
239 int main(int argc, char **argv)
241 int i, format_index, ret, ascii_mask;
248 fterr_setid(argv[0]);
249 --- flow-tools-0.67/src/flow-header.c.orig 2003-04-02 20:03:02.000000000 +0200
250 +++ flow-tools-0.67/src/flow-header.c 2004-05-08 22:16:30.110451757 +0200
257 int main(int argc, char **argv)
260 char cc; /* comment character */
265 fterr_setid(argv[0]);
266 --- flow-tools-0.67/src/flow-import.c.orig 2003-11-11 17:53:57.000000000 +0100
267 +++ flow-tools-0.67/src/flow-import.c 2004-05-08 22:16:54.946493773 +0200
268 @@ -110,13 +110,14 @@
269 #define strtoull strtoul
270 #endif /* HAVE_LL_STRTOULL */
274 int main(int argc, char **argv)
278 int i, n, format_index, ret;
283 fterr_setid(argv[0]);