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

author: waldemar brodkorb <wbx@debian-lenny-amd64.foo.bar> 2010-01-19 21:14:16 +0100
committer: waldemar brodkorb <wbx@debian-lenny-amd64.foo.bar> 2010-01-19 21:14:16 +0100
commit: dd181acc1ac0c1e7dc9db85da30bd8522a95773d (patch)
tree: 08396068cfd74178f725d4b096a321d54ae8a53e
parent: fc4027a2b4f5a9384e8552b8dd515e53aae9444c (diff)
parent: a903c4fefdc19bb838e808146c6aa1a32296e4cb (diff)
51 files changed, 357 insertions, 583 deletions
diff --git a/Makefile b/Makefile
index 3b6d13687..5e9c37a3e 100644
--- a/Makefile
+++ b/Makefile
@@ -62,6 +62,7 @@ pkg-help:
 
 dev-help:
 	@echo 'Regenerate menu information via "make menu"'
+	@echo 'Regenerate dependency information via "make dep"'
 	@echo
 	@echo 'Fast way of updating package patches:'
 	@echo '  run "make package=<pkgname> clean" to start with a good base'
@@ -146,6 +147,9 @@ bulk: .prereq_done
 menu: .prereq_done
 	@${GMAKE_INV} menu
 
+dep: .prereq_done
+	@${GMAKE_INV} dep
+
 world: .prereq_done
 	@${GMAKE_INV} world
 
diff --git a/mk/build.mk b/mk/build.mk
index 0b5bd0b20..798b0a762 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -428,4 +428,7 @@ bulk:
 	mksh $(TOPDIR)/package/pkgmaker
 	@:>.menu
 
-.PHONY: menu
+dep:
+	mksh $(TOPDIR)/package/depmaker
+
+.PHONY: menu dep
diff --git a/mk/modules.mk b/mk/modules.mk
index e42029271..c208b80a7 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -768,7 +768,6 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\
 ,11))
 
 $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\
-    $(MODULES_DIR)/kernel/lib/zlib_inflate/zlib_inflate \
     $(MODULES_DIR)/kernel/lib/zlib_deflate/zlib_deflate \
     $(MODULES_DIR)/kernel/crypto/deflate \
 ,10))
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index a3ca4590c..0dc830b28 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -18,6 +18,10 @@ ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
 	mkdir -p ${WRKBUILD}
 	@${MAKE} pre-configure $(MAKE_TRACE)
 
+ifneq ($(filter autogen,${CONFIGURE_STYLE}),)
+	cd ${WRKBUILD}; \
+		./autogen.sh $(MAKE_TRACE)
+endif
 ifneq ($(filter autotool,${CONFIGURE_STYLE}),)
 	cd ${WRKBUILD}; \
 	    env AUTOCONF_VERSION=2.62 \
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/patc
author	waldemar brodkorb <wbx@debian-lenny-amd64.foo.bar>	2010-01-19 21:14:16 +0100
committer	waldemar brodkorb <wbx@debian-lenny-amd64.foo.bar>	2010-01-19 21:14:16 +0100
commit	dd181acc1ac0c1e7dc9db85da30bd8522a95773d (patch)
tree	08396068cfd74178f725d4b096a321d54ae8a53e
parent	fc4027a2b4f5a9384e8552b8dd515e53aae9444c (diff)
parent	a903c4fefdc19bb838e808146c6aa1a32296e4cb (diff)