make allmodconfig work for alix1c eglibc

many upstream package updates,
squid, php, asterisk, gnutls, nmap, sqlite, dhcp, git

TODO

@@ -1,4 +1,7 @@
 - stripping of kernel is not working for all targets
+- implement a non-interactive allmodconfig for different targets
+  (make TARGET=foo defconfig allmodconfig) 
+  needed for ADK buildserver
 - rescue initramfs image (more archs, generic kernel config )
   - usb boot via stick
 - fix init scripts pidof? vs. killall

package/asterisk/Config.in

@@ -1,5 +1,6 @@
 config ADK_PACKAGE_ASTERISK
 	bool "asterisk................... Telephony server"
+	depends on !ADK_LINUX_CRIS_FOXBOARD
         select ADK_PACKAGE_LIBCURL
 	select ADK_PACKAGE_LIBNCURSES
 	select ADK_PACKAGE_LIBPTHREAD

package/asterisk/Makefile

@@ -4,14 +4,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.4.26
+PKG_VERSION:=		1.4.26.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		f54d6685533a149a0241c3468a88e02a
+PKG_MD5SUM:=		9b46f8628f43e1d3c275460ceee26646
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl
 PKG_URL:=		http://www.asterisk.org
-PKG_SITES:=		http://downloads.digium.com/pub/telephony/asterisk/releases/
+PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 
 include $(TOPDIR)/mk/package.mk
 
@@ -40,6 +40,11 @@ SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_GSM}+=	asterisk-codec-gsm-install
 SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PBX_DUNDI}+=	asterisk-pbx-dundi-install
 SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_RES_AGI}+=		asterisk-res-agi-install
 
+#workaround for cris and gcc 4.4, where -Os generates ICE
+ifeq ($(ARCH),cris)
+TARGET_OPTIMIZATION:=$(subst Os,O2,$(TARGET_OPTIMIZATION))
+endif
+
 CONFIGURE_ARGS=		--with-z=${STAGING_DIR}/usr \
 			--with-ncurses=${STAGING_DIR}/usr \
 			--with-ssl=${STAGING_DIR}/usr \
@@ -100,7 +105,7 @@ CONFIGURE_ARGS+=	--without-misdn \
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		STRIP=${STRIP}
 BUILD_STYLE:=		auto
-MAKE_ENV=		ASTCFLAGS="${TCPPFLAGS} ${TCFLAGS} -DHAVE_STRTOQ" \
+MAKE_ENV=		ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \
 			ASTLDFLAGS="${TLDFLAGS}"
 MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \
 			OPTIMIZE="${TARGET_OPTIMIZATION}" \

package/asterisk/patches/patch-codecs_gsm_Makefile

@@ -0,0 +1,66 @@
+disable uname -m checks 
+--- asterisk-1.4.26.orig/codecs/gsm/Makefile	2008-11-19 22:34:47.000000000 +0100
++++ asterisk-1.4.26/codecs/gsm/Makefile	2009-08-21 12:29:21.450418652 +0200
+@@ -37,13 +37,13 @@ WAV49	= -DWAV49
+ ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
+ ######### probably require gcc. 
+ 
+-ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
+-ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
+-ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
+-OPTIMIZE+=-march=$(PROC)
+-endif
+-endif
+-endif
++#ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
++#ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
++#ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
++#OPTIMIZE+=-march=$(PROC)
++#endif
++#endif
++#endif
+ 
+ #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+ #This works for even old (2.96) versions of gcc and provides a small boost either way.
+@@ -207,13 +207,13 @@ GSM_SOURCES =	$(SRC)/add.c		\
+ # add k6-specific code only if not on a non-k6 hardware or proc.
+ # XXX Keep a space after each findstring argument
+ # XXX should merge with GSM_OBJECTS
+-ifeq ($(OSARCH),linux-gnu)
+-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
+-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
+-GSM_SOURCES+= $(SRC)/k6opt.s
+-endif
+-endif
+-endif
++#ifeq ($(OSARCH),linux-gnu)
++#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
++#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
++#GSM_SOURCES+= $(SRC)/k6opt.s
++#endif
++#endif
++#endif
+ 
+ TOAST_SOURCES = $(SRC)/toast.c 		\
+ 		$(SRC)/toast_lin.c	\
+@@ -259,13 +259,13 @@ GSM_OBJECTS =	$(SRC)/add.o		\
+ 		$(SRC)/short_term.o	\
+ 		$(SRC)/table.o
+ 
+-ifeq ($(OSARCH),linux-gnu)
+-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
+-ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
+-GSM_OBJECTS+= $(SRC)/k6opt.o
+-endif
+-endif
+-endif
++#ifeq ($(OSARCH),linux-gnu)
++#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
++#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
++#GSM_OBJECTS+= $(SRC)/k6opt.o
++#endif
++#endif
++#endif
+ 
+ TOAST_OBJECTS =	$(SRC)/toast.o 		\
+ 		$(SRC)/toast_lin.o	\

package/asterisk/patches/patch-menuselect-tree

@@ -1,13 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- asterisk-1.4.24.1.orig/menuselect-tree	2009-04-02 19:44:31.000000000 +0200
-+++ asterisk-1.4.24.1/menuselect-tree	2009-05-12 16:07:12.000000000 +0200
-@@ -59,9 +59,6 @@
- <member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
- 	<depend>dahdi</depend>
- </member>
--<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
--        <depend>chan_local</depend>
--</member>
- <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
- </member>
- <member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">

package/asterisk/patches/patch-menuselect_example_menuselect-tree

@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- asterisk-1.4.24.1.orig/menuselect/example_menuselect-tree	2006-08-19 22:55:53.000000000 +0200
-+++ asterisk-1.4.24.1/menuselect/example_menuselect-tree	2009-05-12 16:07:32.000000000 +0200
-@@ -45,8 +45,6 @@
- 		<member name="app_flash" displayname="Flash zap trunk application" remove_on_change="apps/app_flash.o apps/app_flash.so">
- 	<depend>zaptel</depend>
- 		</member>
--		<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
--		</member>
- 		<member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities." remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
- 		</member>
- 		<member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">

package/collectd/Makefile

@@ -86,6 +86,7 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-vserver \
 			--enable-wireless \
 			--with-fp-layout=nothing \
+			--without-java \
 			--with-nan-emulation
 
 XAKE_FLAGS+=		LIBS='-lm'

package/cryptsetup/Makefile

