net/snort/patches/001-compile.patch

   1 --- a/configure.in
   2 +++ b/configure.in
   3 @@ -282,21 +282,7 @@ AC_CHECK_TYPES([int8_t,int16_t,int32_t,i
   4  AC_CHECK_TYPES([boolean])
   5
   6  # In case INADDR_NONE is not defined (like on Solaris)
   7 -have_inaddr_none="no"
   8 -AC_MSG_CHECKING([for INADDR_NONE])
   9 -AC_RUN_IFELSE(
  10 -[AC_LANG_PROGRAM(
  11 -[[
  12 -#include <sys/types.h>
  13 -#include <netinet/in.h>
  14 -#include <arpa/inet.h>
  15 -]],
  16 -[[
  17 -       if (inet_addr("10,5,2") == INADDR_NONE);
  18 -    return 0;
  19 -]])],
  20 -[have_inaddr_none="yes"],
  21 -[have_inaddr_none="no"])
  22 +have_inaddr_none="yes"
  23  AC_MSG_RESULT($have_inaddr_none)
  24  if test "x$have_inaddr_none" = "xno"; then
  25         AC_DEFINE([INADDR_NONE],[-1],[For INADDR_NONE definition])
  26 @@ -428,17 +414,7 @@ if test "x$LPCAP" = "xno"; then
  27    fi
  28  fi
  29
  30 -AC_MSG_CHECKING([for pcap_lex_destroy])
  31 -AC_RUN_IFELSE(
  32 -[AC_LANG_PROGRAM(
  33 -[[
  34 -#include <pcap.h>
  35 -]],
  36 -[[
  37 -   pcap_lex_destroy();
  38 -]])],
  39 -[have_pcap_lex_destroy="yes"],
  40 -[have_pcap_lex_destroy="no"])
  41 +have_pcap_lex_destroy="yes"
  42  AC_MSG_RESULT($have_pcap_lex_destroy)
  43  if test "x$have_pcap_lex_destroy" = "xyes"; then
  44      AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex buffer stack created by pcap bpf filter])
  45 @@ -716,18 +692,7 @@ fi
  46
  47  AC_CHECK_FUNCS([daq_hup_apply] [daq_acquire_with_meta] [daq_dp_add_dc])
  48
  49 -AC_MSG_CHECKING([for daq real addresses])
  50 -AC_RUN_IFELSE(
  51 -[AC_LANG_PROGRAM(
  52 -[[
  53 -#include <daq.h>
  54 -]],
  55 -[[
  56 -   DAQ_PktHdr_t hdr;
  57 -   hdr.n_real_dPort = 0;
  58 -]])],
  59 -[have_daq_real_addresses="yes"],
  60 -[have_daq_real_addresses="no"])
  61 +have_daq_address_space_id="yes"
  62  AC_MSG_RESULT($have_daq_real_addresses)
  63  if test "x$have_daq_real_addresses" = "xyes"; then
  64      AC_DEFINE([HAVE_DAQ_REAL_ADDRESSES],[1],
  65 @@ -770,56 +735,21 @@ if test "x$ac_cv_func_daq_dp_add_dc" = "
  66
  67  fi
  68
  69 -AC_MSG_CHECKING([for daq address space ID])
  70 -AC_RUN_IFELSE(
  71 -[AC_LANG_PROGRAM(
  72 -[[
  73 -#include <daq.h>
  74 -]],
  75 -[[
  76 -   DAQ_PktHdr_t hdr;
  77 -   hdr.address_space_id = 0;
  78 -]])],
  79 -[have_daq_address_space_id="yes"],
  80 -[have_daq_address_space_id="no"])
  81 +have_daq_address_space_id="yes"
  82  AC_MSG_RESULT($have_daq_address_space_id)
  83  if test "x$have_daq_address_space_id" = "xyes"; then
  84      AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1],
  85          [DAQ version supports address space ID in header.])
  86  fi
  87
  88 -AC_MSG_CHECKING([for daq flow ID])
  89 -AC_RUN_IFELSE(
  90 -[AC_LANG_PROGRAM(
  91 -[[
  92 -#include <daq.h>
  93 -]],
  94 -[[
  95 -   DAQ_PktHdr_t hdr;
  96 -   hdr.flow_id = 0;
  97 -]])],
  98 -[have_daq_flow_id="yes"],
  99 -[have_daq_flow_id="no"])
 100 +have_daq_flow_id="yes"
 101  AC_MSG_RESULT($have_daq_flow_id)
 102  if test "x$have_daq_flow_id" = "xyes"; then
 103      AC_DEFINE([HAVE_DAQ_FLOW_ID],[1],
 104          [DAQ version supports flow ID in header.])
 105  fi
 106
 107 -AC_MSG_CHECKING([for daq extended flow modifiers])
 108 -AC_RUN_IFELSE(
 109 -[AC_LANG_PROGRAM(
 110 -[[
 111 -#include <daq.h>
 112 -]],
 113 -[[
 114 -   DAQ_ModFlow_t mod;
 115 -   mod.type = 0;
 116 -   mod.length = 0;
 117 -   mod.value = NULL;
 118 -]])],
 119 -[have_daq_ext_modflow="yes"],
 120 -[have_daq_ext_modflow="no"])
 121 +have_daq_ext_modflow="yes"
 122  AC_MSG_RESULT($have_daq_ext_modflow)
 123  if test "x$have_daq_ext_modflow" = "xyes"; then
 124      CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_EXT_MODFLOW"
 125 @@ -827,20 +757,7 @@ if test "x$have_daq_ext_modflow" = "xyes
 126          [DAQ version supports extended flow modifiers.])
 127  fi
 128
 129 -AC_MSG_CHECKING([for daq query flow])
 130 -AC_RUN_IFELSE(
 131 -[AC_LANG_PROGRAM(
 132 -[[
 133 -#include <daq.h>
 134 -]],
 135 -[[
 136 -   DAQ_QueryFlow_t mod;
 137 -   mod.type = 0;
 138 -   mod.length = 0;
 139 -   mod.value = NULL;
 140 -]])],
 141 -[have_daq_queryflow="yes"],
 142 -[have_daq_queryflow="no"])
 143 +have_daq_queryflow="no"
 144  AC_MSG_RESULT($have_daq_queryflow)
 145  if test "x$have_daq_queryflow" = "xyes"; then
 146      CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_QUERYFLOW"
 147 @@ -848,17 +765,7 @@ if test "x$have_daq_queryflow" = "xyes";
 148          [DAQ version supports query flow.])
 149  fi
 150
 151 -AC_MSG_CHECKING([for daq data channel flags])
 152 -AC_RUN_IFELSE(
 153 -[AC_LANG_PROGRAM(
 154 -[[
 155 -#include <daq.h>
 156 -]],
 157 -[[
 158 -   DAQ_Data_Channel_Params_t params;
 159 -]])],
 160 -[have_daq_data_channel_flags="yes"],
 161 -[have_daq_data_channel_flags="no"])
 162 +have_daq_data_channel_flags="yes"
 163  AC_MSG_RESULT($have_daq_data_channel_flags)
 164  if test "x$have_daq_data_channel_flags" = "xyes"; then
 165      CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_DATA_CHANNEL_PARAMS"
 166 @@ -866,18 +773,7 @@ if test "x$have_daq_data_channel_flags"
 167          [DAQ version supports data channel.])
 168  fi
 169
 170 -AC_MSG_CHECKING([for separate IP versions on pinhole endpoints])
 171 -AC_RUN_IFELSE(
 172 -[AC_LANG_PROGRAM(
 173 -[[
 174 -#include <daq.h>
 175 -]],
 176 -[[
 177 -   DAQ_DP_key_t dpKey;
 178 -   dpKey.src_af = 0;
 179 -]])],
 180 -[have_daq_data_channel_separate_ip_versions="yes"],
 181 -[have_daq_data_channel_separate_ip_versions="no"])
 182 +have_daq_data_channel_separate_ip_versions="yes"
 183  AC_MSG_RESULT($have_daq_data_channel_separate_ip_versions)
 184  if test "x$have_daq_data_channel_separate_ip_versions" = "xyes"; then
 185      CCONFIGFLAGS="${CCONFIGFLAGS} -DHAVE_DAQ_DATA_CHANNEL_SEPARATE_IP_VERSIONS"
 186 @@ -886,35 +782,14 @@ if test "x$have_daq_data_channel_separat
 187  fi
 188
 189  AC_MSG_CHECKING([for DAQ_VERDICT_RETRY])
 190 -AC_RUN_IFELSE(
 191 -[AC_LANG_PROGRAM(
 192 -[[
 193 -#include <daq.h>
 194 -]],
 195 -[[
 196 -   DAQ_Verdict verdict;
 197 -   verdict = DAQ_VERDICT_RETRY;
 198 -]])],
 199 -[have_daq_verdict_retry="yes"],
 200 -[have_daq_verdict_retry="no"])
 201 +have_daq_verdict_retry="yes"
 202  AC_MSG_RESULT($have_daq_verdict_retry)
 203  if test "x$have_daq_verdict_retry" = "xyes"; then
 204      AC_DEFINE([HAVE_DAQ_VERDICT_RETRY],[1],
 205          [DAQ version supports DAQ_VERDICT_RETRY in DAQ_Verdict.])
 206  fi
 207
 208 -AC_MSG_CHECKING([for daq packet trace])
 209 -AC_RUN_IFELSE(
 210 -[AC_LANG_PROGRAM(
 211 -[[
 212 -#include <daq.h>
 213 -]],
 214 -[[
 215 -   DAQ_PktHdr_t hdr;
 216 -   hdr.flags = DAQ_PKT_FLAG_TRACE_ENABLED;
 217 -]])],
 218 -[have_daq_packet_trace="yes"],
 219 -[have_daq_packet_trace="no"])
 220 +have_daq_packet_trace="no"
 221  AC_MSG_RESULT($have_daq_packet_trace)
 222  if test "x$have_daq_packet_trace" = "xyes"; then
 223      AC_DEFINE([HAVE_DAQ_PKT_TRACE],[1],
 224 @@ -923,18 +798,7 @@ else
 225      echo "DAQ version doesn't support packet trace."
 226  fi
 227
 228 -AC_MSG_CHECKING([for daq verdict reason])
 229 -AC_RUN_IFELSE(
 230 -[AC_LANG_PROGRAM(
 231 -[[
 232 -#include <daq.h>
 233 -]],
 234 -[[
 235 -   DAQ_ModFlow_t fl;
 236 -   fl.type = DAQ_MODFLOW_TYPE_VER_REASON;
 237 -]])],
 238 -[have_daq_verdict_reason="yes"],
 239 -[have_daq_verdict_reason="no"])
 240 +have_daq_verdict_reason="no"
 241  AC_MSG_RESULT($have_daq_verdict_reason)
 242  if test "x$have_daq_verdict_reason" = "xyes"; then
 243      AC_DEFINE([HAVE_DAQ_VERDICT_REASON],[1],