summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/build.mk7
-rw-r--r--mk/modules.mk1
-rw-r--r--package/Config.in7
-rw-r--r--package/Makefile7
-rw-r--r--package/asterisk/Makefile17
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/busybox/Makefile2
-rwxr-xr-xpackage/ctorrent/Makefile10
-rw-r--r--package/cxxtools/Makefile15
-rw-r--r--package/eglibc/Config.in.manual4
-rw-r--r--package/freeradius-server/Makefile1
-rw-r--r--package/freetype/Makefile4
-rw-r--r--package/grub-bin/Makefile2
-rw-r--r--package/grub/Makefile3
-rw-r--r--package/libXv/Makefile2
-rw-r--r--package/libsigc++/Makefile22
-rw-r--r--package/libtorrent/Makefile28
-rw-r--r--package/lighttpd/Makefile18
-rw-r--r--package/mpd/Makefile85
-rw-r--r--package/mplayer/Makefile6
-rw-r--r--package/mysql/Makefile12
-rw-r--r--package/mysql/patches/patch-configure662
-rw-r--r--package/mysql/patches/patch-include_my_global_h59
-rw-r--r--package/ncurses/Makefile5
-rw-r--r--package/ncurses/patches/patch-misc_run_tic_in12
-rw-r--r--package/nfs-utils/Config.in.kerberos31
-rw-r--r--package/nfs-utils/Makefile43
-rw-r--r--package/nfs-utils/patches/patch-aclocal_kerberos5_m4138
-rw-r--r--package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c5
-rw-r--r--package/nfs-utils/patches/patch-tools_Makefile_am11
-rw-r--r--package/nfs-utils/patches/patch-tools_Makefile_in15
-rw-r--r--package/nfs-utils/patches/patch-utils_mount_error_c5
-rw-r--r--package/nfs-utils/patches/patch-utils_mountd_cache_c75
-rw-r--r--package/nfs-utils/patches/patch-utils_mountd_fsloc_c5
-rw-r--r--package/nut/Makefile28
-rw-r--r--package/olsrd/Makefile1
-rw-r--r--package/php/Makefile9
-rw-r--r--package/pkgmaker21
-rw-r--r--package/ppp/Makefile1
-rw-r--r--package/rtorrent/Makefile12
-rw-r--r--package/sane-backends/Makefile3
-rw-r--r--package/sangam-atm/Makefile2
-rw-r--r--package/sispmctl/Makefile4
-rw-r--r--package/snort-wireless/Makefile48
-rw-r--r--package/snort-wireless/files/snort-wireless.conffiles2
-rw-r--r--package/snort-wireless/files/snort-wireless.init29
-rw-r--r--package/snort-wireless/files/snort-wireless.postinst4
-rw-r--r--package/snort-wireless/patches/500-no-config-search.patch35
-rw-r--r--package/snort-wireless/patches/750-lightweight-config.patch178
-rw-r--r--package/snort/Makefile20
-rw-r--r--package/snort/patches/patch-configure83
-rw-r--r--package/snort/patches/patch-configure.orig74
-rw-r--r--package/snort/patches/patch-src_detection-plugins_sp_ip_tos_check_c26
-rw-r--r--package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c85
-rw-r--r--package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c.orig47
-rw-r--r--package/snort/patches/patch-src_detection-plugins_sp_replace_c38
-rw-r--r--package/snort/patches/patch-src_detection-plugins_sp_replace_c.orig11
-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_c26
-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_c162
-rw-r--r--package/snort/patches/patch-src_log_c.orig38
-rw-r--r--package/snort/patches/patch-src_log_text_c38
-rw-r--r--package/snort/patches/patch-src_mempool_c11
-rw-r--r--package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c50
-rw-r--r--package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c.orig32
-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_c16
-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/squid/Makefile26
-rw-r--r--package/tntnet/Makefile18
-rw-r--r--package/udev/Makefile4
-rw-r--r--package/ulogd/Makefile11
-rw-r--r--package/updatedd/Makefile1
-rw-r--r--package/xorg-server/Makefile5
-rw-r--r--package/xz/Makefile4
-rw-r--r--target/linux/config/Config.in.block6
84 files changed, 1489 insertions, 1287 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 2fb5bb3..6397d78 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -15,6 +15,7 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \
ADK_STATIC=n \
ADK_FORCE_PARALLEL=n \
ADK_PACKAGE_GRUB=n \
+ ADK_PACKAGE_BASE_FILES=y \
BUSYBOX_SELINUX=n \
BUSYBOX_MODPROBE_SMALL=n \
BUSYBOX_EJECT=n \
@@ -81,7 +82,7 @@ include ${TOPDIR}/mk/split-cfg.mk
all: world
allcopy: all
- $(CP) $(BIN_DIR) $(TOPDIR)/bulkdir/${d}/
+ $(CP) $(BIN_DIR) $(TOPDIR)/bulkdir/${targetdir}/
${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config
mksh ${TOPDIR}/package/depmaker
@@ -375,9 +376,9 @@ bulk:
defconfig; \
fi && \
$(MAKE) VERBOSE=1 -f mk/build.mk allcopy \
- d=$$target-$$libc-$$fs && \
+ targetdir=$$target-$$libc-$$fs; \
$(MAKE) cleantarget; \
- rm .*config; \
+ rm .config; \
) 2>&1 | tee $(TOPDIR)/bulkdir/$$target-$$libc-$$fs/log; \
done <${TOPDIR}/target/bulk.lst
diff --git a/mk/modules.mk b/mk/modules.mk
index b923b8e..c36bdb2 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -934,7 +934,6 @@ $(eval $(call KMOD_template,SND,sound-alsa,\
$(MODULES_DIR)/kernel/sound/core/snd \
$(MODULES_DIR)/kernel/sound/core/snd-timer \
$(MODULES_DIR)/kernel/sound/core/snd-pcm \
- $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \
,40))
$(eval $(call KMOD_template,SND_OSSEMUL,sound-alsa-oss-emul,\
diff --git a/package/Config.in b/package/Config.in
index f982e34..e4c5288 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -162,7 +162,7 @@ source "package/procps/Config.in"
source "package/sispmctl/Config.in"
source "package/stress/Config.in"
source "package/sysstat/Config.in"
-source "package/udev/Config.in"
+#source "package/udev/Config.in"
source "package/watchdog/Config.in"
endmenu
@@ -289,7 +289,6 @@ menu "Network Filesystems"
source "package/davfs2/Config.in"
source "package/davfs2/Config.in.kernel"
source "package/nfs-utils/Config.in"
-source "package/nfs-utils/Config.in.kerberos"
source "package/samba/Config.in"
endmenu
@@ -359,7 +358,6 @@ source "package/hostapd/Config.in"
source "package/iw/Config.in"
#source "package/kismet/Config.in"
source "package/olsrd/Config.in"
-source "package/snort-wireless/Config.in"
source "package/wifidog/Config.in"
source "package/wireless-firmware/Config.in"
source "package/wpa_supplicant/Config.in"
@@ -483,6 +481,7 @@ source "package/speex/Config.in"
source "package/sqlite/Config.in.lib"
source "package/librpcsecgss/Config.in"
source "package/libshout/Config.in"
+source "package/libshout/Config.in.lib"
source "package/libsigc++/Config.in"
source "package/libstdcxx/Config.in"
source "package/libtasn1/Config.in"
@@ -499,7 +498,7 @@ source "package/tcp_wrappers/Config.in"
source "package/libxml2/Config.in"
source "package/libxslt/Config.in"
source "package/lua/Config.in.lib"
-source "package/uclibc++/Config.in"
+source "package/uclibc++/Config.in.manual"
source "package/ustl/Config.in"
source "package/zlib/Config.in"
endmenu
diff --git a/package/Makefile b/package/Makefile
index 1b3943f..2e83a07 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -18,6 +18,7 @@ endif
ifneq (${ADK_NATIVE},y)
package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
endif
+
ifneq (${ADK_TARGET_LIB_GLIBC},y)
ifneq (${ADK_NATIVE},y)
package-$(ADK_PACKAGE_UCLIBC) += uclibc
@@ -30,6 +31,7 @@ COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
all: compile
+download: $(DOWNLOAD)
clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m) base-files)
ifeq ($(ADK_TOOLCHAIN_ONLY),y)
compile: $(COMPILE_PACKAGES)
@@ -38,10 +40,9 @@ else
compile: base-files-compile $(COMPILE_PACKAGES)
install: base-files-install $(INSTALL_PACKAGES)
endif
-download: $(DOWNLOAD)
-$(COMPILE_PACKAGES): base-files-compile
-$(INSTALL_PACKAGES): base-files-install
+#$(COMPILE_PACKAGES): base-files-compile
+#$(INSTALL_PACKAGES): base-files-install
$(TARGET_DIR):
mkdir -p $(TARGET_DIR)
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 7dd463c..c66f4c7 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,8 +4,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= asterisk
-PKG_VERSION:= 1.4.27.1
+PKG_VERSION:= 1.4.28
PKG_RELEASE:= 1
+PKG_MD5SUM:= e8006ce319e18ce07ce1335ad583330a
+PKG_DESCR:= Open Source PBX
+PKG_SECTION:= net
+PKG_MULTI:= 1
+PKG_NOPARALLEL:= 1
+PKG_DEPENDS:= libncurses libpthread libopenssl libcurl
PKG_BUILDDEP+= ncurses openssl zlib curl popt
ifneq ($(ADK_PACKAGE_ASTERISK_CODEC_SPEEX),)
PKG_BUILDDEP+= speex
@@ -13,17 +19,12 @@ endif
ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),)
PKG_BUILDDEP+= postgresql
endif
-PKG_MD5SUM:= e09ca163a6e90018c92c65a50b9ec398
-PKG_DESCR:= Open Source PBX
-PKG_SECTION:= net
-PKG_DEPENDS:= libncurses libpthread libopenssl libcurl
-PKG_NOPARALLEL:= 1
PKG_URL:= http://www.asterisk.org
PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/
PKG_TARGET_DEPENDS:= !foxboard
-PKG_DEPENDS_MAIN:= asterisk
+#PKG_DEPENDS_MAIN:= asterisk
PKG_DESCR_CHAN_MGCP:= Media Gateway Control Protocol implementation
PKG_DESCR_CHAN_SKINNY:= Skinny Client Control Protocol implementation
PKG_DESCR_CHAN_IAX2:= Support for the Inter Asterisk Protocol
@@ -38,7 +39,7 @@ $(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_
$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_MGCP},${PKG_SECTION}))
$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_SKINNY},${PKG_SECTION}))
$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_IAX2},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_SPEEX},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CODEC_SPEEX},${PKG_SECTION}))
$(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index bff93bd..82541e6 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -18,6 +18,8 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,BASE_FILES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
PKGDFLT_BASE_FILES= y if !ADK_TOOLCHAIN_ONLY
+BUILD_STYLE:= manual
+INSTALL_STYLE:= manual
do-install:
$(CP) ./extra/* $(IDIR_BASE_FILES)
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 78b741c..2a9ef5e 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 495e320537f0772125f2db3c098e437c
PKG_DESCR:= Core utilities for embedded Linux systems
PKG_SECTION:= base
+PKG_DEPENDS:= base-files
+PKG_BUILDDEP+= base-files
PKG_URL:= http://www.busybox.net
PKG_SITES:= http://www.busybox.net/downloads/
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index fb51b10..6cc8878 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= ctorrent
PKG_VERSION:= dnh3.3.2
PKG_RELEASE:= 1
PKG_BUILDDEP+= openssl
-PKG_CXX:= CTORRENT
+#PKG_CXX:= CTORRENT
PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6
PKG_DESCR:= console-based BitTorrent client
PKG_SECTION:= net
@@ -18,10 +18,10 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y)
-TCXXFLAGS+= -fno-threadsafe-statics -fno-builtin -fno-rtti -nostdinc++
-TLDFLAGS+= -lgcc_s -luClibc++ -lc -lm -nodefaultlibs
-endif
+#ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y)
+#TCXXFLAGS+= -fno-threadsafe-statics -fno-builtin -fno-rtti -nostdinc++
+#TLDFLAGS+= -lgcc_s -luClibc++ -lc -lm -nodefaultlibs
+#endif
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 0de1367..326bed1 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -6,14 +6,15 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= cxxtools
PKG_VERSION:= 1.4.8
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libiconv
-PKG_CXX:= CXXTOOLS
PKG_MD5SUM:= 16ce92a83beb925fa5138fc9a52d55af
PKG_DESCR:= a collection of general-purpose C++ classes
PKG_SECTION:= net
PKG_DEPENDS:= libiconv
+PKG_BUILDDEP+= libiconv
PKG_URL:= http://www.tntnet.org
PKG_SITES:= http://www.tntnet.org/download/
+#PKG_CXX:= CXXTOOLS
+
include ${TOPDIR}/mk/package.mk
@@ -34,12 +35,12 @@ CONFIGURE_ARGS+= --with-libiconv-prefix='${STAGING_DIR}/usr'
BUILD_STYLE:= auto
INSTALL_STYLE:= auto confprog
-ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
+#ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
# add workaround because libtool tries to link libstdc++
-post-configure:
- ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \
- ${WRKBUILD}/libtool
-endif
+#post-configure:
+# ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \
+# ${WRKBUILD}/libtool
+#endif
post-install:
${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib
diff --git a/package/eglibc/Config.in.manual b/package/eglibc/Config.in.manual
index 6e1daf4..e7acac9 100644
--- a/package/eglibc/Config.in.manual
+++ b/package/eglibc/Config.in.manual
@@ -1,5 +1,5 @@
config ADK_PACKAGE_EGLIBC
- prompt "eglibc............................... embedded GNU C library"
+ prompt "eglibc............................ embedded GNU C library"
bool
default y if ADK_TARGET_LIB_EGLIBC && !ADK_TOOLCHAIN_ONLY
default n
@@ -8,7 +8,7 @@ config ADK_PACKAGE_EGLIBC
embedded GNU C library.
config ADK_PACKAGE_EGLIBC_DEV
- prompt "eglibc-dev........................... development files"
+ prompt "eglibc-dev........................ development files"
tristate
default n
depends on ADK_TARGET_LIB_EGLIBC
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index f8f769d..6d58d3f 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= b1f77c5e3116bcb0ac0aa9080a06ebf1
PKG_DESCR:= a flexible RADIUS server
PKG_SECTION:= net
+PKG_MULTI:= 1
PKG_DEPENDS:= libltdl libopenssl libpthread
PKG_BUILDDEP+= libtool openssl
ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_LDAP),)
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index e902954..6acb8c2 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= freetype
PKG_VERSION:= 2.3.11
PKG_RELEASE:= 2
-PKG_BUILDDEP+= zlib
-PKG_MD5SUM:= 519c7cbf5cbd72ffa822c66844d3114c
+PKG_MD5SUM:= a693c9a4b0121890ca71e39364ffea4a
PKG_DESCR:= A free, high-quality and portable font engine
PKG_SECTION:= libs
PKG_DEPENDS:= zlib
+PKG_BUILDDEP+= zlib
PKG_URL:= http://www.freetype.org
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freetype/}
diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile
index 30a9568..1c48a0b 100644
--- a/package/grub-bin/Makefile
+++ b/package/grub-bin/Makefile
@@ -13,7 +13,7 @@ PKG_DESCR:= GRUB bootloader
PKG_SECTION:= sys
PKG_SITES:= http://openadk.org/distfiles/
-PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix2d
+PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix2d x86_qemu x86_64_qemu
include ${TOPDIR}/mk/package.mk
diff --git a/package/grub/Makefile b/package/grub/Makefile
index c808d0b..d4ef5f1 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -12,6 +12,9 @@ PKG_SECTION:= base
PKG_URL:= http://www.gnu.org/software/grub
PKG_SITES:= ftp://alpha.gnu.org/gnu/grub/
+PKG_HOST_DEPENDS:= linux
+PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix2d x86_qemu x86_64_qemu
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,GRUB,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/libXv/Makefile b/package/libXv/Makefile
index 9d51fbf..4165f85 100644
--- a/package/libXv/Makefile
+++ b/package/libXv/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXv
PKG_VERSION:= 1.0.5
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libX11 videoproto
+PKG_BUILDDEP+= libX11 videoproto libXext
PKG_MD5SUM:= 6ee98790de6b3cd470074e60057d5c5c
PKG_DESCR:= X11 Xvideo extensions
PKG_SECTION:= x11
diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile
index 724196b..a4a5fc8 100644
--- a/package/libsigc++/Makefile
+++ b/package/libsigc++/Makefile
@@ -11,28 +11,28 @@ PKG_DESCR:= Callback framework for C++
PKG_SECTION:= libs
PKG_URL:= http://libsigc.sourceforge.net
PKG_SITES:= ${MASTER_SITE_GNOME:=libsigc++/2.2/}
-PKG_CXX:= LIBSIGCXX
+#PKG_CXX:= LIBSIGCXX
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBSIGCXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-ifeq ($(ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX),y)
-CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \
- -I${STAGING_DIR}/usr/include/uClibc++" \
- LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc"
-endif
+#ifeq ($(ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX),y)
+#CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \
+# -I${STAGING_DIR}/usr/include/uClibc++" \
+# LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc"
+#endif
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
-ifeq (${ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX},y)
+#ifeq (${ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX},y)
# add workaround because libtool tries to link libstdc++
-post-configure:
- ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \
- ${WRKBUILD}/libtool
-endif
+#post-configure:
+# ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \
+# ${WRKBUILD}/libtool
+#endif
post-install:
${INSTALL_DIR} ${IDIR_LIBSIGCXX}/usr/lib
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile
index 4d55aa8..5f33fa9 100644
--- a/package/libtorrent/Makefile
+++ b/package/libtorrent/Makefile
@@ -13,29 +13,29 @@ PKG_SECTION:= libs
PKG_DEPENDS:= libopenssl libsigc++
PKG_URL:= http://libtorrent.rakshasa.no
PKG_SITES:= http://libtorrent.rakshasa.no/downloads/
-PKG_CXX:= LIBTORRENT
+#PKG_CXX:= LIBTORRENT
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-ifeq ($(ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX),y)
-CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ -fno-strict-aliasing -fno-inline \
- -I${STAGING_DIR}/usr/include/uClibc++" \
- LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc"
-endif
+#ifeq ($(ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX),y)
+#CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ -fno-strict-aliasing -fno-inline \
+# -I${STAGING_DIR}/usr/include/uClibc++" \
+# LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc"
+#endif
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --enable-aligned
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
-ifeq (${ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX},y)
+#ifeq (${ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX},y)
# add workaround because libtool tries to link libstdc++
-post-configure:
- ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \
- ${WRKBUILD}/libtool
-endif
+#post-configure:
+# ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \
+# ${WRKBUILD}/libtool
+#endif
post-install:
${INSTALL_DIR} ${IDIR_LIBTORRENT}/usr/lib
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index 3ed9860..648d6cf 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -6,23 +6,21 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= lighttpd
PKG_VERSION:= 1.4.25
PKG_RELEASE:= 1
-PKG_BUILDDEP+= pcre libxml2 sqlite
-ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y)
-PKG_BUILDDEP+= openssl
-endif
PKG_MD5SUM:= 87e936ec272ddaba8a2fdfecd8c6b704
PKG_DESCR:= a flexible and lightweight web server
PKG_SECTION:= net
PKG_DEPENDS:= libxml2 libsqlite pcre
+PKG_BUILDDEP+= pcre libxml2 sqlite
+ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y)
+PKG_DEPENDS+= libopenssl
+PKG_BUILDDEP+= openssl
+endif
PKG_URL:= http://www.lighttpd.net
PKG_SITES:= http://download.lighttpd.net/lighttpd/releases-1.4.x/
+PKG_MULTI:= 1
include $(TOPDIR)/mk/package.mk
-ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y)
-PKG_DEPENDS+= libopenssl
-endif
-
define PKG_mod_template
INSTALL_MODS_$${ADK_PACKAGE_${1}}+= ${2}-install
@@ -71,7 +69,7 @@ $(eval $(call PKG_mod_template,LIGHTTPD_MOD_WEBDAV,webdav))
TCPPFLAGS+= -I$(STAGING_DIR)/usr/include/libxml2
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= PCRE_LIB="-lpcre"
-CONFIGURE_ARGS+= --without-openssl \
+CONFIGURE_ARGS+= \
--libdir=/usr/lib/lighttpd \
--sysconfdir=/etc/lighttpd \
--without-attr \
@@ -89,6 +87,8 @@ BUILD_STYLE:= auto
INSTALL_STYLE:= auto
ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y)
CONFIGURE_ARGS+= --with-openssl='${STAGING_DIR}/usr'
+else
+CONFIGURE_ARGS+= --without-openssl
endif
post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 150391a..f4ccc4b 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -7,86 +7,99 @@ PKG_NAME:= mpd
PKG_VERSION:= 0.15.6
PKG_RELEASE:= 1
PKG_BUILDDEP+= alsa-lib glib
-ifneq ($(ADK_COMPILE_MPD_WITH_MP3),)
+PKG_MD5SUM:= c78b8933e4902c5dc407d59925f8b10e
+PKG_DESCR:= A music player daemon
+PKG_SECTION:= net
+PKG_DEPENDS:= glib
+ifneq ($(ADK_PACKAGE_MPD_WITH_MP3),)
PKG_BUILDDEP+= libid3tag libmad
endif
-ifneq ($(ADK_COMPILE_MPD_WITH_MP4),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_MP4),)
PKG_BUILDDEP+= faad2
endif
-ifneq ($(ADK_COMPILE_MPD_WITH_OGG),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_OGG),)
PKG_BUILDDEP+= libvorbis
endif
-ifneq ($(ADK_COMPILE_MPD_WITH_TREMOR),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_TREMOR),)
PKG_BUILDDEP+= libvorbisidec
endif
-ifneq ($(ADK_COMPILE_MPD_WITH_FLAC),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_FLAC),)
PKG_BUILDDEP+= flac
endif
-ifneq ($(ADK_COMPILE_MPD_WITH_WAV),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_WAV),)
PKG_BUILDDEP+= libaudiofile
endif
-ifneq ($(ADK_COMPILE_MPD_WITH_SHOUT),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_SHOUT),)
PKG_BUILDDEP+= lame
endif
-ifneq ($(ADK_COMPILE_MPD_WITH_CURL),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_CURL),)
PKG_BUILDDEP+= curl
endif
-ifneq ($(ADK_COMPILE_MPD_WITH_MMS),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_MMS),)
PKG_BUILDDEP+= libmms
endif
-ifneq ($(ADK_COMPILE_MPD_WITH_FFMPEG),)
+ifneq ($(ADK_PACKAGE_MPD_WITH_FFMPEG),)
PKG_BUILDDEP+= ffmpeg
endif
-PKG_MD5SUM:= c78b8933e4902c5dc407d59925f8b10e
-PKG_DESCR:= A music player daemon
-PKG_SECTION:= net
-PKG_DEPENDS:= glib
PKG_URL:= http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=musicpd/}
+PKG_FLAVOURS:= WITH_ALSA WITH_MP3 WITH_MP4 WITH_TREMOR WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG WITH_SHOUT WITH_CURL
+PKGFD_WITH_ALSA:= enable ALSA output
+PKGFD_WITH_MP3:= enable MP3 support
+PKGFD_WITH_MP4:= enable MP4 support
+PKGFD_WITH_OGG:= enable OGG support
+PKGFD_WITH_TREMOR:= enable fixpoint Vorbis/OGG support
+PKGFD_WITH_FLAC:= enable FLAC support
+PKGFD_WITH_WAV:= enable WAVE support
+PKGFD_WITH_MMS:= enable MMS support
+PKGFD_WITH_FFMPEG:= enable FFMPEG support
+PKGFD_WITH_SHOUT:= enable Shoutcast output support
+PKGFD_WITH_CURL:= enable CURL support
+
include ${TOPDIR}/mk/package.mk
-ifneq (${ADK_COMPILE_MPD_WITH_ALSA},)
+ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},)
PKG_DEPENDS+= alsa-lib
endif
-ifneq (${ADK_COMPILE_MPD_WITH_MP3},)
+ifneq (${ADK_PACKAGE_MPD_WITH_MP3},)
PKG_DEPENDS+= libid3tag libmad
endif
-ifneq (${ADK_COMPILE_MPD_WITH_MP4},)
+ifneq (${ADK_PACKAGE_MPD_WITH_MP4},)
PKG_DEPENDS+= libfaad2
endif
-ifneq (${ADK_COMPILE_MPD_WITH_OGG},)
+ifneq (${ADK_PACKAGE_MPD_WITH_OGG},)
PKG_DEPENDS+= libvorbis libogg
endif
-ifneq (${ADK_COMPILE_MPD_WITH_TREMOR},)
+ifneq (${ADK_PACKAGE_MPD_WITH_TREMOR},)
PKG_DEPENDS+= libvorbisidec
endif
-ifneq (${ADK_COMPILE_MPD_WITH_FLAC},)
+ifneq (${ADK_PACKAGE_MPD_WITH_FLAC},)
PKG_DEPENDS+= libflac
endif
-ifneq (${ADK_COMPILE_MPD_WITH_WAV},)
+ifneq (${ADK_PACKAGE_MPD_WITH_WAV},)
PKG_DEPENDS+= libaudiofile
endif
-ifneq (${ADK_COMPILE_MPD_WITH_SHOUT},)
+ifneq (${ADK_PACKAGE_MPD_WITH_SHOUT},)
PKG_DEPENDS+= libshout liblame
endif
-ifneq (${ADK_COMPILE_MPD_WITH_CURL},)
+ifneq (${ADK_PACKAGE_MPD_WITH_CURL},)
PKG_DEPENDS+= libcurl
endif
-ifneq (${ADK_COMPILE_MPD_WITH_MMS},)
+ifneq (${ADK_PACKAGE_MPD_WITH_MMS},)
PKG_DEPENDS+= libmms
endif
-ifneq (${ADK_COMPILE_MPD_WITH_FFMPEG},)
+ifneq (${ADK_PACKAGE_MPD_WITH_FFMPEG},)
PKG_DEPENDS+= ffmpeg
endif
@@ -110,31 +123,31 @@ CONFIGURE_ARGS+= \
--disable-sqlite \
--with-zeroconf=no
-ifneq (${ADK_COMPILE_MPD_WITH_ALSA},)
+ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},)
CONFIGURE_ARGS+= --enable-alsa
else
CONFIGURE_ARGS+= --disable-alsa
endif
-ifneq (${ADK_COMPILE_MPD_WITH_MP3},)
+ifneq (${ADK_PACKAGE_MPD_WITH_MP3},)
CONFIGURE_ARGS+= --enable-id3 --enable-mad
else
CONFIGURE_ARGS+= --disable-id3 --disable-mad
endif
-ifneq (${ADK_COMPILE_MPD_WITH_MP4},)
+ifneq (${ADK_PACKAGE_MPD_WITH_MP4},)
CONFIGURE_ARGS+= --enable-aac
else
CONFIGURE_ARGS+= --disable-aac
endif
-ifneq (${ADK_COMPILE_MPD_WITH_OGG},)
+ifneq (${ADK_PACKAGE_MPD_WITH_OGG},)
CONFIGURE_ARGS+= --enable-vorbis
else
CONFIGURE_ARGS+= --disable-vorbis
endif
-ifneq (${ADK_COMPILE_MPD_WITH_TREMOR},)
+ifneq (${ADK_PACKAGE_MPD_WITH_TREMOR},)
CONFIGURE_ARGS+= \
--disable-vorbis \
--with-tremor \
@@ -142,19 +155,19 @@ CONFIGURE_ARGS+= \
--with-tremor-libraries=${STAGING_DIR}/usr/lib
endif
-ifneq (${ADK_COMPILE_MPD_WITH_FLAC},)
+ifneq (${ADK_PACKAGE_MPD_WITH_FLAC},)
CONFIGURE_ARGS+= --enable-flac
else
CONFIGURE_ARGS+= --disable-flac
endif
-ifneq (${ADK_COMPILE_MPD_WITH_WAV},)
+ifneq (${ADK_PACKAGE_MPD_WITH_WAV},)
CONFIGURE_ARGS+= --enable-audiofile
else
CONFIGURE_ARGS+= --disable-audiofile
endif
-ifneq (${ADK_COMPILE_MPD_WITH_SHOUT},)
+ifneq (${ADK_PACKAGE_MPD_WITH_SHOUT},)
CONFIGURE_ARGS+= --enable-shout \
--enable-lame-encoder \
--enable-vorbis-encoder \
@@ -166,19 +179,19 @@ CONFIGURE_ARGS+= --disable-shout \
--disable-vorbis-encoder
endif
-ifneq (${ADK_COMPILE_MPD_WITH_CURL},)
+ifneq (${ADK_PACKAGE_MPD_WITH_CURL},)
CONFIGURE_ARGS+= --enable-curl
else
CONFIGURE_ARGS+= --disable-curl
endif
-ifneq (${ADK_COMPILE_MPD_WITH_MMS},)
+ifneq (${ADK_PACKAGE_MPD_WITH_MMS},)
CONFIGURE_ARGS+= --enable-mms
else
CONFIGURE_ARGS+= --disable-mms
endif
-ifneq (${ADK_COMPILE_MPD_WITH_FFMPEG},)
+ifneq (${ADK_PACKAGE_MPD_WITH_FFMPEG},)
CONFIGURE_ARGS+= --enable-ffmpeg
else
CONFIGURE_ARGS+= --disable-ffmpeg
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 89127b7..a938466 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= mplayer
PKG_VERSION:= 1.0-29987
PKG_RELEASE:= 1
-PKG_BUILDDEP+= alsa-lib libmad libvorbis faad2 ncurses zlib
PKG_MD5SUM:= 416fa6a247987305d74572d03dc6dde7
PKG_DESCR:= popular video player
PKG_SECTION:= video
-PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread libpng libjpeg
+PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread libpng libjpeg libx11 libxv
+PKG_BUILDDEP+= alsa-lib libmad libvorbis faad2 ncurses zlib libX11 libXv libpng
PKG_URL:= http://www.mplayerhq.hu
PKG_SITES:= http://openadk.org/distfiles/
@@ -93,6 +93,8 @@ pre-configure:
--disable-pnm \
--disable-md5sum \
--disable-liblzo \
+ --disable-xinerama \
+ --disable-vidix \
${CONFIGURE_CPU_OPTS} \
${CONFIGURE_DEBUG} \
);
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index db20a04..e8334bd 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -4,15 +4,15 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= mysql
-PKG_VERSION:= 5.0.85
+PKG_VERSION:= 5.1.41
PKG_RELEASE:= 1
-PKG_BUILDDEP+= ncurses zlib readline
-PKG_MD5SUM:= f672ec5154f8ea3db87fec5e0b227f4c
+PKG_MD5SUM:= b5d39e8789174753f3c782959729e68c
PKG_DESCR:= MySQL client library
PKG_SECTION:= libs
PKG_DEPENDS:= libncurses zlib
+PKG_BUILDDEP+= ncurses zlib readline
PKG_URL:= http://www.mysql.com
-PKG_SITES= ${MASTER_SITE_MYSQL:=Downloads/MySQL-5.0/}
+PKG_SITES= ${MASTER_SITE_MYSQL:=Downloads/MySQL-5.1/}
include ${TOPDIR}/mk/package.mk
@@ -28,10 +28,12 @@ CONFIGURE_ENV+= OPTIMIZE_CFLAGS="${TARGET_CFLAGS}" \
mysql_cv_compress=yes \
ac_cv_sys_restartable_syscalls=no \
ac_cv_conv_longlong_to_float=yes \
+ mysql_cv_gcc_atomic_builtins=yes \
mysql_cv_gethostname_style=glibc2
CONFIGURE_ARGS+= --disable-assembler \
--with-pthread \
--without-raid \
+ --with-atomic-ops=rwlocks \
--with-unix-socket-path=/tmp/.mysql.sock \
--with-named-thread-libs=-lpthread \
--without-libwrap \
@@ -42,7 +44,7 @@ CONFIGURE_ARGS+= --disable-assembler \
--without-query-cache \
--without-mysqlfs \
--without-vio \
- --without-openssl \
+ --without-ssl \
--without-docs \
--without-bench \
--without-innodb \
diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure
index 4fe4d41..cf3239b 100644
--- a/package/mysql/patches/patch-configure
+++ b/package/mysql/patches/patch-configure
@@ -1,496 +1,302 @@
---- mysql-5.0.85.orig/configure 2009-08-11 12:56:42.000000000 +0200
-+++ mysql-5.0.85/configure 2009-08-27 22:35:38.879725240 +0200
-@@ -835,8 +835,6 @@ MYSQLD_EXTRA_LIBS
- CLIENT_EXTRA_LDFLAGS
- MYSQLD_EXTRA_LDFLAGS
- LIBDL
--COMPILE_PSTACK_FALSE
--COMPILE_PSTACK_TRUE
- pstack_libs
- pstack_dirs
- WRAPLIBS
-@@ -16480,89 +16478,10 @@ else
- $as_echo "no" >&6; }
- fi
+--- mysql-5.1.41.orig/configure 2009-11-04 19:37:28.000000000 +0100
++++ mysql-5.1.41/configure 2009-12-25 12:18:01.000000000 +0100
+@@ -46976,197 +46976,14 @@ $as_echo "$as_me: error: unknown endiann
+ esac
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking \"return type of sprintf\"" >&5
--$as_echo_n "checking \"return type of sprintf\"... " >&6; }
--
--#check the return type of sprintf
--case $SYSTEM_TYPE in
-- *netware*)
-- $as_echo "#define SPRINTF_RETURNS_INT 1" >>confdefs.h
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"int\"" >&5
--$as_echo "\"int\"" >&6; }
-- ;;
-- *)
--if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+
+- { $as_echo "$as_me:$LINENO: checking whether GCC atomic builtins are available" >&5
+-$as_echo_n "checking whether GCC atomic builtins are available... " >&6; }
+- # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
+- if test "$cross_compiling" = yes; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
-else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-- int main()
-- {
-- char* s = "hello";
-- char buf[6];
-- if((int)sprintf(buf, s) == strlen(s))
-- return 0;
--
-- return -1;
-- }
+- int main()
+- {
+- long x;
+- long y;
+- long res;
+- char c;
+-
+- x = 10;
+- y = 123;
+- res = __sync_bool_compare_and_swap(&x, x, y);
+- if (!res || x != y) {
+- return(1);
+- }
+-
+- x = 10;
+- y = 123;
+- res = __sync_bool_compare_and_swap(&x, x + 1, y);
+- if (res || x != 10) {
+- return(1);
+- }
+-
+- x = 10;
+- y = 123;
+- res = __sync_add_and_fetch(&x, y);
+- if (res != 123 + 10 || x != 123 + 10) {
+- return(1);
+- }
+-
+- c = 10;
+- res = __sync_lock_test_and_set(&c, 123);
+- if (res != 10 || c != 123) {
+- return(1);
+- }
+-
+- return(0);
+- }
-
-_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--$as_echo "#define SPRINTF_RETURNS_INT 1" >>confdefs.h
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"int\"" >&5
--$as_echo "\"int\"" >&6; }
--else
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
-
-- int main()
-- {
-- char* s = "hello";
-- char buf[6];
-- if((char*)sprintf(buf,s) == buf + strlen(s))
-- return 0;
-- return -1;
-- }
-+# return type of sprintf is int for Linux glibc/uClibc
-+cat >>confdefs.h <<\_ACEOF
-+#define SPRINTF_RETURNS_INT 1
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_IB_GCC_ATOMIC_BUILTINS 1
_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--$as_echo "#define SPRINTF_RETURNS_PTR 1" >>confdefs.h
+
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"ptr\"" >&5
--$as_echo "\"ptr\"" >&6; }
-else
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
-
--$as_echo "#define SPRINTF_RETURNS_GARBAGE 1" >>confdefs.h
+-( exit $ac_status )
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"garbage\"" >&5
--$as_echo "\"garbage\"" >&6; }
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
-
-
-fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-- conftest.$ac_objext conftest.beam conftest.$ac_ext
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-- ;;
--esac
-
- # Extract the first word of "uname", so it can be a program name with args.
- set dummy uname; ac_word=$2
-@@ -17587,97 +17506,7 @@ $as_echo "no" >&6; }
- rm -f conftest.ic conftest.h
- fi
-
-
--# Look for PS usage. We use double dollar-signs in FIND_PROC because this
--# value is written to a makefile, which interprets away one level of
--# dollar-signs. So, interpretation stages are m4 and then shell in autoconf,
--# then Make, then shell. The autoconf substitution uses single quotes, so
--# no unprotected single quotes should appear in the expression.
--# Extract the first word of "ps", so it can be a program name with args.
--set dummy ps; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PS+set}" = set; then :
-- $as_echo_n "(cached) " >&6
--else
-- case $PS in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PS="$PS" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PS="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
-- done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_PS" && ac_cv_path_PS="ps"
-- ;;
--esac
--fi
--PS=$ac_cv_path_PS
--if test -n "$PS"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PS" >&5
--$as_echo "$PS" >&6; }
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
-
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking \"how to check if pid exists\"" >&5
--$as_echo_n "checking \"how to check if pid exists\"... " >&6; }
--PS=$ac_cv_path_PS
--# Linux style
--if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
--then
-- FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
--# Solaris
--elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
--then
-- FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
--# BSD style
--elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null
--then
-- FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
--# SysV style
--elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null
--then
-- FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
--# Do anybody use this?
--elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null
--then
-- FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+- { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by GCC atomic builtins" >&5
+-$as_echo_n "checking whether pthread_t can be used by GCC atomic builtins... " >&6; }
+- # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
+- if test "$cross_compiling" = yes; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
-else
-- case $SYSTEM_TYPE in
-- *freebsd*|*dragonfly*)
-- FIND_PROC="$PS p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
-- ;;
-- *darwin*)
-- FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
-- ;;
-- *cygwin*)
-- FIND_PROC="$PS -e | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
-- ;;
-- *netware*)
-- FIND_PROC=
-- ;;
-- *)
-- as_fn_error "Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." "$LINENO" 5
-- esac
--fi
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$FIND_PROC\"" >&5
--$as_echo "\"$FIND_PROC\"" >&6; }
-+FIND_PROC="/bin/ps wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
-
- # Check if a pid is valid
- # Extract the first word of "kill", so it can be a program name with args.
-@@ -19842,218 +19671,9 @@ fi
- fi
-
-
--
--if test "$TARGET_LINUX" = "true"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for atomic operations" >&5
--$as_echo_n "checking for atomic operations... " >&6; }
--
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
-
-- ac_ext=cpp
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+- #include <pthread.h>
+- #include <string.h>
-
+- int main(int argc, char** argv) {
+- pthread_t x1;
+- pthread_t x2;
+- pthread_t x3;
-
-- atom_ops=
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
+- memset(&x1, 0x0, sizeof(x1));
+- memset(&x2, 0x0, sizeof(x2));
+- memset(&x3, 0x0, sizeof(x3));
-
--#include <asm/atomic.h>
--int main()
--{
-- atomic_t v;
+- __sync_bool_compare_and_swap(&x1, x2, x3);
-
-- atomic_set(&v, 23);
-- atomic_add(5, &v);
-- return atomic_read(&v) == 28 ? 0 : -1;
--}
+- return(0);
+- }
-
-_ACEOF
--if ac_fn_cxx_try_run "$LINENO"; then :
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
-
--$as_echo "#define HAVE_ATOMIC_ADD 1" >>confdefs.h
-
-- atom_ops="${atom_ops}atomic_add "
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_IB_ATOMIC_PTHREAD_T_GCC 1
+ _ACEOF
+
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
-
-- if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
-else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include <asm/atomic.h>
--int main()
--{
-- atomic_t v;
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
-
-- atomic_set(&v, 23);
-- atomic_sub(5, &v);
-- return atomic_read(&v) == 18 ? 0 : -1;
--}
+-( exit $ac_status )
-
--_ACEOF
--if ac_fn_cxx_try_run "$LINENO"; then :
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
-
--$as_echo "#define HAVE_ATOMIC_SUB 1" >>confdefs.h
-
-- atom_ops="${atom_ops}atomic_sub "
-fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-- conftest.$ac_objext conftest.beam conftest.$ac_ext
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-- if test -z "$atom_ops"; then atom_ops="no"; fi
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $atom_ops" >&5
--$as_echo "$atom_ops" >&6; }
--
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--
--# Check whether --with-pstack was given.
--if test "${with_pstack+set}" = set; then :
-- withval=$with_pstack; USE_PSTACK=$withval
--else
-- USE_PSTACK=no
--fi
--
-- pstack_libs=
-- pstack_dirs=
-- if test "$USE_PSTACK" = yes -a "$TARGET_LINUX" = "true" -a "$BASE_MACHINE_TYPE" = "i386"
-- then
-- have_libiberty= have_libbfd=
-- my_save_LIBS="$LIBS"
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdmatch in -liberty" >&5
--$as_echo_n "checking for fdmatch in -liberty... " >&6; }
--if test "${ac_cv_lib_iberty_fdmatch+set}" = set; then :
-- $as_echo_n "(cached) " >&6
+
+ { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5
+ $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; }
+@@ -47284,101 +47101,6 @@ fi
+ done
+
+
+- { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by Solaris libc atomic functions" >&5
+-$as_echo_n "checking whether pthread_t can be used by Solaris libc atomic functions... " >&6; }
+- # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
+- if test "$cross_compiling" = yes; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
-else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-liberty $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char fdmatch ();
--int
--main ()
--{
--return fdmatch ();
-- ;
-- return 0;
--}
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
-_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_lib_iberty_fdmatch=yes
--else
-- ac_cv_lib_iberty_fdmatch=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iberty_fdmatch" >&5
--$as_echo "$ac_cv_lib_iberty_fdmatch" >&6; }
--if test "x$ac_cv_lib_iberty_fdmatch" = x""yes; then :
-- have_libiberty=yes
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
--$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
--if test "${ac_cv_lib_bfd_bfd_openr+set}" = set; then :
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lbfd -liberty $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bfd_openr ();
--int
--main ()
--{
--return bfd_openr ();
-- ;
-- return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_lib_bfd_bfd_openr=yes
--else
-- ac_cv_lib_bfd_bfd_openr=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
--$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
--if test "x$ac_cv_lib_bfd_bfd_openr" = x""yes; then :
-- have_libbfd=yes
--fi
--
--fi
+- #include <pthread.h>
+- #include <string.h>
-
-- LIBS="$my_save_LIBS"
+- int main(int argc, char** argv) {
+- pthread_t x1;
+- pthread_t x2;
+- pthread_t x3;
-
-- if test x"$have_libiberty" = xyes -a x"$have_libbfd" = xyes
-- then
-- pstack_dirs='$(top_srcdir)'/pstack
-- pstack_libs="../pstack/libpstack.a -lbfd -liberty"
-- # We must link staticly when using pstack
-- with_mysqld_ldflags="-all-static"
+- memset(&x1, 0x0, sizeof(x1));
+- memset(&x2, 0x0, sizeof(x2));
+- memset(&x3, 0x0, sizeof(x3));
-
+- if (sizeof(pthread_t) == 4) {
-
+- atomic_cas_32(&x1, x2, x3);
-
--$as_echo "#define USE_PSTACK 1" >>confdefs.h
+- } else if (sizeof(pthread_t) == 8) {
-
-- else
-- USE_PSTACK="no"
-- fi
-- else
-- USE_PSTACK="no"
-- fi
--fi
-- if test "$USE_PSTACK" = "yes"; then
-- COMPILE_PSTACK_TRUE=
-- COMPILE_PSTACK_FALSE='#'
--else
-- COMPILE_PSTACK_TRUE='#'
-- COMPILE_PSTACK_FALSE=
--fi
+- atomic_cas_64(&x1, x2, x3);
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should use pstack" >&5
--$as_echo_n "checking if we should use pstack... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_PSTACK" >&5
--$as_echo "$USE_PSTACK" >&6; }
-+$as_echo "#define HAVE_ATOMIC_ADD 0" >>confdefs.h
-+$as_echo "#define HAVE_ATOMIC_SUB 0" >>confdefs.h
-+$as_echo "#define USE_PSTACK 0" >>confdefs.h
-
- # Check for gtty if termio.h doesn't exists
- if test "$ac_cv_header_termio_h" = "no" -a "$ac_cv_header_termios_h" = "no"
-@@ -20116,59 +19736,6 @@ fi
- # Later in this script LIBS will be augmented with a threads library.
- NON_THREADED_LIBS="$LIBS"
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for int8" >&5
--$as_echo_n "checking for int8... " >&6; }
--case $SYSTEM_TYPE in
-- *netware)
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-- ;;
-- *)
--if test "$cross_compiling" = yes; then :
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
+- } else {
-
--#ifdef HAVE_STDLIB_H
--#include <stdlib.h>
--#endif
+- return(1);
+- }
-
--#ifdef HAVE_STDDEF_H
--#include <stddef.h>
--#endif
+- return(0);
+- }
-
--#ifdef HAVE_SYS_TYPES_H
--#include <sys/types.h>
--#endif
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
-
--int main()
--{
-- int8 i;
-- return 0;
--}
-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS 1
-_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--$as_echo "#define HAVE_INT_8_16_32 1" >>confdefs.h
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+-
-else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+- $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-
+- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-
+-
-fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-- conftest.$ac_objext conftest.beam conftest.$ac_ext
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-- ;;
--esac
- #
- # Some system specific hacks
-@@ -27705,10 +27272,6 @@ if test -z "${ASSEMBLER_TRUE}" && test -
- as_fn_error "conditional \"ASSEMBLER\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
--if test -z "${COMPILE_PSTACK_TRUE}" && test -z "${COMPILE_PSTACK_FALSE}"; then
-- as_fn_error "conditional \"COMPILE_PSTACK\" was never defined.
--Usually this means the macro was only invoked conditionally." "$LINENO" 5
--fi
- if test -z "${HAVE_YASSL_TRUE}" && test -z "${HAVE_YASSL_FALSE}"; then
- as_fn_error "conditional \"HAVE_YASSL\" was never defined.
+ # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h
deleted file mode 100644
index 0513e1c..0000000
--- a/package/mysql/patches/patch-include_my_global_h
+++ /dev/null
@@ -1,59 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- mysql-5.0.85.orig/include/my_global.h 2009-08-11 12:50:17.000000000 +0200
-+++ mysql-5.0.85/include/my_global.h 2009-08-27 22:21:39.363259500 +0200
-@@ -350,29 +350,32 @@ C_MODE_END
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+
- #if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA)
- #undef HAVE_ALLOCA
- #undef HAVE_ALLOCA_H
- #endif
--#ifdef HAVE_ALLOCA_H
--#include <alloca.h>
-+
-+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
-+#ifndef BSD
-+#define BSD
- #endif
--#ifdef HAVE_ATOMIC_ADD
--#define new my_arg_new
--#define need_to_restore_new 1
--C_MODE_START
--#include <asm/atomic.h>
--C_MODE_END
--#ifdef need_to_restore_new /* probably safer than #ifdef new */
--#undef new
--#undef need_to_restore_new
- #endif
-+
-+#if defined(HAVE_ALLOCA_H) && !defined(BSD)
-+#include <alloca.h>
- #endif
-+
- #include <errno.h> /* Recommended by debian */
- /* We need the following to go around a problem with openssl on solaris */
-+#ifdef BSD
-+#include <pwd.h>
-+#include <unistd.h>
-+#else
- #if defined(HAVE_CRYPT_H)
- #include <crypt.h>
- #endif
-+#endif
-
- /*
- A lot of our programs uses asserts, so better to always include it
-@@ -791,9 +794,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
- #define finite(x) (1.0 / fabs(x) > 0.0)
- #endif
-
-+/*
- #ifndef HAVE_ISNAN
- #define isnan(x) ((x) != (x))
- #endif
-+*/
-
- #ifdef HAVE_ISINF
- /* Check if C compiler is affected by GCC bug #39228 */
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index c3997b0..9e9ddf9 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -43,12 +43,15 @@ INSTALL_STYLE= auto
ALL_TARGET:= libs
INSTALL_TARGET:= install.libs install.data
+ifeq (${ADK_HOST_CYGWIN},y)
+CONFOPT:= --with-shared
+endif
pre-configure:
(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
./configure \
+ ${CONFOPT} \
--with-build-cc=${HOSTCC} \
- --with-shared \
--with-progs \
);
${MAKE} -C ${WRKBUILD}/include
diff --git a/package/ncurses/patches/patch-misc_run_tic_in b/package/ncurses/patches/patch-misc_run_tic_in
deleted file mode 100644
index c2d76c4..0000000
--- a/package/ncurses/patches/patch-misc_run_tic_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ncurses-5.7.orig/misc/run_tic.in 2006-10-28 21:43:30.000000000 +0200
-+++ ncurses-5.7/misc/run_tic.in 2009-05-07 18:43:38.156250000 +0200
-@@ -61,7 +61,7 @@ test -z "${DESTDIR}" && DESTDIR=
- # Allow tic to run either from the install-path, or from the build-directory.
- # Do not do this if we appear to be cross-compiling. In that case, we rely
- # on the host's copy of tic to compile the terminfo database.
--if test "$THAT_CC" = "$THIS_CC" ; then
-+if test "$THAT_CC" != "$THIS_CC" ; then
- case "$PATH" in
- :*) PATH=../progs:../lib:${DESTDIR}$bindir$PATH ;;
- *) PATH=../progs:../lib:${DESTDIR}$bindir:$PATH ;;
diff --git a/package/nfs-utils/Config.in.kerberos b/package/nfs-utils/Config.in.kerberos
deleted file mode 100644
index 7c82d55..0000000
--- a/package/nfs-utils/Config.in.kerberos
+++ /dev/null
@@ -1,31 +0,0 @@
-config ADK_COMPILE_NFS_UTILS_WITH_KERBEROS
- prompt "Enable Kerberos and NFSv4"
- bool
- select ADK_PACKAGE_LIBEVENT
- select ADK_PACKAGE_LIBNFSIDMAP
- select ADK_PACKAGE_LIBRPCSECGSS
- select ADK_PACKAGE_LIBCOM_ERR
- select ADK_KERNEL_NFSD_V4
- default n
- depends on ADK_PACKAGE_NFS_UTILS
-
-choice
-prompt "Kerberos implementation"
-depends on ADK_COMPILE_NFS_UTILS_WITH_KERBEROS
-config ADK_COMPILE_NFS_UTILS_WITH_KRB5
- prompt "MIT"
- bool
- select ADK_COMPILE_KRB5
- select ADK_PACKAGE_KRB5_LIBS
- select ADK_PACKAGE_LIBGSSGLUE
- help
- use MIT kerberos libraries
-
-config ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL
- prompt "Heimdal"
- bool
- select ADK_PACKAGE_HEIMDAL_LIBS
- help
- Use heimdal kerberos libraries (experimental)
-
-endchoice
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index c2cb0d8..b2c2c21 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -4,53 +4,40 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= nfs-utils
-PKG_VERSION:= 1.2.0
+PKG_VERSION:= 1.2.1
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libtirpc
-ifeq (${ADK_COMPILE_NFS_UTILS_WITH_KRB5},y)
-PKG_BUILDDEP+= libnfsidmap krb5 libevent libgssglue librpcsecgss
-endif
-ifeq (${ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL},y)
-PKG_BUILDDEP+= libnfsidmap heimdal libevent librpcsecgss
-endif
-PKG_MD5SUM:= 779cf81044e92cb51ad590960e7b3671
+PKG_MD5SUM:= c3ccd16c147befd49fe4541a506dd177
PKG_DESCR:= Utilities for NFS kernel server implementation
PKG_SECTION:= net
PKG_DEPENDS:= portmap libtirpc
+PKG_BUILDDEP+= libtirpc
+ifeq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y)
+PKG_BUILDDEP+= libnfsidmap krb5 libevent libgssglue librpcsecgss
+endif
PKG_URL:= http://sourceforge.net/projects/nfs
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-include ${TOPDIR}/mk/package.mk
+PKG_FLAVOURS:= WITH_KERBEROS
+PKGFD_WITH_KERBEROS:= enable Kerberos support (MIT)
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KRB5),y)
-PKG_DEPENDS+= krb5-libs libevent libnfsidmap librpcsecgss libcom_err libgssglue
-endif
+include ${TOPDIR}/mk/package.mk
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL),y)
-PKG_DEPENDS+= heimdal-libs libevent libnfsidmap librpcsecgss libcom_err
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
+PKG_DEPENDS+= krb5-libs libevent libnfsidmap librpcsecgss libcom-err libgssglue
endif
$(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TCPPFLAGS+= -I${LINUX_DIR}/include
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KRB5),y)
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
CONFIGURE_ARGS+= --enable-nfsv4 \
--with-krb5-config=${STAGING_DIR}/usr/bin/krb5-config \
--enable-gss
CONFIGURE_ENV+= LIBS="-lrpcsecgss"
-endif
-
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL),y)
-CONFIGURE_ARGS+= --enable-nfsv4 \
- --with-krb5-config=${STAGING_DIR}/usr/bin/krb5-config \
- --enable-gss
-CONFIGURE_ENV+= LIBS="-lrpcsecgss"
-endif
-
-ifneq ($(ADK_COMPILE_NFS_UTILS_WITH_KERBEROS),y)
+else
CONFIGURE_ARGS+= --disable-nfsv4 \
--disable-gss
endif
@@ -62,7 +49,7 @@ CONFIGURE_ARGS+= --without-tcp-wrappers \
--with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc \
--disable-uuid
-CONFIGURE_STYLE:= autotool gnu
+CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
@@ -76,7 +63,7 @@ post-install:
${INSTALL_BIN} ${WRKBUILD}/utils/statd/statd ${IDIR_NFS_UTILS}/usr/sbin/
${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd ${IDIR_NFS_UTILS}/usr/sbin/
${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd ${IDIR_NFS_UTILS}/usr/sbin/
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KERBEROS),y)
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS}/etc
${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd ${IDIR_NFS_UTILS}/usr/sbin/
${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd ${IDIR_NFS_UTILS}/usr/sbin/
diff --git a/package/nfs-utils/patches/patch-aclocal_kerberos5_m4 b/package/nfs-utils/patches/patch-aclocal_kerberos5_m4
deleted file mode 100644
index 1a5ca00..0000000
--- a/package/nfs-utils/patches/patch-aclocal_kerberos5_m4
+++ /dev/null
@@ -1,138 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nfs-utils-1.1.4.orig/aclocal/kerberos5.m4 2008-10-17 16:20:09.000000000 +0200
-+++ nfs-utils-1.1.4/aclocal/kerberos5.m4 2009-01-30 16:24:45.000000000 +0100
-@@ -1,112 +1,48 @@
--dnl Checks for Kerberos
--dnl NOTE: while we intend to do generic gss-api, currently we
--dnl have a requirement to get an initial Kerberos machine
--dnl credential. Thus, the requirement for Kerberos.
--dnl The Kerberos gssapi library will be dynamically loaded?
- AC_DEFUN([AC_KERBEROS_V5],[
-+ K5CONFIG="krb5-config"
- AC_MSG_CHECKING(for Kerberos v5)
-- AC_ARG_WITH(krb5,
-- [AC_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])],
-+ AC_ARG_WITH(krb5-config,
-+ [AC_HELP_STRING([--with-krb5-config=PATH], [Full Path to krb5-config.])],
- [ case "$withval" in
- yes|no)
-- krb5_with=""
-+ K5CONFIG="krb5-config"
- ;;
- *)
-- krb5_with="$withval"
-+ K5CONFIG="$withval"
- ;;
- esac ]
- )
-
-- for dir in $krb5_with /usr /usr/kerberos /usr/local /usr/local/krb5 \
-- /usr/krb5 /usr/heimdal /usr/local/heimdal /usr/athena ; do
-- dnl This ugly hack brought on by the split installation of
-- dnl MIT Kerberos on Fedora Core 1
-- K5CONFIG=""
-- if test -f $dir/bin/krb5-config; then
-- K5CONFIG=$dir/bin/krb5-config
-- elif test -f "/usr/kerberos/bin/krb5-config"; then
-- K5CONFIG="/usr/kerberos/bin/krb5-config"
-- elif test -f "/usr/lib/mit/bin/krb5-config"; then
-- K5CONFIG="/usr/lib/mit/bin/krb5-config"
-- fi
- if test "$K5CONFIG" != ""; then
- KRBCFLAGS=`$K5CONFIG --cflags`
- KRBLIBS=`$K5CONFIG --libs gssapi`
-- K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
-- AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
-- if test -f $dir/include/gssapi/gssapi_krb5.h -a \
-- \( -f $dir/lib/libgssapi_krb5.a -o \
-- -f $dir/lib64/libgssapi_krb5.a -o \
-- -f $dir/lib64/libgssapi_krb5.so -o \
-- -f $dir/lib/libgssapi_krb5.so \) ; then
-+ if $K5CONFIG --version | grep -q -e heimdal; then
-+ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f2 -d ' ' | tr -d '.'`
-+ AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
-+ gssapi_lib=gssapi
-+ KRBIMPL="heimdal"
-+ elif $K5CONFIG --version | grep -q -e Kerberos; then
-+ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f4 -d ' ' | tr -d '.'`
- AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
-- KRBDIR="$dir"
-- dnl If we are using MIT K5 1.3.1 and before, we *MUST* use the
-- dnl private function (gss_krb5_ccache_name) to get correct
-- dnl behavior of changing the ccache used by gssapi.
-- dnl Starting in 1.3.2, we *DO NOT* want to use
-- dnl gss_krb5_ccache_name, instead we want to set KRB5CCNAME
-- dnl to get gssapi to use a different ccache
- if test $K5VERS -le 131; then
- AC_DEFINE(USE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the private function, gss_krb5_cache_name, must be used to tell the Kerberos library which credentials cache to use. Otherwise, this is done by setting the KRB5CCNAME environment variable])
- fi
- gssapi_lib=gssapi_krb5
-- break
-- dnl The following ugly hack brought on by the split installation
-- dnl of Heimdal Kerberos on SuSe
-- elif test \( -f $dir/include/heim_err.h -o\
-- -f $dir/include/heimdal/heim_err.h \) -a \
-- -f $dir/lib/libroken.a; then
-- AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
-- KRBDIR="$dir"
-- gssapi_lib=gssapi
-- break
-- fi
-- fi
-- done
-- dnl We didn't find a usable Kerberos environment
-- if test "x$KRBDIR" = "x"; then
-- if test "x$krb5_with" = "x"; then
-- AC_MSG_ERROR(Kerberos v5 with GSS support not found: consider --disable-gss or --with-krb5=)
-+ KRBIMPL="mit-krb5"
- else
-- AC_MSG_ERROR(Kerberos v5 with GSS support not found at $krb5_with)
-- fi
-+ AC_MSG_ERROR(Unknown Kerberos 5 Implementation. Is neither heimdal or mit-krb5.)
-+ KRBIMPL="unknown"
- fi
-- AC_MSG_RESULT($KRBDIR)
--
-- dnl Check if -rpath=$(KRBDIR)/lib is needed
-- echo "The current KRBDIR is $KRBDIR"
-- if test "$KRBDIR/lib" = "/lib" -o "$KRBDIR/lib" = "/usr/lib" \
-- -o "$KRBDIR/lib" = "//lib" -o "$KRBDIR/lib" = "/usr//lib" ; then
-- KRBLDFLAGS="";
-- elif /sbin/ldconfig -p | grep > /dev/null "=> $KRBDIR/lib/"; then
-- KRBLDFLAGS="";
-- else
-- KRBLDFLAGS="-Wl,-rpath=$KRBDIR/lib"
-+ AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
- fi
-+ AC_MSG_RESULT($KRBIMPL)
-
-- dnl Now check for functions within gssapi library
-- AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context,
-- AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS)
-- AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes,
-- AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS)
-- AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name,
-- AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS)
--
-- dnl Check for newer error message facility
-- AC_CHECK_LIB($gssapi_lib, krb5_get_error_message,
-- AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS)
--
-- dnl Check for function to specify addressless tickets
-- AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless,
-- AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS)
--
-- dnl If they specified a directory and it didn't work, give them a warning
-- if test "x$krb5_with" != "x" -a "$krb5_with" != "$KRBDIR"; then
-- AC_MSG_WARN(Using $KRBDIR instead of requested value of $krb5_with for Kerberos!)
-- fi
-+ AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS)
-+ AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS)
-+ AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS)
-+ AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS)
-+ AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS)
-
-- AC_SUBST([KRBDIR])
- AC_SUBST([KRBLIBS])
- AC_SUBST([KRBCFLAGS])
- AC_SUBST([KRBLDFLAGS])
diff --git a/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c b/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c
index 5097e0c..65c51fc 100644
--- a/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c
+++ b/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c
@@ -1,6 +1,5 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nfs-utils-1.1.3.orig/support/nfs/nfs_mntent.c 2008-07-27 23:01:45.000000000 +0200
-+++ nfs-utils-1.1.3/support/nfs/nfs_mntent.c 2008-10-06 16:53:17.000000000 +0200
+--- nfs-utils-1.2.1.orig/support/nfs/nfs_mntent.c 2009-11-04 12:13:56.000000000 +0100
++++ nfs-utils-1.2.1/support/nfs/nfs_mntent.c 2009-12-25 19:33:24.000000000 +0100
@@ -9,7 +9,7 @@
*/
diff --git a/package/nfs-utils/patches/patch-tools_Makefile_am b/package/nfs-utils/patches/patch-tools_Makefile_am
deleted file mode 100644
index 073486f..0000000
--- a/package/nfs-utils/patches/patch-tools_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nfs-utils-1.1.4.orig/tools/Makefile.am 2008-10-17 16:20:09.000000000 +0200
-+++ nfs-utils-1.1.4/tools/Makefile.am 2009-01-03 14:12:09.000000000 +0100
-@@ -6,6 +6,6 @@ if CONFIG_RPCGEN
- OPTDIRS += rpcgen
- endif
-
--SUBDIRS = locktest rpcdebug nlmtest $(OPTDIRS)
-+SUBDIRS = $(OPTDIRS)
-
- MAINTAINERCLEANFILES = Makefile.in
diff --git a/package/nfs-utils/patches/patch-tools_Makefile_in b/package/nfs-utils/patches/patch-tools_Makefile_in
index ef12d1e..a972261 100644
--- a/package/nfs-utils/patches/patch-tools_Makefile_in
+++ b/package/nfs-utils/patches/patch-tools_Makefile_in
@@ -1,16 +1,15 @@
-$Id$
---- nfs-utils-1.1.4.orig/tools/Makefile.in 2008-10-17 16:23:52.000000000 +0200
-+++ nfs-utils-1.1.4/tools/Makefile.in 2009-01-03 13:46:50.000000000 +0100
-@@ -59,7 +59,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
- distclean-recursive maintainer-clean-recursive
+--- nfs-utils-1.2.1.orig/tools/Makefile.in 2009-11-04 12:15:52.000000000 +0100
++++ nfs-utils-1.2.1/tools/Makefile.in 2009-12-25 19:25:33.000000000 +0100
+@@ -71,7 +71,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
+ distdir
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = locktest rpcdebug nlmtest rpcgen
+DIST_SUBDIRS = rpcgen
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-@@ -210,7 +210,7 @@ target_alias = @target_alias@
+ am__relativize = \
+ dir0=`pwd`; \
+@@ -257,7 +257,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
OPTDIRS = $(am__append_1)
diff --git a/package/nfs-utils/patches/patch-utils_mount_error_c b/package/nfs-utils/patches/patch-utils_mount_error_c
index ab45902..641a482 100644
--- a/package/nfs-utils/patches/patch-utils_mount_error_c
+++ b/package/nfs-utils/patches/patch-utils_mount_error_c
@@ -1,6 +1,5 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nfs-utils-1.1.3.orig/utils/mount/error.c 2008-07-27 23:01:45.000000000 +0200
-+++ nfs-utils-1.1.3/utils/mount/error.c 2008-10-06 16:58:40.000000000 +0200
+--- nfs-utils-1.2.1.orig/utils/mount/error.c 2009-11-04 12:13:56.000000000 +0100
++++ nfs-utils-1.2.1/utils/mount/error.c 2009-12-25 19:32:49.000000000 +0100
@@ -62,7 +62,7 @@ static int rpc_strerror(int spos)
char *tmp;
diff --git a/package/nfs-utils/patches/patch-utils_mountd_cache_c b/package/nfs-utils/patches/patch-utils_mountd_cache_c
deleted file mode 100644
index 5f46d31..0000000
--- a/package/nfs-utils/patches/patch-utils_mountd_cache_c
+++ /dev/null
@@ -1,75 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nfs-utils-1.1.4.orig/utils/mountd/cache.c 2008-10-17 16:20:09.000000000 +0200
-+++ nfs-utils-1.1.4/utils/mountd/cache.c 2009-01-03 13:48:33.000000000 +0100
-@@ -118,54 +118,6 @@ void auth_unix_ip(FILE *f)
- free(he);
- }
-
--void auth_unix_gid(FILE *f)
--{
-- /* Request are
-- * uid
-- * reply is
-- * uid expiry count list of group ids
-- */
-- int uid;
-- struct passwd *pw;
-- gid_t glist[100], *groups = glist;
-- int ngroups = 100;
-- int rv, i;
-- char *cp;
--
-- if (readline(fileno(f), &lbuf, &lbuflen) != 1)
-- return;
--
-- cp = lbuf;
-- if (qword_get_int(&cp, &uid) != 0)
-- return;
--
-- pw = getpwuid(uid);
-- if (!pw)
-- rv = -1;
-- else {
-- rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
-- if (rv == -1 && ngroups >= 100) {
-- groups = malloc(sizeof(gid_t)*ngroups);
-- if (!groups)
-- rv = -1;
-- else
-- rv = getgrouplist(pw->pw_name, pw->pw_gid,
-- groups, &ngroups);
-- }
-- }
-- qword_printint(f, uid);
-- qword_printint(f, time(0)+30*60);
-- if (rv >= 0) {
-- qword_printint(f, ngroups);
-- for (i=0; i<ngroups; i++)
-- qword_printint(f, groups[i]);
-- } else
-- qword_printint(f, 0);
-- qword_eol(f);
--
-- if (groups != glist)
-- free(groups);
--}
-
- #if USE_BLKID
- static const char *get_uuid_blkdev(char *path)
-@@ -730,7 +682,6 @@ struct {
- FILE *f;
- } cachelist[] = {
- { "auth.unix.ip", auth_unix_ip},
-- { "auth.unix.gid", auth_unix_gid},
- { "nfsd.export", nfsd_export},
- { "nfsd.fh", nfsd_fh},
- { NULL, NULL }
-@@ -742,8 +693,6 @@ void cache_open(void)
- int i;
- for (i=0; cachelist[i].cache_name; i++ ) {
- char path[100];
-- if (!manage_gids && cachelist[i].cache_handle == auth_unix_gid)
-- continue;
- sprintf(path, "/proc/net/rpc/%s/channel", cachelist[i].cache_name);
- cachelist[i].f = fopen(path, "r+");
- }
diff --git a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
index 61e42a7..e5569c8 100644
--- a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
+++ b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
@@ -1,6 +1,5 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nfs-utils-1.1.3.orig/utils/mountd/fsloc.c 2008-07-27 23:01:45.000000000 +0200
-+++ nfs-utils-1.1.3/utils/mountd/fsloc.c 2008-10-06 16:46:49.000000000 +0200
+--- nfs-utils-1.2.1.orig/utils/mountd/fsloc.c 2009-11-04 12:13:56.000000000 +0100
++++ nfs-utils-1.2.1/utils/mountd/fsloc.c 2009-12-25 19:26:25.000000000 +0100
@@ -126,7 +126,7 @@ static struct servers *method_list(char
struct servers *rv=NULL;
diff --git a/package/nut/Makefile b/package/nut/Makefile
index e01d4dc..1239402 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -6,34 +6,30 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= nut
PKG_VERSION:= 2.4.1
PKG_RELEASE:= 1
+PKG_MD5SUM:= 609ebaf2123fc7171d25a6c742dd7d66
+PKG_DESCR:= Network UPS Tools
+PKG_SECTION:= sys
ifneq (${ADK_PACKAGE_NUT_SSL},)
+PKG_DEPENDS+= libopenssl
PKG_BUILDDEP+= openssl
endif
ifneq (${ADK_PACKAGE_NUT_USB},)
+PKG_DEPENDS+= libusb
PKG_BUILDDEP+= libusb
endif
ifneq (${ADK_PACKAGE_NUT_SNMP},)
+PKG_DEPENDS+= libnetsnmp
PKG_BUILDDEP+= net-snmp
endif
-PKG_MD5SUM:= 609ebaf2123fc7171d25a6c742dd7d66
-PKG_DESCR:= Network UPS Tools
-PKG_SECTION:= sys
PKG_URL:= http://www.networkupstools.org
PKG_SITES:= http://www.networkupstools.org/source/2.4/
-include ${TOPDIR}/mk/package.mk
-
-ifneq (${ADK_PACKAGE_NUT_SNMP},)
-PKG_DEPENDS+= libnetsnmp
-endif
-
-ifneq (${ADK_PACKAGE_NUT_USB},)
-PKG_DEPENDS+= libusb
-endif
+PKG_FLAVOURS:= SSL SNMP USB
+PKGFD_SSL:= enable SSL support
+PKGFD_SNMP:= enable SNMP support
+PKGFD_USB:= enable USB support
-ifneq (${ADK_PACKAGE_NUT_SSL},)
-PKG_DEPENDS+= libopenssl
-endif
+include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,NUT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -95,10 +91,12 @@ CONFIGURE_ARGS+= --with-ssl
CONFIGURE_ENV+= CPPFLAGS="${TCPPFLAGS} ${TLDFLAGS}"
MAKE_FLAGS+= SSL_CFLAGS="${TCPPFLAGS}" SSL_LDFLAGS="${TLDFLAGS} -lssl -lcrypto"
endif
+
BUILD_STYLE:= auto
ALL_TARGET:= all
INSTALL_STYLE:= auto
INSTALL_TARGET:= install
+
ifneq (${ADK_PACKAGE_NUT_USB},)
ALL_TARGET+= usb
INSTALL_TARGET+= install-usb
diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile
index 4e0b181..c2c600f 100644
--- a/package/olsrd/Makefile
+++ b/package/olsrd/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= acf15dbd0af521a6826541b567c6473a
PKG_DESCR:= implementation of the Optimized Link State Routing protocol
PKG_SECTION:= net
+PKG_MULTI:= 1
PKG_URL:= http://www.olsr.org
PKG_SITES:= http://www.olsr.org/releases/0.5/
diff --git a/package/php/Makefile b/package/php/Makefile
index d5b00c0..e8db125 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -6,6 +6,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= php
PKG_VERSION:= 5.3.1
PKG_RELEASE:= 1
+PKG_MD5SUM:= 41fbb368d86acb13fc3519657d277681
+PKG_DESCR:= PHP CLI
+PKG_SECTION:= net
+PKG_MULTI:= 1
+PKG_DEPENDS:= libopenssl zlib
PKG_BUILDDEP+= openssl zlib
ifneq ($(ADK_PACKAGE_PHP_MOD_CURL),)
PKG_BUILDDEP+= curl
@@ -34,10 +39,6 @@ endif
ifneq ($(ADK_PACKAGE_PHP_MOD_XML),)
PKG_BUILDDEP+= expat
endif
-PKG_MD5SUM:= 41fbb368d86acb13fc3519657d277681
-PKG_DESCR:= PHP CLI
-PKG_SECTION:= net
-PKG_DEPENDS:= libopenssl zlib
PHP_URL:= http://www.php.net
PKG_SITES:= http://de.php.net/distributions/
diff --git a/package/pkgmaker b/package/pkgmaker
index d9c9285..9ed51b7 100644
--- a/package/pkgmaker
+++ b/package/pkgmaker
@@ -61,7 +61,7 @@ for dn in */Makefile; do
# CFLINE_*: one free-format Config.in line per subpackage option
# PKGFD_*: flavour description, per package flavour option
# PKG_{HOST,TARGET}_DEPENDS: add host or target dependencies
- eval $($GMAKE dump="PKG_NAME PKG_FLAVOURS PKG_DESCR PKG_URL PKG_CXX \
+ eval $($GMAKE dump="PKG_NAME PKG_FLAVOURS PKG_DESCR PKG_URL PKG_MULTI PKG_CXX \
ALL_PKGOPTS \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x} \
PKGDESC_\${x} PKGDEPS_\${x} PKGDFLT_\${x} CFLINE_\${x}) \
\$(foreach x,\${PKG_FLAVOURS},PKGFD_\${x}) \
@@ -93,8 +93,18 @@ for dn in */Makefile; do
print -nu4 \\tdepends on
sp=' ' # local sp: space (or ' || ')
for spcu in $ALL_PKGOPTS; do # spcu: package option, ucase
- print -nu4 "${sp}ADK_PACKAGE_$spcu"
- sp=' || '
+ if [[ -n $PKG_MULTI ]]; then
+ if [[ $dnu != $spcu ]]; then
+ print -nu4 "${sp}ADK_PACKAGE_$spcu"
+ sp=' || '
+ else
+ print -nu4 "${sp}ADK_HAVE_DOT_CONFIG"
+ sp=' || '
+ fi
+ else
+ print -nu4 "${sp}ADK_PACKAGE_$spcu"
+ sp=' || '
+ fi
done
print -u4
fi
@@ -177,6 +187,11 @@ for dn in */Makefile; do
fi
print -u$h "\tprompt \"$spnf\""
print -u$h \\ttristate
+ if [[ -n $PKG_MULTI ]]; then
+ if [[ $spcu != $dnu ]]; then
+ print -u$h "\tdepends on ADK_PACKAGE_$dnu"
+ fi
+ fi
[[ -n $phd ]] && print -u$h "$phd"
[[ -n $ptd ]] && print -u$h "$ptd"
print -u$h "\tdefault ${dflt:-n}"
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 322812d..09327b6 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 18
PKG_MD5SUM:= 183800762e266132218b204dfb428d29
PKG_DESCR:= Point-to-Point Protocol software
PKG_SECTION:= net
+PKG_MULTI:= 1
PKG_DEPENDS:= kmod-ppp
PKG_URL:= http://ppp.samba.org
PKG_SITES:= ftp://ftp.samba.org/pub/ppp/
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile
index e38f0d8..a36c187 100644
--- a/package/rtorrent/Makefile
+++ b/package/rtorrent/Makefile
@@ -13,17 +13,17 @@ PKG_SECTION:= net
PKG_DEPENDS:= libncurses libtorrent libcurl
PKG_URL:= http://libtorrent.rakshasa.no
PKG_SITES:= http://libtorrent.rakshasa.no/downloads/
-PKG_CXX:= RTORRENT
+#PKG_CXX:= RTORRENT
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,RTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-ifeq ($(ADK_COMPILE_RTORRENT_WITH_UCLIBCXX),y)
-CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \
- -I${STAGING_DIR}/usr/include/uClibc++" \
- LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc"
-endif
+#ifeq ($(ADK_COMPILE_RTORRENT_WITH_UCLIBCXX),y)
+#CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \
+# -I${STAGING_DIR}/usr/include/uClibc++" \
+# LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc"
+#endif
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile
index deba7ab..445e508 100644
--- a/package/sane-backends/Makefile
+++ b/package/sane-backends/Makefile
@@ -6,11 +6,12 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= sane-backends
PKG_VERSION:= 1.0.20
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libpthread libusb
PKG_MD5SUM:= a0cfdfdebca2feb4f2ba5d3418b15a42
PKG_DESCR:= Scanner access now easy
PKG_SECTION:= misc
PKG_DEPENDS:= libpthread
+PKG_BUILDDEP+= libpthread libusb
+PKG_MULTI:= 1
PKG_URL:= http://www.sane-project.org
PKG_SITES:= ftp://ftp2.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/ \
ftp://ftp3.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/ \
diff --git a/package/sangam-atm/Makefile b/package/sangam-atm/Makefile
index 143d7a0..ed13776 100644
--- a/package/sangam-atm/Makefile
+++ b/package/sangam-atm/Makefile
@@ -11,6 +11,8 @@ PKG_DESCR:= sangam-atm DSL modem driver for TI AR7 boards
PKG_SECTION:= kernel
PKG_SITES:= http://openadk.org/distfiles/
+PKG_TARGET_DEPENDS:= ag241
+
include ${TOPDIR}/mk/package.mk
include ${TOPDIR}/mk/kernel-vars.mk
diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile
index 86feb2d..c65a3a0 100644
--- a/package/sispmctl/Makefile
+++ b/package/sispmctl/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= sispmctl
PKG_VERSION:= 2.7
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libusb
PKG_MD5SUM:= 2457f76cd129f880634f3381be0aeb76
PKG_DESCR:= control application for power sockets
PKG_SECTION:= misc
-PKG_DEPENDS:= libusb
+PKG_DEPENDS:= libusb libusb-compat
+PKG_BUILDDEP+= libusb libusb-compat
PKG_URL:= http://sispmctl.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sispmctl/}
diff --git a/package/snort-wireless/Makefile b/package/snort-wireless/Makefile
deleted file mode 100644
index 1aed15e..0000000
--- a/package/snort-wireless/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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:= snort-wireless
-PKG_VERSION:= 2.4.3-alpha04
-PKG_RELEASE:= 9
-PKG_BUILDDEP+= libnet libpcap pcre
-PKG_MD5SUM:= 1aa699ae279bf7a1140cf6cca02f9999
-PKG_DESCR:= a flexible Wireless Network Intrusion Detection System (NIDS)
-PKG_SECTION:= net
-PKG_DEPENDS:= libnet libpcap pcre
-PKG_URL:= http://www.snort-wireless.org
-PKG_SITES:= http://www.snort-wireless.org/files/
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,SNORT_WIRELESS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --enable-flexresp \
- --with-libnet-includes="${STAGING_DIR}/usr/include" \
- --with-libnet-libraries="${STAGING_DIR}/usr/lib" \
- --with-libpcap-includes="${STAGING_DIR}/usr/include" \
- --with-libpcap-libraries="${STAGING_DIR}/usr/lib" \
- --with-libpcre-includes="${STAGING_DIR}/usr/include" \
- --with-libpcre-libraries="${STAGING_DIR}/usr/lib" \
- --without-mysql \
- --without-postgresql \
- --disable-inline
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
-
-post-install:
- ${INSTALL_DIR} ${IDIR_SNORT_WIRELESS}/usr/bin
- ${INSTALL_DIR} ${IDIR_SNORT_WIRELESS}/etc/snort
- ${INSTALL_DATA} ${WRKBUILD}/etc/snort.conf ${IDIR_SNORT_WIRELESS}/etc/snort/
- ${INSTALL_DATA} ${WRKBUILD}/etc/classification.config \
- ${IDIR_SNORT_WIRELESS}/etc/snort/
- ${INSTALL_DATA} ${WRKBUILD}/etc/gen-msg.map ${IDIR_SNORT_WIRELESS}/etc/snort/
- ${INSTALL_DATA} ${WRKBUILD}/etc/reference.config ${IDIR_SNORT_WIRELESS}/etc/snort/
- ${INSTALL_DATA} ${WRKBUILD}/etc/sid-msg.map ${IDIR_SNORT_WIRELESS}/etc/snort/
- ${INSTALL_DATA} ${WRKBUILD}/etc/threshold.conf ${IDIR_SNORT_WIRELESS}/etc/snort/
- ${INSTALL_DATA} ${WRKBUILD}/etc/unicode.map ${IDIR_SNORT_WIRELESS}/etc/snort/
- ${INSTALL_BIN} ${WRKINST}/usr/bin/snort ${IDIR_SNORT_WIRELESS}/usr/bin
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/snort-wireless/files/snort-wireless.conffiles b/package/snort-wireless/files/snort-wireless.conffiles
deleted file mode 100644
index a224c4c..0000000
--- a/package/snort-wireless/files/snort-wireless.conffiles
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/snort/snort.conf
-/etc/snort/threshold.conf
diff --git a/package/snort-wireless/files/snort-wireless.init b/package/snort-wireless/files/snort-wireless.init
deleted file mode 100644
index 1a07d1b..0000000
--- a/package/snort-wireless/files/snort-wireless.init
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#PKG snort-wireless
-#INIT 75
-
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
- test x"${snort_wireless:-NO}" = x"NO" && exit 0
- exec sh $0 start
- ;;
-start)
- [ -d /var/log/snort ] || mkdir -p /var/log/snort
- snort ${snort_wireless_flags}
- ;;
-stop)
- pkill snort
- ;;
-restart)
- sh $0 stop
- sh $0 start
- ;;
-*)
- echo "Usage: $0 {start | stop | restart}"
- exit 1
- ;;
-esac
-exit $?
diff --git a/package/snort-wireless/files/snort-wireless.postinst b/package/snort-wireless/files/snort-wireless.postinst
deleted file mode 100644
index a348b7a..0000000
--- a/package/snort-wireless/files/snort-wireless.postinst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf snort-wireless snort_wireless NO
-add_rcconf snort-wireless snort_wireless_flags "-i eth0.1 -c /etc/snort/snort.conf -D -N -q -s"
diff --git a/package/snort-wireless/patches/500-no-config-search.patch b/package/snort-wireless/patches/500-no-config-search.patch
deleted file mode 100644
index d674ba6..0000000
--- a/package/snort-wireless/patches/500-no-config-search.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- snort-2.3.2-orig/src/snort.c 2005-01-13 21:36:20.000000000 +0100
-+++ snort-2.3.2-1/src/snort.c 2005-04-04 20:03:34.000000000 +0200
-@@ -1949,7 +1949,7 @@
- {
- struct stat st;
- int i;
-- char *conf_files[]={"/etc/snort.conf", "./snort.conf", NULL};
-+ char *conf_files[]={"/etc/snort/snort.conf", NULL};
- char *fname = NULL;
- char *home_dir = NULL;
- char *rval = NULL;
-@@ -1970,23 +1970,6 @@
- i++;
- }
-
-- /* search for .snortrc in the HOMEDIR */
-- if(!rval)
-- {
-- if((home_dir = getenv("HOME")))
-- {
-- /* create the full path */
-- fname = (char *)malloc(strlen(home_dir) + strlen("/.snortrc") + 1);
-- if(!fname)
-- FatalError("Out of memory searching for config file\n");
--
-- if(stat(fname, &st) != -1)
-- rval = fname;
-- else
-- free(fname);
-- }
-- }
--
- return rval;
- }
-
diff --git a/package/snort-wireless/patches/750-lightweight-config.patch b/package/snort-wireless/patches/750-lightweight-config.patch
deleted file mode 100644
index daea3be..0000000
--- a/package/snort-wireless/patches/750-lightweight-config.patch
+++ /dev/null
@@ -1,178 +0,0 @@
---- snort-wireless-2.4.3-alpha04/etc/snort.conf 2005-10-21 09:41:01.000000000 +0200
-+++ /Users/florian/telechargements/snort.conf 2005-10-30 13:20:17.000000000 +0100
-@@ -6,6 +6,7 @@
- #
- ###################################################
- # This file contains a sample snort configuration.
-+# Most preprocessors and rules were disabled to save memory.
- # You can take the following steps to create your own custom configuration:
- #
- # 1) Set the variables for your network
-@@ -42,10 +43,10 @@
- # or you can specify the variable to be any IP address
- # like this:
-
--var HOME_NET any
-+var HOME_NET 192.168.1.0/24
-
- # Set up the external network addresses as well. A good start may be "any"
--var EXTERNAL_NET any
-+var EXTERNAL_NET !$HOME_NET
-
- # Configure your wireless AP lists. This allows snort to look for attacks
- # against your wireless network, such as rogue access points or adhoc wireless
-@@ -137,7 +138,7 @@
- # Path to your rules files (this can be a relative path)
- # Note for Windows users: You are advised to make this an absolute path,
- # such as: c:\snort\rules
--var RULE_PATH ../rules
-+var RULE_PATH /etc/snort/rules
-
- # Configure the snort decoder
- # ============================
-@@ -413,11 +414,11 @@
- # lots of options available here. See doc/README.http_inspect.
- # unicode.map should be wherever your snort.conf lives, or given
- # a full path to where snort can find it.
--preprocessor http_inspect: global \
-- iis_unicode_map unicode.map 1252
-+#preprocessor http_inspect: global \
-+# iis_unicode_map unicode.map 1252
-
--preprocessor http_inspect_server: server default \
-- profile all ports { 80 8080 8180 } oversize_dir_length 500
-+#preprocessor http_inspect_server: server default \
-+# profile all ports { 80 8080 8180 } oversize_dir_length 500
-
- #
- # Example unique server configuration
-@@ -451,7 +452,7 @@
- # no_alert_incomplete - don't alert when a single segment
- # exceeds the current packet size
-
--preprocessor rpc_decode: 111 32771
-+#preprocessor rpc_decode: 111 32771
-
- # bo: Back Orifice detector
- # -------------------------
-@@ -474,7 +475,7 @@
- # 3 Back Orifice Server Traffic Detected
- # 4 Back Orifice Snort Buffer Attack
-
--preprocessor bo
-+#preprocessor bo
-
- # telnet_decode: Telnet negotiation string normalizer
- # ---------------------------------------------------
-@@ -486,7 +487,7 @@
- # This preprocessor requires no arguments.
- # Portscan uses Generator ID 109 and does not generate any SID currently.
-
--preprocessor telnet_decode
-+#preprocessor telnet_decode
-
- # sfPortscan
- # ----------
-@@ -537,9 +538,9 @@
- # are still watched as scanner hosts. The 'ignore_scanned' option is
- # used to tune alerts from very active hosts such as syslog servers, etc.
- #
--preprocessor sfportscan: proto { all } \
-- memcap { 10000000 } \
-- sense_level { low }
-+#preprocessor sfportscan: proto { all } \
-+# memcap { 10000000 } \
-+# sense_level { low }
-
- # arpspoof
- #----------------------------------------
-@@ -814,41 +815,41 @@
- include $RULE_PATH/bad-traffic.rules
- include $RULE_PATH/exploit.rules
- include $RULE_PATH/scan.rules
--include $RULE_PATH/finger.rules
--include $RULE_PATH/ftp.rules
--include $RULE_PATH/telnet.rules
--include $RULE_PATH/rpc.rules
--include $RULE_PATH/rservices.rules
--include $RULE_PATH/dos.rules
--include $RULE_PATH/ddos.rules
--include $RULE_PATH/dns.rules
--include $RULE_PATH/tftp.rules
--
--include $RULE_PATH/web-cgi.rules
--include $RULE_PATH/web-coldfusion.rules
--include $RULE_PATH/web-iis.rules
--include $RULE_PATH/web-frontpage.rules
--include $RULE_PATH/web-misc.rules
--include $RULE_PATH/web-client.rules
--include $RULE_PATH/web-php.rules
--
--include $RULE_PATH/sql.rules
--include $RULE_PATH/x11.rules
--include $RULE_PATH/icmp.rules
--include $RULE_PATH/netbios.rules
--include $RULE_PATH/misc.rules
--include $RULE_PATH/attack-responses.rules
--include $RULE_PATH/oracle.rules
--include $RULE_PATH/mysql.rules
--include $RULE_PATH/snmp.rules
--
--include $RULE_PATH/smtp.rules
--include $RULE_PATH/imap.rules
--include $RULE_PATH/pop2.rules
--include $RULE_PATH/pop3.rules
-+#include $RULE_PATH/finger.rules
-+#include $RULE_PATH/ftp.rules
-+#include $RULE_PATH/telnet.rules
-+#include $RULE_PATH/rpc.rules
-+#include $RULE_PATH/rservices.rules
-+#include $RULE_PATH/dos.rules
-+#include $RULE_PATH/ddos.rules
-+#include $RULE_PATH/dns.rules
-+#include $RULE_PATH/tftp.rules
-+
-+#include $RULE_PATH/web-cgi.rules
-+#include $RULE_PATH/web-coldfusion.rules
-+#include $RULE_PATH/web-iis.rules
-+#include $RULE_PATH/web-frontpage.rules
-+#include $RULE_PATH/web-misc.rules
-+#include $RULE_PATH/web-client.rules
-+#include $RULE_PATH/web-php.rules
-+
-+#include $RULE_PATH/sql.rules
-+#include $RULE_PATH/x11.rules
-+#include $RULE_PATH/icmp.rules
-+#include $RULE_PATH/netbios.rules
-+#include $RULE_PATH/misc.rules
-+#include $RULE_PATH/attack-responses.rules
-+#include $RULE_PATH/oracle.rules
-+#include $RULE_PATH/mysql.rules
-+#include $RULE_PATH/snmp.rules
-+
-+#include $RULE_PATH/smtp.rules
-+#include $RULE_PATH/imap.rules
-+#include $RULE_PATH/pop2.rules
-+#include $RULE_PATH/pop3.rules
-
--include $RULE_PATH/nntp.rules
--include $RULE_PATH/other-ids.rules
-+#include $RULE_PATH/nntp.rules
-+#include $RULE_PATH/other-ids.rules
- # include $RULE_PATH/web-attacks.rules
- # include $RULE_PATH/backdoor.rules
- # include $RULE_PATH/shellcode.rules
-@@ -856,11 +857,11 @@
- # include $RULE_PATH/porn.rules
- # include $RULE_PATH/info.rules
- # include $RULE_PATH/icmp-info.rules
-- include $RULE_PATH/virus.rules
-+# include $RULE_PATH/virus.rules
- # include $RULE_PATH/chat.rules
- # include $RULE_PATH/multimedia.rules
- # include $RULE_PATH/p2p.rules
--include $RULE_PATH/experimental.rules
-+#include $RULE_PATH/experimental.rules
- #include $RULE_PATH/wifi.rules
-
- # Include any thresholding or suppression commands. See threshold.conf in the
diff --git a/package/snort/Makefile b/package/snort/Makefile
index 1c9832c..cc38c43 100644
--- a/package/snort/Makefile
+++ b/package/snort/Makefile
@@ -4,21 +4,23 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= snort
-PKG_VERSION:= 2.6.1.2
-PKG_RELEASE:= 8
-PKG_BUILDDEP+= libnet libpcap pcre
-PKG_MD5SUM:= 22c448e25538cdf74c62abe586aeac0a
+PKG_VERSION:= 2.8.5.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= b1abf3a9fa3486720c9a2b5eff920417
PKG_DESCR:= a flexible Network Intrusion Detection System (NIDS)
PKG_SECTION:= net
+PKG_NOPARALLEL:= 1
PKG_DEPENDS:= libnet libpcap pcre
-PKG_SITES:= http://www.snort.org/dl/current/
+PKG_BUILDDEP+= libnet libpcap pcre
+PKG_URL:= http://www.snort.org/
+PKG_SITES:= http://dl.snort.org/snort-current/
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,SNORT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --enable-flexresp \
+CONFIGURE_STYLE:= gnu
+CONFIGURE_ARGS+= --disable-flexresp \
--with-libnet-includes="${STAGING_DIR}/usr/include" \
--with-libnet-libraries="${STAGING_DIR}/usr/lib" \
--with-libpcap-includes="${STAGING_DIR}/usr/include" \
@@ -28,8 +30,8 @@ CONFIGURE_ARGS+= --enable-flexresp \
--without-mysql \
--without-postgresql \
--disable-inline
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_SNORT}/usr/bin
diff --git a/package/snort/patches/patch-configure b/package/snort/patches/patch-configure
new file mode 100644
index 0000000..ddf3d5b
--- /dev/null
+++ b/package/snort/patches/patch-configure
@@ -0,0 +1,83 @@
+--- 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
+ fi
+
+
+-# In case INADDR_NONE is not defined (like on Solaris)
+-have_inaddr_none="no"
+-echo "$as_me:$LINENO: checking for INADDR_NONE" >&5
+-echo $ECHO_N "checking for INADDR_NONE... $ECHO_C" >&6
+-if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <sys/types.h>
+-#include <netinet/in.h>
+-#include <arpa/inet.h>
+-
+-int
+-main ()
+-{
+-
+- if (inet_addr("10,5,2") == INADDR_NONE);
+- return 0;
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- have_inaddr_none="yes"
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-have_inaddr_none="no"
+-fi
+-rm -f core *.core 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
+-if test "x$have_inaddr_none" = "xno"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define INADDR_NONE -1
+-_ACEOF
+-
+-fi
++have_inaddr_none="yes"
+
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -24959,7 +24896,7 @@ fi
+ # that versions < 0.9 do not accumulate packet statistics whereas >= 0.9 do accumulate.
+ # This is Linux only. The check is done after pcre because the code below uses pcre.
+ # It seems Phil Wood's pcap does not accumulate - 0.9x
+-pcap_version_check="yes"
++pcap_version_check="no"
+ if test "x$linux" = "xyes"; then
+ if test "x$pcap_version_check" = "xyes"; then
+ echo "$as_me:$LINENO: checking for libpcap version >= 0.9" >&5
diff --git a/package/snort/patches/patch-configure.orig b/package/snort/patches/patch-configure.orig
new file mode 100644
index 0000000..c2a99e2
--- /dev/null
+++ b/package/snort/patches/patch-configure.orig
@@ -0,0 +1,74 @@
+--- 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:47:57.000000000 +0100
+@@ -24242,70 +24242,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
+-if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <sys/types.h>
+-#include <netinet/in.h>
+-#include <arpa/inet.h>
+-
+-int
+-main ()
+-{
+-
+- if (inet_addr("10,5,2") == INADDR_NONE);
+- return 0;
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- have_inaddr_none="yes"
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-have_inaddr_none="no"
+-fi
+-rm -f core *.core 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
+-if test "x$have_inaddr_none" = "xno"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define INADDR_NONE -1
+-_ACEOF
+-
+-fi
++have_inaddr_none="yes"
+
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
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
new file mode 100644
index 0000000..3f755d3
--- /dev/null
+++ b/package/snort/patches/patch-src_detection-plugins_sp_ip_tos_check_c
@@ -0,0 +1,26 @@
+--- 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
+@@ -191,19 +191,19 @@ void ParseIpTos(char *data, OptTreeNode
+ ds_ptr->not_flag = 1;
+ }
+
+- if(index(data, (int) 'x') == NULL && index(data, (int)'X') == NULL)
++ if(strchr(data, (int) 'x') == NULL && strchr(data, (int)'X') == NULL)
+ {
+ ds_ptr->ip_tos = atoi(data);
+ }
+ else
+ {
+- if(index(data,(int)'x'))
++ if(strchr(data,(int)'x'))
+ {
+- ds_ptr->ip_tos = (u_char) strtol((index(data, (int)'x')+1), NULL, 16);
++ ds_ptr->ip_tos = (u_char) strtol((strchr(data, (int)'x')+1), NULL, 16);
+ }
+ else
+ {
+- ds_ptr->ip_tos = (u_char) strtol((index(data, (int)'X')+1), NULL, 16);
++ ds_ptr->ip_tos = (u_char) strtol((strchr(data, (int)'X')+1), NULL, 16);
+ }
+ }
+
diff --git a/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c b/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c
new file mode 100644
index 0000000..6c03a34
--- /dev/null
+++ b/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c
@@ -0,0 +1,85 @@
+--- 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
+@@ -831,7 +831,7 @@ void PayloadSearchListInit(char *data, O
+ data++;
+
+ /* grab everything between the starting " and the end one */
+- sptr = index(data, '"');
++ sptr = strchr(data, '"');
+ eptr = strrchr(data, '"');
+
+ if(sptr != NULL && eptr != NULL)
+@@ -862,21 +862,21 @@ static char *PayloadExtractParameter(cha
+ char *quote_one = NULL, *quote_two = NULL;
+ char *comma = NULL;
+
+- quote_one = index(data, '"');
++ quote_one = strchr(data, '"');
+ if (quote_one)
+ {
+- quote_two = index(quote_one+1, '"');
++ quote_two = strchr(quote_one+1, '"');
+ while ( quote_two && quote_two[-1] == '\\' )
+- quote_two = index(quote_two+1, '"');
++ quote_two = strchr(quote_two+1, '"');
+ }
+
+ if (quote_one && quote_two)
+ {
+- comma = index(quote_two, ',');
++ comma = strchr(quote_two, ',');
+ }
+ else if (!quote_one)
+ {
+- comma = index(data, ',');
++ comma = strchr(data, ',');
+ }
+
+ if (comma)
+@@ -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
+ }
+
+ /* find the start of the data */
+- start_ptr = index(rule, '"');
++ start_ptr = strchr(rule, '"');
+
+ 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_pattern_match_c.orig b/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c.orig
new file mode 100644
index 0000000..a0a9802
--- /dev/null
+++ b/package/snort/patches/patch-src_detection-plugins_sp_pattern_match_c.orig
@@ -0,0 +1,47 @@
+--- 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 16:06:41.000000000 +0100
+@@ -831,7 +831,7 @@ void PayloadSearchListInit(char *data, O
+ data++;
+
+ /* grab everything between the starting " and the end one */
+- sptr = index(data, '"');
++ sptr = strchr(data, '"');
+ eptr = strrchr(data, '"');
+
+ if(sptr != NULL && eptr != NULL)
+@@ -862,21 +862,21 @@ static char *PayloadExtractParameter(cha
+ char *quote_one = NULL, *quote_two = NULL;
+ char *comma = NULL;
+
+- quote_one = index(data, '"');
++ quote_one = strchr(data, '"');
+ if (quote_one)
+ {
+- quote_two = index(quote_one+1, '"');
++ quote_two = strchr(quote_one+1, '"');
+ while ( quote_two && quote_two[-1] == '\\' )
+- quote_two = index(quote_two+1, '"');
++ quote_two = strchr(quote_two+1, '"');
+ }
+
+ if (quote_one && quote_two)
+ {
+- comma = index(quote_two, ',');
++ comma = strchr(quote_two, ',');
+ }
+ else if (!quote_one)
+ {
+- comma = index(data, ',');
++ comma = strchr(data, ',');
+ }
+
+ if (comma)
+@@ -2035,7 +2035,7 @@ void ParsePattern(char *rule, OptTreeNod
+ }
+
+ /* find the start of the data */
+- start_ptr = index(rule, '"');
++ start_ptr = strchr(rule, '"');
+
+ if(start_ptr != rule)
+ {
diff --git a/package/snort/patches/patch-src_detection-plugins_sp_replace_c b/package/snort/patches/patch-src_detection-plugins_sp_replace_c
new file mode 100644
index 0000000..ebf2f03
--- /dev/null
+++ b/package/snort/patches/patch-src_detection-plugins_sp_replace_c
@@ -0,0 +1,38 @@
+--- 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++;
+@@ -122,7 +122,7 @@ static PatternMatchData * Replace_Parse(
+ }
+
+ /* find the start of the data */
+- start_ptr = index(rule, '"');
++ start_ptr = strchr(rule, '"');
+
+ if(start_ptr == NULL)
+ {
+@@ -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_replace_c.orig b/package/snort/patches/patch-src_detection-plugins_sp_replace_c.orig
new file mode 100644
index 0000000..3e78de5
--- /dev/null
+++ b/package/snort/patches/patch-src_detection-plugins_sp_replace_c.orig
@@ -0,0 +1,11 @@
+--- 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:14:46.000000000 +0100
+@@ -122,7 +122,7 @@ static PatternMatchData * Replace_Parse(
+ }
+
+ /* find the start of the data */
+- start_ptr = index(rule, '"');
++ start_ptr = strchr(rule, '"');
+
+ if(start_ptr == NULL)
+ {
diff --git a/package/snort/patches/patch-src_detection-plugins_sp_session_c b/package/snort/patches/patch-src_detection-plugins_sp_session_c
new file mode 100644
index 0000000..8f874f5
--- /dev/null
+++ b/package/snort/patches/patch-src_detection-plugins_sp_session_c
@@ -0,0 +1,13 @@
+--- 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
new file mode 100644
index 0000000..6433539
--- /dev/null
+++ b/package/snort/patches/patch-src_detection-plugins_sp_tcp_win_check_c
@@ -0,0 +1,26 @@
+--- 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
+@@ -196,19 +196,19 @@ void ParseTcpWin(char *data, OptTreeNode
+ ds_ptr->not_flag = 1;
+ }
+
+- if(index(data, (int) 'x') == NULL && index(data, (int)'X') == NULL)
++ if(strchr(data, (int) 'x') == NULL && strchr(data, (int)'X') == NULL)
+ {
+ win_size = atoi(data);
+ }
+ else
+ {
+- if(index(data,(int)'x'))
++ if(strchr(data,(int)'x'))
+ {
+- win_size = (uint16_t) strtol((index(data, (int)'x')+1), NULL, 16);
++ win_size = (uint16_t) strtol((strchr(data, (int)'x')+1), NULL, 16);
+ }
+ else
+ {
+- win_size = (uint16_t) strtol((index(data, (int)'X')+1), NULL, 16);
++ win_size = (uint16_t) strtol((strchr(data, (int)'X')+1), NULL, 16);
+ }
+ }
+
diff --git a/package/snort/patches/patch-src_dynamic-preprocessors_dns_spp_dns_c b/package/snort/patches/patch-src_dynamic-preprocessors_dns_spp_dns_c
new file mode 100644
index 0000000..c858441
--- /dev/null
+++ b/package/snort/patches/patch-src_dynamic-preprocessors_dns_spp_dns_c
@@ -0,0 +1,47 @@
+--- 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
new file mode 100644
index 0000000..64c7a22
--- /dev/null
+++ b/package/snort/patches/patch-src_inline_c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 0000000..456b6a0
--- /dev/null
+++ b/package/snort/patches/patch-src_log_c
@@ -0,0 +1,162 @@
+--- 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 */
+@@ -916,7 +916,7 @@ void PrintArpHeader(FILE * fp, Packet *
+ switch(ntohs(p->ah->ea_hdr.ar_op))
+ {
+ case ARPOP_REQUEST:
+- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr));
++ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr));
+ fprintf(fp, "ARP who-has %s", inet_ntoa(ip_addr));
+
+ if(memcmp((char *) ezero, (char *) p->ah->arp_tha, 6) != 0)
+@@ -925,7 +925,7 @@ void PrintArpHeader(FILE * fp, Packet *
+ p->ah->arp_tha[1], p->ah->arp_tha[2], p->ah->arp_tha[3],
+ p->ah->arp_tha[4], p->ah->arp_tha[5]);
+ }
+- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr));
++ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr));
+
+ fprintf(fp, " tell %s", inet_ntoa(ip_addr));
+
+@@ -938,7 +938,7 @@ void PrintArpHeader(FILE * fp, Packet *
+ break;
+
+ case ARPOP_REPLY:
+- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr));
++ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr));
+ fprintf(fp, "ARP reply %s", inet_ntoa(ip_addr));
+
+ /* print out the originating request if we're on a weirder
+@@ -971,7 +971,7 @@ void PrintArpHeader(FILE * fp, Packet *
+ break;
+
+ case ARPOP_RREPLY:
+- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr));
++ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr));
+ fprintf(fp, "RARP reply %X:%X:%X:%X:%X:%X at %s",
+ p->ah->arp_tha[0], p->ah->arp_tha[1], p->ah->arp_tha[2],
+ p->ah->arp_tha[3], p->ah->arp_tha[4], p->ah->arp_tha[5],
+@@ -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_c.orig b/package/snort/patches/patch-src_log_c.orig
new file mode 100644
index 0000000..3848941
--- /dev/null
+++ b/package/snort/patches/patch-src_log_c.orig
@@ -0,0 +1,38 @@
+--- 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 16:21:59.000000000 +0100
+@@ -916,7 +916,7 @@ void PrintArpHeader(FILE * fp, Packet *
+ switch(ntohs(p->ah->ea_hdr.ar_op))
+ {
+ case ARPOP_REQUEST:
+- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr));
++ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr));
+ fprintf(fp, "ARP who-has %s", inet_ntoa(ip_addr));
+
+ if(memcmp((char *) ezero, (char *) p->ah->arp_tha, 6) != 0)
+@@ -925,7 +925,7 @@ void PrintArpHeader(FILE * fp, Packet *
+ p->ah->arp_tha[1], p->ah->arp_tha[2], p->ah->arp_tha[3],
+ p->ah->arp_tha[4], p->ah->arp_tha[5]);
+ }
+- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr));
++ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr));
+
+ fprintf(fp, " tell %s", inet_ntoa(ip_addr));
+
+@@ -938,7 +938,7 @@ void PrintArpHeader(FILE * fp, Packet *
+ break;
+
+ case ARPOP_REPLY:
+- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr));
++ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr));
+ fprintf(fp, "ARP reply %s", inet_ntoa(ip_addr));
+
+ /* print out the originating request if we're on a weirder
+@@ -971,7 +971,7 @@ void PrintArpHeader(FILE * fp, Packet *
+ break;
+
+ case ARPOP_RREPLY:
+- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr));
++ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr));
+ fprintf(fp, "RARP reply %X:%X:%X:%X:%X:%X at %s",
+ p->ah->arp_tha[0], p->ah->arp_tha[1], p->ah->arp_tha[2],
+ p->ah->arp_tha[3], p->ah->arp_tha[4], p->ah->arp_tha[5],
diff --git a/package/snort/patches/patch-src_log_text_c b/package/snort/patches/patch-src_log_text_c
new file mode 100644
index 0000000..6451bbd
--- /dev/null
+++ b/package/snort/patches/patch-src_log_text_c
@@ -0,0 +1,38 @@
+--- 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
+@@ -1604,7 +1604,7 @@ void LogArpHeader(TextLog* log, Packet *
+ switch(ntohs(p->ah->ea_hdr.ar_op))
+ {
+ case ARPOP_REQUEST:
+- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr));
++ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr));
+ TextLog_Print(log, "ARP who-has %s", inet_ntoa(ip_addr));
+
+ if(memcmp((char *) ezero, (char *) p->ah->arp_tha, 6) != 0)
+@@ -1613,7 +1613,7 @@ void LogArpHeader(TextLog* log, Packet *
+ p->ah->arp_tha[1], p->ah->arp_tha[2], p->ah->arp_tha[3],
+ p->ah->arp_tha[4], p->ah->arp_tha[5]);
+ }
+- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr));
++ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr));
+
+ TextLog_Print(log, " tell %s", inet_ntoa(ip_addr));
+
+@@ -1626,7 +1626,7 @@ void LogArpHeader(TextLog* log, Packet *
+ break;
+
+ case ARPOP_REPLY:
+- bcopy((void *)p->ah->arp_spa, (void *) &ip_addr, sizeof(ip_addr));
++ memcpy((void *) &ip_addr, (void *)p->ah->arp_spa, sizeof(ip_addr));
+ TextLog_Print(log, "ARP reply %s", inet_ntoa(ip_addr));
+
+ /* print out the originating request if we're on a weirder
+@@ -1659,7 +1659,7 @@ void LogArpHeader(TextLog* log, Packet *
+ break;
+
+ case ARPOP_RREPLY:
+- bcopy((void *)p->ah->arp_tpa, (void *) &ip_addr, sizeof(ip_addr));
++ memcpy((void *) &ip_addr, (void *)p->ah->arp_tpa, sizeof(ip_addr));
+ TextLog_Print(log, "RARP reply %X:%X:%X:%X:%X:%X at %s",
+ p->ah->arp_tha[0], p->ah->arp_tha[1], p->ah->arp_tha[2],
+ p->ah->arp_tha[3], p->ah->arp_tha[4], p->ah->arp_tha[5],
diff --git a/package/snort/patches/patch-src_mempool_c b/package/snort/patches/patch-src_mempool_c
new file mode 100644
index 0000000..50455ac
--- /dev/null
+++ b/package/snort/patches/patch-src_mempool_c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 0000000..a940ec0
--- /dev/null
+++ b/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c
@@ -0,0 +1,50 @@
+--- 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));
+ if (event)
+ {
+- bcopy((const void *)event,(void *)&alertpkt.event,sizeof(Event));
++ memcpy((void *)&alertpkt.event,(const void *)event,sizeof(Event));
+ }
+
+ if(p && p->pkt)
+ {
+- bcopy((const void *)p->pkth,(void *)&alertpkt.pkth,sizeof(struct pcap_pkthdr));
+- bcopy((const void *)p->pkt,alertpkt.pkt,
++ memcpy((void *)&alertpkt.pkth,(const void *)p->pkth,sizeof(struct pcap_pkthdr));
++ memcpy(alertpkt.pkt,(const void *)p->pkt,
+ alertpkt.pkth.caplen > SNAPLEN? SNAPLEN : alertpkt.pkth.caplen);
+ }
+ else
+@@ -193,7 +193,7 @@ void AlertUnixSock(Packet *p, char *msg,
+
+ if (msg)
+ {
+- bcopy((const void *)msg,(void *)alertpkt.alertmsg,
++ memcpy((void *)alertpkt.alertmsg,(const void *)msg,
+ strlen(msg)>ALERTMSG_LENGTH-1 ? ALERTMSG_LENGTH - 1 : strlen(msg));
+ }
+
+@@ -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_alert_unixsock_c.orig b/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c.orig
new file mode 100644
index 0000000..fd98d87
--- /dev/null
+++ b/package/snort/patches/patch-src_output-plugins_spo_alert_unixsock_c.orig
@@ -0,0 +1,32 @@
+--- 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:12:45.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));
+ if (event)
+ {
+- bcopy((const void *)event,(void *)&alertpkt.event,sizeof(Event));
++ memcpy((void *)&alertpkt.event,(const void *)event,sizeof(Event));
+ }
+
+ if(p && p->pkt)
+ {
+- bcopy((const void *)p->pkth,(void *)&alertpkt.pkth,sizeof(struct pcap_pkthdr));
+- bcopy((const void *)p->pkt,alertpkt.pkt,
++ memcpy((void *)&alertpkt.pkth,(const void *)p->pkth,sizeof(struct pcap_pkthdr));
++ memcpy(alertpkt.pkt,(const void *)p->pkt,
+ alertpkt.pkth.caplen > SNAPLEN? SNAPLEN : alertpkt.pkth.caplen);
+ }
+ else
+@@ -193,7 +193,7 @@ void AlertUnixSock(Packet *p, char *msg,
+
+ if (msg)
+ {
+- bcopy((const void *)msg,(void *)alertpkt.alertmsg,
++ memcpy((void *)alertpkt.alertmsg,(const void *)msg,
+ strlen(msg)>ALERTMSG_LENGTH-1 ? ALERTMSG_LENGTH - 1 : strlen(msg));
+ }
+
diff --git a/package/snort/patches/patch-src_output-plugins_spo_database_c b/package/snort/patches/patch-src_output-plugins_spo_database_c
new file mode 100644
index 0000000..3703cd0
--- /dev/null
+++ b/package/snort/patches/patch-src_output-plugins_spo_database_c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 0000000..3c1e220
--- /dev/null
+++ b/package/snort/patches/patch-src_output-plugins_spo_log_ascii_c
@@ -0,0 +1,15 @@
+--- 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
new file mode 100644
index 0000000..50bdd85
--- /dev/null
+++ b/package/snort/patches/patch-src_output-plugins_spo_log_tcpdump_c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 0000000..9613b7f
--- /dev/null
+++ b/package/snort/patches/patch-src_output-plugins_spo_unified_c
@@ -0,0 +1,47 @@
+--- 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
new file mode 100644
index 0000000..fd365a6
--- /dev/null
+++ b/package/snort/patches/patch-src_parser_IpAddrSet_c
@@ -0,0 +1,16 @@
+--- 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
+@@ -388,11 +388,11 @@ int ParseIP(char *paddr, IpAddrSet *ias,
+ /* protecting against malicious DNS servers */
+ if(host_info->h_length <= (int)sizeof(sin.sin_addr))
+ {
+- bcopy(host_info->h_addr, (char *) &sin.sin_addr, host_info->h_length);
++ memcpy((char *) &sin.sin_addr, host_info->h_addr, host_info->h_length);
+ }
+ else
+ {
+- bcopy(host_info->h_addr, (char *) &sin.sin_addr, sizeof(sin.sin_addr));
++ memcpy((char *) &sin.sin_addr, host_info->h_addr, sizeof(sin.sin_addr));
+ }
+ }
+ /* Using h_errno */
diff --git a/package/snort/patches/patch-src_parser_c b/package/snort/patches/patch-src_parser_c
new file mode 100644
index 0000000..23ee433
--- /dev/null
+++ b/package/snort/patches/patch-src_parser_c
@@ -0,0 +1,40 @@
+--- 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
new file mode 100644
index 0000000..4948465
--- /dev/null
+++ b/package/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 0000000..a3ec233
--- /dev/null
+++ b/package/snort/patches/patch-src_snort_c
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 0000000..79de725
--- /dev/null
+++ b/package/snort/patches/patch-src_util_c
@@ -0,0 +1,20 @@
+--- 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/squid/Makefile b/package/squid/Makefile
index 807e4dc..3fb78d6 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -13,7 +13,8 @@ PKG_SECTION:= net
PKG_DEPENDS:= libopenssl libpthread
PKG_URL:= http://www.squid-cache.org
PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.0/
-PKG_CXX:= SQUID
+PKG_MULTI:= 1
+#PKG_CXX:= SQUID
AUTH_MODULES:= basic digest ntlm
ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM},)
@@ -74,11 +75,11 @@ $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_grou
$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth))
$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,ntlm_auth))
-ifeq ($(ADK_COMPILE_SQUID_WITH_UCLIBCXX),y)
-CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \
- -I${STAGING_DIR}/usr/include/uClibc++" \
- LIBS="-nodefaultlibs -luClibc++ -ldl -lm"
-endif
+#ifeq ($(ADK_COMPILE_SQUID_WITH_UCLIBCXX),y)
+#CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \
+# -I${STAGING_DIR}/usr/include/uClibc++" \
+# LIBS="-nodefaultlibs -luClibc++ -ldl -lm"
+#endif
CONFIGURE_STYLE:= autotool gnu
CONFIGURE_ENV+= ac_cv_sizeof_void_p=4 \
@@ -136,15 +137,12 @@ CONFIGURE_ARGS+= --datadir=/usr/share/squid \
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
-ifeq (${ADK_COMPILE_SQUID_WITH_UCLIBCXX},y)
+#ifeq (${ADK_COMPILE_SQUID_WITH_UCLIBCXX},y)
# add workaround because libtool tries to link libstdc++
-post-configure:
- ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \
- ${WRKBUILD}/libtool
-endif
-post-configure:
- ${SED} 's#\(hardcode_into_libs=\).*$$#\1no#' \
- ${WRKBUILD}/libtool
+#post-configure:
+# ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \
+# ${WRKBUILD}/libtool
+#endif
post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
${INSTALL_DIR} ${IDIR_SQUID}/etc/squid
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index a768954..0d23f40 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -6,19 +6,19 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= tntnet
PKG_VERSION:= 1.6.4
PKG_RELEASE:= 1
+PKG_MD5SUM:= e2c3c5075a890711a7569730493c0996
+PKG_DESCR:= small C++ application server
+PKG_SECTION:= net
PKG_BUILDDEP+= cxxtools zlib
ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},)
PKG_BUILDDEP+= openssl
else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},)
PKG_BUILDDEP+= gnutls
endif
-PKG_MD5SUM:= e2c3c5075a890711a7569730493c0996
-PKG_DESCR:= small C++ application server
-PKG_SECTION:= net
PKG_DEPENDS:= cxxtools zlib libpthread libiconv
PKG_URL:= http://www.tntnet.org
PKG_SITES:= http://www.tntnet.org/download/
-PKG_CXX:= TNTNET
+#PKG_CXX:= TNTNET
include ${TOPDIR}/mk/package.mk
@@ -54,12 +54,12 @@ CONFIGURE_ENV+= CXXFLAGS='${TCXXFLAGS}' \
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
-ifeq (${ADK_COMPILE_TNTNET_WITH_UCLIBCXX},y)
+#ifeq (${ADK_COMPILE_TNTNET_WITH_UCLIBCXX},y)
# add workaround because libtool tries to link libstdc++
-post-configure:
- ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \
- ${WRKBUILD}/libtool
-endif
+#post-configure:
+# ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \
+# ${WRKBUILD}/libtool
+#endif
post-install:
${INSTALL_DIR} ${IDIR_TNTNET}/www
diff --git a/package/udev/Makefile b/package/udev/Makefile
index 90ffefe..4f329db 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= udev
-PKG_VERSION:= 142
+PKG_VERSION:= 149
PKG_RELEASE:= 1
-PKG_MD5SUM:= 3edc4cf383dccb06d866c5156d59ddd5
+PKG_MD5SUM:= b218bd15939e8afc6368e1907a48bb26
PKG_DESCR:= Dynamic device management subsystem
PKG_SECTION:= base
PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile
index a7dcfa0..30c1707 100644
--- a/package/ulogd/Makefile
+++ b/package/ulogd/Makefile
@@ -6,6 +6,12 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= ulogd
PKG_VERSION:= 1.24
PKG_RELEASE:= 7
+PKG_MD5SUM:= 05b4ed2926b9a22aaeaf642917bbf8ff
+PKG_DESCR:= Netfilter userspace logging daemon
+PKG_SECTION:= net
+PKG_MULTI:= 1
+PKG_NOPARALLEL:= 1
+PKG_DEPENDS:= iptables
PKG_BUILDDEP+= iptables
ifneq ($(ADK_PACKAGE_ULOGD_MOD_MYSQL),)
PKG_BUILDDEP+= mysql
@@ -19,11 +25,6 @@ endif
ifneq ($(ADK_PACKAGE_ULOGD_MOD_SQLITE),)
PKG_BUILDDEP+= sqlite
endif
-PKG_MD5SUM:= 05b4ed2926b9a22aaeaf642917bbf8ff
-PKG_DESCR:= Netfilter userspace logging daemon
-PKG_SECTION:= net
-PKG_DEPENDS:= iptables
-PKG_NOPARALLEL:= 1
PKG_URL:= http://www.netfilter.org/projects/ulogd
PKG_SITES:= ftp://ftp.netfilter.org/pub/ulogd/ \
ftp://ftp.be.netfilter.org/pub/netfilter/ulogd/ \
diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile
index 40acba4..f13bee5 100644
--- a/package/updatedd/Makefile
+++ b/package/updatedd/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 95655596eb6e0e381d60a458f6a45fee
PKG_DESCR:= A tool to update dynamic dns services.
PKG_SECTION:= net
+PKG_MULTI:= 1
PKG_SITES:= http://savannah.nongnu.org/download/updatedd/
DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index f208118..3927ca2 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xorg-server
PKG_VERSION:= 1.7.1
PKG_RELEASE:= 1
-PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl
PKG_MD5SUM:= 913a672cbd6da516de15965d594e20b9
PKG_DESCR:= Xorg server
PKG_SECTION:= x11
-PKG_DEPENDS:= libopenssl
+PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile
+PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl xf86dgaproto
PKG_URL:= http://www.x.org
PKG_SITES:= ${MASTER_SITE_XORG}
@@ -19,6 +19,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_STYLE:= gnu
+CONFIGURE_ENV+= V=1
CONFIGURE_ARGS+= \
--enable-dga \
--enable-xorg \
diff --git a/package/xz/Makefile b/package/xz/Makefile
index 5bffd58..0caa69f 100644
--- a/package/xz/Makefile
+++ b/package/xz/Makefile
@@ -7,9 +7,9 @@ PKG_NAME:= xz
PKG_VERSION:= 4.999.9beta
PKG_RELEASE:= 1
PKG_MD5SUM:= f2073579b6da2fe35d453adee1aaf1b2
-PKG_DESCR:= retrieving files using HTTP, HTTPS and FTP
+PKG_DESCR:= lzma compression utility
PKG_SECTION:= net
-PKG_URL:= http://tukaani.org/xz
+PKG_URL:= http://tukaani.org/xz/
PKG_SITES:= http://tukaani.org/xz/
include ${TOPDIR}/mk/package.mk
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index cedaa94..bdad024 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -265,7 +265,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM
config ADK_KPACKAGE_KMOD_DM_CRYPT
prompt "kmod-dm-crypt................... Crypt target support"
- depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM
+ select ADK_KPACKAGE_KMOD_BLK_DEV_DM
depends on !ADK_KERNEL_DM_CRYPT
select ADK_KERNEL_MD
select ADK_KERNEL_CRYPTO
@@ -283,14 +283,14 @@ config ADK_KPACKAGE_KMOD_DM_CRYPT
config ADK_KPACKAGE_KMOD_DM_SNAPSHOT
prompt "kmod-dm-snapshot................ Snapshot target"
- depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM
+ select ADK_KPACKAGE_KMOD_BLK_DEV_DM
tristate
help
Allow volume managers to take writable snapshots of a device.
config ADK_KPACKAGE_KMOD_DM_MIRROR
prompt "kmod-dm-mirror.................. Mirror target"
- depends on ADK_KPACKAGE_KMOD_BLK_DEV_DM
+ select ADK_KPACKAGE_KMOD_BLK_DEV_DM
tristate
help
Allow volume managers to mirror logical volumes, also