@@ -28,7 +28,7 @@ INSTALL_STYLE:=		auto
 pre-configure:
 	(cd ${WRKBUILD}; \
 		env ${CONFIGURE_ENV} \
-		./configure --enable-static \
+		./configure --enable-static --disable-nls \
 			--build=${GNU_HOST_NAME} \
 			--host=${GNU_TARGET_NAME} \
 			--target=${GNU_TARGET_NAME} \

package/dhcp/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dhcp
-PKG_VERSION:=		4.1.0
+PKG_VERSION:=		4.1.0p1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1fffed2e8c3d67b111316d6a9b33db7a
+PKG_MD5SUM:=		325ff8338c5a21f89d5304ac13ffebdf
 PKG_DESCR:=		ISC DHCP server
 PKG_SECTION:=		net
 PKG_URL:=		https://www.isc.org/software/dhcp

package/expat/Makefile

@@ -14,7 +14,7 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=expat/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBEXPAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 BUILD_STYLE=		auto

package/gcc/Makefile

@@ -41,10 +41,10 @@ post-install:
 	${INSTALL_BIN} ${WRKINST}/usr/bin/gcc ${IDIR_GCC}/usr/bin/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/cpp ${IDIR_GCC}/usr/bin/
 	${CP} ${WRKINST}/usr/lib/gcc/* ${IDIR_GCC}/usr/lib/gcc/
-ifeq ($(ADK_TARGET_LIB_GLIBC),y)
-	${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib
-else
+ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 	${CP} ${STAGING_DIR}/lib/crt* ${IDIR_GCC}/usr/lib
+else
+	${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib
 endif
 	rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/include-fixed
 	rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools

package/git/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.6.3.3
+PKG_VERSION:=		1.6.4.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a634d76881f3bd6b92cb1892ea5f88fe
+PKG_MD5SUM:=		d16be619150bdab188ba2c269472f496
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		openssl curl

package/git/patches/patch-Makefile

@@ -1,16 +1,6 @@
-use symlinks instead of hardlinks
---- git-1.6.3.3.orig/Makefile	2009-06-22 08:24:25.000000000 +0200
-+++ git-1.6.3.3/Makefile	2009-07-24 20:59:26.186421458 +0200
-@@ -215,7 +215,7 @@ bindir_relative = bin
- bindir = $(prefix)/$(bindir_relative)
- mandir = share/man
- infodir = share/info
--gitexecdir = libexec/git-core
-+gitexecdir = bin
- sharedir = $(prefix)/share
- template_dir = share/git-core/templates
- htmldir = share/doc/git-doc
-@@ -1239,7 +1239,6 @@ builtin-help.o: builtin-help.c common-cm
+--- git-1.6.4.1.orig/Makefile	2009-08-22 06:54:01.000000000 +0200
++++ git-1.6.4.1/Makefile	2009-08-23 12:11:07.755226105 +0200
+@@ -1345,7 +1345,6 @@ builtin-help.o: builtin-help.c common-cm
  
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && \
@@ -18,15 +8,17 @@ use symlinks instead of hardlinks
  	ln -s git$X $@ 2>/dev/null || \
  	cp git$X $@
  
-@@ -1554,11 +1553,9 @@ endif
- 	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
- 	{ $(RM) "$$execdir/git-add$X" && \
+@@ -1663,11 +1662,11 @@ endif
+ 	{ test "$$bindir/" = "$$execdir/" || \
+ 		{ $(RM) "$$execdir/git$X" && \
  		test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
--		ln "$$bindir/git$X" "$$execdir/git-add$X" 2>/dev/null || \
- 		cp "$$bindir/git$X" "$$execdir/git-add$X"; } && \
- 	{ for p in $(filter-out git-add$X,$(BUILT_INS)); do \
+-		ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
++		ln -s "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
+ 		cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
+ 	{ for p in $(BUILT_INS); do \
  		$(RM) "$$execdir/$$p" && \
--		ln "$$execdir/git-add$X" "$$execdir/$$p" 2>/dev/null || \
- 		ln -s "git-add$X" "$$execdir/$$p" 2>/dev/null || \
- 		cp "$$execdir/git-add$X" "$$execdir/$$p" || exit; \
+-		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
++		ln -s "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
+ 		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
  	  done; } && \

package/gnutls/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gnutls
-PKG_VERSION:=		2.6.6
+PKG_VERSION:=		2.8.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ca2489e29f9dc313a79b9747bb1090e5
+PKG_MD5SUM:=		72b77092c5d1ae01306cd14c0f22d6e4
 PKG_DESCR:=		GNU TLS library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libgcrypt libtasn1 zlib
@@ -31,6 +31,7 @@ $(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_
 $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR},${PKG_SECTION}))
 
+TCFLAGS+=		-lncurses
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--without-libopencdk-prefix \
 			--without-libz-prefix

package/ipset/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ipset
 PKG_VERSION:=		3.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		92bb09883dd8a77ec5cfbff1c8932b15
 PKG_DESCR:=		Netfilter ip sets administration utility
 PKG_SECTION:=		net
@@ -17,18 +17,27 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION}))
 
-XAKE_FLAGS+=		V=1 ARCH=${ARCH} KERNEL_DIR=${LINUX_DIR} \
-			PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
-			LD=$(TARGET_CROSS)gcc
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-INSTALL_TARGET=		binaries_install
+XAKE_FLAGS+=		PREFIX=/usr
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+ALL_TARGET:=		binaries
+INSTALL_TARGET:=	binaries_install
+
+pre-build:
+	V=1 ARCH=${ARCH} KERNEL_DIR=${LINUX_DIR} \
+	PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
+	LD=$(TARGET_CROSS)gcc
+	$(MAKE) -C ${WRKBUILD} modules
 
 post-install:
-	${INSTALL_DIR} ${IDIR_IPSET}/usr/sbin
-	${INSTALL_DIR} ${IDIR_IPSET}/usr/lib/ipset
+	${INSTALL_DIR} ${IDIR_IPSET}/usr/sbin ${IDIR_IPSET}/usr/lib/ipset
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/ipset ${IDIR_IPSET}/usr/sbin
 	${CP} ${WRKINST}/usr/lib/ipset/*.so ${IDIR_IPSET}/usr/lib/ipset/
+	# kernel modules (no autoload at the moment)
+	${INSTALL_DIR} ${IDIR_KMOD_IPSET}/lib/modules/${KERNEL_VERSION}/
+	${INSTALL_DATA} ${WRKBUILD}/kernel/*.ko \
+		${IDIR_KMOD_IPSET}/lib/modules/${KERNEL_VERSION}
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libgd/Makefile

@@ -17,7 +17,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	autotool gnu
 CONFIGURE_ENV+=		LIBPNG12_CONFIG="${STAGING_DIR}/usr/bin/libpng12-config"
 CONFIGURE_ARGS+=	--without-x \
 			--without-freetype \

package/libnet/Makefile

@@ -23,7 +23,7 @@ endif
 
 $(eval $(call PKG_template,LIBNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE=	autotool gnu
 CONFIGURE_ENV+=		ac_libnet_have_pf_packet=yes \
 			ac_cv_libnet_endianess=${ENDIAN} \
 			ac_cv_lbl_unaligned_fail=no

package/libnet/patches/patch-Makefile

@@ -1,6 +1,6 @@
 --- Libnet-1.0.2a.orig/Makefile	1970-01-01 00:00:00.000000000 +0100
-+++ Libnet-1.0.2a/Makefile	2009-06-12 21:52:51.000000000 +0200
-@@ -0,0 +1,620 @@
++++ Libnet-1.0.2a/Makefile	2009-08-23 00:40:10.898406314 +0200
+@@ -0,0 +1,638 @@
 +# Makefile.in generated by automake 1.8.5 from Makefile.am.
 +# Makefile.  Generated from Makefile.in by configure.
 +
@@ -17,9 +17,9 @@
 +
 +
 +
-+srcdir = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a
-+top_srcdir = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a
-+VPATH = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a
++srcdir = .
++top_srcdir = .
++
 +pkgdatadir = $(datadir)/libnet
 +pkglibdir = $(libdir)/libnet
 +pkgincludedir = $(includedir)/libnet
@@ -37,7 +37,7 @@
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
-+build_triplet = x86_64-undermydesk-freebsd
++build_triplet = i686-pc-linux-gnu
 +host_triplet = i586-pc-linux-gnu
 +target_triplet = i586-pc-linux-gnu
 +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -88,31 +88,35 @@
 +AMDEP_FALSE = 
 +AMDEP_TRUE = #
 +AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run tar
-+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
++AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ar
 +AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run autoconf
 +AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run autoheader
 +AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run automake-1.8
 +AWK = gawk
 +BIN_PREFIX = /usr/bin/
-+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
++CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-gcc
 +CCDEPMODE = depmode=none
 +CFLAGS = -O2 -funroll-loops -fomit-frame-pointer -Wall
-+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
++CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E
 +CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
 +CYGPATH_W = echo
 +DEFS = -DHAVE_CONFIG_H
 +DEPDIR = .deps
-+ECHO = echo
++DSYMUTIL = 
++DUMPBIN = 
 +ECHO_C = 
 +ECHO_N = -n
 +ECHO_T = 
-+EGREP = grep -E
++EGREP = /bin/grep -E
 +EXEEXT = 
++FGREP = /bin/grep -F
++GREP = /bin/grep
 +INC_PREFIX = /usr/include/
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_PROGRAM = ${INSTALL}
 +INSTALL_SCRIPT = ${INSTALL}
 +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
++LD = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ld
 +LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
 +LIBNET_CONFIG_CFLAGS = 
 +LIBNET_CONFIG_DEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H -DLIBNET_LIL_ENDIAN
@@ -121,14 +125,20 @@
 +LIBS = 
 +LIBTOOL = $(SHELL) $(top_builddir)/libtool
 +LIB_PREFIX = /usr/lib/
-+LL_INT_TYPE = 
-+LL_INT_TYPE_UC = 
++LIPO = 
++LL_INT_TYPE = sockpacket
++LL_INT_TYPE_UC = SOCKPACKET
 +LN = ln
 +LN_S = ln -s
 +LTLIBOBJS = 
 +MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run makeinfo
 +MAN_PREFIX = /usr/share/man/man3/
++NM = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-nm
++NMEDIT = 
++OBJDUMP = i586-linux-objdump
 +OBJEXT = o
++OTOOL = 
++OTOOL64 = 
 +PACKAGE = libnet
 +PACKAGE_BUGREPORT = 
 +PACKAGE_NAME = 
@@ -136,43 +146,51 @@
 +PACKAGE_TARNAME = 
 +PACKAGE_VERSION = 
 +PATH_SEPARATOR = :
-+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
++RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ranlib
++SED = /home/wbx/openadk/scripts/sed
 +SET_MAKE = 
-+SHELL = /usr/local/bin/bash
++SHELL = /bin/bash
 +STRIP = i586-linux-strip
 +VERSION = 1.0.2a
 +ac_ct_CC = 
-+ac_ct_RANLIB = 
-+ac_ct_STRIP = 
++ac_ct_DUMPBIN = 
 +am__fastdepCC_FALSE = 
 +am__fastdepCC_TRUE = #
 +am__include = include
 +am__leading_dot = .
 +am__quote = 
 +bindir = ${exec_prefix}/bin
-+build = x86_64-undermydesk-freebsd
-+build_alias = amd64-undermydesk-freebsd
-+build_cpu = x86_64
-+build_os = freebsd
-+build_vendor = undermydesk
++build = i686-pc-linux-gnu
++build_alias = i686-pc-linux-gnu
++build_cpu = i686
++build_os = linux-gnu
++build_vendor = pc
 +datadir = /usr/share
++datarootdir = ${prefix}/share
++docdir = ${datarootdir}/doc/${PACKAGE}
++dvidir = ${docdir}
 +exec_prefix = ${prefix}
 +host = i586-pc-linux-gnu
 +host_alias = i586-linux
 +host_cpu = i586
 +host_os = linux-gnu
 +host_vendor = pc
++htmldir = ${docdir}
 +includedir = ${prefix}/include
-+infodir = ${prefix}/info
++infodir = ${datarootdir}/info
 +install_sh = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/install-sh
 +libdir = ${exec_prefix}/lib
 +libexecdir = /usr/sbin
++localedir = ${datarootdir}/locale
 +localstatedir = /var
++lt_ECHO = echo
 +mandir = /usr/share/man
-+mkdir_p = $(mkinstalldirs)
++mkdir_p = mkdir -p -- .
 +oldincludedir = /usr/include
++pdfdir = ${docdir}
 +prefix = /usr
-+program_transform_name = s,$$,,;s,^,,
++program_transform_name = s&$$&&;s&^&&
++psdir = ${docdir}
 +sbindir = ${exec_prefix}/sbin
 +sharedstatedir = ${prefix}/com
 +sysconfdir = /etc

package/libnet/patches/patch-Makefile_in

@@ -1,6 +1,6 @@
 --- Libnet-1.0.2a.orig/Makefile.in	2001-02-05 18:51:41.000000000 +0100
-+++ Libnet-1.0.2a/Makefile.in	2009-06-12 21:48:27.000000000 +0200
-@@ -1,147 +1,620 @@
++++ Libnet-1.0.2a/Makefile.in	2009-08-23 00:39:58.705644309 +0200
+@@ -1,147 +1,638 @@
 -#
 -#   $Id: Makefile.in,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
 -#
@@ -172,17 +172,21 @@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEPDIR = @DEPDIR@
-+ECHO = @ECHO@
++DSYMUTIL = @DSYMUTIL@
++DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
++FGREP = @FGREP@
++GREP = @GREP@
 +INC_PREFIX = @INC_PREFIX@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LIBNET_CONFIG_CFLAGS = @LIBNET_CONFIG_CFLAGS@
 +LIBNET_CONFIG_DEFINES = @LIBNET_CONFIG_DEFINES@
@@ -191,6 +195,7 @@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIB_PREFIX = @LIB_PREFIX@
++LIPO = @LIPO@
 +LL_INT_TYPE = @LL_INT_TYPE@
 +LL_INT_TYPE_UC = @LL_INT_TYPE_UC@
 +LN = @LN@
@@ -198,7 +203,12 @@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAKEINFO = @MAKEINFO@
 +MAN_PREFIX = @MAN_PREFIX@
++NM = @NM@
++NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
@@ -207,13 +217,13 @@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +RANLIB = @RANLIB@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
 +STRIP = @STRIP@
 +VERSION = @VERSION@
 +ac_ct_CC = @ac_ct_CC@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 +am__include = @am__include@
@@ -226,23 +236,31 @@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
++htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
++localedir = @localedir@
 +localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
++psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +sysconfdir = @sysconfdir@

package/libnet/patches/patch-include_Makefile

@@ -1,6 +1,6 @@
 --- Libnet-1.0.2a.orig/include/Makefile	1970-01-01 00:00:00.000000000 +0100
-+++ Libnet-1.0.2a/include/Makefile	2009-06-12 21:52:51.000000000 +0200
-@@ -0,0 +1,509 @@
++++ Libnet-1.0.2a/include/Makefile	2009-08-23 00:40:11.006413643 +0200
+@@ -0,0 +1,527 @@
 +# Makefile.in generated by automake 1.8.5 from Makefile.am.
 +# include/Makefile.  Generated from Makefile.in by configure.
 +
@@ -17,9 +17,9 @@
 +
 +
 +
-+srcdir = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/include
-+top_srcdir = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a
-+VPATH = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/include
++srcdir = .
++top_srcdir = ..
++
 +pkgdatadir = $(datadir)/libnet
 +pkglibdir = $(libdir)/libnet
 +pkgincludedir = $(includedir)/libnet
@@ -37,7 +37,7 @@
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
-+build_triplet = x86_64-undermydesk-freebsd
++build_triplet = i686-pc-linux-gnu
 +host_triplet = i586-pc-linux-gnu
 +target_triplet = i586-pc-linux-gnu
 +DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
@@ -74,31 +74,35 @@
 +AMDEP_FALSE = 
 +AMDEP_TRUE = #
 +AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run tar
-+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
++AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ar
 +AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run autoconf
 +AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run autoheader
 +AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run automake-1.8
 +AWK = gawk
 +BIN_PREFIX = /usr/bin/
-+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
++CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-gcc
 +CCDEPMODE = depmode=none
 +CFLAGS = -O2 -funroll-loops -fomit-frame-pointer -Wall
-+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
++CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E
 +CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
 +CYGPATH_W = echo
 +DEFS = -DHAVE_CONFIG_H
 +DEPDIR = .deps
-+ECHO = echo
++DSYMUTIL = 
++DUMPBIN = 
 +ECHO_C = 
 +ECHO_N = -n
 +ECHO_T = 
-+EGREP = grep -E
++EGREP = /bin/grep -E
 +EXEEXT = 
++FGREP = /bin/grep -F
++GREP = /bin/grep
 +INC_PREFIX = /usr/include/
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_PROGRAM = ${INSTALL}
 +INSTALL_SCRIPT = ${INSTALL}
 +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
++LD = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ld
 +LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
 +LIBNET_CONFIG_CFLAGS = 
 +LIBNET_CONFIG_DEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H -DLIBNET_LIL_ENDIAN
@@ -107,14 +111,20 @@
 +LIBS = 
 +LIBTOOL = $(SHELL) $(top_builddir)/libtool
 +LIB_PREFIX = /usr/lib/
-+LL_INT_TYPE = 
-+LL_INT_TYPE_UC = 
++LIPO = 
++LL_INT_TYPE = sockpacket
++LL_INT_TYPE_UC = SOCKPACKET
 +LN = ln
 +LN_S = ln -s
 +LTLIBOBJS = 
 +MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run makeinfo
 +MAN_PREFIX = /usr/share/man/man3/
++NM = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-nm
++NMEDIT = 
++OBJDUMP = i586-linux-objdump
 +OBJEXT = o
++OTOOL = 
++OTOOL64 = 
 +PACKAGE = libnet
 +PACKAGE_BUGREPORT = 
 +PACKAGE_NAME = 
@@ -122,43 +132,51 @@
 +PACKAGE_TARNAME = 
 +PACKAGE_VERSION = 
 +PATH_SEPARATOR = :
-+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
++RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ranlib
++SED = /home/wbx/openadk/scripts/sed
 +SET_MAKE = 
-+SHELL = /usr/local/bin/bash
++SHELL = /bin/bash
 +STRIP = i586-linux-strip
 +VERSION = 1.0.2a
 +ac_ct_CC = 
-+ac_ct_RANLIB = 
-+ac_ct_STRIP = 
++ac_ct_DUMPBIN = 
 +am__fastdepCC_FALSE = 
 +am__fastdepCC_TRUE = #
 +am__include = include
 +am__leading_dot = .
 +am__quote = 
 +bindir = ${exec_prefix}/bin
-+build = x86_64-undermydesk-freebsd
-+build_alias = amd64-undermydesk-freebsd
-+build_cpu = x86_64
-+build_os = freebsd
-+build_vendor = undermydesk
++build = i686-pc-linux-gnu
++build_alias = i686-pc-linux-gnu
++build_cpu = i686
++build_os = linux-gnu
++build_vendor = pc
 +datadir = /usr/share
++datarootdir = ${prefix}/share
++docdir = ${datarootdir}/doc/${PACKAGE}
++dvidir = ${docdir}
 +exec_prefix = ${prefix}
 +host = i586-pc-linux-gnu
 +host_alias = i586-linux
 +host_cpu = i586
 +host_os = linux-gnu
 +host_vendor = pc
++htmldir = ${docdir}
 +includedir = ${prefix}/include
-+infodir = ${prefix}/info
++infodir = ${datarootdir}/info
 +install_sh = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/install-sh
 +libdir = ${exec_prefix}/lib
 +libexecdir = /usr/sbin
++localedir = ${datarootdir}/locale
 +localstatedir = /var
++lt_ECHO = echo
 +mandir = /usr/share/man
-+mkdir_p = $(mkinstalldirs)
++mkdir_p = mkdir -p -- .
 +oldincludedir = /usr/include
++pdfdir = ${docdir}
 +prefix = /usr
-+program_transform_name = s,$$,,;s,^,,
++program_transform_name = s&$$&&;s&^&&
++psdir = ${docdir}
 +sbindir = ${exec_prefix}/sbin
 +sharedstatedir = ${prefix}/com
 +sysconfdir = /etc

package/libnet/patches/patch-include_Makefile_in

@@ -1,6 +1,6 @@
 --- Libnet-1.0.2a.orig/include/Makefile.in	1970-01-01 00:00:00.000000000 +0100
-+++ Libnet-1.0.2a/include/Makefile.in	2009-06-12 21:48:27.000000000 +0200
-@@ -0,0 +1,509 @@
++++ Libnet-1.0.2a/include/Makefile.in	2009-08-23 00:39:58.945660085 +0200
+@@ -0,0 +1,527 @@
 +# Makefile.in generated by automake 1.8.5 from Makefile.am.
 +# @configure_input@
 +
@@ -88,17 +88,21 @@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEPDIR = @DEPDIR@
-+ECHO = @ECHO@
++DSYMUTIL = @DSYMUTIL@
++DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
++FGREP = @FGREP@
++GREP = @GREP@
 +INC_PREFIX = @INC_PREFIX@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LIBNET_CONFIG_CFLAGS = @LIBNET_CONFIG_CFLAGS@
 +LIBNET_CONFIG_DEFINES = @LIBNET_CONFIG_DEFINES@
@@ -107,6 +111,7 @@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIB_PREFIX = @LIB_PREFIX@
++LIPO = @LIPO@
 +LL_INT_TYPE = @LL_INT_TYPE@
 +LL_INT_TYPE_UC = @LL_INT_TYPE_UC@
 +LN = @LN@
@@ -114,7 +119,12 @@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAKEINFO = @MAKEINFO@
 +MAN_PREFIX = @MAN_PREFIX@
++NM = @NM@
++NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
@@ -123,13 +133,13 @@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +RANLIB = @RANLIB@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
 +STRIP = @STRIP@
 +VERSION = @VERSION@
 +ac_ct_CC = @ac_ct_CC@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 +am__include = @am__include@
@@ -142,23 +152,31 @@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
++htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
++localedir = @localedir@
 +localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
++psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +sysconfdir = @sysconfdir@

package/libnet/patches/patch-include_config_h

@@ -1,9 +1,9 @@
 --- Libnet-1.0.2a.orig/include/config.h	1970-01-01 00:00:00.000000000 +0100
-+++ Libnet-1.0.2a/include/config.h	2009-06-12 21:52:51.000000000 +0200
-@@ -0,0 +1,107 @@
-+/* include/config.h.  Generated by configure.  */
++++ Libnet-1.0.2a/include/config.h	2009-08-23 00:40:11.126420818 +0200
+@@ -0,0 +1,111 @@
++/* include/config.h.  Generated from config.h.in by configure.  */
 +/* include/config.h.in.  Generated from configure.in by autoheader.  */
-+/*
++/* $Id: acconfig.h,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
 + *
 + * Libnet autoconfiguration acconfig.h file
 + * Copyright (c) 1998 - 2001 Mike D. Schiffman <mike@infonexus.com>
@@ -82,6 +82,10 @@
 +/* Define to 1 if you have the <unistd.h> header file. */
 +#define HAVE_UNISTD_H 1
 +
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++   */
++#define LT_OBJDIR ".libs/"
++
 +/* Name of package */
 +#define PACKAGE "libnet"
 +

package/libnet/patches/patch-include_config_h_in

@@ -1,12 +1,12 @@
 --- Libnet-1.0.2a.orig/include/config.h.in	2000-05-25 02:28:49.000000000 +0200
-+++ Libnet-1.0.2a/include/config.h.in	2009-06-12 21:48:27.000000000 +0200
++++ Libnet-1.0.2a/include/config.h.in	2009-08-23 00:39:57.000000000 +0200
 @@ -1,14 +1,20 @@
 -/* include/config.h.in.  Generated automatically from configure.in by autoheader.  */
 -
 -/* Define to empty if the keyword does not work.  */
 -#undef const
 +/* include/config.h.in.  Generated from configure.in by autoheader.  */
-+/* 
++/* $Id: acconfig.h,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
 + *
 + * Libnet autoconfiguration acconfig.h file
 + * Copyright (c) 1998 - 2001 Mike D. Schiffman <mike@infonexus.com>
@@ -26,7 +26,7 @@
  #undef HAVE_DLPI
  #undef HAVE_PF_PACKET
  #undef HAVE_STRUCT_IP_CSUM
-@@ -21,23 +27,80 @@
+@@ -21,23 +27,84 @@
  #undef LIBNET_BIG_ENDIAN
  #undef LIBNET_LIL_ENDIAN
  
@@ -91,6 +91,10 @@
 +/* Define to 1 if you have the <unistd.h> header file. */
 +#undef HAVE_UNISTD_H
 +
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++   */
++#undef LT_OBJDIR
++
 +/* Name of package */
 +#undef PACKAGE
 +

package/libnet/patches/patch-include_libnet_Makefile

@@ -1,6 +1,6 @@
 --- Libnet-1.0.2a.orig/include/libnet/Makefile	1970-01-01 00:00:00.000000000 +0100
-+++ Libnet-1.0.2a/include/libnet/Makefile	2009-06-12 21:52:51.000000000 +0200
-@@ -0,0 +1,398 @@
++++ Libnet-1.0.2a/include/libnet/Makefile	2009-08-23 00:40:11.054416961 +0200
+@@ -0,0 +1,416 @@
 +# Makefile.in generated by automake 1.8.5 from Makefile.am.
 +# include/libnet/Makefile.  Generated from Makefile.in by configure.
 +
@@ -17,9 +17,9 @@
 +
 +
 +
-+srcdir = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/include/libnet
-+top_srcdir = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a
-+VPATH = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/include/libnet
++srcdir = .
++top_srcdir = ../..
++
 +pkgdatadir = $(datadir)/libnet
 +pkglibdir = $(libdir)/libnet
 +pkgincludedir = $(includedir)/libnet
@@ -37,7 +37,7 @@
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
-+build_triplet = x86_64-undermydesk-freebsd
++build_triplet = i686-pc-linux-gnu
 +host_triplet = i586-pc-linux-gnu
 +target_triplet = i586-pc-linux-gnu
 +DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
@@ -66,31 +66,35 @@
 +AMDEP_FALSE = 
 +AMDEP_TRUE = #
 +AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run tar
-+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
++AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ar
 +AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run autoconf
 +AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run autoheader
 +AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run automake-1.8
 +AWK = gawk
 +BIN_PREFIX = /usr/bin/
-+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
++CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-gcc
 +CCDEPMODE = depmode=none
 +CFLAGS = -O2 -funroll-loops -fomit-frame-pointer -Wall
-+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
++CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E
 +CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
 +CYGPATH_W = echo
 +DEFS = -DHAVE_CONFIG_H
 +DEPDIR = .deps
-+ECHO = echo
++DSYMUTIL = 
++DUMPBIN = 
 +ECHO_C = 
 +ECHO_N = -n
 +ECHO_T = 
-+EGREP = grep -E
++EGREP = /bin/grep -E
 +EXEEXT = 
++FGREP = /bin/grep -F
++GREP = /bin/grep
 +INC_PREFIX = /usr/include/
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_PROGRAM = ${INSTALL}
 +INSTALL_SCRIPT = ${INSTALL}
 +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
++LD = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ld
 +LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
 +LIBNET_CONFIG_CFLAGS = 
 +LIBNET_CONFIG_DEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H -DLIBNET_LIL_ENDIAN
@@ -99,14 +103,20 @@
 +LIBS = 
 +LIBTOOL = $(SHELL) $(top_builddir)/libtool
 +LIB_PREFIX = /usr/lib/
-+LL_INT_TYPE = 
-+LL_INT_TYPE_UC = 
++LIPO = 
++LL_INT_TYPE = sockpacket
++LL_INT_TYPE_UC = SOCKPACKET
 +LN = ln
 +LN_S = ln -s
 +LTLIBOBJS = 
 +MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run makeinfo
 +MAN_PREFIX = /usr/share/man/man3/
++NM = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-nm
++NMEDIT = 
++OBJDUMP = i586-linux-objdump
 +OBJEXT = o
++OTOOL = 
++OTOOL64 = 
 +PACKAGE = libnet
 +PACKAGE_BUGREPORT = 
 +PACKAGE_NAME = 
@@ -114,43 +124,51 @@
 +PACKAGE_TARNAME = 
 +PACKAGE_VERSION = 
 +PATH_SEPARATOR = :
-+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
++RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ranlib
++SED = /home/wbx/openadk/scripts/sed
 +SET_MAKE = 
-+SHELL = /usr/local/bin/bash
++SHELL = /bin/bash
 +STRIP = i586-linux-strip
 +VERSION = 1.0.2a
 +ac_ct_CC = 
-+ac_ct_RANLIB = 
-+ac_ct_STRIP = 
++ac_ct_DUMPBIN = 
 +am__fastdepCC_FALSE = 
 +am__fastdepCC_TRUE = #
 +am__include = include
 +am__leading_dot = .
 +am__quote = 
 +bindir = ${exec_prefix}/bin
-+build = x86_64-undermydesk-freebsd
-+build_alias = amd64-undermydesk-freebsd
-+build_cpu = x86_64
-+build_os = freebsd
-+build_vendor = undermydesk
++build = i686-pc-linux-gnu
++build_alias = i686-pc-linux-gnu
++build_cpu = i686
++build_os = linux-gnu
++build_vendor = pc
 +datadir = /usr/share
++datarootdir = ${prefix}/share
++docdir = ${datarootdir}/doc/${PACKAGE}
++dvidir = ${docdir}
 +exec_prefix = ${prefix}
 +host = i586-pc-linux-gnu
 +host_alias = i586-linux
 +host_cpu = i586
 +host_os = linux-gnu
 +host_vendor = pc
++htmldir = ${docdir}
 +includedir = ${prefix}/include
-+infodir = ${prefix}/info
++infodir = ${datarootdir}/info
 +install_sh = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/install-sh
 +libdir = ${exec_prefix}/lib
 +libexecdir = /usr/sbin
++localedir = ${datarootdir}/locale
 +localstatedir = /var
++lt_ECHO = echo
 +mandir = /usr/share/man
-+mkdir_p = $(mkinstalldirs)
++mkdir_p = mkdir -p -- .
 +oldincludedir = /usr/include
++pdfdir = ${docdir}
 +prefix = /usr
-+program_transform_name = s,$$,,;s,^,,
++program_transform_name = s&$$&&;s&^&&
++psdir = ${docdir}
 +sbindir = ${exec_prefix}/sbin
 +sharedstatedir = ${prefix}/com
 +sysconfdir = /etc

package/libnet/patches/patch-include_libnet_Makefile_in

@@ -1,6 +1,6 @@
 --- Libnet-1.0.2a.orig/include/libnet/Makefile.in	1970-01-01 00:00:00.000000000 +0100
-+++ Libnet-1.0.2a/include/libnet/Makefile.in	2009-06-12 21:48:27.000000000 +0200
-@@ -0,0 +1,398 @@
++++ Libnet-1.0.2a/include/libnet/Makefile.in	2009-08-23 00:39:59.105669564 +0200
+@@ -0,0 +1,416 @@
 +# Makefile.in generated by automake 1.8.5 from Makefile.am.
 +# @configure_input@
 +
@@ -80,17 +80,21 @@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEPDIR = @DEPDIR@
-+ECHO = @ECHO@
++DSYMUTIL = @DSYMUTIL@
++DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
++FGREP = @FGREP@
++GREP = @GREP@
 +INC_PREFIX = @INC_PREFIX@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LIBNET_CONFIG_CFLAGS = @LIBNET_CONFIG_CFLAGS@
 +LIBNET_CONFIG_DEFINES = @LIBNET_CONFIG_DEFINES@
@@ -99,6 +103,7 @@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIB_PREFIX = @LIB_PREFIX@
++LIPO = @LIPO@
 +LL_INT_TYPE = @LL_INT_TYPE@
 +LL_INT_TYPE_UC = @LL_INT_TYPE_UC@
 +LN = @LN@
@@ -106,7 +111,12 @@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAKEINFO = @MAKEINFO@
 +MAN_PREFIX = @MAN_PREFIX@
++NM = @NM@
++NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
@@ -115,13 +125,13 @@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +RANLIB = @RANLIB@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
 +STRIP = @STRIP@
 +VERSION = @VERSION@
 +ac_ct_CC = @ac_ct_CC@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 +am__include = @am__include@
@@ -134,23 +144,31 @@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
++htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
++localedir = @localedir@
 +localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
++psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +sysconfdir = @sysconfdir@

package/libnet/patches/patch-include_stamp-h1

@@ -1,4 +0,0 @@
---- Libnet-1.0.2a.orig/include/stamp-h1	1970-01-01 00:00:00.000000000 +0100
-+++ Libnet-1.0.2a/include/stamp-h1	2009-06-12 21:52:51.000000000 +0200
-@@ -0,0 +1 @@
-+timestamp for include/config.h

package/libnet/patches/patch-install-sh

@@ -1,11 +1,501 @@
 --- Libnet-1.0.2a.orig/install-sh	2001-02-05 18:51:48.000000000 +0100
-+++ Libnet-1.0.2a/install-sh	2009-06-12 21:48:27.000000000 +0200
-@@ -44,7 +44,7 @@ mkdirprog="${MKDIRPROG-mkdir}"
- transformbasename=""
- transform_arg=""
- instcmd="$cpprog"
--chmodcmd="$chmodprog 0755"
-+chmodcmd=""
- chowncmd=""
- chgrpcmd=""
- stripcmd=""
++++ Libnet-1.0.2a/install-sh	2009-08-23 00:39:58.189621602 +0200
+@@ -1,19 +1,38 @@
+-#! /bin/sh
+-#
++#!/bin/sh
+ # install - install a program, script, or datafile
+-# This comes from X11R5 (mit/util/scripts/install.sh).
++
++scriptversion=2004-04-01.17
++
++# This originates from X11R5 (mit/util/scripts/install.sh), which was
++# later released in X11R6 (xc/config/util/install.sh) with the
++# following copyright and license.
+ #
+-# Copyright 1991 by the Massachusetts Institute of Technology
++# Copyright (C) 1994 X Consortium
+ #
+-# Permission to use, copy, modify, distribute, and sell this software and its
+-# documentation for any purpose is hereby granted without fee, provided that
+-# the above copyright notice appear in all copies and that both that
+-# copyright notice and this permission notice appear in supporting
+-# documentation, and that the name of M.I.T. not be used in advertising or
+-# publicity pertaining to distribution of the software without specific,
+-# written prior permission.  M.I.T. makes no representations about the
+-# suitability of this software for any purpose.  It is provided "as is"
+-# without express or implied warranty.
++# Permission is hereby granted, free of charge, to any person obtaining a copy
++# of this software and associated documentation files (the "Software"), to
++# deal in the Software without restriction, including without limitation the
++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++# sell copies of the Software, and to permit persons to whom the Software is
++# furnished to do so, subject to the following conditions:
++#
++# The above copyright notice and this permission notice shall be included in
++# all copies or substantial portions of the Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++#
++# Except as contained in this notice, the name of the X Consortium shall not
++# be used in advertising or otherwise to promote the sale, use or other deal-
++# ings in this Software without prior written authorization from the X Consor-
++# tium.
++#
++#
++# FSF changes to this file are in the public domain.
+ #
+ # Calling this script install-sh is preferred over install.sh, to prevent
+ # `make' implicit rules from creating a file called install from it
+@@ -23,13 +42,11 @@
+ # from scratch.  It can only install one file at a time, a restriction
+ # shared with many OS's install programs.
+ 
+-
+ # set DOITPROG to echo to test this script
+ 
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit="${DOITPROG-}"
+ 
+-
+ # put in absolute paths if you don't have them in your path; or use env. vars.
+ 
+ mvprog="${MVPROG-mv}"
+@@ -41,210 +58,268 @@ stripprog="${STRIPPROG-strip}"
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
+ 
+-transformbasename=""
+-transform_arg=""
+-instcmd="$cpprog"
++transformbasename=
++transform_arg=
++instcmd="$mvprog"
+ chmodcmd="$chmodprog 0755"
+-chowncmd=""
+-chgrpcmd=""
+-stripcmd=""
++chowncmd=
++chgrpcmd=
++stripcmd=
+ rmcmd="$rmprog -f"
+ mvcmd="$mvprog"
+-src=""
+-dst=""
+-dir_arg=""
+-
+-while [ x"$1" != x ]; do
+-    case $1 in
+-	-c) instcmd="$cpprog"
+-	    shift
+-	    continue;;
+-
+-	-d) dir_arg=true
+-	    shift
+-	    continue;;
++src=
++dst=
++dir_arg=
+ 
+-	-m) chmodcmd="$chmodprog $2"
+-	    shift
+-	    shift
+-	    continue;;
++usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
++   or: $0 [OPTION]... SRCFILES... DIRECTORY
++   or: $0 -d DIRECTORIES...
+ 
+-	-o) chowncmd="$chownprog $2"
+-	    shift
+-	    shift
+-	    continue;;
++In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
++In the second, create the directory path DIR.
+ 
+-	-g) chgrpcmd="$chgrpprog $2"
+-	    shift
+-	    shift
+-	    continue;;
++Options:
++-b=TRANSFORMBASENAME
++-c         copy source (using $cpprog) instead of moving (using $mvprog).
++-d         create directories instead of installing files.
++-g GROUP   $chgrp installed files to GROUP.
++-m MODE    $chmod installed files to MODE.
++-o USER    $chown installed files to USER.
++-s         strip installed files (using $stripprog).
++-t=TRANSFORM
++--help     display this help and exit.
++--version  display version info and exit.
+ 
+-	-s) stripcmd="$stripprog"
+-	    shift
+-	    continue;;
++Environment variables override the default commands:
++  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++"
+ 
+-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+-	    shift
+-	    continue;;
++while test -n "$1"; do
++  case $1 in
++    -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
++        shift
++        continue;;
+ 
+-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+-	    shift
+-	    continue;;
++    -c) instcmd=$cpprog
++        shift
++        continue;;
+ 
+-	*)  if [ x"$src" = x ]
+-	    then
+-		src=$1
+-	    else
+-		# this colon is to work around a 386BSD /bin/sh bug
+-		:
+-		dst=$1
+-	    fi
+-	    shift
+-	    continue;;
+-    esac
+-done
++    -d) dir_arg=true
++        shift
++        continue;;
+ 
+-if [ x"$src" = x ]
+-then
+-	echo "install:	no input file specified"
+-	exit 1
+-else
+-	true
+-fi
++    -g) chgrpcmd="$chgrpprog $2"
++        shift
++        shift
++        continue;;
+ 
+-if [ x"$dir_arg" != x ]; then
+-	dst=$src
+-	src=""
+-	
+-	if [ -d $dst ]; then
+-		instcmd=:
+-	else
+-		instcmd=mkdir
+-	fi
+-else
++    --help) echo "$usage"; exit 0;;
+ 
+-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+-# might cause directories to be created, which would be especially bad 
+-# if $src (and thus $dsttmp) contains '*'.
++    -m) chmodcmd="$chmodprog $2"
++        shift
++        shift
++        continue;;
+ 
+-	if [ -f $src -o -d $src ]
+-	then
+-		true
+-	else
+-		echo "install:  $src does not exist"
+-		exit 1
+-	fi
+-	
+-	if [ x"$dst" = x ]
+-	then
+-		echo "install:	no destination specified"
+-		exit 1
+-	else
+-		true
+-	fi
++    -o) chowncmd="$chownprog $2"
++        shift
++        shift
++        continue;;
+ 
+-# If destination is a directory, append the input filename; if your system
+-# does not like double slashes in filenames, you may need to add some logic
++    -s) stripcmd=$stripprog
++        shift
++        continue;;
+ 
+-	if [ -d $dst ]
+-	then
+-		dst="$dst"/`basename $src`
+-	else
+-		true
+-	fi
+-fi
++    -t=*) transformarg=`echo $1 | sed 's/-t=//'`
++        shift
++        continue;;
+ 
+-## this sed command emulates the dirname command
+-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
++    --version) echo "$0 $scriptversion"; exit 0;;
+ 
+-# Make sure that the destination directory exists.
+-#  this part is taken from Noah Friedman's mkinstalldirs script
++    *)  # When -d is used, all remaining arguments are directories to create.
++	test -n "$dir_arg" && break
++        # Otherwise, the last argument is the destination.  Remove it from $@.
++	for arg
++	do
++          if test -n "$dstarg"; then
++	    # $@ is not empty: it contains at least $arg.
++	    set fnord "$@" "$dstarg"
++	    shift # fnord
++	  fi
++	  shift # arg
++	  dstarg=$arg
++	done
++	break;;
++  esac
++done
+ 
+-# Skip lots of stat calls in the usual case.
+-if [ ! -d "$dstdir" ]; then
+-defaultIFS='	
+-'
+-IFS="${IFS-${defaultIFS}}"
++if test -z "$1"; then
++  if test -z "$dir_arg"; then
++    echo "$0: no input file specified." >&2
++    exit 1
++  fi
++  # It's OK to call `install-sh -d' without argument.
++  # This can happen when creating conditional directories.
++  exit 0
++fi
+ 
+-oIFS="${IFS}"
+-# Some sh's can't handle IFS=/ for some reason.
+-IFS='%'
+-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+-IFS="${oIFS}"
++for src
++do
++  # Protect names starting with `-'.
++  case $src in
++    -*) src=./$src ;;
++  esac
+ 
+-pathcomp=''
++  if test -n "$dir_arg"; then
++    dst=$src
++    src=
+ 
+-while [ $# -ne 0 ] ; do
+-	pathcomp="${pathcomp}${1}"
+-	shift
++    if test -d "$dst"; then
++      instcmd=:
++      chmodcmd=
++    else
++      instcmd=$mkdirprog
++    fi
++  else
++    # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
++    # might cause directories to be created, which would be especially bad
++    # if $src (and thus $dsttmp) contains '*'.
++    if test ! -f "$src" && test ! -d "$src"; then
++      echo "$0: $src does not exist." >&2
++      exit 1
++    fi
+ 
+-	if [ ! -d "${pathcomp}" ] ;
+-        then
+-		$mkdirprog "${pathcomp}"
+-	else
+-		true
+-	fi
++    if test -z "$dstarg"; then
++      echo "$0: no destination specified." >&2
++      exit 1
++    fi
+ 
+-	pathcomp="${pathcomp}/"
+-done
+-fi
++    dst=$dstarg
++    # Protect names starting with `-'.
++    case $dst in
++      -*) dst=./$dst ;;
++    esac
+ 
+-if [ x"$dir_arg" != x ]
+-then
+-	$doit $instcmd $dst &&
++    # If destination is a directory, append the input filename; won't work
++    # if double slashes aren't ignored.
++    if test -d "$dst"; then
++      dst=$dst/`basename "$src"`
++    fi
++  fi
+ 
+-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+-else
++  # This sed command emulates the dirname command.
++  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+ 
+-# If we're going to rename the final executable, determine the name now.
++  # Make sure that the destination directory exists.
+ 
+-	if [ x"$transformarg" = x ] 
+-	then
+-		dstfile=`basename $dst`
+-	else
+-		dstfile=`basename $dst $transformbasename | 
+-			sed $transformarg`$transformbasename
+-	fi
++  # Skip lots of stat calls in the usual case.
++  if test ! -d "$dstdir"; then
++    defaultIFS='
++	 '
++    IFS="${IFS-$defaultIFS}"
+ 
+-# don't allow the sed command to completely eliminate the filename
++    oIFS=$IFS
++    # Some sh's can't handle IFS=/ for some reason.
++    IFS='%'
++    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    IFS=$oIFS
+ 
+-	if [ x"$dstfile" = x ] 
+-	then
+-		dstfile=`basename $dst`
+-	else
+-		true
+-	fi
++    pathcomp=
+ 
+-# Make a temp file name in the proper directory.
++    while test $# -ne 0 ; do
++      pathcomp=$pathcomp$1
++      shift
++      if test ! -d "$pathcomp"; then
++        $mkdirprog "$pathcomp" || lasterr=$?
++	# mkdir can fail with a `File exist' error in case several
++	# install-sh are creating the directory concurrently.  This
++	# is OK.
++	test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
++      fi
++      pathcomp=$pathcomp/
++    done
++  fi
+ 
+-	dsttmp=$dstdir/#inst.$$#
++  if test -n "$dir_arg"; then
++    $doit $instcmd "$dst" \
++      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
++      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
++      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
++      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+ 
+-# Move or copy the file name to the temp name
++  else
++    # If we're going to rename the final executable, determine the name now.
++    if test -z "$transformarg"; then
++      dstfile=`basename "$dst"`
++    else
++      dstfile=`basename "$dst" $transformbasename \
++               | sed $transformarg`$transformbasename
++    fi
+ 
+-	$doit $instcmd $src $dsttmp &&
++    # don't allow the sed command to completely eliminate the filename.
++    test -z "$dstfile" && dstfile=`basename "$dst"`
+ 
+-	trap "rm -f ${dsttmp}" 0 &&
++    # Make a couple of temp file names in the proper directory.
++    dsttmp=$dstdir/_inst.$$_
++    rmtmp=$dstdir/_rm.$$_
+ 
+-# and set any options; do chmod last to preserve setuid bits
++    # Trap to clean up those temp files at exit.
++    trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
++    trap '(exit $?); exit' 1 2 13 15
+ 
+-# If any of these fail, we abort the whole thing.  If we want to
+-# ignore errors from any of these, just make sure not to ignore
+-# errors from the above "$doit $instcmd $src $dsttmp" command.
++    # Move or copy the file name to the temp name
++    $doit $instcmd "$src" "$dsttmp" &&
+ 
+-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
++    # and set any options; do chmod last to preserve setuid bits.
++    #
++    # If any of these fail, we abort the whole thing.  If we want to
++    # ignore errors from any of these, just make sure not to ignore
++    # errors from the above "$doit $instcmd $src $dsttmp" command.
++    #
++    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
++      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
++      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
++      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+ 
+-# Now rename the file to the real destination.
++    # Now rename the file to the real destination.
++    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
++      || {
++	   # The rename failed, perhaps because mv can't rename something else
++	   # to itself, or perhaps because mv is so ancient that it does not
++	   # support -f.
+ 
+-	$doit $rmcmd -f $dstdir/$dstfile &&
+-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
++	   # Now remove or move aside any old file at destination location.
++	   # We try this two ways since rm can't unlink itself on some
++	   # systems and the destination file might be busy for other
++	   # reasons.  In this case, the final cleanup might fail but the new
++	   # file should still install successfully.
++	   {
++	     if test -f "$dstdir/$dstfile"; then
++	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
++	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
++	       || {
++		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
++		 (exit 1); exit
++	       }
++	     else
++	       :
++	     fi
++	   } &&
+ 
+-fi &&
++	   # Now rename the file to the real destination.
++	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
++	 }
++    }
++  fi || { (exit 1); exit; }
++done
+ 
++# The final little trick to "correctly" pass the exit status to the exit trap.
++{
++  (exit 0); exit
++}
+ 
+-exit 0
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:

