Merge branch 'master' of git+ssh://openadk.org/git/openadk

22 files changed, 45 insertions, 502 deletions

diff --git a/package/snort/Makefile b/package/snort/Makefile
index 64dab93e8..6d1f9c134 100644
--- a/package/snort/Makefile
+++ b/package/snort/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		snort
-PKG_VERSION:=		2.8.5.1
+PKG_VERSION:=		2.8.5.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b1abf3a9fa3486720c9a2b5eff920417
+PKG_MD5SUM:=		e6a8bc5aa1ebe4d2100533d7709c4a9e
 PKG_DESCR:=		a flexible Network Intrusion Detection System (NIDS)
 PKG_SECTION:=		net
 PKG_NOPARALLEL:=	1
diff --git a/package/snort/patches/patch-configure b/package/snort/patches/patch-configure
index ddf3d5bba..2f5bfde4e 100644
--- a/package/snort/patches/patch-configure
+++ b/package/snort/patches/patch-configure
@@ -1,13 +1,13 @@
---- snort-2.8.5.1.orig/configure	2009-10-19 23:08:11.000000000 +0200
-+++ snort-2.8.5.1/configure	2009-12-27 15:59:57.000000000 +0100
-@@ -24242,70 +24242,7 @@ _ACEOF
+--- 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
  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
+-{ 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
@@ -38,13 +38,22 @@
 -}
 -_ACEOF
 -rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
+-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'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (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
@@ -57,10 +66,12 @@
 -( exit $ac_status )
 -have_inaddr_none="no"
 -fi
--rm -f core *.core 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.$ac_ext
 -fi
--echo "$as_me:$LINENO: result: $have_inaddr_none" >&5
--echo "${ECHO_T}$have_inaddr_none" >&6
+-
+-
+-{ echo "$as_me:$LINENO: result: $have_inaddr_none" >&5
+-echo "${ECHO_T}$have_inaddr_none" >&6; }
 -if test "x$have_inaddr_none" = "xno"; then
 -
 -cat >>confdefs.h <<\_ACEOF
@@ -72,7 +83,7 @@
  
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -24959,7 +24896,7 @@ fi
+@@ -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
@@ -80,4 +91,4 @@
 +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
+         { echo "$as_me:$LINENO: checking for libpcap version >= 0.9" >&5
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
index 3f755d349..f4462c208 100644
--- 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
@@ -1,5 +1,5 @@
---- snort-2.8.5.1.orig/src/detection-plugins/sp_ip_tos_check.c	2009-05-07 00:28:33.000000000 +0200
-+++ snort-2.8.5.1/src/detection-plugins/sp_ip_tos_check.c	2009-12-27 16:51:48.000000000 +0100
+--- 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;
      }
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
index 6c03a3417..ff3f016da 100644
--- a/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c
+++ b/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c
@@ -1,5 +1,5 @@
---- snort-2.8.5.1.orig/src/detection-plugins/sp_pattern_match.c	2009-08-10 22:41:44.000000000 +0200
-+++ snort-2.8.5.1/src/detection-plugins/sp_pattern_match.c	2009-12-27 17:24:45.000000000 +0100
+--- 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++;
  
@@ -36,15 +36,6 @@
      }
  
      if (comma)
