summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorwaldemar brodkorb <wbx@debian-lenny-amd64.foo.bar>2010-01-19 21:14:16 +0100
committerwaldemar brodkorb <wbx@debian-lenny-amd64.foo.bar>2010-01-19 21:14:16 +0100
commitdd181acc1ac0c1e7dc9db85da30bd8522a95773d (patch)
tree08396068cfd74178f725d4b096a321d54ae8a53e /package
parentfc4027a2b4f5a9384e8552b8dd515e53aae9444c (diff)
parenta903c4fefdc19bb838e808146c6aa1a32296e4cb (diff)
Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/Config.in3
-rwxr-xr-xpackage/base-files/extra/sbin/update6
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/busybox/config/miscutils/Config.in2
-rw-r--r--package/busybox/files/busybox.postinst1
-rw-r--r--package/busybox/files/watchdog.init27
-rw-r--r--package/mdadm/patches/patch-Makefile14
-rw-r--r--package/olsrd/Makefile3
-rw-r--r--package/perl/Makefile2
-rw-r--r--package/sane-backends/Makefile1
-rw-r--r--package/sane-backends/patches/patch-configure11
-rw-r--r--package/sdl-image/Makefile36
-rw-r--r--package/sdl/Makefile11
-rw-r--r--package/snort/Makefile4
-rw-r--r--package/snort/patches/patch-configure39
-rw-r--r--package/snort/patches/patch-src_detection-plugins_sp_ip_tos_check_c4
-rw-r--r--package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c42
-rw-r--r--package/snort/patches/patch-src_detection-plugins_sp_replace_c31
-rw-r--r--package/snort/patches/patch-src_detection-plugins_sp_session_c13
-rw-r--r--package/snort/patches/patch-src_detection-plugins_sp_tcp_win_check_c4
-rw-r--r--package/snort/patches/patch-src_dynamic-preprocessors_dns_spp_dns_c47
-rw-r--r--package/snort/patches/patch-src_inline_c11
-rw-r--r--package/snort/patches/patch-src_log_c128
-rw-r--r--package/snort/patches/patch-src_log_text_c4
-rw-r--r--package/snort/patches/patch-src_mempool_c11
-rw-r--r--package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c30
-rw-r--r--package/snort/patches/patch-src_output-plugins_spo_database_c11
-rw-r--r--package/snort/patches/patch-src_output-plugins_spo_log_ascii_c15
-rw-r--r--package/snort/patches/patch-src_output-plugins_spo_log_tcpdump_c11
-rw-r--r--package/snort/patches/patch-src_output-plugins_spo_unified_c47
-rw-r--r--package/snort/patches/patch-src_parser_IpAddrSet_c4
-rw-r--r--package/snort/patches/patch-src_parser_c40
-rw-r--r--package/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c11
-rw-r--r--package/snort/patches/patch-src_snort_c20
-rw-r--r--package/snort/patches/patch-src_util_c20
-rw-r--r--package/tcl/patches/patch-generic_tclStrToD_c30
-rw-r--r--package/tslib/Makefile42
-rw-r--r--package/tslib/patches/patch-configure_ac11
-rw-r--r--package/ulogd/Makefile1
39 files changed, 239 insertions, 511 deletions
diff --git a/package/Config.in b/package/Config.in
index a642c10a0..dadce220f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -501,6 +501,8 @@ source "package/readline/Config.in"
source "package/cyrus-sasl/Config.in.lib"
source "package/sdl/Config.in"
source "package/sdl/Config.in.lib"
+source "package/sdl-image/Config.in"
+source "package/sdl-image/Config.in.lib"
source "package/speex/Config.in"
source "package/openssl/Config.in.lib"
source "package/sqlite/Config.in.lib"
@@ -532,6 +534,7 @@ source "package/libvorbis/Config.in.lib"
source "package/libvorbisidec/Config.in"
source "package/libvorbisidec/Config.in.lib"
source "package/tcp_wrappers/Config.in"
+source "package/tslib/Config.in"
source "package/libxml2/Config.in"
source "package/libxml2/Config.in.lib"
source "package/libxslt/Config.in"
diff --git a/package/base-files/extra/sbin/update b/package/base-files/extra/sbin/update
index c51962f5b..d41e23a0f 100755
--- a/package/base-files/extra/sbin/update
+++ b/package/base-files/extra/sbin/update
@@ -27,19 +27,19 @@ prepare() {
extract_from_file() {
prepare
- cat $1 | $updatecmd
+ cat $1 | eval $updatecmd
check_exit
}
extract_from_ssh() {
prepare
- ssh $1 "cat $2" | $updatecmd
+ ssh $1 "cat $2" | eval $updatecmd
check_exit
}
extract_from_http() {
prepare
- wget -O - $1 | $updatecmd
+ wget -O - $1 | eval $updatecmd
check_exit
}
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 2a9ef5e14..37f50bdd6 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= busybox
PKG_VERSION:= 1.15.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 495e320537f0772125f2db3c098e437c
PKG_DESCR:= Core utilities for embedded Linux systems
PKG_SECTION:= base
diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index eeb0d6d34..8346391a9 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -617,7 +617,7 @@ config BUSYBOX_VOLNAME
config BUSYBOX_WATCHDOG
bool "watchdog"
depends on !ADK_PACKAGE_WATCHDOG
- default n
+ default y
help
The watchdog utility is used with hardware or software watchdog
device drivers. It opens the specified watchdog device special file
diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst
index 90ddf9d42..761fb777d 100644
--- a/package/busybox/files/busybox.postinst
+++ b/package/busybox/files/busybox.postinst
@@ -2,5 +2,6 @@
. $IPKG_INSTROOT/etc/functions.sh
add_rcconf network network YES
add_rcconf crond crond NO
+add_rcconf watchdog watchdog NO
add_rcconf 'use "-C32" normally, "NO" to disable' syslogd_flags '-C32'
add_rcconf inetd
diff --git a/package/busybox/files/watchdog.init b/package/busybox/files/watchdog.init
new file mode 100644
index 000000000..c5d0e9545
--- /dev/null
+++ b/package/busybox/files/watchdog.init
@@ -0,0 +1,27 @@
+#!/bin/sh
+#PKG busybox
+#INIT 10
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+ [[ $watchdog = NO ]] && exit 0
+ exec sh $0 start
+ ;;
+start)
+ watchdog /dev/watchdog
+ ;;
+stop)
+ pkill watchdog
+ ;;
+restart)
+ sh $0 stop
+ sh $0 start
+ ;;
+*)
+ echo "Usage: $0 {start | stop | restart}"
+ exit 1
+ ;;
+esac
+exit $?
diff --git a/package/mdadm/patches/patch-Makefile b/package/mdadm/patches/patch-Makefile
index 585f6730b..79b801c74 100644
--- a/package/mdadm/patches/patch-Makefile
+++ b/package/mdadm/patches/patch-Makefile
@@ -1,6 +1,16 @@
--- mdadm-3.0.orig/Makefile 2009-06-02 07:48:29.000000000 +0200
-+++ mdadm-3.0/Makefile 2009-12-11 19:01:17.000000000 +0100
-@@ -186,29 +186,36 @@ sha1.o : sha1.c sha1.h md5.h
++++ mdadm-3.0/Makefile 2010-01-16 09:36:14.000000000 +0100
+@@ -58,7 +58,8 @@ CONFFILE = $(SYSCONFDIR)/mdadm.conf
+ CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf
+ MAILCMD =/usr/sbin/sendmail -t
+ CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\"
+-CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS)
++CFLAGS ?=
++CFLAGS += $(CWFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS)
+
+ # If you want a static binary, you might uncomment these
+ # LDFLAGS = -static
+@@ -186,29 +187,36 @@ sha1.o : sha1.c sha1.h md5.h
$(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c
install : mdadm mdmon install-man install-udev
diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile
index c2c600f3f..bb416c1ff 100644
--- a/package/olsrd/Makefile
+++ b/package/olsrd/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= olsrd
PKG_VERSION:= 0.5.6-r2
PKG_RELEASE:= 1
PKG_MD5SUM:= acf15dbd0af521a6826541b567c6473a
-PKG_DESCR:= implementation of the Optimized Link State Routing protocol
+PKG_DESCR:= Optimized Link State Routing protocol
PKG_SECTION:= net
PKG_MULTI:= 1
PKG_URL:= http://www.olsr.org
@@ -36,6 +36,7 @@ $(eval $(call PKG_mod_template,OLSRD_MOD_HTTPINFO,httpinfo))
$(eval $(call PKG_mod_template,OLSRD_MOD_NAMESERVICE,nameservice))
$(eval $(call PKG_mod_template,OLSRD_MOD_TAS,tas))
+TCFLAGS+= -fPIC
do-build:
rm -rf ${WRKINST}
diff --git a/package/perl/Makefile b/package/perl/Makefile
index 5500ec9ac..d5eea8ba8 100644
--- a/package/perl/Makefile
+++ b/package/perl/Makefile
@@ -15,6 +15,8 @@ PKG_SITES:= ftp://ftp.cpan.org/pub/CPAN/src/5.0/ \
ftp://ftp.gmd.de/mirrors/CPAN/src/5.0/ \
ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0/
+CFLINE_PERL:= depends on ADK_NATIVE
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,PERL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile
index 445e50899..abb31e847 100644
--- a/package/sane-backends/Makefile
+++ b/package/sane-backends/Makefile
@@ -153,6 +153,7 @@ $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX1220U,umax1220u))
$(eval $(call PKG_mod_template,SANE_BACKEND_UMAX_PP,umax_pp))
$(eval $(call PKG_mod_template,SANE_BACKEND_UMAX,umax))
+CONFIGURE_ENV+= ac_cv_func_ioperm=no
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --disable-translations \
--without-gphoto2 \
diff --git a/package/sane-backends/patches/patch-configure b/package/sane-backends/patches/patch-configure
new file mode 100644
index 000000000..927e3a8ab
--- /dev/null
+++ b/package/sane-backends/patches/patch-configure
@@ -0,0 +1,11 @@
+--- sane-backends-1.0.20.orig/configure 2009-05-03 18:59:22.000000000 +0200
++++ sane-backends-1.0.20/configure 2010-01-14 19:51:31.000000000 +0100
+@@ -34117,7 +34117,7 @@ ALL_BACKENDS="abaton agfafocus apple art
+ hp5590 hpsj5s hpljm1005 hs2p ibm leo lexmark ma1509 \
+ matsushita microtek microtek2 mustek mustek_pp \
+ mustek_usb mustek_usb2 nec net niash pie pint \
+- pixma plustek plustek_pp qcam ricoh rts8891 s9036 \
++ pixma plustek plustek_pp ricoh rts8891 s9036 \
+ sceptre sharp sm3600 sm3840 snapscan sp15c st400 \
+ stv680 tamarack teco1 teco2 teco3 test u12 umax
+ umax_pp umax1220u v4l xerox_mfp"
diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile
new file mode 100644
index 000000000..da8872763
--- /dev/null
+++ b/package/sdl-image/Makefile
@@ -0,0 +1,36 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= sdl-image
+PKG_VERSION:= 1.2.10
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 6c06584b31559e2b59f2b982d0d1f628
+PKG_DESCR:= Simple DirectMedia Layer
+PKG_SECTION:= libs
+PKG_DEPENDS:= libpng libtiff libjpeg
+PKG_BUILDDEP:= libpng libtiff jpeg
+PKG_URL:= http://www.libsdl.org
+PKG_SITES:= http://www.libsdl.org/projects/SDL_image/release/
+
+DISTFILES:= SDL_image-${PKG_VERSION}.tar.gz
+WRKDIST= ${WRKDIR}/SDL_image-${PKG_VERSION}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:= gnu
+CONFIGURE_ARGS+= --enable-png \
+ --enable-jpg \
+ --enable-bmp \
+ --enable-tif
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib
+ $(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL_IMAGE)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index 8d1caac22..0f244569d 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= e52086d1b508fa0b76c52ee30b55bec4
PKG_DESCR:= Simple DirectMedia Layer
PKG_SECTION:= libs
+PKG_DEPENDS:= libusb alsa-lib libpthread tslib
+PKG_BUILDDEP+= libusb alsa-lib tslib
PKG_URL:= http://www.libsdl.org
PKG_SITES:= http://www.libsdl.org/release/
@@ -20,7 +22,14 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_STYLE:= gnu
-CONFIGURE_ARGS+= --disable-esd
+CONFIGURE_ARGS+= --disable-esd \
+ --disable-oss \
+ --enable-alsa \
+ --enable-video-fbcon \
+ --disable-video-directfb \
+ --disable-video-opengl \
+ --enable-input-tslib \
+ --without-x
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
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;
-
diff --git a/package/tcl/patches/patch-generic_tclStrToD_c b/package/tcl/patches/patch-generic_tclStrToD_c
new file mode 100644
index 000000000..95eceecf7
--- /dev/null
+++ b/package/tcl/patches/patch-generic_tclStrToD_c
@@ -0,0 +1,30 @@
+--- tcl8.5.8.orig/generic/tclStrToD.c 2009-07-16 22:50:54.000000000 +0200
++++ tcl8.5.8/generic/tclStrToD.c 2010-01-14 20:44:55.000000000 +0100
+@@ -73,9 +73,11 @@ typedef unsigned int fpu_control_t __att
+ * MIPS floating-point units need special settings in control registers
+ * to use gradual underflow as we expect.
+ */
++/*
+ #if defined(__mips)
+ #include <sys/fpu.h>
+ #endif
++*/
+ /*
+ * HP's PA_RISC architecture uses 7ff4000000000000 to represent a quiet NaN.
+ * Everyone else uses 7ff8000000000000. (Why, HP, why?)
+@@ -2166,6 +2168,7 @@ TclInitDoubleConversion(void)
+ } bitwhack;
+ #endif
+
++/*
+ #if defined(__mips)
+ union fpc_csr mipsCR;
+
+@@ -2173,6 +2176,7 @@ TclInitDoubleConversion(void)
+ mipsCR.fc_struct.flush = 0;
+ set_fpc_csr(mipsCR.fc_word);
+ #endif
++*/
+
+ /*
+ * Initialize table of powers of 10 expressed as wide integers.
diff --git a/package/tslib/Makefile b/package/tslib/Makefile
new file mode 100644
index 000000000..9a7c0fd6b
--- /dev/null
+++ b/package/tslib/Makefile
@@ -0,0 +1,42 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= tslib
+PKG_VERSION:= 1.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 92b2eb55b1e4ef7e2c0347069389390e
+PKG_DESCR:= touchscreen library
+PKG_SECTION:= libs
+PKG_URL:= http://tslib.berlios.de/
+PKG_SITES:= http://download.berlios.de/tslib/ \
+ http://download2.berlios.de/tslib/
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,TSLIB,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:= autogen gnu
+CONFIGURE_ARGS+= --disable-ucb1x00 \
+ --disable-corgi \
+ --disable-collie \
+ --disable-h3600 \
+ --disable-mk712 \
+ --disable-linear-h2200 \
+ --disable-arctic2
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_TSLIB)/etc
+ $(INSTALL_DIR) $(IDIR_TSLIB)/usr/lib/ts
+ $(INSTALL_DIR) $(IDIR_TSLIB)/usr/bin
+ $(CP) $(WRKINST)/usr/lib/libts*so* $(IDIR_TSLIB)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/ts/*.so $(IDIR_TSLIB)/usr/lib/ts
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/ts_calibrate $(IDIR_TSLIB)/usr/bin
+ $(INSTALL_DATA) $(WRKINST)/etc/ts.conf $(IDIR_TSLIB)/etc
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tslib/patches/patch-configure_ac b/package/tslib/patches/patch-configure_ac
new file mode 100644
index 000000000..bb2ff1f42
--- /dev/null
+++ b/package/tslib/patches/patch-configure_ac
@@ -0,0 +1,11 @@
+--- tslib-1.0.orig/configure.ac 2006-08-24 23:02:55.000000000 +0200
++++ tslib-1.0/configure.ac 2010-01-19 08:07:05.861094823 +0100
+@@ -71,7 +71,7 @@ AC_MSG_RESULT($dejitter_module)
+ AM_CONDITIONAL(ENABLE_DEJITTER_MODULE, test "$dejitter_module" = "yes")
+
+ AC_MSG_CHECKING([whether linear-h2200 module is requested])
+-AC_ARG_ENABLE(dejitter,
++AC_ARG_ENABLE(linear-h2200,
+ AS_HELP_STRING([--enable-linear-h2200],
+ [Enable building of linearizing filter for iPAQ h2200 (default=yes)]),
+ [h2200_linear_module=$enableval],
diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile
index eb539ab31..7679b0318 100644
--- a/package/ulogd/Makefile
+++ b/package/ulogd/Makefile
@@ -52,6 +52,7 @@ SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_PGSQL}+= ulogd-mod-pgsql-install
SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_SQLITE}+= ulogd-mod-sqlite-install
SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_EXTRA}+= ulogd-mod-extra-install
+TCFLAGS+= -fPIC
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
INSTALL_STYLE:= auto