diff options
Diffstat (limited to 'package/snort/patches')
29 files changed, 222 insertions, 461 deletions
diff --git a/package/snort/patches/patch-configure b/package/snort/patches/patch-configure index 2f5bfde4e..3b197b010 100644 --- a/package/snort/patches/patch-configure +++ b/package/snort/patches/patch-configure @@ -1,25 +1,20 @@ ---- snort-2.8.5.2.orig/configure 2009-10-19 23:18:06.000000000 +0200 -+++ snort-2.8.5.2/configure 2010-01-14 20:16:49.000000000 +0100 -@@ -25882,81 +25882,7 @@ _ACEOF +--- snort-2.9.5.orig/configure 2013-06-04 23:21:55.000000000 +0200 ++++ snort-2.9.5/configure 2013-07-17 11:07:20.000000000 +0200 +@@ -14205,50 +14205,6 @@ _ACEOF fi -# In case INADDR_NONE is not defined (like on Solaris) -have_inaddr_none="no" --{ echo "$as_me:$LINENO: checking for INADDR_NONE" >&5 --echo $ECHO_N "checking for INADDR_NONE... $ECHO_C" >&6; } --if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INADDR_NONE" >&5 +-$as_echo_n "checking for INADDR_NONE... " >&6; } +-if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } -else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <sys/types.h> @@ -37,58 +32,108 @@ - return 0; -} -_ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then +-if ac_fn_c_try_run "$LINENO"; then : - have_inaddr_none="yes" -else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --have_inaddr_none="no" +- have_inaddr_none="no" -fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -- --{ echo "$as_me:$LINENO: result: $have_inaddr_none" >&5 --echo "${ECHO_T}$have_inaddr_none" >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_inaddr_none" >&5 +-$as_echo "$have_inaddr_none" >&6; } -if test "x$have_inaddr_none" = "xno"; then - --cat >>confdefs.h <<\_ACEOF --#define INADDR_NONE -1 +-$as_echo "#define INADDR_NONE -1" >>confdefs.h +- +-fi + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -14578,45 +14534,6 @@ if test "x$LPCAP" = "xno"; then + fi + fi + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_lex_destroy" >&5 +-$as_echo_n "checking for pcap_lex_destroy... " >&6; } +-if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include <pcap.h> +- +-int +-main () +-{ +- +- pcap_lex_destroy(); +- +- ; +- return 0; +-} -_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- have_pcap_lex_destroy="yes" +-else +- have_pcap_lex_destroy="no" +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_pcap_lex_destroy" >&5 +-$as_echo "$have_pcap_lex_destroy" >&6; } +-if test "x$have_pcap_lex_destroy" = "xyes"; then +- +-$as_echo "#define HAVE_PCAP_LEX_DESTROY 1" >>confdefs.h +- +-fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_lib_version" >&5 + $as_echo_n "checking for pcap_lib_version... " >&6; } +@@ -15432,38 +15349,7 @@ fi + done + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for daq address space ID" >&5 +-$as_echo_n "checking for daq address space ID... " >&6; } +-if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include <daq.h> - +-int +-main () +-{ +- +- DAQ_PktHdr_t hdr; +- hdr.address_space_id = 0; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- have_daq_address_space_id="yes" +-else +- have_daq_address_space_id="no" +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -+have_inaddr_none="yes" ++have_daq_address_space_id="yes" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -26580,7 +26506,7 @@ fi - # that versions < 0.9 do not accumulate packet statistics whereas >= 0.9 do accumulate. - # This is Linux only. The check is done after pcre because the code below uses pcre. - # It seems Phil Wood's pcap does not accumulate - 0.9x --pcap_version_check="yes" -+pcap_version_check="no" - if test "x$linux" = "xyes"; then - if test "x$pcap_version_check" = "xyes"; then - { echo "$as_me:$LINENO: checking for libpcap version >= 0.9" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_daq_address_space_id" >&5 + $as_echo "$have_daq_address_space_id" >&6; } diff --git a/package/snort/patches/patch-ltmain_sh b/package/snort/patches/patch-ltmain_sh deleted file mode 100644 index 09079e090..000000000 --- a/package/snort/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- snort-2.8.5.2.orig/ltmain.sh 2007-04-05 16:20:16.000000000 +0200 -+++ snort-2.8.5.2/ltmain.sh 2011-01-17 14:42:39.000000000 +0100 -@@ -1653,7 +1653,7 @@ EOF - # -pg pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ -- -t[45]*|-txscale*|@*) -+ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. diff --git a/package/snort/patches/patch-src_Makefile_in b/package/snort/patches/patch-src_Makefile_in deleted file mode 100644 index 0a7d2bba3..000000000 --- a/package/snort/patches/patch-src_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/Makefile.in 2009-10-19 23:17:59.000000000 +0200 -+++ snort-2.8.5.2/src/Makefile.in 2010-07-30 21:13:15.000000000 +0200 -@@ -181,7 +181,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_detection-plugins_Makefile_in b/package/snort/patches/patch-src_detection-plugins_Makefile_in deleted file mode 100644 index 41879362d..000000000 --- a/package/snort/patches/patch-src_detection-plugins_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/detection-plugins/Makefile.in 2009-10-19 23:17:59.000000000 +0200 -+++ snort-2.8.5.2/src/detection-plugins/Makefile.in 2010-07-30 20:38:56.000000000 +0200 -@@ -173,7 +173,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_detection-plugins_sp_ip_tos_check_c b/package/snort/patches/patch-src_detection-plugins_sp_ip_tos_check_c deleted file mode 100644 index f4462c208..000000000 --- a/package/snort/patches/patch-src_detection-plugins_sp_ip_tos_check_c +++ /dev/null @@ -1,26 +0,0 @@ ---- snort-2.8.5.2.orig/src/detection-plugins/sp_ip_tos_check.c 2009-05-07 00:28:33.000000000 +0200 -+++ snort-2.8.5.2/src/detection-plugins/sp_ip_tos_check.c 2010-01-19 19:58:18.000000000 +0100 -@@ -191,19 +191,19 @@ void ParseIpTos(char *data, OptTreeNode - ds_ptr->not_flag = 1; - } - -- if(index(data, (int) 'x') == NULL && index(data, (int)'X') == NULL) -+ if(strchr(data, (int) 'x') == NULL && strchr(data, (int)'X') == NULL) - { - ds_ptr->ip_tos = atoi(data); - } - else - { -- if(index(data,(int)'x')) -+ if(strchr(data,(int)'x')) - { -- ds_ptr->ip_tos = (u_char) strtol((index(data, (int)'x')+1), NULL, 16); -+ ds_ptr->ip_tos = (u_char) strtol((strchr(data, (int)'x')+1), NULL, 16); - } - else - { -- ds_ptr->ip_tos = (u_char) strtol((index(data, (int)'X')+1), NULL, 16); -+ ds_ptr->ip_tos = (u_char) strtol((strchr(data, (int)'X')+1), NULL, 16); - } - } - diff --git a/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c b/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c deleted file mode 100644 index ff3f016da..000000000 --- a/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c +++ /dev/null @@ -1,47 +0,0 @@ ---- snort-2.8.5.2.orig/src/detection-plugins/sp_pattern_match.c 2009-08-10 22:41:44.000000000 +0200 -+++ snort-2.8.5.2/src/detection-plugins/sp_pattern_match.c 2010-01-19 19:58:58.000000000 +0100 -@@ -831,7 +831,7 @@ void PayloadSearchListInit(char *data, O - data++; - - /* grab everything between the starting " and the end one */ -- sptr = index(data, '"'); -+ sptr = strchr(data, '"'); - eptr = strrchr(data, '"'); - - if(sptr != NULL && eptr != NULL) -@@ -862,21 +862,21 @@ static char *PayloadExtractParameter(cha - char *quote_one = NULL, *quote_two = NULL; - char *comma = NULL; - -- quote_one = index(data, '"'); -+ quote_one = strchr(data, '"'); - if (quote_one) - { -- quote_two = index(quote_one+1, '"'); -+ quote_two = strchr(quote_one+1, '"'); - while ( quote_two && quote_two[-1] == '\\' ) -- quote_two = index(quote_two+1, '"'); -+ quote_two = strchr(quote_two+1, '"'); - } - - if (quote_one && quote_two) - { -- comma = index(quote_two, ','); -+ comma = strchr(quote_two, ','); - } - else if (!quote_one) - { -- comma = index(data, ','); -+ comma = strchr(data, ','); - } - - if (comma) -@@ -2035,7 +2035,7 @@ void ParsePattern(char *rule, OptTreeNod - } - - /* find the start of the data */ -- start_ptr = index(rule, '"'); -+ start_ptr = strchr(rule, '"'); - - if(start_ptr != rule) - { diff --git a/package/snort/patches/patch-src_detection-plugins_sp_replace_c b/package/snort/patches/patch-src_detection-plugins_sp_replace_c deleted file mode 100644 index e532b2ac1..000000000 --- a/package/snort/patches/patch-src_detection-plugins_sp_replace_c +++ /dev/null @@ -1,11 +0,0 @@ ---- snort-2.8.5.2.orig/src/detection-plugins/sp_replace.c 2009-07-07 17:37:04.000000000 +0200 -+++ snort-2.8.5.2/src/detection-plugins/sp_replace.c 2010-01-19 20:21:14.000000000 +0100 -@@ -122,7 +122,7 @@ static PatternMatchData * Replace_Parse( - } - - /* find the start of the data */ -- start_ptr = index(rule, '"'); -+ start_ptr = strchr(rule, '"'); - - if(start_ptr == NULL) - { diff --git a/package/snort/patches/patch-src_detection-plugins_sp_tcp_win_check_c b/package/snort/patches/patch-src_detection-plugins_sp_tcp_win_check_c deleted file mode 100644 index c1df26aad..000000000 --- a/package/snort/patches/patch-src_detection-plugins_sp_tcp_win_check_c +++ /dev/null @@ -1,26 +0,0 @@ ---- snort-2.8.5.2.orig/src/detection-plugins/sp_tcp_win_check.c 2009-05-07 00:28:39.000000000 +0200 -+++ snort-2.8.5.2/src/detection-plugins/sp_tcp_win_check.c 2010-01-19 20:06:29.000000000 +0100 -@@ -196,19 +196,19 @@ void ParseTcpWin(char *data, OptTreeNode - ds_ptr->not_flag = 1; - } - -- if(index(data, (int) 'x') == NULL && index(data, (int)'X') == NULL) -+ if(strchr(data, (int) 'x') == NULL && strchr(data, (int)'X') == NULL) - { - win_size = atoi(data); - } - else - { -- if(index(data,(int)'x')) -+ if(strchr(data,(int)'x')) - { -- win_size = (uint16_t) strtol((index(data, (int)'x')+1), NULL, 16); -+ win_size = (uint16_t) strtol((strchr(data, (int)'x')+1), NULL, 16); - } - else - { -- win_size = (uint16_t) strtol((index(data, (int)'X')+1), NULL, 16); -+ win_size = (uint16_t) strtol((strchr(data, (int)'X')+1), NULL, 16); - } - } - diff --git a/package/snort/patches/patch-src_dynamic-examples_Makefile_in b/package/snort/patches/patch-src_dynamic-examples_Makefile_in deleted file mode 100644 index 34f1c3d65..000000000 --- a/package/snort/patches/patch-src_dynamic-examples_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/dynamic-examples/Makefile.in 2009-10-19 23:17:59.000000000 +0200 -+++ snort-2.8.5.2/src/dynamic-examples/Makefile.in 2010-07-30 21:12:51.000000000 +0200 -@@ -148,7 +148,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_dynamic-plugins_Makefile_in b/package/snort/patches/patch-src_dynamic-plugins_Makefile_in deleted file mode 100644 index 33319192a..000000000 --- a/package/snort/patches/patch-src_dynamic-plugins_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/dynamic-plugins/Makefile.in 2009-10-19 23:17:59.000000000 +0200 -+++ snort-2.8.5.2/src/dynamic-plugins/Makefile.in 2010-07-30 20:41:39.000000000 +0200 -@@ -167,7 +167,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_log_c b/package/snort/patches/patch-src_log_c deleted file mode 100644 index 5f59a4ed0..000000000 --- a/package/snort/patches/patch-src_log_c +++ /dev/null @@ -1,38 +0,0 @@ ---- snort-2.8.5.2.orig/src/log.c 2009-10-19 17:48:42.000000000 +0200 -+++ snort-2.8.5.2/src/log.c 2010-01-19 20:01:42.000000000 +0100 -@@ -916,7 +916,7 @@ void PrintArpHeader(FILE * fp, Packet * - switch(ntohs(p->ah->ea_hdr.ar_op)) - { - case ARPOP_REQUEST: -- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr)); - fprintf(fp, "ARP who-has %s", inet_ntoa(ip_addr)); - - if(memcmp((char *) ezero, (char *) p->ah->arp_tha, 6) != 0) -@@ -925,7 +925,7 @@ void PrintArpHeader(FILE * fp, Packet * - p->ah->arp_tha[1], p->ah->arp_tha[2], p->ah->arp_tha[3], - p->ah->arp_tha[4], p->ah->arp_tha[5]); - } -- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr)); - - fprintf(fp, " tell %s", inet_ntoa(ip_addr)); - -@@ -938,7 +938,7 @@ void PrintArpHeader(FILE * fp, Packet * - break; - - case ARPOP_REPLY: -- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr)); - fprintf(fp, "ARP reply %s", inet_ntoa(ip_addr)); - - /* print out the originating request if we're on a weirder -@@ -971,7 +971,7 @@ void PrintArpHeader(FILE * fp, Packet * - break; - - case ARPOP_RREPLY: -- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr)); - fprintf(fp, "RARP reply %X:%X:%X:%X:%X:%X at %s", - p->ah->arp_tha[0], p->ah->arp_tha[1], p->ah->arp_tha[2], - p->ah->arp_tha[3], p->ah->arp_tha[4], p->ah->arp_tha[5], diff --git a/package/snort/patches/patch-src_log_text_c b/package/snort/patches/patch-src_log_text_c deleted file mode 100644 index 033608f9f..000000000 --- a/package/snort/patches/patch-src_log_text_c +++ /dev/null @@ -1,38 +0,0 @@ ---- snort-2.8.5.2.orig/src/log_text.c 2009-05-07 00:28:15.000000000 +0200 -+++ snort-2.8.5.2/src/log_text.c 2010-01-19 20:00:30.000000000 +0100 -@@ -1604,7 +1604,7 @@ void LogArpHeader(TextLog* log, Packet * - switch(ntohs(p->ah->ea_hdr.ar_op)) - { - case ARPOP_REQUEST: -- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr)); - TextLog_Print(log, "ARP who-has %s", inet_ntoa(ip_addr)); - - if(memcmp((char *) ezero, (char *) p->ah->arp_tha, 6) != 0) -@@ -1613,7 +1613,7 @@ void LogArpHeader(TextLog* log, Packet * - p->ah->arp_tha[1], p->ah->arp_tha[2], p->ah->arp_tha[3], - p->ah->arp_tha[4], p->ah->arp_tha[5]); - } -- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr)); - - TextLog_Print(log, " tell %s", inet_ntoa(ip_addr)); - -@@ -1626,7 +1626,7 @@ void LogArpHeader(TextLog* log, Packet * - break; - - case ARPOP_REPLY: -- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr)); - TextLog_Print(log, "ARP reply %s", inet_ntoa(ip_addr)); - - /* print out the originating request if we're on a weirder -@@ -1659,7 +1659,7 @@ void LogArpHeader(TextLog* log, Packet * - break; - - case ARPOP_RREPLY: -- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr)); -+ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr)); - TextLog_Print(log, "RARP reply %X:%X:%X:%X:%X:%X at %s", - p->ah->arp_tha[0], p->ah->arp_tha[1], p->ah->arp_tha[2], - p->ah->arp_tha[3], p->ah->arp_tha[4], p->ah->arp_tha[5], diff --git a/package/snort/patches/patch-src_output-plugins_Makefile_in b/package/snort/patches/patch-src_output-plugins_Makefile_in deleted file mode 100644 index 1333552aa..000000000 --- a/package/snort/patches/patch-src_output-plugins_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/output-plugins/Makefile.in 2009-10-19 23:18:00.000000000 +0200 -+++ snort-2.8.5.2/src/output-plugins/Makefile.in 2010-07-30 20:37:01.000000000 +0200 -@@ -162,7 +162,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c b/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c deleted file mode 100644 index 5b07072be..000000000 --- a/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c +++ /dev/null @@ -1,28 +0,0 @@ ---- snort-2.8.5.2.orig/src/output-plugins/spo_alert_unixsock.c 2009-05-07 00:29:12.000000000 +0200 -+++ snort-2.8.5.2/src/output-plugins/spo_alert_unixsock.c 2010-01-19 20:05:44.000000000 +0100 -@@ -179,13 +179,13 @@ void AlertUnixSock(Packet *p, char *msg, - bzero((char *)&alertpkt,sizeof(alertpkt)); - if (event) - { -- bcopy((const void *)event,(void *)&alertpkt.event,sizeof(Event)); -+ memcpy((void *)&alertpkt.event,(const void *)event,sizeof(Event)); - } - - if(p && p->pkt) - { -- bcopy((const void *)p->pkth,(void *)&alertpkt.pkth,sizeof(struct pcap_pkthdr)); -- bcopy((const void *)p->pkt,alertpkt.pkt, -+ memcpy((void *)&alertpkt.pkth,(const void *)p->pkth,sizeof(struct pcap_pkthdr)); -+ memcpy(alertpkt.pkt,(const void *)p->pkt, - alertpkt.pkth.caplen > SNAPLEN? SNAPLEN : alertpkt.pkth.caplen); - } - else -@@ -193,7 +193,7 @@ void AlertUnixSock(Packet *p, char *msg, - - if (msg) - { -- bcopy((const void *)msg,(void *)alertpkt.alertmsg, -+ memcpy((void *)alertpkt.alertmsg,(const void *)msg, - strlen(msg)>ALERTMSG_LENGTH-1 ? ALERTMSG_LENGTH - 1 : strlen(msg)); - } - diff --git a/package/snort/patches/patch-src_parser_IpAddrSet_c b/package/snort/patches/patch-src_parser_IpAddrSet_c deleted file mode 100644 index edb62126d..000000000 --- a/package/snort/patches/patch-src_parser_IpAddrSet_c +++ /dev/null @@ -1,16 +0,0 @@ ---- snort-2.8.5.2.orig/src/parser/IpAddrSet.c 2009-07-07 17:37:07.000000000 +0200 -+++ snort-2.8.5.2/src/parser/IpAddrSet.c 2010-01-19 20:20:50.000000000 +0100 -@@ -388,11 +388,11 @@ int ParseIP(char *paddr, IpAddrSet *ias, - /* protecting against malicious DNS servers */ - if(host_info->h_length <= (int)sizeof(sin.sin_addr)) - { -- bcopy(host_info->h_addr, (char *) &sin.sin_addr, host_info->h_length); -+ memcpy((char *) &sin.sin_addr, host_info->h_addr, host_info->h_length); - } - else - { -- bcopy(host_info->h_addr, (char *) &sin.sin_addr, sizeof(sin.sin_addr)); -+ memcpy((char *) &sin.sin_addr, host_info->h_addr, sizeof(sin.sin_addr)); - } - } - /* Using h_errno */ diff --git a/package/snort/patches/patch-src_parser_Makefile_in b/package/snort/patches/patch-src_parser_Makefile_in deleted file mode 100644 index 759f00c7f..000000000 --- a/package/snort/patches/patch-src_parser_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/parser/Makefile.in 2009-10-19 23:18:00.000000000 +0200 -+++ snort-2.8.5.2/src/parser/Makefile.in 2010-07-30 21:10:25.000000000 +0200 -@@ -155,7 +155,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_anomaly_detection_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_anomaly_detection_Makefile_in deleted file mode 100644 index 5129950f3..000000000 --- a/package/snort/patches/patch-src_preprocessors_HttpInspect_anomaly_detection_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/HttpInspect/anomaly_detection/Makefile.in 2009-10-19 23:18:00.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/HttpInspect/anomaly_detection/Makefile.in 2010-07-30 20:53:23.000000000 +0200 -@@ -155,7 +155,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_client_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_client_Makefile_in deleted file mode 100644 index 8ac2134d6..000000000 --- a/package/snort/patches/patch-src_preprocessors_HttpInspect_client_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/HttpInspect/client/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/HttpInspect/client/Makefile.in 2010-07-30 20:59:11.000000000 +0200 -@@ -156,7 +156,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_event_output_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_event_output_Makefile_in deleted file mode 100644 index 3726d6c6f..000000000 --- a/package/snort/patches/patch-src_preprocessors_HttpInspect_event_output_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/HttpInspect/event_output/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/HttpInspect/event_output/Makefile.in 2010-07-30 20:56:45.000000000 +0200 -@@ -155,7 +155,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_mode_inspection_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_mode_inspection_Makefile_in deleted file mode 100644 index cadcd41c0..000000000 --- a/package/snort/patches/patch-src_preprocessors_HttpInspect_mode_inspection_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/HttpInspect/mode_inspection/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/HttpInspect/mode_inspection/Makefile.in 2010-07-30 20:49:58.000000000 +0200 -@@ -155,7 +155,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_normalization_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_normalization_Makefile_in deleted file mode 100644 index 932899608..000000000 --- a/package/snort/patches/patch-src_preprocessors_HttpInspect_normalization_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/HttpInspect/normalization/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/HttpInspect/normalization/Makefile.in 2010-07-30 21:01:32.000000000 +0200 -@@ -155,7 +155,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_server_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_server_Makefile_in deleted file mode 100644 index a299ae945..000000000 --- a/package/snort/patches/patch-src_preprocessors_HttpInspect_server_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/HttpInspect/server/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/HttpInspect/server/Makefile.in 2010-07-30 20:58:00.000000000 +0200 -@@ -155,7 +155,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_HttpInspect_session_inspection_Makefile_in b/package/snort/patches/patch-src_preprocessors_HttpInspect_session_inspection_Makefile_in deleted file mode 100644 index decc25e2a..000000000 --- a/package/snort/patches/patch-src_preprocessors_HttpInspect_session_inspection_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/HttpInspect/session_inspection/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/HttpInspect/session_inspection/Makefile.in 2010-07-30 20:44:26.000000000 +0200 -@@ -155,7 +155,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_Makefile_in b/package/snort/patches/patch-src_preprocessors_Makefile_in deleted file mode 100644 index 1dabe1e71..000000000 --- a/package/snort/patches/patch-src_preprocessors_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/Makefile.in 2010-07-30 21:07:39.000000000 +0200 -@@ -173,7 +173,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_preprocessors_Stream5_Makefile_in b/package/snort/patches/patch-src_preprocessors_Stream5_Makefile_in deleted file mode 100644 index a6a5a4fc1..000000000 --- a/package/snort/patches/patch-src_preprocessors_Stream5_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/preprocessors/Stream5/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/preprocessors/Stream5/Makefile.in 2010-07-30 21:04:38.000000000 +0200 -@@ -158,7 +158,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_sfutil_Makefile_in b/package/snort/patches/patch-src_sfutil_Makefile_in deleted file mode 100644 index b8b536bf2..000000000 --- a/package/snort/patches/patch-src_sfutil_Makefile_in +++ /dev/null @@ -1,10 +0,0 @@ ---- snort-2.8.5.2.orig/src/sfutil/Makefile.in 2009-10-19 23:18:01.000000000 +0200 -+++ snort-2.8.5.2/src/sfutil/Makefile.in 2010-07-30 20:34:40.000000000 +0200 -@@ -166,7 +166,6 @@ datarootdir = @datarootdir@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ --extra_incl = @extra_incl@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ diff --git a/package/snort/patches/patch-src_target-based_sf_attribute_table_parser_c b/package/snort/patches/patch-src_target-based_sf_attribute_table_parser_c new file mode 100644 index 000000000..4279b4a72 --- /dev/null +++ b/package/snort/patches/patch-src_target-based_sf_attribute_table_parser_c @@ -0,0 +1,95 @@ +--- snort-2.9.5.orig/src/target-based/sf_attribute_table_parser.c 2013-06-04 23:23:12.000000000 +0200 ++++ snort-2.9.5/src/target-based/sf_attribute_table_parser.c 2013-07-17 11:10:59.000000000 +0200 +@@ -73,7 +73,6 @@ typedef int flex_int32_t; + typedef unsigned char flex_uint8_t; + typedef unsigned short int flex_uint16_t; + typedef unsigned int flex_uint32_t; +-#endif /* ! C99 */ + + /* Limits of integral types. */ + #ifndef INT8_MIN +@@ -104,6 +103,8 @@ typedef unsigned int flex_uint32_t; + #define UINT32_MAX (4294967295U) + #endif + ++#endif /* ! C99 */ ++ + #endif /* ! FLEXINT_H */ + + #ifdef __cplusplus +@@ -160,7 +161,15 @@ typedef unsigned int flex_uint32_t; + + /* Size of default input buffer. */ + #ifndef YY_BUF_SIZE ++#ifdef __ia64__ ++/* On IA-64, the buffer size is 16k, not 8k. ++ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. ++ * Ditto for the __ia64__ case accordingly. ++ */ ++#define YY_BUF_SIZE 32768 ++#else + #define YY_BUF_SIZE 16384 ++#endif /* __ia64__ */ + #endif + + /* The state buf must be large enough to hold one state per character in the main buffer. +@@ -6264,7 +6273,7 @@ int sfat_parse(void); + /* Rules Section. + * All rules are in here prior to second "%%" seperator + */ +-#line 6268 "sf_attribute_table_parser.c" ++#line 6277 "sf_attribute_table_parser.c" + + #define INITIAL 0 + #define waiting_for_comma_prior_to_data 1 +@@ -6345,7 +6354,12 @@ static int input (void ); + + /* Amount of stuff to slurp up with each read. */ + #ifndef YY_READ_BUF_SIZE ++#ifdef __ia64__ ++/* On IA-64, the buffer size is 16k, not 8k */ ++#define YY_READ_BUF_SIZE 16384 ++#else + #define YY_READ_BUF_SIZE 8192 ++#endif /* __ia64__ */ + #endif + + /* Copy whatever the last rule matched to the standard output. */ +@@ -6364,7 +6378,7 @@ static int input (void ); + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ + { \ + int c = '*'; \ +- unsigned n; \ ++ size_t n; \ + for ( n = 0; n < max_size && \ + (c = getc( sfatin )) != EOF && c != '\n'; ++n ) \ + buf[n] = (char) c; \ +@@ -6448,7 +6462,7 @@ YY_DECL + + #line 100 "sf_attribute_table_parser.l" + +-#line 6452 "sf_attribute_table_parser.c" ++#line 6466 "sf_attribute_table_parser.c" + + if ( !(yy_init) ) + { +@@ -6842,7 +6856,7 @@ YY_RULE_SETUP + #line 186 "sf_attribute_table_parser.l" + ECHO; + YY_BREAK +-#line 6846 "sf_attribute_table_parser.c" ++#line 6860 "sf_attribute_table_parser.c" + + case YY_END_OF_BUFFER: + { +@@ -7558,8 +7572,8 @@ YY_BUFFER_STATE sfat_scan_string (yycons + + /** Setup the input buffer state to scan the given bytes. The next call to sfatlex() will + * scan from a @e copy of @a bytes. +- * @param bytes the byte buffer to scan +- * @param len the number of bytes in the buffer pointed to by @a bytes. ++ * @param yybytes the byte buffer to scan ++ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * + * @return the newly allocated buffer state object. + */ diff --git a/package/snort/patches/patch-tools_u2boat_Makefile_in b/package/snort/patches/patch-tools_u2boat_Makefile_in new file mode 100644 index 000000000..495fab6c8 --- /dev/null +++ b/package/snort/patches/patch-tools_u2boat_Makefile_in @@ -0,0 +1,11 @@ +--- snort-2.9.5.orig/tools/u2boat/Makefile.in 2013-06-04 23:21:53.000000000 +0200 ++++ snort-2.9.5/tools/u2boat/Makefile.in 2013-07-17 11:21:52.000000000 +0200 +@@ -256,7 +256,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign + u2boat_SOURCES = u2boat.c u2boat.h +-u2boat_CFLAGS = @CFLAGS@ $(AM_CFLAGS) ++#u2boat_CFLAGS = @CFLAGS@ $(AM_CFLAGS) + u2boat_LDADD = -lpcap + dist_doc_DATA = README.u2boat + all: all-am diff --git a/package/snort/patches/patch-tools_u2spewfoo_Makefile_in b/package/snort/patches/patch-tools_u2spewfoo_Makefile_in new file mode 100644 index 000000000..a8f36785d --- /dev/null +++ b/package/snort/patches/patch-tools_u2spewfoo_Makefile_in @@ -0,0 +1,11 @@ +--- snort-2.9.5.orig/tools/u2spewfoo/Makefile.in 2013-06-04 23:21:54.000000000 +0200 ++++ snort-2.9.5/tools/u2spewfoo/Makefile.in 2013-07-17 11:24:18.000000000 +0200 +@@ -226,7 +226,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign + u2spewfoo_SOURCES = u2spewfoo.c +-u2spewfoo_CFLAGS = @CFLAGS@ $(AM_CFLAGS) ++#u2spewfoo_CFLAGS = @CFLAGS@ $(AM_CFLAGS) + EXTRA_DIST = \ + u2spewfoo.dsp + |