package/libnet/patches/patch-missing

@@ -1,9 +1,13 @@
 --- Libnet-1.0.2a.orig/missing	1970-01-01 00:00:00.000000000 +0100
-+++ Libnet-1.0.2a/missing	2009-06-12 21:48:27.000000000 +0200
-@@ -0,0 +1,336 @@
++++ Libnet-1.0.2a/missing	2009-08-23 00:39:58.197624019 +0200
+@@ -0,0 +1,360 @@
 +#! /bin/sh
 +# Common stub for a few missing GNU programs while installing.
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
++
++scriptversion=2003-09-02.23
++
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
++#   Free Software Foundation, Inc.
 +# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -41,12 +45,23 @@
 +  configure_ac=configure.in
 +fi
 +
++msg="missing on your system"
++
 +case "$1" in
 +--run)
 +  # Try to run requested program, and just exit if it succeeds.
 +  run=
 +  shift
 +  "$@" && exit 0
++  # Exit code 63 means version mismatch.  This often happens
++  # when the user try to use an ancient version of a tool on
++  # a file that requires a minimum version.  In this case we
++  # we should proceed has if the program had been absent, or
++  # if --run hadn't been passed.
++  if test $? = 63; then
++    run=:
++    msg="probably too old"
++  fi
 +  ;;
 +esac
 +