-@@ -2016,7 +2016,7 @@ void ParsePattern(char *rule, OptTreeNod
-     PatternMatchData *ds_idx;
- 
-     /* clear out the temp buffer */
--    bzero(tmp_buf, MAX_PATTERN_SIZE);
-+    memset(tmp_buf, 0, MAX_PATTERN_SIZE);
- 
-     if(rule == NULL)
-     {
 @@ -2035,7 +2035,7 @@ void ParsePattern(char *rule, OptTreeNod
      }
  
@@ -54,32 +45,3 @@
  
      if(start_ptr != rule)
      {
-@@ -2089,7 +2089,7 @@ void ParsePattern(char *rule, OptTreeNod
-     dummy_end = (dummy_idx + size);
- 
-     /* why is this buffer so small? */
--    bzero(hex_buf, 3);
-+    memset(hex_buf, 0, 3);
-     memset(hex_buf, '0', 2);
- 
-     /* BEGIN BAD JUJU..... */
-@@ -2204,7 +2204,7 @@ void ParsePattern(char *rule, OptTreeNod
-                                     strtol(hex_buf, (char **) NULL, 16)&0xFF;
- 
-                                 dummy_size++;
--                                bzero(hex_buf, 3);
-+                                memset(hex_buf, 0, 3);
-                                 memset(hex_buf, '0', 2);
-                             }
-                             else
-@@ -2759,8 +2759,8 @@ static void ParseContentListFile(char *f
-     }
- 
-     /* clear the line and rule buffers */
--    bzero((char *) buf, STD_BUF);
--    bzero((char *) rule_buf, STD_BUF);
-+    memset((char *) buf, 0, STD_BUF);
-+    memset((char *) rule_buf, 0, STD_BUF);
-     frazes_count = 0;
- 
-     /* loop thru each list_file line and content to the 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
index ebf2f0375..e532b2ac1 100644
--- a/package/snort/patches/patch-src_detection-plugins_sp_replace_c
+++ b/package/snort/patches/patch-src_detection-plugins_sp_replace_c
@@ -1,14 +1,5 @@
---- snort-2.8.5.1.orig/src/detection-plugins/sp_replace.c	2009-07-07 17:37:04.000000000 +0200
-+++ snort-2.8.5.1/src/detection-plugins/sp_replace.c	2009-12-27 17:23:47.000000000 +0100
-@@ -111,7 +111,7 @@ static PatternMatchData * Replace_Parse(
-             file_name, file_line);
-     }
-     /* clear out the temp buffer */
--    bzero(tmp_buf, MAX_PATTERN_SIZE);
-+    memset(tmp_buf, 0, MAX_PATTERN_SIZE);
- 
-     while(isspace((int)*rule))
-         rule++;
+--- 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(
      }
  
@@ -18,21 +9,3 @@
  
      if(start_ptr == NULL)
      {
-@@ -163,7 +163,7 @@ static PatternMatchData * Replace_Parse(
-     dummy_end = (dummy_idx + size);
- 
-     /* why is this buffer so small? */
--    bzero(hex_buf, 3);
-+    memset(hex_buf, 0, 3);
-     memset(hex_buf, '0', 2);
- 
-     /* BEGIN BAD JUJU..... */
-@@ -269,7 +269,7 @@ static PatternMatchData * Replace_Parse(
-                                     strtol(hex_buf, (char **) NULL, 16)&0xFF;
- 
-                                 dummy_size++;
--                                bzero(hex_buf, 3);
-+                                memset(hex_buf, 0, 3);
-                                 memset(hex_buf, '0', 2);
-                             }
-                             else
diff --git a/package/snort/patches/patch-src_detection-plugins_sp_session_c b/package/snort/patches/patch-src_detection-plugins_sp_session_c
deleted file mode 100644
index 8f874f5ac..000000000
--- a/package/snort/patches/patch-src_detection-plugins_sp_session_c
+++ /dev/null
@@ -1,13 +0,0 @@
---- snort-2.8.5.1.orig/src/detection-plugins/sp_session.c	2009-08-10 22:41:45.000000000 +0200
-+++ snort-2.8.5.1/src/detection-plugins/sp_session.c	2009-12-27 17:24:07.000000000 +0100
-@@ -378,8 +378,8 @@ FILE *OpenSessionFile(Packet *p)
-         return NULL;
-     }
- 
--    bzero((char *)session_file, STD_BUF);
--    bzero((char *)log_path, STD_BUF);
-+    memset((char *)session_file, 0, STD_BUF);
-+    memset((char *)log_path, 0, STD_BUF);
- 
-     /* figure out which way this packet is headed in relation to the homenet */
- #ifdef SUP_IP6
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
index 6433539c7..c1df26aad 100644
--- 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
@@ -1,5 +1,5 @@
---- snort-2.8.5.1.orig/src/detection-plugins/sp_tcp_win_check.c	2009-05-07 00:28:39.000000000 +0200
-+++ snort-2.8.5.1/src/detection-plugins/sp_tcp_win_check.c	2009-12-27 16:11:37.000000000 +0100
+--- 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;
      }
diff --git a/package/snort/patches/patch-src_dynamic-preprocessors_dns_spp_dns_c b/package/snort/patches/patch-src_dynamic-preprocessors_dns_spp_dns_c
deleted file mode 100644
index c8584410b..000000000
--- a/package/snort/patches/patch-src_dynamic-preprocessors_dns_spp_dns_c
+++ /dev/null
@@ -1,47 +0,0 @@
---- snort-2.8.5.1.orig/src/dynamic-preprocessors/dns/spp_dns.c	2009-10-02 22:29:57.000000000 +0200
-+++ snort-2.8.5.1/src/dynamic-preprocessors/dns/spp_dns.c	2009-12-27 17:17:22.000000000 +0100
-@@ -749,7 +749,7 @@ static uint16_t ParseDNSQuestion(const u
-         if (dnsSessionData->curr_txt.name_state == DNS_RESP_STATE_NAME_COMPLETE)
-         {
-             dnsSessionData->curr_rec_state = DNS_RESP_STATE_Q_TYPE;
--            bzero(&dnsSessionData->curr_txt, sizeof(DNSNameState));
-+            memset(&dnsSessionData->curr_txt, 0, sizeof(DNSNameState));
-             data = data + bytes_used;
-             bytes_unused = new_bytes_unused;
- 
-@@ -837,7 +837,7 @@ uint16_t ParseDNSAnswer(const unsigned c
-         if (dnsSessionData->curr_txt.name_state == DNS_RESP_STATE_NAME_COMPLETE)
-         {
-             dnsSessionData->curr_rec_state = DNS_RESP_STATE_RR_TYPE;
--            bzero(&dnsSessionData->curr_txt, sizeof(DNSNameState));
-+            memset(&dnsSessionData->curr_txt, 0, sizeof(DNSNameState));
-             data = data + bytes_used;
-         }
-         bytes_unused = new_bytes_unused;
-@@ -1272,7 +1272,7 @@ void ParseDNSResponseMessage(SFSnortPack
-                         if (dnsSessionData->curr_rr.type == DNS_RR_TYPE_TXT)
-                         {
-                             /* Reset the state tracking for this record */
--                            bzero(&dnsSessionData->curr_txt, sizeof(DNSNameState));
-+                            memset(&dnsSessionData->curr_txt, 0, sizeof(DNSNameState));
-                         }
-                         data = p->payload + (p->payload_size - bytes_unused);
-                     }
-@@ -1328,7 +1328,7 @@ void ParseDNSResponseMessage(SFSnortPack
-                         if (dnsSessionData->curr_rr.type == DNS_RR_TYPE_TXT)
-                         {
-                             /* Reset the state tracking for this record */
--                            bzero(&dnsSessionData->curr_txt, sizeof(DNSNameState));
-+                            memset(&dnsSessionData->curr_txt, 0, sizeof(DNSNameState));
-                         }
-                         data = p->payload + (p->payload_size - bytes_unused);
-                     }
-@@ -1384,7 +1384,7 @@ void ParseDNSResponseMessage(SFSnortPack
-                         if (dnsSessionData->curr_rr.type == DNS_RR_TYPE_TXT)
-                         {
-                             /* Reset the state tracking for this record */
--                            bzero(&dnsSessionData->curr_txt, sizeof(DNSNameState));
-+                            memset(&dnsSessionData->curr_txt, 0, sizeof(DNSNameState));
-                         }
-                         data = p->payload + (p->payload_size - bytes_unused);
-                     }
diff --git a/package/snort/patches/patch-src_inline_c b/package/snort/patches/patch-src_inline_c
deleted file mode 100644
index 64c7a226f..000000000
--- a/package/snort/patches/patch-src_inline_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- snort-2.8.5.1.orig/src/inline.c	2009-07-07 17:37:01.000000000 +0200
-+++ snort-2.8.5.1/src/inline.c	2009-12-27 17:20:43.000000000 +0100
-@@ -335,7 +335,7 @@ void IpfwLoop(void)
-     }
- 
-     /* Fill in necessary fields */
--    bzero(&sin, sizeof(sin));
-+    memset(&sin, 0, sizeof(sin));
-     sin.sin_family = PF_INET;
-     sin.sin_addr.s_addr = INADDR_ANY;
-     sin.sin_port = htons(ScDivertPort());
diff --git a/package/snort/patches/patch-src_log_c b/package/snort/patches/patch-src_log_c
index 456b6a033..5f59a4ed0 100644
--- a/package/snort/patches/patch-src_log_c
+++ b/package/snort/patches/patch-src_log_c
@@ -1,25 +1,5 @@
---- snort-2.8.5.1.orig/src/log.c	2009-10-19 17:48:42.000000000 +0200
-+++ snort-2.8.5.1/src/log.c	2009-12-27 17:19:26.000000000 +0100
-@@ -362,7 +362,7 @@ void PrintIPPkt(FILE * fp, int type, Pac
- 
-     DEBUG_WRAP(DebugMessage(DEBUG_LOG, "PrintIPPkt type = %d\n", type););
- 
--    bzero((char *) timestamp, TIMEBUF_SIZE);
-+    memset((char *) timestamp, 0, TIMEBUF_SIZE);
-     ts_print((struct timeval *) & p->pkth->ts, timestamp);
- 
-     /* dump the timestamp */
-@@ -863,8 +863,8 @@ void PrintArpHeader(FILE * fp, Packet * 
-     const uint8_t *mac_src = NULL;
-     const uint8_t *mac_dst = NULL;
- 
--    bzero((struct in_addr *) &ip_addr, sizeof(struct in_addr));
--    bzero((char *) timestamp, TIMEBUF_SIZE);
-+    memset((struct in_addr *) &ip_addr, 0, sizeof(struct in_addr));
-+    memset((char *) timestamp, 0, TIMEBUF_SIZE);
-     ts_print((struct timeval *) & p->pkth->ts, timestamp);
- 
-     /* determine what to use as MAC src and dst */
+--- 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))
      {
@@ -56,107 +36,3 @@
              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],
-@@ -1467,7 +1467,7 @@ void PrintICMPEmbeddedIP(FILE *fp, Packe
-     if (fp == NULL || p == NULL)
-         return;
- 
--    bzero((char *) &op, sizeof(Packet));
-+    memset((char *) &op, 0, sizeof(Packet));
-     orig_p = &op;
- 
-     orig_p->iph = p->orig_iph;
-@@ -1717,7 +1717,7 @@ void PrintTcpOptions(FILE * fp, Packet *
-         switch(p->tcp_options[i].code)
-         {
-             case TCPOPT_MAXSEG:
--                bzero((char *) tmp, 5);
-+                memset((char *) tmp, 0, 5);
-                 fwrite("MSS: ", 5, 1, fp);
-                 if (p->tcp_options[i].data)
-                     memcpy(tmp, p->tcp_options[i].data, 2);
-@@ -1740,11 +1740,11 @@ void PrintTcpOptions(FILE * fp, Packet *
-                 break;
- 
-             case TCPOPT_SACK:
--                bzero((char *) tmp, 5);
-+                memset((char *) tmp, 0, 5);
-                 if (p->tcp_options[i].data && (p->tcp_options[i].len >= 2))
-                     memcpy(tmp, p->tcp_options[i].data, 2);
-                 fprintf(fp, "Sack: %u@", EXTRACT_16BITS(tmp));
--                bzero((char *) tmp, 5);
-+                memset((char *) tmp, 0, 5);
-                 if (p->tcp_options[i].data && (p->tcp_options[i].len >= 4))
-                     memcpy(tmp, (p->tcp_options[i].data) + 2, 2);
-                 fprintf(fp, "%u ", EXTRACT_16BITS(tmp));
-@@ -1755,46 +1755,46 @@ void PrintTcpOptions(FILE * fp, Packet *
-                 break;
- 
-             case TCPOPT_ECHO:
--                bzero((char *) tmp, 5);
-+                memset((char *) tmp, 0, 5);
-                 if (p->tcp_options[i].data)
-                     memcpy(tmp, p->tcp_options[i].data, 4);
-                 fprintf(fp, "Echo: %u ", EXTRACT_32BITS(tmp));
-                 break;
- 
-             case TCPOPT_ECHOREPLY:
--                bzero((char *) tmp, 5);
-+                memset((char *) tmp, 0, 5);
-                 if (p->tcp_options[i].data)
-                     memcpy(tmp, p->tcp_options[i].data, 4);
-                 fprintf(fp, "Echo Rep: %u ", EXTRACT_32BITS(tmp));
-                 break;
- 
-             case TCPOPT_TIMESTAMP:
--                bzero((char *) tmp, 5);
-+                memset((char *) tmp, 0, 5);
-                 if (p->tcp_options[i].data)
-                     memcpy(tmp, p->tcp_options[i].data, 4);
-                 fprintf(fp, "TS: %u ", EXTRACT_32BITS(tmp));
--                bzero((char *) tmp, 5);
-+                memset((char *) tmp, 0, 5);
-                 if (p->tcp_options[i].data)
-                     memcpy(tmp, (p->tcp_options[i].data) + 4, 4);
-                 fprintf(fp, "%u ", EXTRACT_32BITS(tmp));
-                 break;
- 
-             case TCPOPT_CC:
--                bzero((char *) tmp, 5);
-+                memset((char *) tmp, 0, 5);
-                 if (p->tcp_options[i].data)
-                     memcpy(tmp, p->tcp_options[i].data, 4);
-                 fprintf(fp, "CC %u ", EXTRACT_32BITS(tmp));
-                 break;
- 
-             case TCPOPT_CCNEW:
--                bzero((char *) tmp, 5);
-+                memset((char *) tmp, 0, 5);
-                 if (p->tcp_options[i].data)
-                     memcpy(tmp, p->tcp_options[i].data, 4);
-                 fprintf(fp, "CCNEW: %u ", EXTRACT_32BITS(tmp));
-                 break;
- 
-             case TCPOPT_CCECHO:
--                bzero((char *) tmp, 5);
-+                memset((char *) tmp, 0, 5);
-                 if (p->tcp_options[i].data)
-                     memcpy(tmp, p->tcp_options[i].data, 4);
-                 fprintf(fp, "CCECHO: %u ", EXTRACT_32BITS(tmp));
-@@ -1944,7 +1944,7 @@ void PrintEapolPkt(FILE * fp, Packet * p
-   char timestamp[TIMEBUF_SIZE];
-   
- 
--    bzero((char *) timestamp, TIMEBUF_SIZE);
-+    memset((char *) timestamp, 0, TIMEBUF_SIZE);
-     ts_print((struct timeval *) & p->pkth->ts, timestamp);
- 
-     /* dump the timestamp */
-@@ -2118,7 +2118,7 @@ void PrintWifiPkt(FILE * fp, Packet * p)
-     char timestamp[TIMEBUF_SIZE];
- 
- 
--    bzero((char *) timestamp, TIMEBUF_SIZE);
-+    memset((char *) timestamp, 0, TIMEBUF_SIZE);
-     ts_print((struct timeval *) & p->pkth->ts, timestamp);
- 
-     /* dump the timestamp */
diff --git a/package/snort/patches/patch-src_log_text_c b/package/snort/patches/patch-src_log_text_c
index 6451bbd1e..033608f9f 100644
--- a/package/snort/patches/patch-src_log_text_c
+++ b/package/snort/patches/patch-src_log_text_c
@@ -1,5 +1,5 @@
---- snort-2.8.5.1.orig/src/log_text.c	2009-05-07 00:28:15.000000000 +0200
-+++ snort-2.8.5.1/src/log_text.c	2009-12-27 16:08:42.000000000 +0100
+--- 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))
      {
diff --git a/package/snort/patches/patch-src_mempool_c b/package/snort/patches/patch-src_mempool_c
deleted file mode 100644
index 50455ac2a..000000000
--- a/package/snort/patches/patch-src_mempool_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- snort-2.8.5.1.orig/src/mempool.c	2009-08-10 22:41:39.000000000 +0200
-+++ snort-2.8.5.1/src/mempool.c	2009-12-27 17:21:21.000000000 +0100
-@@ -288,7 +288,7 @@ MemBucket *mempool_alloc(MemPool *mempoo
- 
-     /* TBD -- make configurable */
-     b = li->data;
--    bzero(b->data, mempool->obj_size);
-+    memset(b->data, 0, mempool->obj_size);
-     
-     return b;
- }
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
index a940ec03a..5b07072be 100644
--- a/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c
+++ b/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c
@@ -1,11 +1,7 @@
---- snort-2.8.5.1.orig/src/output-plugins/spo_alert_unixsock.c	2009-05-07 00:29:12.000000000 +0200
-+++ snort-2.8.5.1/src/output-plugins/spo_alert_unixsock.c	2009-12-27 17:23:19.000000000 +0100
-@@ -176,16 +176,16 @@ void AlertUnixSock(Packet *p, char *msg,
- 
-     DEBUG_WRAP(DebugMessage(DEBUG_LOG, "Logging Alert data!\n"););
- 
--    bzero((char *)&alertpkt,sizeof(alertpkt));
-+    memset((char *)&alertpkt, 0, sizeof(alertpkt));
+--- 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));
@@ -30,21 +26,3 @@
                 strlen(msg)>ALERTMSG_LENGTH-1 ? ALERTMSG_LENGTH - 1 : strlen(msg));
      }
  
-@@ -236,7 +236,7 @@ void AlertUnixSock(Packet *p, char *msg,
-                        break;
- 		    
-                     default:
--                        /* alertpkt.transhdr is null due to initial bzero */
-+                        /* alertpkt.transhdr is null due to initial memset */
-                         alertpkt.val|=NO_TRANSHDR;
-                         break;
-                 }
-@@ -282,7 +282,7 @@ void OpenAlertSock(void)
-             srv);
-     }
- 
--    bzero((char *) &alertaddr, sizeof(alertaddr));
-+    memset((char *) &alertaddr, 0, sizeof(alertaddr));
-     
-     /* 108 is the size of sun_path */
-     strncpy(alertaddr.sun_path, srv, 108);
diff --git a/package/snort/patches/patch-src_output-plugins_spo_database_c b/package/snort/patches/patch-src_output-plugins_spo_database_c
deleted file mode 100644
index 3703cd03d..000000000
--- a/package/snort/patches/patch-src_output-plugins_spo_database_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- snort-2.8.5.1.orig/src/output-plugins/spo_database.c	2009-10-02 22:29:59.000000000 +0200
-+++ snort-2.8.5.1/src/output-plugins/spo_database.c	2009-12-27 17:21:41.000000000 +0100
-@@ -333,7 +333,7 @@ static int instances = 0;
-     /* this is for debugging purposes only */
-     static char g_CurrentStatement[2048];
-     #define SAVESTATEMENT(str)   strncpy(g_CurrentStatement, str, sizeof(g_CurrentStatement) - 1);
--    #define CLEARSTATEMENT()     bzero((char *) g_CurrentStatement, sizeof(g_CurrentStatement));
-+    #define CLEARSTATEMENT()     memset((char *) g_CurrentStatement, 0, sizeof(g_CurrentStatement));
- #else
-     #define SAVESTATEMENT(str)   NULL;
-     #define CLEARSTATEMENT()     NULL;
diff --git a/package/snort/patches/patch-src_output-plugins_spo_log_ascii_c b/package/snort/patches/patch-src_output-plugins_spo_log_ascii_c
deleted file mode 100644
index 3c1e220d0..000000000
--- a/package/snort/patches/patch-src_output-plugins_spo_log_ascii_c
+++ /dev/null
@@ -1,15 +0,0 @@
---- snort-2.8.5.1.orig/src/output-plugins/spo_log_ascii.c	2009-05-07 00:29:14.000000000 +0200
-+++ snort-2.8.5.1/src/output-plugins/spo_log_ascii.c	2009-12-27 17:22:59.000000000 +0100
-@@ -198,9 +198,9 @@ FILE *OpenLogFile(int mode, Packet * p)
- #endif
- 
-     /* zero out our buffers */
--    bzero((char *) log_path, STD_BUF);
--    bzero((char *) log_file, STD_BUF);
--    bzero((char *) proto, 5);
-+    memset((char *) log_path, 0, STD_BUF);
-+    memset((char *) log_file, 0, STD_BUF);
-+    memset((char *) proto, 0, 5);
- 
-     if (mode == GENERIC_LOG || mode == DUMP || mode == BOGUS ||
-         mode == NON_IP || mode == ARP)
diff --git a/package/snort/patches/patch-src_output-plugins_spo_log_tcpdump_c b/package/snort/patches/patch-src_output-plugins_spo_log_tcpdump_c
deleted file mode 100644
index 50bdd855b..000000000
--- a/package/snort/patches/patch-src_output-plugins_spo_log_tcpdump_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- snort-2.8.5.1.orig/src/output-plugins/spo_log_tcpdump.c	2009-05-07 00:29:15.000000000 +0200
-+++ snort-2.8.5.1/src/output-plugins/spo_log_tcpdump.c	2009-12-27 17:22:31.000000000 +0100
-@@ -469,7 +469,7 @@ static void SpoLogTcpdumpCleanup(int sig
-         free (data->filename);
-     }
- 
--    bzero(data, sizeof(LogTcpdumpData));
-+    memset(data, 0, sizeof(LogTcpdumpData));
-     free(data);
- }
- 
diff --git a/package/snort/patches/patch-src_output-plugins_spo_unified_c b/package/snort/patches/patch-src_output-plugins_spo_unified_c
deleted file mode 100644
index 9613b7fd0..000000000
--- a/package/snort/patches/patch-src_output-plugins_spo_unified_c
+++ /dev/null
@@ -1,47 +0,0 @@
---- snort-2.8.5.1.orig/src/output-plugins/spo_unified.c	2009-08-10 22:41:52.000000000 +0200
-+++ snort-2.8.5.1/src/output-plugins/spo_unified.c	2009-12-27 17:22:15.000000000 +0100
-@@ -302,7 +302,7 @@ static void UnifiedInitFile(UnifiedConfi
-     FileHeader hdr;
-     int value;
- 
--    bzero(logdir, STD_BUF);
-+    memset(logdir, 0, STD_BUF);
-     curr_time = time(NULL);
- 
-     if(data == NULL)
-@@ -398,7 +398,7 @@ void RealUnifiedLogAlert(Packet *p, char
-     UnifiedConfig *data = (UnifiedConfig *)arg;
-     UnifiedAlert alertdata;
- 
--    bzero(&alertdata, sizeof(alertdata));
-+    memset(&alertdata, 0, sizeof(alertdata));
- 
-     if(event != NULL)
-     {
-@@ -483,7 +483,7 @@ void RealUnifiedLogAlert6(Packet *p, cha
-     UnifiedConfig *data = (UnifiedConfig *)arg;
-     UnifiedIPv6Alert alertdata;
- 
--    bzero(&alertdata, sizeof(alertdata));
-+    memset(&alertdata, 0, sizeof(alertdata));
- 
-     if(event != NULL)
-     {
-@@ -1039,7 +1039,7 @@ void UnifiedInitAlertFile(UnifiedConfig 
-     int value;
-     UnifiedAlertFileHeader hdr;
- 
--    bzero(logdir, STD_BUF);
-+    memset(logdir, 0, STD_BUF);
-     curr_time = time(NULL);
- 
-     if(data->nostamp) 
-@@ -1167,7 +1167,7 @@ void UnifiedInitLogFile(UnifiedConfig *d
-     int value;
-     //UnifiedLogFileHeader hdr;
- 
--    bzero(logdir, STD_BUF);
-+    memset(logdir, 0, STD_BUF);
-     curr_time = time(NULL);
- 
-     if(data == NULL)
diff --git a/package/snort/patches/patch-src_parser_IpAddrSet_c b/package/snort/patches/patch-src_parser_IpAddrSet_c
index fd365a696..edb62126d 100644
--- a/package/snort/patches/patch-src_parser_IpAddrSet_c
+++ b/package/snort/patches/patch-src_parser_IpAddrSet_c
@@ -1,5 +1,5 @@
---- snort-2.8.5.1.orig/src/parser/IpAddrSet.c	2009-07-07 17:37:07.000000000 +0200
-+++ snort-2.8.5.1/src/parser/IpAddrSet.c	2009-12-27 16:38:24.000000000 +0100
+--- 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))
diff --git a/package/snort/patches/patch-src_parser_c b/package/snort/patches/patch-src_parser_c
deleted file mode 100644
index 23ee43347..000000000
--- a/package/snort/patches/patch-src_parser_c
+++ /dev/null
@@ -1,40 +0,0 @@
---- snort-2.8.5.1.orig/src/parser.c	2009-10-02 22:29:56.000000000 +0200
-+++ snort-2.8.5.1/src/parser.c	2009-12-27 17:20:27.000000000 +0100
-@@ -4362,7 +4362,7 @@ static char * ExpandVars(SnortConfig *sc
-     if(!string || !*string || !strchr(string, '$'))
-         return(string);
- 
--    bzero((char *) estring, PARSERULE_SIZE);
-+    memset((char *) estring, 0, PARSERULE_SIZE);
- 
-     i = j = 0;
-     l_string = strlen(string);
-@@ -4381,7 +4381,7 @@ static char * ExpandVars(SnortConfig *sc
- 
-         if(c == '$' && !quote_toggle)
-         {
--            bzero((char *) rawvarname, sizeof(rawvarname));
-+            memset((char *) rawvarname, 0, sizeof(rawvarname));
-             varname_completed = 0;
-             name_only = 1;
-             iv = i;
-@@ -4421,8 +4421,8 @@ static char * ExpandVars(SnortConfig *sc
- 
-                 varcontents = NULL;
- 
--                bzero((char *) varname, sizeof(varname));
--                bzero((char *) varaux, sizeof(varaux));
-+                memset((char *) varname, 0, sizeof(varname));
-+                memset((char *) varaux, 0, sizeof(varaux));
-                 varmodifier = ' ';
- 
-                 p = strchr(rawvarname, ':');
-@@ -4439,7 +4439,7 @@ static char * ExpandVars(SnortConfig *sc
-                 else
-                     SnortStrncpy(varname, rawvarname, sizeof(varname));
- 
--                bzero((char *) varbuffer, sizeof(varbuffer));
-+                memset((char *) varbuffer, 0, sizeof(varbuffer));
- 
-                 varcontents = VarSearch(sc, varname);
- 
diff --git a/package/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c b/package/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
deleted file mode 100644
index 4948465a3..000000000
--- a/package/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- snort-2.8.5.1.orig/src/preprocessors/Stream5/snort_stream5_tcp.c	2009-10-02 22:30:01.000000000 +0200
-+++ snort-2.8.5.1/src/preprocessors/Stream5/snort_stream5_tcp.c	2009-12-27 17:16:36.000000000 +0100
-@@ -6913,7 +6913,7 @@ static int ProcessTcp(Stream5LWSession *
-                     char timestamp[TIMEBUF_SIZE];
-                     char src_addr[17];
-                     char dst_addr[17];
--                    bzero((char *)timestamp, TIMEBUF_SIZE);
-+                    memset((char *)timestamp, 0, TIMEBUF_SIZE);
-                     ts_print((struct timeval *) &p->pkth->ts, timestamp);
-                     SnortSnprintf(src_addr, 17, "%s",
-                         inet_ntoa(GET_SRC_ADDR(p)));
diff --git a/package/snort/patches/patch-src_snort_c b/package/snort/patches/patch-src_snort_c
deleted file mode 100644
index a3ec23375..000000000
--- a/package/snort/patches/patch-src_snort_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- snort-2.8.5.1.orig/src/snort.c	2009-10-19 19:44:03.000000000 +0200
-+++ snort-2.8.5.1/src/snort.c	2009-12-27 17:17:42.000000000 +0100
-@@ -3581,7 +3581,7 @@ static void SnortCleanup(int exit_val)
-         struct timeval difftime;
-         struct timezone tz;
- 
--        bzero((char *) &tz, sizeof(tz));
-+        memset((char *) &tz, 0, sizeof(tz));
-         gettimeofday(&endtime, &tz);
- 
-         TIMERSUB(&endtime, &starttime, &difftime);
-@@ -3628,7 +3628,7 @@ static void SnortCleanup(int exit_val)
-         sfActionQueueDestroy (decoderActionQ);
-         mempool_destroy (&decoderAlertMemPool);
-         decoderActionQ = NULL;
--        bzero(&decoderAlertMemPool, sizeof(decoderAlertMemPool));
-+        memset(&decoderAlertMemPool, 0, sizeof(decoderAlertMemPool));
-     }
- 
-     /* Print Statistics */
diff --git a/package/snort/patches/patch-src_util_c b/package/snort/patches/patch-src_util_c
deleted file mode 100644
index 79de72511..000000000
--- a/package/snort/patches/patch-src_util_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- snort-2.8.5.1.orig/src/util.c	2009-08-10 22:41:42.000000000 +0200
-+++ snort-2.8.5.1/src/util.c	2009-12-27 17:21:05.000000000 +0100
-@@ -227,7 +227,7 @@ void ts_print(register const struct time
-     if(!tvp)
-     {
-         /* manual page (for linux) says tz is never used, so.. */
--        bzero((char *) &tz, sizeof(tz));
-+        memset((char *) &tz, 0, sizeof(tz));
-         gettimeofday(&tv, &tz);
-         tvp = &tv;
-     }
-@@ -2714,7 +2714,7 @@ char *GetCurrentTimestamp()
- 
-     buf = (char *)SnortAlloc(SMALLBUFFER * sizeof(char));
- 
--    bzero((char *)&tz,sizeof(tz));
-+    memset((char *)&tz, 0, sizeof(tz));
-     gettimeofday(&tv,&tz);
-     tvp = &tv;
-