flow-tools-shared.patch

   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
   3 @@ -2,17 +2,17 @@
   4
   5  #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
   6  #AM_CFLAGS=-O2
   7 -AM_CFLAGS=-g -Wall
   8 +AM_CFLAGS=-Wall
   9
  10  DEFS=-I. -I$(srcdir)/lib
  11
  12  include_HEADERS = ftlib.h ftqueue.h radix.h ftpaths.h ftconfig.h
  13 -lib_LIBRARIES = libft.a
  14 +lib_LTLIBRARIES = libft.la
  15
  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
  21
  22 -libft_a_LIBADD = @LIBOBJS@
  23 +libft_la_LIBADD = @LTLIBOBJS@
  24
  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
  27 @@ -7,7 +7,7 @@
  28
  29  #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
  30  #AM_CFLAGS=-O2
  31 -AM_CFLAGS=-g -Wall
  32 +AM_CFLAGS=-Wall
  33
  34  bin_PROGRAMS = flow-capture flow-cat flow-stat flow-print flow-dscan \
  35          flow-send flow-receive flow-gen flow-expire \
  36 @@ -21,108 +21,87 @@
  37  #      ./ftbuild.sh
  38
  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
  44
  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
  50
  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
  56
  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
  62
  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
  68
  69  flow_capture_SOURCES = flow-capture.c
  70 -flow_capture_LDFLAGS = -L../lib
  71 -flow_capture_LDADD =  -lft @CRYPTOLIB@
  72 +flow_capture_LDADD = ../lib/libft.la $(LIBWRAP)
  73  flow_capture_DEPENDENCIES = ftbuild.h
  74
  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
  80
  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
  86
  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
  92
  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
  98
  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
 104
 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
 110
 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
 116
 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
 122
 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
 128
 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
 134
 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
 141
 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
 147
 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
 153
 154  flow_xlate_SOURCES = flow-xlate.c
 155 -flow_xlate_LDFLAGS = -L../lib
 156 -flow_xlate_LDADD =  -lft @CRYPTOLIB@
 157 +flow_xlate_LDADD = ../lib/libft.la
 158  flow_xlate_DEPENDENCIES = ftbuild.h
 159
 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
 165
 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
 168 @@ -6,7 +6,7 @@
 169  AM_INIT_AUTOMAKE(flow-tools, 0.67)
 170  AM_CONFIG_HEADER(lib/ftconfig.h:lib/ftconfig.h.in)
 171
 172 -CFLAGS="-g -Wall"
 173 +CFLAGS="$CFLAGS -Wall"
 174
 175  dnl Checks for programs.
 176  AC_PROG_CC
 177 @@ -14,7 +14,7 @@
 178  AC_PROG_MAKE_SET
 179  AC_PROG_YACC
 180  YACC="$YACC -d"
 181 -AC_PROG_RANLIB
 182 +AC_PROG_LIBTOOL
 183  AM_PROG_LEX
 184
 185  AC_SUBST(YLIB)
 186 @@ -82,7 +82,12 @@
 187     AC_MSG_ERROR(Link with "-lz" (zlib >= 1.0.2) failed!)
 188     ;;
 189  esac
 190 -AC_CHECK_LIB(wrap,allow_severity)
 191 +LIBWRAP=""
 192 +AC_CHECK_LIB(wrap,allow_severity,[
 193 +       AC_DEFINE([HAVE_LIBWRAP],,[have libwrap])
 194 +       LIBWRAP="-lwrap"
 195 +])
 196 +AC_SUBST(LIBWRAP)
 197
 198  dnl Checks for header files.
 199  AC_HEADER_DIRENT
 200 @@ -114,8 +119,8 @@
 201  AC_FUNC_MMAP
 202  AC_FUNC_ALLOCA
 203  AC_TYPE_SIGNAL
 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
 213 @@ -90,6 +90,8 @@
 214
 215  void usage(void);
 216
 217 +int debug;
 218 +
 219  int main(argc, argv)
 220  int argc;
 221  char **argv;
 222 @@ -97,7 +99,7 @@
 223    struct ftio ftio;
 224    struct ftprof ftp;
 225    int i, format_index, set_format, ret;
 226 -  int print_header, options, debug;
 227 +  int print_header, options;
 228    char cc; /* comment character */
 229
 230    /* init fterr */
 231 --- flow-tools-0.67/src/flow-header.c.orig      2003-04-02 20:03:02.000000000 +0200
 232 +++ flow-tools-0.67/src/flow-header.c   2004-05-08 22:16:30.110451757 +0200
 233 @@ -35,11 +35,13 @@
 234
 235  void usage(void);
 236
 237 +int debug;
 238 +
 239  int main(int argc, char **argv)
 240  {
 241    struct ftio ftio;
 242    char cc; /* comment character */
 243 -  int i, debug;
 244 +  int i;
 245
 246    /* init fterr */
 247    fterr_setid(argv[0]);
 248 --- flow-tools-0.67/src/flow-import.c.orig      2003-11-11 17:53:57.000000000 +0100
 249 +++ flow-tools-0.67/src/flow-import.c   2004-05-08 22:16:54.946493773 +0200
 250 @@ -110,13 +110,14 @@
 251    #define strtoull strtoul
 252  #endif /* HAVE_LL_STRTOULL */
 253
 254 +int debug;
 255 +
 256  int main(int argc, char **argv)
 257  {
 258    struct ftio ftio;
 259    struct options opt;
 260    int i, n, format_index, ret;
 261    unsigned int v1, v2;
 262 -  int debug;
 263
 264    /* init fterr */
 265    fterr_setid(argv[0]);