@@ -77,11 +92,13 @@
 +  lex          create \`lex.yy.c', if possible, from existing .c
 +  makeinfo     touch the output file
 +  tar          try tar, gnutar, gtar, then tar without non-portable flags
-+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
++  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
++
++Send bug reports to <bug-automake@gnu.org>."
 +    ;;
 +
 +  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-+    echo "missing 0.4 - GNU automake"
++    echo "missing $scriptversion (GNU Automake)"
 +    ;;
 +
 +  -*)
@@ -97,7 +114,7 @@
 +    fi
 +
 +    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
 +         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
 +         to install the \`Automake' and \`Perl' packages.  Grab them from
 +         any GNU archive site."
@@ -111,7 +128,7 @@
 +    fi
 +
 +    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
 +         you modified \`${configure_ac}'.  You might want to install the
 +         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
 +         archive site."
@@ -125,7 +142,7 @@
 +    fi
 +
 +    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
 +         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
 +         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
 +         from any GNU archive site."
@@ -149,7 +166,7 @@
 +    fi
 +
 +    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
 +         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
 +         You might want to install the \`Automake' and \`Perl' packages.
 +         Grab them from any GNU archive site."
@@ -165,8 +182,8 @@
 +    fi
 +
 +    echo 1>&2 "\
-+WARNING: \`$1' is needed, and you do not seem to have it handy on your
-+         system.  You might have modified some files without having the
++WARNING: \`$1' is needed, but is $msg.
++         You might have modified some files without having the
 +         proper tools for further handling them.
 +         You can get \`$1' as part of \`Autoconf' from any GNU
 +         archive site."
@@ -188,7 +205,7 @@
 +
 +  bison|yacc)
 +    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' $msg.  You should only need it if
 +         you modified a \`.y' file.  You may need the \`Bison' package
 +         in order for those modifications to take effect.  You can get
 +         \`Bison' from any GNU archive site."
@@ -218,7 +235,7 @@
 +
 +  lex|flex)
 +    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
 +         you modified a \`.l' file.  You may need the \`Flex' package
 +         in order for those modifications to take effect.  You can get
 +         \`Flex' from any GNU archive site."
@@ -246,7 +263,7 @@
 +    fi
 +
 +    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
 +	 you modified a dependency of a manual page.  You may need the
 +	 \`Help2man' package in order for those modifications to take
 +	 effect.  You can get \`Help2man' from any GNU archive site."
@@ -271,7 +288,7 @@
 +    fi
 +
 +    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
 +         you modified a \`.texi' or \`.texinfo' file, or any other file
 +         indirectly affecting the aspect of the manual.  The spurious
 +         call might also be the consequence of using a buggy \`make' (AIX,
@@ -326,8 +343,8 @@
 +
 +  *)
 +    echo 1>&2 "\
-+WARNING: \`$1' is needed, and you do not seem to have it handy on your
-+         system.  You might have modified some files without having the
++WARNING: \`$1' is needed, and is $msg.
++         You might have modified some files without having the
 +         proper tools for further handling them.  Check the \`README' file,
 +         it often tells you about the needed prerequisites for installing
 +         this package.  You may also peek at any GNU archive site, in case
@@ -337,3 +354,10 @@
 +esac
 +
 +exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:

package/libnet/patches/patch-mkinstalldirs

@@ -1,23 +1,35 @@
 --- Libnet-1.0.2a.orig/mkinstalldirs	1970-01-01 00:00:00.000000000 +0100
-+++ Libnet-1.0.2a/mkinstalldirs	2009-06-12 21:48:27.000000000 +0200
-@@ -0,0 +1,111 @@
++++ Libnet-1.0.2a/mkinstalldirs	2009-08-23 00:39:59.149675166 +0200
+@@ -0,0 +1,150 @@
 +#! /bin/sh
 +# mkinstalldirs --- make directory hierarchy
-+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
++
++scriptversion=2004-02-15.20
++
++# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 +# Created: 1993-05-16
-+# Public domain
++# Public domain.
++#
++# This file is maintained in Automake, please report
++# bugs to <bug-automake@gnu.org> or send patches to
++# <automake-patches@gnu.org>.
 +
 +errstatus=0
 +dirmode=""
 +
 +usage="\
-+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
++
++Create each directory DIR (with mode MODE, if specified), including all
++leading file name components.
++
++Report bugs to <bug-automake@gnu.org>."
 +
 +# process command line arguments
 +while test $# -gt 0 ; do
 +  case $1 in
 +    -h | --help | --h*)         # -h for help
-+      echo "$usage" 1>&2
++      echo "$usage"
 +      exit 0
 +      ;;
 +    -m)                         # -m PERM arg
@@ -26,6 +38,10 @@
 +      dirmode=$1
 +      shift
 +      ;;
++    --version)
++      echo "$0 $scriptversion"
++      exit 0
++      ;;
 +    --)                         # stop option processing
 +      shift
 +      break
@@ -53,17 +69,37 @@
 +  0) exit 0 ;;
 +esac
 +
++# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
++# mkdir -p a/c at the same time, both will detect that a is missing,
++# one will create a, then the other will try to create a and die with
++# a "File exists" error.  This is a problem when calling mkinstalldirs
++# from a parallel make.  We use --version in the probe to restrict
++# ourselves to GNU mkdir, which is thread-safe.
 +case $dirmode in
 +  '')
-+    if mkdir -p -- . 2>/dev/null; then
++    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
 +      echo "mkdir -p -- $*"
 +      exec mkdir -p -- "$@"
++    else
++      # On NextStep and OpenStep, the `mkdir' command does not
++      # recognize any option.  It will interpret all options as
++      # directories to create, and then abort because `.' already
++      # exists.
++      test -d ./-p && rmdir ./-p
++      test -d ./--version && rmdir ./--version
 +    fi
 +    ;;
 +  *)
-+    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
++    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
++       test ! -d ./--version; then
 +      echo "mkdir -m $dirmode -p -- $*"
 +      exec mkdir -m "$dirmode" -p -- "$@"
++    else
++      # Clean up after NextStep and OpenStep mkdir.
++      for d in ./-m ./-p ./--version "./$dirmode";
++      do
++        test -d $d && rmdir $d
++      done
 +    fi
 +    ;;
 +esac
@@ -87,17 +123,17 @@
 +      mkdir "$pathcomp" || lasterr=$?
 +
 +      if test ! -d "$pathcomp"; then
-+  	errstatus=$lasterr
++	errstatus=$lasterr
 +      else
-+  	if test ! -z "$dirmode"; then
++	if test ! -z "$dirmode"; then
 +	  echo "chmod $dirmode $pathcomp"
-+    	  lasterr=""
-+  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
++	  lasterr=""
++	  chmod "$dirmode" "$pathcomp" || lasterr=$?
 +
-+  	  if test ! -z "$lasterr"; then
-+  	    errstatus=$lasterr
-+  	  fi
-+  	fi
++	  if test ! -z "$lasterr"; then
++	    errstatus=$lasterr
++	  fi
++	fi
 +      fi
 +    fi
 +
@@ -110,5 +146,8 @@
 +# Local Variables:
 +# mode: shell-script
 +# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
 +# End:
-+# mkinstalldirs ends here

package/libnet/patches/patch-src_Makefile

@@ -1,6 +1,6 @@
 --- Libnet-1.0.2a.orig/src/Makefile	1970-01-01 00:00:00.000000000 +0100
-+++ Libnet-1.0.2a/src/Makefile	2009-06-12 21:52:51.000000000 +0200
-@@ -0,0 +1,502 @@
++++ Libnet-1.0.2a/src/Makefile	2009-08-23 00:40:10.950411820 +0200
+@@ -0,0 +1,520 @@
 +# Makefile.in generated by automake 1.8.5 from Makefile.am.
 +# src/Makefile.  Generated from Makefile.in by configure.
 +
@@ -19,9 +19,9 @@
 +
 +SOURCES = $(libnet_la_SOURCES)
 +
-+srcdir = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/src
-+top_srcdir = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a
-+VPATH = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/src
++srcdir = .
++top_srcdir = ..
++
 +pkgdatadir = $(datadir)/libnet
 +pkglibdir = $(libdir)/libnet
 +pkgincludedir = $(includedir)/libnet
@@ -39,7 +39,7 @@
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
-+build_triplet = x86_64-undermydesk-freebsd
++build_triplet = i686-pc-linux-gnu
 +host_triplet = i586-pc-linux-gnu
 +target_triplet = i586-pc-linux-gnu
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -60,7 +60,7 @@
 +am_libnet_la_OBJECTS = libnet_resolve.lo libnet_socket.lo \
 +	libnet_checksum.lo libnet_prand.lo libnet_version.lo \
 +	libnet_write_ip.lo libnet_insert_ipo.lo libnet_insert_tcpo.lo \
-+	libnet_error.lo libnet_link_.lo \
++	libnet_error.lo libnet_link_sockpacket.lo \
 +	libnet_packet_mem.lo libnet_build_ip.lo libnet_build_tcp.lo \
 +	libnet_build_udp.lo libnet_build_arp.lo \
 +	libnet_build_ethernet.lo libnet_build_icmp.lo \
@@ -90,31 +90,35 @@
 +AMDEP_FALSE = 
 +AMDEP_TRUE = #
 +AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run tar
-+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
++AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ar
 +AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run autoconf
 +AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run autoheader
 +AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run automake-1.8
 +AWK = gawk
 +BIN_PREFIX = /usr/bin/
-+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
++CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-gcc
 +CCDEPMODE = depmode=none
 +CFLAGS = -O2 -funroll-loops -fomit-frame-pointer -Wall
-+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
++CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E
 +CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
 +CYGPATH_W = echo
 +DEFS = -DHAVE_CONFIG_H
 +DEPDIR = .deps
-+ECHO = echo
++DSYMUTIL = 
++DUMPBIN = 
 +ECHO_C = 
 +ECHO_N = -n
 +ECHO_T = 
-+EGREP = grep -E
++EGREP = /bin/grep -E
 +EXEEXT = 
++FGREP = /bin/grep -F
++GREP = /bin/grep
 +INC_PREFIX = /usr/include/
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_PROGRAM = ${INSTALL}
 +INSTALL_SCRIPT = ${INSTALL}
 +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
++LD = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ld
 +LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
 +LIBNET_CONFIG_CFLAGS = 
 +LIBNET_CONFIG_DEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H -DLIBNET_LIL_ENDIAN
@@ -123,14 +127,20 @@
 +LIBS = 
 +LIBTOOL = $(SHELL) $(top_builddir)/libtool
 +LIB_PREFIX = /usr/lib/
-+LL_INT_TYPE = 
-+LL_INT_TYPE_UC = 
++LIPO = 
++LL_INT_TYPE = sockpacket
++LL_INT_TYPE_UC = SOCKPACKET
 +LN = ln
 +LN_S = ln -s
 +LTLIBOBJS = 
 +MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run makeinfo
 +MAN_PREFIX = /usr/share/man/man3/
++NM = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-nm
++NMEDIT = 
++OBJDUMP = i586-linux-objdump
 +OBJEXT = o
++OTOOL = 
++OTOOL64 = 
 +PACKAGE = libnet
 +PACKAGE_BUGREPORT = 
 +PACKAGE_NAME = 
@@ -138,43 +148,51 @@
 +PACKAGE_TARNAME = 
 +PACKAGE_VERSION = 
 +PATH_SEPARATOR = :
-+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
++RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ranlib
++SED = /home/wbx/openadk/scripts/sed
 +SET_MAKE = 
-+SHELL = /usr/local/bin/bash
++SHELL = /bin/bash
 +STRIP = i586-linux-strip
 +VERSION = 1.0.2a
 +ac_ct_CC = 
-+ac_ct_RANLIB = 
-+ac_ct_STRIP = 
++ac_ct_DUMPBIN = 
 +am__fastdepCC_FALSE = 
 +am__fastdepCC_TRUE = #
 +am__include = include
 +am__leading_dot = .
 +am__quote = 
 +bindir = ${exec_prefix}/bin
-+build = x86_64-undermydesk-freebsd
-+build_alias = amd64-undermydesk-freebsd
-+build_cpu = x86_64
-+build_os = freebsd
-+build_vendor = undermydesk
++build = i686-pc-linux-gnu
++build_alias = i686-pc-linux-gnu
++build_cpu = i686
++build_os = linux-gnu
++build_vendor = pc
 +datadir = /usr/share
++datarootdir = ${prefix}/share
++docdir = ${datarootdir}/doc/${PACKAGE}
++dvidir = ${docdir}
 +exec_prefix = ${prefix}
 +host = i586-pc-linux-gnu
 +host_alias = i586-linux
 +host_cpu = i586
 +host_os = linux-gnu
 +host_vendor = pc
++htmldir = ${docdir}
 +includedir = ${prefix}/include
-+infodir = ${prefix}/info
++infodir = ${datarootdir}/info
 +install_sh = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/install-sh
 +libdir = ${exec_prefix}/lib
 +libexecdir = /usr/sbin
++localedir = ${datarootdir}/locale
 +localstatedir = /var
++lt_ECHO = echo
 +mandir = /usr/share/man
-+mkdir_p = $(mkinstalldirs)
++mkdir_p = mkdir -p -- .
 +oldincludedir = /usr/include
++pdfdir = ${docdir}
 +prefix = /usr
-+program_transform_name = s,$$,,;s,^,,
++program_transform_name = s&$$&&;s&^&&
++psdir = ${docdir}
 +sbindir = ${exec_prefix}/sbin
 +sharedstatedir = ${prefix}/com
 +sysconfdir = /etc
@@ -196,7 +214,7 @@
 +	libnet_insert_ipo.c \
 +	libnet_insert_tcpo.c \
 +	libnet_error.c \
-+	libnet_link_.c \
++	libnet_link_sockpacket.c \
 +	libnet_packet_mem.c \
 +	libnet_build_ip.c \
 +	libnet_build_tcp.c \

package/libnet/patches/patch-src_Makefile_in

@@ -1,6 +1,6 @@
 --- Libnet-1.0.2a.orig/src/Makefile.in	1970-01-01 00:00:00.000000000 +0100
-+++ Libnet-1.0.2a/src/Makefile.in	2009-06-12 21:48:27.000000000 +0200
-@@ -0,0 +1,502 @@
++++ Libnet-1.0.2a/src/Makefile.in	2009-08-23 00:39:59.509694769 +0200
+@@ -0,0 +1,520 @@
 +# Makefile.in generated by automake 1.8.5 from Makefile.am.
 +# @configure_input@
 +
@@ -104,17 +104,21 @@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEPDIR = @DEPDIR@
-+ECHO = @ECHO@
++DSYMUTIL = @DSYMUTIL@
++DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
++FGREP = @FGREP@
++GREP = @GREP@
 +INC_PREFIX = @INC_PREFIX@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LIBNET_CONFIG_CFLAGS = @LIBNET_CONFIG_CFLAGS@
 +LIBNET_CONFIG_DEFINES = @LIBNET_CONFIG_DEFINES@
@@ -123,6 +127,7 @@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIB_PREFIX = @LIB_PREFIX@
++LIPO = @LIPO@
 +LL_INT_TYPE = @LL_INT_TYPE@
 +LL_INT_TYPE_UC = @LL_INT_TYPE_UC@
 +LN = @LN@
@@ -130,7 +135,12 @@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAKEINFO = @MAKEINFO@
 +MAN_PREFIX = @MAN_PREFIX@
++NM = @NM@
++NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
@@ -139,13 +149,13 @@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +RANLIB = @RANLIB@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
 +STRIP = @STRIP@
 +VERSION = @VERSION@
 +ac_ct_CC = @ac_ct_CC@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 +am__include = @am__include@
@@ -158,23 +168,31 @@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
++htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
++localedir = @localedir@
 +localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
++psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +sysconfdir = @sysconfdir@

package/libnet/patches/patch-src_libnet_prand_c

@@ -1,11 +0,0 @@
---- Libnet-1.0.2a.orig/src/libnet_prand.c	2001-02-05 20:22:26.000000000 +0100
-+++ Libnet-1.0.2a/src/libnet_prand.c	2009-06-12 21:48:27.000000000 +0200
-@@ -30,6 +30,8 @@
-  *
-  */
-  
-+#include <stdlib.h>
-+
- #if (HAVE_CONFIG_H)
- #include "../include/config.h"
- #endif

package/libpri/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libpri
-PKG_VERSION:=		1.4.10
+PKG_VERSION:=		1.4.10.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		2a80f0cea1271f3143aaad57c5de42e6
+PKG_MD5SUM:=		55ce81cd0b2cf0c40e287fc5bd5b4883
 PKG_DESCR:=		C implementation of the Primary Rate ISDN specification
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.asterisk.org

package/mrd6/Makefile

@@ -35,7 +35,7 @@ INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MRD6}/usr/sbin ${IDIR_MRD6}/etc
-	${INSTALL_DIR} ${IDIR_MRD6}/usr/lib/mrd6 ${IDIR_MRD6}/bin
+	${INSTALL_DIR} ${IDIR_MRD6}/usr/lib/mrd6 ${IDIR_MRD6}/usr/bin
 	${INSTALL_DATA} ./files/${PKG_NAME}.conf ${IDIR_MRD6}/etc
 	${INSTALL_BIN} ${WRKINST}/usr/local/sbin/mrd \
 		 ${IDIR_MRD6}/usr/sbin

package/mysql/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mysql
-PKG_VERSION:=		5.0.81
+PKG_VERSION:=		5.0.83
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		2d35e4980f279c839172a6efdb0f0b15
+PKG_MD5SUM:=		051392064a1e32cca5c23a593908b10e
 PKG_DESCR:=		MySQL client library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libncurses zlib

package/nmap/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nmap
-PKG_VERSION:=		4.76
+PKG_VERSION:=		5.00
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		278dd2e849cc3dbb947df961a1aaffd0
+PKG_MD5SUM:=		32d27de32166c02d670bb4a086185886
 PKG_DESCR:=		utility for network exploration or security auditing
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libdnet libpcap libpcre
@@ -29,11 +29,12 @@ TCPPFLAGS+=		-DNOLUA
 ifeq ($(ADK_COMPILE_NMAP_WITH_UCLIBCXX),y)
 CONFIGURE_ENV+=		CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \
 			-I${STAGING_DIR}/usr/include/uClibc++" \
-			LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc"
+			LIBS="-nodefaultlibs -luClibc++ -lgcc"
 endif
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--without-openssl \
 			--without-zenmap \
+			--without-ndiff \
 			--without-liblua \
 			--with-libdnet="${STAGING_DIR}/usr" \
 			--with-libpcap="${STAGING_DIR}/usr" \

package/nmap/extra/sctp.h

@@ -0,0 +1,109 @@
+/*
+ * Stream Control Transmission Protocol (RFC 2960).
+ *
+ * Copyright (c) 2008 Daniel Roethlisberger <daniel@roe.ch>
+ * Copyright (c) 2000 Dug Song <dugsong@monkey.org>
+ *
+ */
+
+#ifndef SCTP_H
+#define SCTP_H
+
+#define SCTP_HDR_LEN	12
+
+struct sctp_hdr {
+	uint16_t	sh_sport;	/* source port */
+	uint16_t	sh_dport;	/* destination port */
+	uint32_t	sh_vtag;	/* sctp verification tag */
+	uint32_t	sh_sum;		/* sctp checksum */
+};
+
+#define SCTP_PORT_MAX	65535
+
+#define sctp_pack_hdr(hdr, sport, dport, vtag) do {		\
+	struct sctp_hdr *sctp_pack_p = (struct sctp_hdr *)(hdr);	\
+	sctp_pack_p->sh_sport = htons(sport);			\
+	sctp_pack_p->sh_dport = htons(dport);			\
+	sctp_pack_p->sh_vtag = htonl(vtag);			\
+} while (0)
+
+struct sctp_chunkhdr {
+	uint8_t		sch_type;	/* chunk type */
+	uint8_t		sch_flags;	/* chunk flags */
+	uint16_t	sch_length;	/* chunk length */
+};
+
+/* chunk types */
+#define SCTP_DATA		0x00
+#define SCTP_INIT		0x01
+#define SCTP_INIT_ACK		0x02
+#define SCTP_SACK		0x03
+#define SCTP_HEARTBEAT		0x04
+#define SCTP_HEARTBEAT_ACK	0x05
+#define SCTP_ABORT		0x06
+#define SCTP_SHUTDOWN		0x07
+#define SCTP_SHUTDOWN_ACK	0x08
+#define SCTP_ERROR		0x09
+#define SCTP_COOKIE_ECHO	0x0a
+#define SCTP_COOKIE_ACK		0x0b
+#define SCTP_ECNE		0x0c
+#define SCTP_CWR		0x0d
+#define SCTP_SHUTDOWN_COMPLETE	0x0e
+#define SCTP_AUTH		0x0f	/* RFC 4895 */
+#define SCTP_ASCONF_ACK		0x80	/* RFC 5061 */
+#define SCTP_PKTDROP		0x81	/* draft-stewart-sctp-pktdrprep-08 */
+#define SCTP_PAD		0x84	/* RFC 4820 */
+#define SCTP_FORWARD_TSN	0xc0	/* RFC 3758 */
+#define SCTP_ASCONF		0xc1	/* RFC 5061 */
+
+/* chunk types bitmask flags */
+#define SCTP_TYPEFLAG_REPORT	1
+#define SCTP_TYPEFLAG_SKIP	2
+
+#define sctp_pack_chunkhdr(hdr, type, flags, length) do {	\
+	struct sctp_chunkhdr *sctp_pack_chp = (struct sctp_chunkhdr *)(hdr);\
+	sctp_pack_chp->sch_type = type;				\
+	sctp_pack_chp->sch_flags = flags;			\
+	sctp_pack_chp->sch_length = htons(length);		\
+} while (0)
+
+struct sctp_chunkhdr_init {
+	struct sctp_chunkhdr chunkhdr;
+
+	int32_t		schi_itag;	/* Initiate Tag */
+	int32_t		schi_arwnd;	/* Advertised Receiver Window Credit */
+	int16_t		schi_nos;	/* Number of Outbound Streams */
+	int16_t		schi_nis;	/* Number of Inbound Streams */
+	int32_t		schi_itsn;	/* Initial TSN */
+};
+
+#define sctp_pack_chunkhdr_init(hdr, type, flags, length, itag, \
+				arwnd, nos, nis, itsn) do {	\
+	struct sctp_chunkhdr_init *sctp_pack_chip = (struct sctp_chunkhdr_init *)(hdr);\
+	sctp_pack_chunkhdr(sctp_pack_chip, type, flags, length);\
+	sctp_pack_chip->schi_itag = htonl(itag);		\
+	sctp_pack_chip->schi_arwnd = htonl(arwnd);		\
+	sctp_pack_chip->schi_nos = htons(nos);			\
+	sctp_pack_chip->schi_nis = htons(nis);			\
+	sctp_pack_chip->schi_itsn = htonl(itsn);		\
+} while (0)
+
+/*
+ * COOKIE ECHO chunk
+ */
+struct sctp_chunkhdr_cookie_echo {
+	struct sctp_chunkhdr chunkhdr;
+
+	/* empty */
+};
+
+#define sctp_pack_chunkhdr_cookie_echo(hdr, type, flags, length) do {	\
+	struct sctp_chunkhdr_cookie_echo *sctp_pack_chip =		\
+			(struct sctp_chunkhdr_cookie_echo *)(hdr);	\
+	sctp_pack_chunkhdr(sctp_pack_chip, type, flags, length);	\
+} while (0)
+
+#endif /* SCTP_H */
+
+
+

package/nmap/patches/patch-configure

@@ -1,16 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nmap-4.76.orig/configure	2008-09-09 01:37:03.000000000 +0200
-+++ nmap-4.76/configure	2008-12-14 18:54:23.000000000 +0100
-@@ -4035,7 +4035,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
- 
- 
-  if test -n "$GXX"; then
--      CXXFLAGS="$CXXFLAGS -Wall "
-+      CXXFLAGS="$CXXFLAGS "
-  fi
- 
- { echo "$as_me:$LINENO: checking whether the compiler is gcc 4 or greater" >&5
-@@ -6656,86 +6656,6 @@ if test $needs_cpp_precomp = yes; then
+--- nmap-5.00.orig/configure	2009-06-24 23:35:54.000000000 +0200
++++ nmap-5.00/configure	2009-07-20 20:36:51.023261444 +0200
+@@ -7074,90 +7074,6 @@ if test $needs_cpp_precomp = yes; then
    CXXFLAGS="-no-cpp-precomp $CXXFLAGS"
  fi
  
@@ -26,14 +16,16 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -  # link with -lpcap for the purposes of this test
 -  LIBS_OLD="$LIBS"
 -  LIBS="$LIBS -lpcap"
--  { echo "$as_me:$LINENO: checking if libpcap version is recent enough" >&5
--echo $ECHO_N "checking if libpcap version is recent enough... $ECHO_C" >&6; }
+-  { $as_echo "$as_me:$LINENO: checking if libpcap version is recent enough" >&5
+-$as_echo_n "checking if libpcap version is recent enough... " >&6; }
 -  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-  { { $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
--echo "$as_me: error: cannot run test program while cross compiling
+-$as_echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }; }
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -62,38 +54,40 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_link") 2>&5
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_try") 2>&5
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }; have_libpcap=yes
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }; have_libpcap=yes
 -else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&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 )
--{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }; have_libpcap=no
+-{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }; have_libpcap=no
 -fi
+-rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 -fi
 -
 -
 -LIBS="$LIBS_OLD"
 -fi
--
+ 
  LIBPCAP_LIBS="-lpcap"
  if test $have_libpcap = yes; then
-   PCAP_DEPENDS=""

package/nmap/patches/patch-ncat_configure

@@ -0,0 +1,93 @@
+--- nmap-5.00.orig/ncat/configure	2009-06-11 08:15:24.000000000 +0200
++++ nmap-5.00/ncat/configure	2009-07-20 20:47:33.391408119 +0200
+@@ -7044,90 +7044,6 @@ fi
+ fi
+ 
+ 
+-if test $have_libpcap = yes; then
+-  if test "${LIBPCAP_INC+set}" = "set"; then
+-    _cflags=$CXXFLAGS
+-    _ldflags=$LDFLAGS
+-
+-    CPPFLAGS="-I$LIBPCAP_INC $CPPFLAGS"
+-    LDFLAGS="-L$LIBPCAP_LIB $LDFLAGS"
+-  fi
+-
+-  # link with -lpcap for the purposes of this test
+-  LIBS_OLD="$LIBS"
+-  LIBS="$LIBS -lpcap"
+-  { $as_echo "$as_me:$LINENO: checking if libpcap version is recent enough" >&5
+-$as_echo_n "checking if libpcap version is recent enough... " >&6; }
+-  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
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include <stdio.h>
+-extern char pcap_version[];
+-int main() {
+-  int major, minor1, minor2;
+-  sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
+-  if (major > 0)
+-    exit(0);
+-  if (minor1 < 9)
+-    exit(1);
+-  if (minor2 < 4)
+-    exit(1);
+-  exit(0);
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }; have_libpcap=yes
+-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
+-
+-( exit $ac_status )
+-{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }; have_libpcap=no
+-fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-
+-LIBS="$LIBS_OLD"
+-fi
+ 
+ PCAP_LIBS="-lpcap"
+ if test $have_libpcap = yes; then

package/nmap/patches/patch-nmap_dns_h

@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nmap-4.76.orig/nmap_dns.h	2008-08-21 11:24:35.000000000 +0200
-+++ nmap-4.76/nmap_dns.h	2008-12-14 19:40:58.000000000 +0100
-@@ -95,6 +95,9 @@
+--- nmap-5.00.orig/nmap_dns.h	2009-06-24 23:35:54.000000000 +0200
++++ nmap-5.00/nmap_dns.h	2009-07-20 20:33:41.191399691 +0200
+@@ -86,6 +86,9 @@
   *                                                                         *
   ***************************************************************************/
  
@@ -10,4 +10,4 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 +
  class Target;
  
- void nmap_mass_rdns(Target ** targets, int num_targets);
+ #include <string>

package/nmap/patches/patch-output_cc

@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nmap-4.76.orig/output.cc	2008-09-10 20:32:35.000000000 +0200
-+++ nmap-4.76/output.cc	2008-10-29 13:29:04.000000000 +0100
-@@ -2003,7 +2003,7 @@ struct data_file_record {
+--- nmap-5.00.orig/output.cc	2009-06-24 23:35:54.000000000 +0200
++++ nmap-5.00/output.cc	2009-07-20 20:33:41.267403513 +0200
+@@ -1966,7 +1966,7 @@ struct data_file_record {
  
    /* Compares this record to another. First compare the directory names, then
       compare the file names. */

package/nmap/patches/patch-scan_engine_cc

@@ -0,0 +1,10 @@
+--- nmap-5.00.orig/scan_engine.cc	2009-06-24 23:35:54.000000000 +0200
++++ nmap-5.00/scan_engine.cc	2009-07-20 21:04:40.819619295 +0200
+@@ -104,6 +104,7 @@
+ #include "Target.h"
+ #include "targets.h"
+ #include "utils.h"
++#include "sctp.h"
+ #include <math.h>
+ #include <list>
+ #include <map>

package/nmap/patches/patch-tcpip_cc

@@ -0,0 +1,10 @@
+--- nmap-5.00.orig/tcpip.cc	2009-06-24 23:35:54.000000000 +0200
++++ nmap-5.00/tcpip.cc	2009-07-20 20:58:55.362028065 +0200
+@@ -99,6 +99,7 @@
+ #include "NmapOps.h"
+ #include "Target.h"
+ #include "utils.h"
++#include "sctp.h"
+ 
+ #if HAVE_SYS_TIME_H
+ #include <sys/time.h>

package/nmap/patches/patch-traceroute_cc

@@ -1,7 +1,15 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- nmap-4.76.orig/traceroute.cc	2008-09-06 06:12:34.000000000 +0200
-+++ nmap-4.76/traceroute.cc	2008-10-29 13:42:16.000000000 +0100
-@@ -850,9 +850,12 @@ Traceroute::outputTarget (Target * t) {
+--- nmap-5.00.orig/traceroute.cc	2009-06-24 23:35:54.000000000 +0200
++++ nmap-5.00/traceroute.cc	2009-07-20 21:07:42.902998599 +0200
+@@ -170,6 +170,7 @@
+ #include "protocols.h"
+ #include "timing.h"
+ #include "utils.h"
++#include "sctp.h"
+ #include <algorithm>
+ #include <stdlib.h>
+ 
+@@ -905,9 +906,12 @@ Traceroute::outputTarget (Target * t) {
      tg = TraceGroups[t->v4host ().s_addr];
  
      /* sort into ttl order */

package/php/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		php
-PKG_VERSION:=		5.2.9
+PKG_VERSION:=		5.3.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		98b647561dc664adefe296106056cf11
+PKG_MD5SUM:=		f4905eca4497da3f0beb5c96863196b4
 PKG_DESCR:=		PHP cli
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libopenssl zlib
@@ -47,12 +47,14 @@ PKG_CONFIGURE_OPTS:=	\
 	--without-libxml-dir \
 	--disable-mbstring \
 	--disable-mbregex \
+	--disable-phar \
 	--with-openssl=shared,"$(STAGING_DIR)/usr" \
 	--with-kerberos=no \
 	--with-openssl-dir="$(STAGING_DIR)/usr" \
 	--enable-session=shared \
 	--disable-simplexml \
 	--disable-soap \
+	--disable-fileinfo \
 	--enable-sockets=shared \
 	--disable-tokenizer \
 	--disable-filter \
@@ -101,9 +103,9 @@ else
 PKG_CONFIGURE_OPTS+=	--without-mysql
 endif
 ifneq ($(ADK_PACKAGE_PHP_MOD_PCRE),)
-PKG_CONFIGURE_OPTS+=	--with-pcre-regex=shared,"$(STAGING_DIR)/usr"
+PKG_CONFIGURE_OPTS+=	--with-pcre-dir=shared,"$(STAGING_DIR)/usr"
 else
-PKG_CONFIGURE_OPTS+=	--without-pcre-regex
+PKG_CONFIGURE_OPTS+=	--without-pcre-dir
 endif
 ifneq ($(ADK_PACKAGE_PHP_MOD_PGSQL),)
 PKG_CONFIGURE_OPTS+=	--with-pgsql=shared,"$(STAGING_DIR)/usr"
@@ -131,7 +133,7 @@ $(eval $(call PKG_template,PHP_MOD_GMP,php-mod-gmp,$(PKG_VERSION)-${PKG_RELEASE}
 $(eval $(call PKG_template,PHP_MOD_LDAP,php-mod-ldap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_MYSQL,php-mod-mysql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_OPENSSL,php-mod-openssl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,PHP_MOD_PCRE,php-mod-pcre,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+#$(eval $(call PKG_template,PHP_MOD_PCRE,php-mod-pcre,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_PGSQL,php-mod-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_SESSION,php-mod-session,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_SOCKETS,php-mod-sockets,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -145,7 +147,6 @@ $(eval $(call PKG_mod_template,PHP_MOD_GMP,gmp))
 $(eval $(call PKG_mod_template,PHP_MOD_LDAP,ldap))
 $(eval $(call PKG_mod_template,PHP_MOD_MYSQL,mysql))
 $(eval $(call PKG_mod_template,PHP_MOD_OPENSSL,openssl))
-$(eval $(call PKG_mod_template,PHP_MOD_PCRE,pcre))
 $(eval $(call PKG_mod_template,PHP_MOD_PGSQL,pgsql))
 $(eval $(call PKG_mod_template,PHP_MOD_SESSION,session))
 $(eval $(call PKG_mod_template,PHP_MOD_SOCKETS,sockets))
@@ -153,6 +154,7 @@ $(eval $(call PKG_mod_template,PHP_MOD_SQLITE,pdo))
 $(eval $(call PKG_mod_template,PHP_MOD_XML,xml))
 
 TLDFLAGS+=		-L$(STAGING_DIR)/usr/lib/mysql
+CONFIGURE_ENV+=		LIBS="-ldl"
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	$(PKG_CONFIGURE_OPTS)
 BUILD_STYLE:=		auto

package/sqlite/Makefile

@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		sqlite
-PKG_VERSION:=		3.6.2
+PKG_VERSION:=		3.6.17
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		46f92e42243bc51aaa3871645ce78bd5
-PKG_DESCR:=		Self-contained, embeddable, zero-configuration SQL database engine
+PKG_MD5SUM:=		f89f62afc765e08b3f0e47cdc47a15d4
+PKG_DESCR:=		Self-contained, embeddable, zero-configuration SQL database
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.sqlite.org
 PKG_SITES:=		http://www.sqlite.org/

package/squid/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		squid
-PKG_VERSION:=		3.0.STABLE15
+PKG_VERSION:=		3.0.STABLE18
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		4c41585af1d90ccbcf1d23ec0dda6f8d
+PKG_MD5SUM:=		8cb529bb8e973c068366e453b9444614
 PKG_DESCR:=		squid web and cache proxy
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libopenssl libpthread
@@ -105,7 +105,7 @@ CONFIGURE_ARGS+=	--datadir=/usr/share/squid \
 			--enable-kill-parent-hack \
 			--enable-arp-acl \
 			--enable-ssl \
-			--enable-htcp \
+			--disable-htcp \
 			--disable-esi \
 			--enable-err-languages=English \
 			--enable-default-err-language=English \
@@ -134,7 +134,8 @@ post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 			${WRKINST}/etc/squid/squid.conf ${IDIR_SQUID}/etc/squid/
 	${INSTALL_DIR} ${IDIR_SQUID}/usr/share/squid
 	${CP} ${WRKINST}/usr/share/squid/* ${IDIR_SQUID}/usr/share/squid/
-	${INSTALL_DIR} ${IDIR_SQUID}/usr/sbin
+	${INSTALL_DIR} ${IDIR_SQUID}/usr/sbin ${IDIR_SQUID}/usr/lib/squid
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/squid ${IDIR_SQUID}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/squid/unlinkd ${IDIR_SQUID}/usr/lib/squid
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/squid/patches/patch-configure_in

@@ -1,6 +1,6 @@
---- squid-3.0.STABLE15.orig/configure.in	2009-05-06 13:11:43.000000000 +0200
-+++ squid-3.0.STABLE15/configure.in	2009-06-04 20:20:15.000000000 +0200
-@@ -1820,6 +1820,10 @@ case "$host" in
+--- squid-3.0.STABLE18.orig/configure.in	2009-08-04 13:57:50.000000000 +0200
++++ squid-3.0.STABLE18/configure.in	2009-08-23 18:00:46.944417936 +0200
+@@ -1895,6 +1895,10 @@ case "$host" in
  	;;
  esac
  

package/squid/patches/patch-lib_util_c

@@ -1,12 +0,0 @@
---- squid-3.0.STABLE15.orig/lib/util.c	2009-05-06 13:11:38.000000000 +0200
-+++ squid-3.0.STABLE15/lib/util.c	2009-06-04 21:05:19.000000000 +0200
-@@ -751,7 +751,8 @@ xstrdup(const char *s)
-     /* copy string, including terminating character */
-     sz = strlen(s) + 1;
- 
--    p = memcpy((char *)xmalloc(sz), s, sz);
-+    p = (char *)xmalloc(sz);
-+    memcpy(p, s, sz);
- 
-     PROF_stop(xstrdup);
- 

package/squid/patches/patch-src_Makefile_am

@@ -1,15 +1,14 @@
---- squid-3.0.STABLE15.orig/src/Makefile.am	2009-05-06 13:11:40.000000000 +0200
-+++ squid-3.0.STABLE15/src/Makefile.am	2009-06-04 20:21:37.000000000 +0200
-@@ -1007,6 +1007,8 @@ DEFAULT_HOSTS		= @OPT_DEFAULT_HOSTS@
+--- squid-3.0.STABLE18.orig/src/Makefile.am	2009-08-04 13:57:48.000000000 +0200
++++ squid-3.0.STABLE18/src/Makefile.am	2009-08-23 18:12:19.744829620 +0200
+@@ -1010,6 +1010,7 @@ DEFAULT_MIB_PATH	= $(datadir)/mib.txt
+ DEFAULT_HOSTS		= @OPT_DEFAULT_HOSTS@
  
  DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
- 
 +HOSTCXX ?= @HOSTCXX@
-+
+ 
  $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
  
- snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
-@@ -1030,6 +1032,11 @@ cache_cf.o: cf_parser.h
+@@ -1034,6 +1035,11 @@ cache_cf.o: cf_parser.h
  squid.conf.default: cf_parser.h
  	true
  

package/subversion/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		subversion
-PKG_VERSION:=		1.6.2
+PKG_VERSION:=		1.6.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		93f128306b11e1a1c64ff51338777952
+PKG_MD5SUM:=		9649be6c47b7d915dce75a1198900c25
 PKG_DESCR:=		revision control program
 PKG_SECTION:=		net
 PKG_DEPENDS:=		zlib apr apr-util libiconv libexpat

target/alix1c/device.mk

@@ -1,7 +1,7 @@
 ARCH:=			x86
 CPU_ARCH:=		i586
-KERNEL_VERSION:=	2.6.30
+KERNEL_VERSION:=	2.6.30.5
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		7a80058a6382e5108cdb5554d1609615
+KERNEL_MD5SUM:=		be9c3a697a54ac099c910d068ff0dc03
 TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=	-march=geode

target/foxboard/Makefile

@@ -17,8 +17,7 @@ tools-compile: $(TOOLS_BUILD_DIR)
 	$(INSTALL_BIN) tools/boot_linux $(BIN_DIR)/
 
 kernel-install: tools-compile
-	PATH='${TARGET_PATH}' \
-	mkfimage $(LINUX_DIR)/arch/cris/boot/zImage \
+	PATH='${TARGET_PATH}' mkfimage $(LINUX_DIR)/arch/cris/boot/zImage \
 		$(BIN_DIR)/${DEVICE}-${ARCH}-kernel $(MAKE_TRACE)
 
 ifeq ($(FS),squashfs)

target/linux/config/Config.in.fs

@@ -188,6 +188,7 @@ config ADK_KPACKAGE_KMOD_UDF_FS
 	prompt "kmod-fs-udf....................... UDF file system support"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRC_ITU_T
+	depends on !ADK_LINUX_CRIS_FOXBOARD
 	default n
 	help
 	  This is the new file system used on some CD-ROMs and DVDs. Say Y if

toolchain/gcc/Makefile.inc

@@ -4,6 +4,6 @@
 PKG_NAME:=		gcc
 PKG_VERSION:=		4.4.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		cf5d787bee57f38168b74d65a7c0e6fd
+PKG_MD5SUM:=		927eaac3d44b22f31f9c83df82f26436
 PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2