resolve merge conflict

BUGS

@@ -1,8 +1,3 @@
 - openssh on amd64 does not work, ssh-keygen endless loop
 - uclibc on lemote mips64 target does not work (only uclibc-trunk with patches)
-<<<<<<< HEAD
 - qemu-mips64* targets does not boot, kernel problem?
-- (cross-)compile from debian amd64 to f.e. qemu-x86_64 or shuttle with
-  either glibc or eglibc is broken, have sth. todo with target == host
-=======
->>>>>>> 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a

Makefile

@@ -208,6 +208,8 @@ NO_ERROR=0
 	    )" >>prereq.mk
 	@echo 'HOSTCC:=${CC}' >>prereq.mk
 	@echo 'HOSTCFLAGS:=-O2' >>prereq.mk
+	@echo 'HOSTCXX:=${CXX}' >>prereq.mk
+	@echo 'HOSTCXXFLAGS:=-O2' >>prereq.mk
 	@echo 'LANGUAGE:=C' >>prereq.mk
 	@echo 'LC_ALL:=C' >>prereq.mk
 	@echo 'MAKE:=$${GMAKE}' >>prereq.mk

TODO

@@ -1,3 +1,5 @@
+- php update
+- openssh update
 - macos x build
 - test on OpenSuSE
 - test on Fedora Core

mk/build.mk

@@ -236,7 +236,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),)
 include ${TOPDIR}/mk/vars.mk
 else
 include $(TOPDIR)/prereq.mk
-export BASH HOSTCC HOSTCFLAGS MAKE LANGUAGE LC_ALL OStype PATH
+export BASH HOSTCC HOSTCFLAGS HOSTCXX HOSTCXXFLAGS MAKE LANGUAGE LC_ALL OStype PATH
 endif
 
 all: menuconfig

mk/modules.mk

@@ -509,6 +509,67 @@ $(eval $(call KMOD_template,IP_NF_TARGET_TTL,ip-nf-target-ttl,\
 	$(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_TTL \
 ,65))
 
+#
+# IPv6: Netfilter
+#
+$(eval $(call KMOD_template,NF_CONNTRACK_IPV6,nf-conntrack-ipv6,\
+	$(MODULES_DIR)/kernel/net/ipv6/netfilter/nf_conntrack_ipv6 \
+,50))
+
+$(eval $(call KMOD_template,IP6_NF_IPTABLES,ip6-nf-iptables,\
+	$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6_tables \
+,50))
+
+$(eval $(call KMOD_template,IP6_NF_MATCH_AH,ip6-nf-match-AH,\
+	$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_ah \
+,55))
+
+$(eval $(call KMOD_template,IP6_NF_MATCH_EUI64,ip6-nf-match-eui64,\
+	$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_eui64 \
+,55))
+
+$(eval $(call KMOD_template,IP6_NF_MATCH_FRAG,ip6-nf-match-frag,\
+	$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_frag \
+,55))
+
+$(eval $(call KMOD_template,IP6_NF_MATCH_OPTS,ip6-nf-match-opts,\
+	$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_hbh \
+,55))
+
+$(eval $(call KMOD_template,IP6_NF_MATCH_IPV6HEADER,ip6-nf-match-ipv6header,\
+	$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_ipv6header \
+,55))
+
+$(eval $(call KMOD_template,IP6_NF_MATCH_MH,ip6-nf-match-mh,\
+	$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_mh \
+,55))
+
+$(eval $(call KMOD_template,IP6_NF_MATCH_RT,ip6-nf-match-rt,\
+	$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_rt \
+,55))
+
+$(eval $(call KMOD_template,IP6_NF_TARGET_LOG,ip6-nf-target-log,\
+	$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_LOG \
+,55))
+
+#
+# IPv6: Filtering
+#
+$(eval $(call KMOD_template,IP6_NF_FILTER,ip6-nf-filter,\
+	$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6table_filter \
+,55))
+
+$(eval $(call KMOD_template,IP6_NF_TARGET_REJECT,ip6-nf-target-reject,\
+	$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_REJECT \
+,60))
+
+#
+# IPv6: Mangle
+#
+$(eval $(call KMOD_template,IP6_NF_MANGLE,ip6-nf-mangle,\
+	$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6table_mangle \
+,60))
+
 #
 # IPVS
 #

mk/package.mk

@@ -43,6 +43,10 @@ else
 CONFIGURE_ARGS+=	--disable-debug
 endif
 
+ifeq ($(ADK_ENABLE_IPV6),y)
+CONFIGURE_ARGS+=	--enable-ipv6
+endif
+
 CONFIGURE_ENV+=		CONFIG_SHELL='$(strip ${SHELL})' \
 			CFLAGS='$(strip ${TCFLAGS})' \
 			CXXFLAGS='$(strip ${TCXXFLAGS})' \

mk/rootfs.mk

@@ -17,6 +17,7 @@ ROOTFS:=	root=/dev/mmcblk0p2 rootwait
 endif
 
 $(eval $(call rootfs_template,ext2-block,EXT2_BLOCK,$(ROOTFS)))
+$(eval $(call rootfs_template,usb,USB,root=/dev/sdb1 rootdelay=10))
 $(eval $(call rootfs_template,archive,ARCHIVE))
 $(eval $(call rootfs_template,initramfs,INITRAMFS))
 $(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK))

package/Config.in

@@ -3,6 +3,18 @@
 
 menu "Package selection"
 
+config ADK_ENABLE_IPV6
+	prompt "enable IPv6 globally"
+	boolean
+	default y
+	# FIXME: selecting stuff here is ugly, better fix package flavours to
+	#        support a symbol-value-based default (i.e., "default y if IPV6")
+	select ADK_PACKAGE_NFS_UTILS_WITH_TIRPC if ADK_PACKAGE_NFS_UTILS != n
+	help
+	  This enables IPv6 support in all related applications. Basically this
+	  just means passing --enable-ipv6 to the configure script, but the
+	  exception proves the rule. ;)
+
 menu "Basesystem"
 source "package/adkinstall/Config.in"
 source "package/base-files/Config.in"
@@ -97,6 +109,7 @@ menu "Firewall / Routing / Bridging"
 source "package/arpd/Config.in"
 source "package/bridge-utils/Config.in"
 source "package/linux-atm/Config.in"
+source "package/conntrack-tools/Config.in"
 source "package/cutter/Config.in"
 source "package/ebtables/Config.in"
 source "package/ether-wake/Config.in"
@@ -157,6 +170,8 @@ source "package/cgilib/Config.in"
 source "package/curl/Config.in.lib"
 source "package/cxxtools/Config.in"
 source "package/dbus/Config.in"
+source "package/dbus-glib/Config.in"
+source "package/dbus-glib/Config.in.lib"
 source "package/e2fsprogs/Config.in.lib"
 source "package/fontconfig/Config.in"
 source "package/gettext/Config.in"
@@ -213,6 +228,8 @@ source "package/libiconv/Config.in"
 source "package/libiconv/Config.in.lib"
 source "package/libid3tag/Config.in"
 source "package/libid3tag/Config.in.lib"
+source "package/libIDL/Config.in"
+source "package/libIDL/Config.in.lib"
 source "package/jpeg/Config.in"
 source "package/jpeg/Config.in.lib"
 source "package/krb5/Config.in.lib"
@@ -220,6 +237,8 @@ source "package/lame/Config.in.lib"
 source "package/mpfr/Config.in"
 source "package/mysql/Config.in"
 source "package/mysql/Config.in.lib"
+source "package/libnotify/Config.in"
+source "package/libnotify/Config.in.lib"
 source "package/nspr/Config.in"
 source "package/nss/Config.in"
 source "package/libtool/Config.in.lib" 
@@ -587,6 +606,7 @@ source "package/xorg-server/Config.in"
 source "package/xf86-video-cirrus/Config.in"
 source "package/xf86-video-geode/Config.in"
 source "package/xf86-video-fbdev/Config.in"
+source "package/xf86-video-intel/Config.in"
 source "package/xf86-video-siliconmotion/Config.in"
 source "package/xf86-input-mouse/Config.in"
 source "package/xf86-input-keyboard/Config.in"
@@ -595,6 +615,7 @@ endmenu
 
 menu "X applications"
 source "package/evilwm/Config.in"
+source "package/firefox/Config.in"
 source "package/font-util/Config.in"
 source "package/rxvt-unicode/Config.in"
 source "package/xauth/Config.in"
@@ -618,6 +639,8 @@ source "package/font-xfree86-type1/Config.in"
 endmenu
 
 menu "X libraries"
+source "package/libdrm/Config.in"
+source "package/libdrm/Config.in.lib"
 source "package/libICE/Config.in"
 source "package/libICE/Config.in.lib"
 source "package/libSM/Config.in"
@@ -642,6 +665,10 @@ source "package/libXau/Config.in"
 source "package/libXau/Config.in.lib"
 source "package/libXaw/Config.in"
 source "package/libXaw/Config.in.lib"
+source "package/libXdamage/Config.in"
+source "package/libXdamage/Config.in.lib"
+source "package/libXfixes/Config.in"
+source "package/libXfixes/Config.in.lib"
 source "package/libXmu/Config.in"
 source "package/libXmu/Config.in.lib"
 source "package/libXpm/Config.in"
@@ -654,6 +681,10 @@ source "package/libXft/Config.in"
 source "package/libXft/Config.in.lib"
 source "package/libXxf86dga/Config.in"
 source "package/libXxf86dga/Config.in.lib"
+source "package/libXxf86vm/Config.in"
+source "package/libXxf86vm/Config.in.lib"
+source "package/MesaLib/Config.in"
+source "package/MesaLib/Config.in.lib"
 source "package/pixman/Config.in"
 source "package/xkbcomp/Config.in"
 source "package/xkeyboard-config/Config.in"

package/MesaLib/Makefile

@@ -0,0 +1,34 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		MesaLib
+PKG_VERSION:=		7.8.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		62e8e47cbd63741b4bbe634dcdc8a56a
+PKG_DESCR:=		MESA library
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libxdamage libxfixes
+PKG_BUILDDEP+=		libXdamage libXfixes libXxf86vm
+PKG_URL:=		add project url
+PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/7.8.1/
+
+WRKDIST=		${WRKDIR}/Mesa-${PKG_VERSION}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+=	--disable-static \
+			--disable-gallium \
+			--without-demos
+
+XAKE_FLAGS+=		APP_CC=${HOSTCC} HOST_CC=${HOSTCC}
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib
+	$(INSTALL_BIN) $(WRKINST)/usr/lib/libGL*.so* \
+		$(IDIR_MESALIB)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/MesaLib/patches/patch-src_glsl_Makefile_template

@@ -0,0 +1,11 @@
+--- Mesa-7.8.1.orig/src/glsl/Makefile.template	2010-04-05 01:46:26.000000000 +0200
++++ Mesa-7.8.1/src/glsl/Makefile.template	2010-04-19 21:18:45.000000000 +0200
+@@ -44,7 +44,7 @@ install:
+ ##### RULES #####
+ 
+ .c.o:
+-	$(CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@
++	$(HOST_CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@
+ 
+ -include depend
+ 

package/MesaLib/patches/patch-src_glsl_apps_Makefile

@@ -0,0 +1,15 @@
+--- Mesa-7.8.1.orig/src/glsl/apps/Makefile	2010-04-05 01:46:26.000000000 +0200
++++ Mesa-7.8.1/src/glsl/apps/Makefile	2010-04-19 21:20:55.000000000 +0200
+@@ -26,10 +26,10 @@ INCLUDES = -I.
+ .SUFFIXES: .c
+ 
+ .c:
+-	$(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
++	$(APP_CC) $(HOSTCFLAGS) $< $(LIBS) -o $@
+ 
+ .c.o:
+-	$(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
++	$(APP_CC) -c $(HOSTCFLAGS) $(DEFINES) $< -o $@
+ 
+ 
+ ##### TARGETS #####

package/MesaLib/patches/patch-src_mesa_drivers_dri_savage_savageioctl_c

@@ -0,0 +1,10 @@
+--- Mesa-7.8.1.orig/src/mesa/drivers/dri/savage/savageioctl.c	2010-04-05 01:46:26.000000000 +0200
++++ Mesa-7.8.1/src/mesa/drivers/dri/savage/savageioctl.c	2010-04-19 21:26:28.000000000 +0200
+@@ -41,7 +41,6 @@
+ #include "savagespan.h"
+ 
+ #include "drm.h"
+-#include <sys/timeb.h>
+ 
+ #define DEPTH_SCALE_16 ((1<<16)-1)
+ #define DEPTH_SCALE_24 ((1<<24)-1)

package/MesaLib/patches/patch-src_mesa_main_imports_c

@@ -0,0 +1,17 @@
+--- Mesa-7.8.1.orig/src/mesa/main/imports.c	2010-04-05 01:46:26.000000000 +0200
++++ Mesa-7.8.1/src/mesa/main/imports.c	2010-04-19 21:22:52.000000000 +0200
+@@ -799,13 +799,7 @@ _mesa_strdup( const char *s )
+ float
+ _mesa_strtof( const char *s, char **end )
+ {
+-#ifdef _GNU_SOURCE
+-   static locale_t loc = NULL;
+-   if (!loc) {
+-      loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+-   }
+-   return strtof_l(s, end, loc);
+-#elif defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
++#if defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
+    return strtof(s, end);
+ #else
+    return (float)strtod(s, end);

package/asterisk/Makefile

@@ -26,13 +26,15 @@ PKG_DESCR_CHAN_MGCP:=	Media Gateway Control Protocol implementation
 PKG_DESCR_CHAN_SKINNY:=	Skinny Client Control Protocol implementation
 PKG_DESCR_CHAN_IAX2:=	Support for the Inter Asterisk Protocol
 PKG_DESCR_CODEC_SPEEX:=	Speex/PCM16 Codec Translator
+PKG_DESCR_SOUNDS:=	Various soundfiles in GSM format
+PKG_DEPENDS_SOUNDS:=	${PKG_DEPENDS} asterisk-codec-gsm
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ASTERISK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_SOUNDS},${PKG_DESCR_SOUNDS},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_MGCP},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_SKINNY},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_IAX2},${PKG_SECTION}))

package/asterisk/files/asterisk.conffiles

@@ -13,7 +13,6 @@
 /etc/asterisk/modules.conf
 /etc/asterisk/musiconhold.conf
 /etc/asterisk/osp.conf
-/etc/asterisk/privacy.conf
 /etc/asterisk/queues.conf
 /etc/asterisk/rtp.conf
 /etc/asterisk/sip.conf

package/autoconf/Makefile

@@ -4,15 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		autoconf
-<<<<<<< HEAD
-PKG_VERSION:=		2.64
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		30a198cef839471dd4926e92ab485361
-=======
 PKG_VERSION:=		2.65
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		46cfb40e0babf4c64f8325f03da81c9b
->>>>>>> 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a
 PKG_DESCR:=		GNU autoconf
 PKG_SECTION:=		utils
 PKG_URL:=		http://www.gnu.org/software/autoconf/

package/base-files/src/etc/init.d/boot

@@ -8,7 +8,7 @@ mkdir -p /var/log
 mkdir -p /var/run
 touch /var/log/lastlog
 touch /var/log/wtmp
-ln -s /var/tmp /tmp
+ln -s /tmp /var/tmp
 
 echo 0 > /proc/sys/kernel/printk
 

package/base-files/src/etc/sysctl.conf

@@ -4,6 +4,7 @@
 #kernel.panic = 3
 # Enable packet forwarding
 #net.ipv4.ip_forward = 1
+#net.ipv6.conf.all.forwarding = 1
 # Disables IP dynaddr
 #net.ipv4.ip_dynaddr = 0
 # Disable ECN

package/bc/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.06
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		d44b5dddebd8a7a7309aea6c36fda117
 PKG_DESCR:=		An arbitrary precision calculator language
-PKG_SECTION:=		util
+PKG_SECTION:=		utils
 PKG_URL:=		http://www.gnu.org/software/bc
 PKG_SITES:=		http://ftp.gnu.org/pub/gnu/bc/
 

package/bogofilter/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bogofilter
-PKG_VERSION:=		1.2.0
+PKG_VERSION:=		1.2.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		4bbc9adc30d4f8e3a547f9be18a1cb74
+PKG_MD5SUM:=		a12a16d88d6d565dacf2a5e6259a3337
 PKG_DESCR:=		mail filter
 PKG_SECTION:=		mail
 PKG_DEPENDS:=		libiconv libdb
@@ -18,7 +18,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BOGOFILTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		LIBS="-liconv"
+CONFIGURE_ENV+=		LIBS="-liconv" \
+			ac_cv_func_memcmp_working=yes
 CONFIGURE_ARGS+=	--without-libsqlite3-prefix \
 			--without-libqdbm-prefix \
 			--with-included-gsl \

package/busybox/Config.in.manual

@@ -17,3 +17,6 @@ menu "Busybox Configuration"
 source "package/busybox/config/Config.in"
 endmenu
 
+config ADK_PACKAGE_UDHCPD
+	boolean
+	default BUSYBOX_APP_UDHCPD

package/busybox/Makefile

@@ -14,9 +14,13 @@ PKG_SITES:=		http://www.busybox.net/downloads/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+PKG_DESCR_UDHCPD:=	uDHCPD meta package
+PKG_SECTION_UDHCPD:=	net
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKG_DESCR_UDHCPD},${PKG_SECTION_UDHCPD}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
@@ -65,6 +69,10 @@ ifeq ($(ADK_DEBUG),y)
 	${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \
 		$(IDIR_BUSYBOX)/bin/busybox
 endif
+ifeq ($(ADK_PACKAGE_UDHCPD),y)
+	${INSTALL_DIR} ${IDIR_UDHCPD}/etc/
+	${INSTALL_DATA} ./files/udhcpd.conf ${IDIR_UDHCPD}/etc/
+endif
 
 fake:	$(TOPDIR)/.busyboxcfg do-configure do-install
 

package/busybox/files/udhcpd.conf

@@ -0,0 +1,28 @@
+# interface to bind to
+interface eth0
+
+# iprange to choose from
+start	192.168.1.100
+end	192.168.1.200
+
+# max number of leases
+#max_leases	100
+
+# period of auto lease file updates (in seconds)
+auto_time 7200
+
+# some timeouts
+#decline_time 3600
+#conflict_time 3600
+#offer_time 60
+#min_lease 60
+
+# do not change the path here
+leases_file /var/udhcpd.leases
+
+# call this script upon lease file write
+# (dumpleases may be useful for debugging)
+#notify_file dumpleases
+
+# static leases
+#static_lease 00:fe:ed:ba:be:00 192.168.1.2

package/busybox/files/udhcpd.conffiles

@@ -0,0 +1 @@
+/etc/udhcpd.conf

package/busybox/files/udhcpd.init

@@ -0,0 +1,28 @@
+#!/bin/sh
+#PKG udhcpd
+#INIT 50
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	[[ $udhcpd = NO ]] && exit 0
+	exec sh $0 start
+	;;
+start)
+	touch /var/udhcp.leases
+	udhcpd -S
+	;;
+stop)
+	pkill udhcpd
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "Usage: $0 {start | stop | restart}"
+	exit 1
+	;;
+esac
+exit $?

package/busybox/files/udhcpd.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf udhcpd udhcpd 'NO'

package/cairo/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cairo
-PKG_VERSION:=		1.8.8
+PKG_VERSION:=		1.8.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d3e1a1035ae563812d4dd44a74fb0dd0
+PKG_MD5SUM:=		b60a82f405f9400bbfdcf850b1728d25
 PKG_DESCR:=		cairo graphics library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		fontconfig libfreetype libpng libx11 pixman

package/conntrack-tools/Makefile

@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		conntrack-tools
+PKG_VERSION:=		0.9.9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		35b0ab9cde069b4ec8a493daae82d67b
+PKG_DESCR:=		Connection tracking userspace tools
+PKG_SECTION:=		firewall
+PKG_DEPENDS:=		libnetfilter_conntrack
+PKG_BUILDDEP+=		libnetfilter_conntrack
+PKG_URL:=		http://conntrack-tools.netfilter.org
+PKG_SITES:=		http://www.netfilter.org/projects/conntrack-tools/files/
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,CONNTRACK_TOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_CONNTRACK_TOOLS)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/conntrack{,d} $(IDIR_CONNTRACK_TOOLS)/usr/sbin/
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/dbus-glib/Makefile

@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		dbus-glib
+PKG_VERSION:=		0.86
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		cd0ab148fb0c786fc88be49d19971f50
+PKG_DESCR:=		DBUS glib bindings
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		dbus
+PKG_BUILDDEP+=		dbus
+PKG_URL:=		http://www.freedesktop.org/wiki/Software/DBusBindings
+PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus-glib/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,DBUS_GLIB,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+=	--disable-checks
+CONFIGURE_ENV+=		ac_cv_have_abstract_sockets=no
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_DBUS_GLIB)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libdbus-glib-1.so* \
+		$(IDIR_DBUS_GLIB)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/dbus-glib/patches/patch-Makefile_in

@@ -0,0 +1,13 @@
+--- dbus-glib-0.86.orig/Makefile.in	2010-03-25 01:20:00.000000000 +0100
++++ dbus-glib-0.86/Makefile.in	2010-04-11 12:29:52.000000000 +0200
+@@ -312,8 +312,8 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+ GLIB_PC = dbus-glib-1.pc
+-SUBDIRS = dbus tools test doc
+-DIST_SUBDIRS = dbus tools test doc m4
++SUBDIRS = dbus
++DIST_SUBDIRS = dbus tools m4
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = $(GLIB_PC)
+ DISTCLEANFILES = \

package/dbus-glib/patches/patch-dbus_Makefile_in

@@ -0,0 +1,11 @@
+--- dbus-glib-0.86.orig/dbus/Makefile.in	2010-03-25 01:19:59.000000000 +0100
++++ dbus-glib-0.86/dbus/Makefile.in	2010-04-11 12:15:19.000000000 +0200
+@@ -369,7 +369,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = . examples
++SUBDIRS = .
+ INCLUDES = \
+ 	-I$(top_srcdir)						\
+ 	-I$(top_builddir)					\

package/dbus/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dbus
-PKG_VERSION:=		1.2.16
+PKG_VERSION:=		1.2.24
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c7a47b851ebe02f6726b65b78d1b730b
+PKG_MD5SUM:=		565346cecd9cfecf1463540c6086cc2c
 PKG_DESCR:=		DBUS library
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libexpat
@@ -42,7 +42,7 @@ post-install:
 	${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib \
 		${IDIR_DBUS}/usr/bin
 	${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc/
-	${CP} ${WRKINST}/usr/lib/libdbus-1.so.* ${IDIR_DBUS}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_DBUS}/usr/lib/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin/
 

package/dri2proto/Makefile

@@ -0,0 +1,15 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		dri2proto
+PKG_VERSION:=		2.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		2087269416782cff56f9b22d1449c192
+PKG_DESCR:=		DRI2 proto headers
+PKG_URL:=		add project url
+PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/proto/
+
+include $(TOPDIR)/mk/package.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/dropbear/Makefile

@@ -5,14 +5,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dropbear
 PKG_VERSION:=		0.52
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		1c69ec674481d7745452f68f2ea5597e
 PKG_DESCR:=		SSH 2 server/client designed for embedded systems 
 PKG_SECTION:=		net
 PKG_URL:=		http://matt.ucc.asn.au/dropbear
 PKG_SITES:=		http://matt.ucc.asn.au/dropbear/releases/
 
-PKG_DESCR_UTIL:=	Utility for converting SSH keys
+PKG_DESCR_UTIL:=	Utility for converting SSH private keys
 
 include $(TOPDIR)/mk/package.mk
 

package/dropbear/files/dropbear.init

@@ -27,6 +27,14 @@ start)
 		test $rv = 0 || exit 1
 		test -f /etc/dropbear/dropbear_rsa_host_key || exit 1
 	fi
+	if test ! -f /etc/dropbear/dropbear_dss_host_key; then
+		# take it easy here, since above already catched the worst cases
+		if test -x /usr/bin/dropbearkey; then
+			bothlog "dropbear: generating SSH private key (DSS)"
+			/usr/bin/dropbearkey -f /etc/dropbear/dropbear_dss_host_key -t dss
+			bothlog dropbear: key generation exited with code $?
+		fi
+	fi
 	/usr/sbin/dropbear $dropbear_flags
 	;;
 stop)

package/dropbear/patches/patch-options_h

@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- dropbear-0.52.orig/options.h	2008-11-11 15:13:50.000000000 +0100
-+++ dropbear-0.52/options.h	2010-01-22 17:55:09.000000000 +0100
++++ dropbear-0.52/options.h	2010-03-14 23:30:26.277667006 +0100
 @@ -10,6 +10,11 @@
   * parts are to allow for commandline -DDROPBEAR_XXX options etc.
   ******************************************************************/
@@ -13,15 +13,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  #ifndef DROPBEAR_DEFPORT
  #define DROPBEAR_DEFPORT "22"
  #endif
-@@ -115,7 +120,7 @@ etc) slower (perhaps by 50%). Recommende
-  * Removing either of these won't save very much space.
-  * SSH2 RFC Draft requires dss, recommends rsa */
- #define DROPBEAR_RSA
--#define DROPBEAR_DSS
-+/* #define DROPBEAR_DSS */
- 
- /* RSA can be vulnerable to timing attacks which use the time required for
-  * signing to guess the private key. Blinding avoids this attack, though makes
 @@ -129,7 +134,7 @@ etc) slower (perhaps by 50%). Recommende
  /* #define DSS_PROTOK */
  

package/firefox/Makefile

@@ -0,0 +1,52 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		firefox
+PKG_VERSION:=		3.6.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		5e4541ab23084b7b14ba228291ce2688
+PKG_DESCR:=		graphical webbrowser
+PKG_SECTION:=		x11
+PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib gtk+ libnotify libidl
+PKG_DEPENDS+=		nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx
+PKG_BUILDDEP+=		alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 libXt
+PKG_BUILDDEP+=		nspr nss jpeg
+PKG_URL:=		http://www.mozilla.org/
+PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/source/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
+
+WRKDIST=		${WRKDIR}/mozilla-1.9.2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,FIREFOX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ENV+=		CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \
+			HOST_CXX="${HOSTCXX}" HOST_CXXFLAGS="${HOSTCXXFLAGS}" \
+			HOST_LIBIDL_CONFIG="/usr/bin/libIDL-config-2"
+CONFIGURE_ARGS+=	--enable-application=browser \
+			--with-system-zlib \
+			--with-system-jpeg \
+			--with-system-nss \
+			--with-system-nspr \
+			--disable-tests \
+			--disable-static \
+			--enable-libxul \
+			--disable-gnomeui \
+			--disable-gnomevfs \
+			--disable-optimize \
+			--disable-necko-wifi \
+			--disable-crashreporter
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin
+	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/firefox-3.6.3 \
+		$(IDIR_FIREFOX)/usr/lib/
+	$(CP) $(WRKINST)/usr/bin/firefox \
+		$(IDIR_FIREFOX)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/firefox/patches/patch-configure

@@ -0,0 +1,13 @@
+--- mozilla-1.9.2.orig/configure	2010-04-02 18:07:41.000000000 +0200
++++ mozilla-1.9.2/configure	2010-04-11 14:38:39.000000000 +0200
+@@ -21012,8 +21012,8 @@ if test -n "$CROSS_COMPILE"; then
+         HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
+     fi
+     if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then
+-        HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
+-        HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
++        HOST_LIBIDL_CFLAGS=`PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig ${HOST_LIBIDL_CONFIG} --cflags`
++        HOST_LIBIDL_LIBS=`PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig ${HOST_LIBIDL_CONFIG} --libs`
+     else
+         HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
+         HOST_LIBIDL_LIBS="$LIBIDL_LIBS"

package/firefox/patches/patch-gfx_qcms_qcmstypes_h

@@ -0,0 +1,25 @@
+--- mozilla-1.9.2.orig/gfx/qcms/qcmstypes.h	2010-04-02 18:02:27.000000000 +0200
++++ mozilla-1.9.2/gfx/qcms/qcmstypes.h	2010-04-11 14:57:54.000000000 +0200
+@@ -11,22 +11,11 @@
+ /* int_types.h gets included somehow, so avoid redefining the types differently */
+ #include <sys/int_types.h>
+ #else
+-typedef PRInt8 int8_t;
+-typedef PRUint8 uint8_t;
+-typedef PRInt16 int16_t;
+-typedef PRUint16 uint16_t;
+-typedef PRInt32 int32_t;
+-typedef PRUint32 uint32_t;
+-typedef PRInt64 int64_t;
+-typedef PRUint64 uint64_t;
+-
+ #ifdef __OS2__
+ /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
+ #include <stdlib.h>
+ #elif defined(__FreeBSD__)
+ /* FreeBSD typedefs uintptr_t in /usr/include/sys/types.h */
+-#else
+-typedef PRUptrdiff uintptr_t;
+ #endif
+ #endif
+ 

package/firefox/patches/patch-js_src_jsnum_h

@@ -0,0 +1,11 @@
+--- mozilla-1.9.2.orig/js/src/jsnum.h	2010-04-02 18:02:28.000000000 +0200
++++ mozilla-1.9.2/js/src/jsnum.h	2010-04-11 14:04:14.000000000 +0200
+@@ -98,7 +98,7 @@ JSDOUBLE_IS_FINITE(jsdouble d)
+ #ifdef WIN32
+     return _finite(d);
+ #else
+-    return finite(d);
++    return isfinite(d);
+ #endif
+ }
+ 

package/firefox/patches/patch-security_nss_lib_freebl_stubs_c

@@ -0,0 +1,11 @@
+--- mozilla-1.9.2.orig/security/nss/lib/freebl/stubs.c	2010-04-02 18:03:06.000000000 +0200
++++ mozilla-1.9.2/security/nss/lib/freebl/stubs.c	2010-04-11 15:37:04.000000000 +0200
+@@ -530,7 +530,7 @@ freebl_InitNSSUtil(void *lib)
+  * fetch the library if it's loaded. For NSS it should already be loaded
+  */
+ #define freebl_getLibrary(libName)  \
+-    dlopen (libName, RTLD_LAZY|RTLD_NOLOAD)
++    dlopen (libName, RTLD_LAZY)
+ 
+ #define freebl_releaseLibrary(lib) \
+     if (lib) dlclose(lib)

package/glproto/Makefile

@@ -0,0 +1,17 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		glproto
+PKG_VERSION:=		1.4.11
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		78e7c4dc7dcb74b1869fee7897e00f59
+PKG_DESCR:=		GL proto headers
+PKG_URL:=		add project url
+PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/proto/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/gpsd/Makefile

@@ -24,7 +24,6 @@ $(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEAS
 
 CONFIGURE_ENV+=		EGREP="grep -E" \
 			CPP="$(TARGET_CC) -E" \
-			PYTHON="none" \
 			ac_cv_func_strlcpy=no \
 			ac_cv_func_strlcat=no \
 			ac_cv_lib_nsl_gethostbyname=no

package/gpsd/patches/patch-Makefile_in

@@ -0,0 +1,44 @@
+--- gpsd-2.92.orig/Makefile.in	2010-03-03 14:49:11.000000000 +0100
++++ gpsd-2.92/Makefile.in	2010-04-03 10:33:48.782836143 +0200
+@@ -615,8 +615,6 @@ libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIB
+ #
+ # Build Python binding
+ #
+-@HAVE_PYTHON_TRUE@PYEXTENSIONS = gpspacket.so gpslib.so
+-@HAVE_PYTHON_TRUE@noinst_SCRIPTS = gpspacket.so gpslib.so setup.py
+ @LIBGPSMM_ENABLE_FALSE@TESTBINS = test_float test_trig test_bits test_packet test_geoid \
+ @LIBGPSMM_ENABLE_FALSE@	test_mkgmtime test_json
+ 
+@@ -1946,32 +1944,6 @@ maskdump.c: gpsd.h-tail maskaudit.py
+ 	$(PYTHON) maskaudit.py -c >maskdump.c && \
+ 	chmod a-w maskdump.c
+ 
+-# Multiple-outputs hack.  See
+-# http://www.gnu.org/software/automake/manual/automake.html#Multiple-Outputs
+-@HAVE_PYTHON_TRUE@$(PYEXTENSIONS): stamp-python-modules
+-@HAVE_PYTHON_TRUE@	+@WITNESS=stamp-python-modules; $(MULTIOUT_RECOVER_DELETED)
+-# TODO:  Should the dependency on libgps.la be enforced inside
+-# setup.py?  (See the variable 'needed_files' in setup.py.)
+-@HAVE_PYTHON_TRUE@stamp-python-modules: gpspacket.c gpsclient.c libgps.la setup.py
+-@HAVE_PYTHON_TRUE@	@rm -f '$@' '$@.tmp'
+-@HAVE_PYTHON_TRUE@	@echo 'timestamp for $@' > '$@.tmp'
+-@HAVE_PYTHON_TRUE@	(cd '$(srcdir)' && \
+-@HAVE_PYTHON_TRUE@	env abs_builddir='$(abs_builddir)' \
+-@HAVE_PYTHON_TRUE@	    MAKE='$(MAKE)' \
+-@HAVE_PYTHON_TRUE@		$(PYTHON) setup.py build_ext \
+-@HAVE_PYTHON_TRUE@			--build-lib '$(srcdir)' \
+-@HAVE_PYTHON_TRUE@			--build-temp '$(srcdir)/build' \
+-@HAVE_PYTHON_TRUE@			--include-dirs '$(srcdir):.'\
+-@HAVE_PYTHON_TRUE@			--mangenerator '$(MANGENERATOR)') && \
+-@HAVE_PYTHON_TRUE@	mv -f '$@.tmp' '$@'
+-
+-# Clean up after Python
+-@HAVE_PYTHON_TRUE@clean-local:
+-@HAVE_PYTHON_TRUE@	rm -rf build
+-
+-# Install Python modules
+-@HAVE_PYTHON_TRUE@install-exec-local:
+-@HAVE_PYTHON_TRUE@	$(PYTHON) setup.py install --prefix=${prefix} # --root=$(DESTDIR)
+ 
+ @HAVE_XSLT_PROCESSOR_TRUE@.xml.1:
+ @HAVE_XSLT_PROCESSOR_TRUE@	$(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $<

package/gpsd/patches/patch-gps_1

@@ -0,0 +1,17 @@
+--- gpsd-2.92.orig/gps.1	2010-03-01 06:00:44.000000000 +0100
++++ gpsd-2.92/gps.1	2010-04-03 10:22:50.111390920 +0200
+@@ -2,12 +2,12 @@
+ .\"     Title: gps
+ .\"    Author: [see the "AUTHORS" section]
+ .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
+-.\"      Date: 03/01/2010
++.\"      Date: 04/03/2010
+ .\"    Manual: [FIXME: manual]
+ .\"    Source: [FIXME: source]
+ .\"  Language: English
+ .\"
+-.TH "GPS" "1" "03/01/2010" "[FIXME: source]" "[FIXME: manual]"
++.TH "GPS" "1" "04/03/2010" "[FIXME: source]" "[FIXME: manual]"
+ .\" -----------------------------------------------------------------
+ .\" * set default formatting
+ .\" -----------------------------------------------------------------

package/gpsd/patches/patch-gpsd_config_h

@@ -0,0 +1,42 @@
+--- gpsd-2.92.orig/gpsd_config.h	2010-03-03 01:58:01.000000000 +0100
++++ gpsd-2.92/gpsd_config.h	2010-04-03 10:22:22.423474030 +0200
+@@ -117,7 +117,7 @@
+ #define HAVE_PYTHON_H 1
+ 
+ /* Define to 1 if you have the `round' function. */
+-/* #undef HAVE_ROUND */
++#define HAVE_ROUND 1
+ 
+ /* Define to 1 if you have the `setlocale' function. */
+ #define HAVE_SETLOCALE 1
+@@ -141,7 +141,7 @@
+ /* #undef HAVE_STRLCPY */
+ 
+ /* Define to 1 if you have the `strtonum' function. */
+-/* #undef HAVE_STRTONUM */
++#define HAVE_STRTONUM 1
+ 
+ /* Define to 1 if `struct tm' is a member of `tm_zone'. */
+ #define HAVE_STRUCT_TM_TM_ZONE 1
+@@ -206,10 +206,10 @@
+ #define HAVE_VSNPRINTF 1
+ 
+ /* Define to 1 if you have the <X11/xpm.h> header file. */
+-#define HAVE_X11_XPM_H 1
++/* #undef HAVE_X11_XPM_H */
+ 
+ /* Xpm available */
+-#define HAVE_XPM 1
++/* #undef HAVE_XPM */
+ 
+ /* Define to 1 if you have the <xpm.h> header file. */
+ /* #undef HAVE_XPM_H */
+@@ -309,7 +309,7 @@
+ #define SIZEOF_INT 4
+ 
+ /* The size of `long', as computed by sizeof. */
+-#define SIZEOF_LONG 8
++#define SIZEOF_LONG 4
+ 
+ /* The size of `long long', as computed by sizeof. */
+ #define SIZEOF_LONG_LONG 8

package/gpsd/patches/patch-gpsd_h

@@ -0,0 +1,42 @@
+--- gpsd-2.92.orig/gpsd.h	2010-03-03 01:58:01.000000000 +0100
++++ gpsd-2.92/gpsd.h	2010-04-03 10:22:22.793473137 +0200
+@@ -137,7 +137,7 @@
+ #define HAVE_PYTHON_H 1
+ 
+ /* Define to 1 if you have the `round' function. */
+-/* #undef HAVE_ROUND */
++#define HAVE_ROUND 1
+ 
+ /* Define to 1 if you have the `setlocale' function. */
+ #define HAVE_SETLOCALE 1
+@@ -161,7 +161,7 @@
+ /* #undef HAVE_STRLCPY */
+ 
+ /* Define to 1 if you have the `strtonum' function. */
+-/* #undef HAVE_STRTONUM */
++#define HAVE_STRTONUM 1
+ 
+ /* Define to 1 if `struct tm' is a member of `tm_zone'. */
+ #define HAVE_STRUCT_TM_TM_ZONE 1
+@@ -226,10 +226,10 @@
+ #define HAVE_VSNPRINTF 1
+ 
+ /* Define to 1 if you have the <X11/xpm.h> header file. */
+-#define HAVE_X11_XPM_H 1
++/* #undef HAVE_X11_XPM_H */
+ 
+ /* Xpm available */
+-#define HAVE_XPM 1
++/* #undef HAVE_XPM */
+ 
+ /* Define to 1 if you have the <xpm.h> header file. */
+ /* #undef HAVE_XPM_H */
+@@ -329,7 +329,7 @@
+ #define SIZEOF_INT 4
+ 
+ /* The size of `long', as computed by sizeof. */
+-#define SIZEOF_LONG 8
++#define SIZEOF_LONG 4
+ 
+ /* The size of `long long', as computed by sizeof. */
+ #define SIZEOF_LONG_LONG 8

package/gpsd/patches/patch-revision_h

@@ -0,0 +1,5 @@
+--- gpsd-2.92.orig/revision.h	2010-03-03 14:49:28.000000000 +0100
++++ gpsd-2.92/revision.h	2010-04-03 10:22:22.843473239 +0200
+@@ -1 +1 @@
+-#define REVISION "svn7020"
++#define REVISION "svnexported"

package/iptables/Makefile

@@ -14,6 +14,8 @@ PKG_DEPENDS+=		kmod-nf-conntrack-ipv4 kmod-nf-nat
 PKG_DEPENDS+=		kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject
 PKG_DEPENDS+=		kmod-ip-nf-filter kmod-ip-nf-match-state 
 PKG_DEPENDS+=		kmod-netfilter-xt-target-tcpmss
+PKG_DEPENDS6:=		kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6
+PKG_DEPENDS6+=		kmod-ip6-nf-filter kmod-ip6-nf-target-reject
 PKG_URL:=		http://www.netfilter.org
 PKG_SITES:=		http://www.netfilter.org/projects/iptables/files/ \
 			ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
@@ -29,7 +31,7 @@ include ${TOPDIR}/mk/package.mk
 #include ${LINUX_DIR}/.config
 
 $(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS6},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--enable-devel
 
@@ -44,8 +46,8 @@ post-install: ${SUB_INSTALL-m} ${SUB_INSTALL-y}
 	${CP} ${WRKINST}/usr/lib/libxtables.so* ${IDIR_IPTABLES}/usr/lib
 
 ip6tables-install:
-	${INSTALL_DIR} ${IDIR_IP6TABLES}/usr/lib
-	${INSTALL_DIR} ${IDIR_IP6TABLES}/usr/sbin
+	${INSTALL_DIR} ${IDIR_IP6TABLES}/{usr/lib,etc,usr/sbin}
+	${INSTALL_DATA} ./files/firewall6.conf ${IDIR_IP6TABLES}/etc
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IP6TABLES}/usr/sbin/
 	${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IP6TABLES}/usr/lib
 

package/iptables/files/firewall.conf

@@ -20,6 +20,7 @@ iptables -t nat -N postrouting_rule
 ### Default policy
 iptables -P INPUT DROP
 iptables -P FORWARD DROP
+iptables -P OUTPUT DROP
 
 ### INPUT
 ###  (connections with the router as destination)
@@ -45,17 +46,19 @@ iptables -A INPUT -j REJECT --reject-with icmp-port-unreachable
 ###  (connections with the router as source)
 
 # base case
-iptables -A OUTPUT -m state --state INVALID -j DROP
-iptables -A OUTPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
+iptables -A OUTPUT -m state --state RELATED,ESTABLISHED,NEW -j ACCEPT
+iptables -A OUTPUT -p icmp -j ACCEPT
 
 ### FORWARD
 ###  (connections routed through the router)
 
 # base case
 iptables -A FORWARD -m state --state INVALID -j DROP
-iptables -A FORWARD -p tcp -o $WAN --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
 iptables -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
 
+# fix for broken ISPs blocking ICMP "fragmentation needed" packets
+#iptables -t mangle -A FORWARD -p tcp -o $WAN --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
+
 # custom rules
 iptables -A FORWARD -j forwarding_rule
 iptables -t nat -A PREROUTING -j prerouting_rule

package/iptables/files/firewall6.conf

@@ -0,0 +1,98 @@
+#!/bin/sh
+echo "configure /etc/firewall6.conf first."
+exit 1
+
+### Interfaces
+WAN=sixxs
+LAN=br0
+WLAN=wlan0
+
+######################################################################
+### Default ruleset
+######################################################################
+
+### Create chains
+ip6tables -N input_rule
+ip6tables -N forwarding_rule
+
+### Default policy
+ip6tables -P INPUT DROP
+ip6tables -P FORWARD DROP
+ip6tables -P OUTPUT DROP
+
+### INPUT
+###  (connections with the router as destination)
+
+# base case
+ip6tables -A INPUT -m state --state INVALID -j DROP
+ip6tables -A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
+ip6tables -A INPUT -p tcp --tcp-flags SYN SYN \! --tcp-option 2 -j DROP
+
+# custom rules
+ip6tables -A INPUT -j input_rule
+
+# allow access from anything but WAN
+ip6tables -A INPUT ${WAN:+\! -i $WAN} -j ACCEPT
+# allow icmp messages
+ip6tables -A INPUT -p icmp6 -j ACCEPT
+
+# reject
+ip6tables -A INPUT -p tcp -j REJECT --reject-with tcp-reset
+ip6tables -A INPUT -j REJECT --reject-with icmp6-port-unreachable
+
+### OUTPUT
+###  (connections with the router as source)
+
+# base case
+ip6tables -A OUTPUT -m state --state RELATED,ESTABLISHED,NEW -j ACCEPT
+ip6tables -A OUTPUT -p icmp6 -j ACCEPT
+
+### FORWARD
+###  (connections routed through the router)
+
+# base case
+ip6tables -A FORWARD -m state --state INVALID -j DROP
+ip6tables -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
+
+# fix for broken ISPs blocking ICMPv6 "packet too big" packets
+#ip6tables -t mangle -A FORWARD -p tcp -o $WAN --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
+
+# custom rules
+ip6tables -A FORWARD -j forwarding_rule
+
+# allow LAN
+ip6tables -A FORWARD -i $LAN -o $WAN -j ACCEPT
+
+######################################################################
+### Default ruleset end
+######################################################################
+
+###
+### Connections to the router
+###
+
+# ssh
+#ip6tables -A input_rule -i $WAN -p tcp -s <a.b.c.d> --dport 22 -j ACCEPT
+
+# IPSec
+#ip6tables -A input_rule -i $WAN -p esp -s <a.b.c.d> -j ACCEPT
+#ip6tables -A input_rule -i $WAN -p udp -s <a.b.c.d> --dport 500 -j ACCEPT
+
+# OpenVPN
+#ip6tables -A input_rule -i $WAN -p udp -s <a.b.c.d> --dport 1194 -j ACCEPT
+
+# PPTP
+#ip6tables -A input_rule -i $WAN -p gre -j ACCEPT
+#ip6tables -A input_rule -i $WAN -p tcp --dport 1723 -j ACCEPT
+
+###
+###  VPN traffic
+###
+
+# IPSec
+#ip6tables -A forwarding_rule -o ipsec+ -j ACCEPT
+#ip6tables -A forwarding_rule -i ipsec+ -j ACCEPT
+
+# OpenVPN
+#ip6tables -A forwarding_rule -o tun+ -j ACCEPT
+#ip6tables -A forwarding_rule -i tun+ -j ACCEPT

package/iptables/files/firewall6.init

@@ -0,0 +1,31 @@
+#!/bin/sh
+#PKG iptables
+#INIT 45
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${firewall6:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	. /etc/firewall6.conf
+	;;
+stop)
+	### Clear tables
+	ip6tables -F
+	ip6tables -X
+	ip6tables -P INPUT ACCEPT
+	ip6tables -P FORWARD ACCEPT
+	ip6tables -P OUTPUT ACCEPT
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "Usage: $0 {start | stop | restart}"
+	;;
+esac
+exit $?

package/iptables/files/iptables.postinst

@@ -2,3 +2,4 @@
 . $IPKG_INSTROOT/etc/functions.sh
 
 add_rcconf iptables firewall NO
+add_rcconf iptables firewall6 NO

package/libIDL/Makefile

@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libIDL
+PKG_VERSION:=		0.8.14
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		531fbc1b40b80dd1d6f3b5e76b99067c
+PKG_DESCR:=		libraries for Interface Definition Language files
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.gnome.org
+PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
+
+include $(TOPDIR)/mk/package.mk
+
+CONFIGURE_ENV+=		libIDL_cv_long_long_format=ll
+
+$(eval $(call PKG_template,LIBIDL,libidl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_LIBIDL)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libIDL*.so* \
+		$(IDIR_LIBIDL)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libXdamage/Makefile

@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libXdamage
+PKG_VERSION:=		1.1.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		f8f19f747c8445213d5409ae8b8b2f0a
+PKG_DESCR:=		add short description
+PKG_SECTION:=		libs
+PKG_BUILDDEP+=		libXfixes
+PKG_URL:=		add project url
+PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/lib/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXDAMAGE,libxdamage,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_LIBXDAMAGE)/usr/lib
+	$(INSTALL_BIN) $(WRKINST)/usr/lib/libXdamage* \
+		$(IDIR_LIBXDAMAGE)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libXfixes/Makefile

@@ -0,0 +1,24 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libXfixes
+PKG_VERSION:=		4.0.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		86eb4b916cd5948c0e20d279107b3331
+PKG_DESCR:=		add short description
+PKG_SECTION:=		libs
+PKG_URL:=		add project url
+PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/lib/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXFIXES,libxfixes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_LIBXFIXES)/usr/lib
+	$(INSTALL_BIN) $(WRKINST)/usr/lib/libXfixes*.so* \
+		$(IDIR_LIBXFIXES)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libXxf86vm/Makefile

@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libXxf86vm
+PKG_VERSION:=		1.1.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		52b49483eccbdd1566b8c560fe7f76e8
+PKG_DESCR:=		add short description
+PKG_SECTION:=		libs
+PKG_BUILDDEP+=		xf86vidmodeproto
+PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/lib/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXXF86VM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+=	--disable-malloc0returnsnull
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_LIBXXF86VM)/usr/lib
+	$(INSTALL_BIN) $(WRKINST)/usr/lib/libXxf86vm*.so* \
+		$(IDIR_LIBXXF86VM)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libdrm/Makefile

@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libdrm
+PKG_VERSION:=		2.4.20
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		dcbf9aa0497c84c7e4af15adb0021955
+PKG_DESCR:=		DRM library
+PKG_SECTION:=		libs
+PKG_BUILDDEP+=		libpthread-stubs
+PKG_URL:=		http://dri.freedesktop.org/wiki/
+PKG_SITES:=		http://dri.freedesktop.org/libdrm/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBDRM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_LIBDRM)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libdrm*.so* \
+		$(IDIR_LIBDRM)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libnotify/Makefile

@@ -0,0 +1,24 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libnotify
+PKG_VERSION:=		0.4.5
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		472e2c1f808848365572a9b024d9e8f5
+PKG_DESCR:=		notify library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.galago-project.org/
+PKG_SITES:=		http://www.galago-project.org/files/releases/source/libnotify/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBNOTIFY,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_LIBNOTIFY)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libnotify*.so* \
+		$(IDIR_LIBNOTIFY)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libpthread-stubs/Makefile

@@ -0,0 +1,18 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libpthread-stubs
+PKG_VERSION:=		0.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		774eabaf33440d534efe108ef9130a7d
+PKG_DESCR:=		weak aliases for pthread functions
+PKG_SECTION:=		libs
+PKG_URL:=		http://xcb.freedesktop.org/
+PKG_SITES:=		http://xcb.freedesktop.org/dist/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/nss/Makefile

@@ -4,15 +4,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		nss
-PKG_VERSION:=		3.12.4
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		1ee3ed9c1900079319bd1de51388d856
+PKG_VERSION:=		3.12.6
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		da42596665f226de5eb3ecfc1ec57cd1
 PKG_DESCR:=		Network Security Services (NSS) library
 PKG_SECTION:=		libs
 PKG_BUILDDEP+=		nspr zlib
 PKG_NOPARALLEL:=	1
 PKG_URL:=		http://www.mozilla.org/projects/security/pki/nss/
-PKG_SITES:=		https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/
+PKG_SITES:=		https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/
 
 PKG_TARGET_DEPENDS:=    !foxboard
 

package/nss/patches/patch-mozilla_security_coreconf_Linux_mk

@@ -1,5 +1,5 @@
---- nss-3.12.4.orig/mozilla/security/coreconf/Linux.mk	2009-07-30 01:43:41.000000000 +0200
-+++ nss-3.12.4/mozilla/security/coreconf/Linux.mk	2009-12-11 20:45:13.000000000 +0100
+--- nss-3.12.6.orig/mozilla/security/coreconf/Linux.mk	2010-01-15 23:19:00.000000000 +0100
++++ nss-3.12.6/mozilla/security/coreconf/Linux.mk	2010-04-12 20:18:32.000000000 +0200
 @@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1)
  	IMPL_STRATEGY = _PTH
  endif
@@ -13,19 +13,19 @@
  
  DEFAULT_COMPILER = gcc
  
-@@ -135,7 +135,7 @@ OS_PTHREAD = -lpthread 
- endif
- 
- OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
+@@ -133,7 +133,7 @@ endif
+ # not build with -ansi.
+ STANDARDS_CFLAGS	= -ansi -D_POSIX_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE
+ OS_CFLAGS		= $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR
 -OS_LIBS			= $(OS_PTHREAD) -ldl -lc
 +OS_LIBS			= $(OS_PTHREAD)
  
  ifdef USE_PTHREADS
  	DEFINES		+= -D_REENTRANT
-@@ -151,7 +151,7 @@ DSO_LDOPTS		= -shared $(ARCHFLAG)
+@@ -148,7 +148,7 @@ DSO_LDOPTS		= -shared $(ARCHFLAG)
+ # we don't use -z defs there.
  ZDEFS_FLAG		= -Wl,-z,defs
  DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
- DSO_LDFLAGS		=
 -LDFLAGS			+= $(ARCHFLAG)
 +#LDFLAGS			+= $(ARCHFLAG)
  

package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh

@@ -1,11 +1,10 @@
---- nss-3.12.4.orig/mozilla/security/nss/cmd/shlibsign/sign.sh	2009-06-05 04:30:52.000000000 +0200
-+++ nss-3.12.4/mozilla/security/nss/cmd/shlibsign/sign.sh	2009-11-20 18:51:43.000000000 +0100
-@@ -35,6 +35,7 @@ WIN*)
+--- nss-3.12.6.orig/mozilla/security/nss/cmd/shlibsign/sign.sh	2009-12-08 02:33:37.000000000 +0100
++++ nss-3.12.6/mozilla/security/nss/cmd/shlibsign/sign.sh	2010-04-12 20:21:23.000000000 +0200
+@@ -35,6 +35,6 @@ WIN*)
      ADDON_PATH=${1}/lib:${4}:$ADDON_PATH
      export ADDON_PATH
-     echo ${2}/shlibsign -v -i ${5}
--    ${2}/shlibsign -v -i ${5}
-+    #disable for cross-compile
-+    #${2}/shlibsign -v -i ${5}
+     echo "${2}"/shlibsign -v -i "${5}"
+-    "${2}"/shlibsign -v -i "${5}"
++    #"${2}"/shlibsign -v -i "${5}"
      ;;
  esac

package/ntfs-3g/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION=		2010.1.16
 PKG_RELEASE=		1
 PKG_MD5SUM=		e104c914e8d7d29ee83e63d46afbba25
 PKG_DESCR:=		ntfs filesystem driver with read and write support
-PKG_SECTION:=		sys
+PKG_SECTION:=		kernel
 PKG_DEPENDS:=		kmod-fuse-fs
 PKG_URL:=		http://tuxera.com
 PKG_SITES=		http://tuxera.com/opensource/

package/openssh/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openssh
-PKG_VERSION:=		5.4p1
+PKG_VERSION:=		5.5p1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		da10af8a789fa2e83e3635f3a1b76f5e
+PKG_MD5SUM:=		88633408f4cb1eb11ec7e2ec58b519eb
 PKG_DESCR:=		OpenSSH server
 PKG_SECTION:=		net
 PKG_DEPENDS:=		zlib libopenssl libpthread

package/openssh/patches/patch-openbsd-compat_port-tun_c

@@ -0,0 +1,11 @@
+--- openssh-5.5p1.orig/openbsd-compat/port-tun.c	2008-05-19 07:28:36.000000000 +0200
++++ openssh-5.5p1/openbsd-compat/port-tun.c	2010-04-21 20:14:00.000000000 +0200
+@@ -213,7 +213,7 @@ sys_tun_infilter(struct Channel *c, char
+ 	if (len <= 0 || len > (int)(sizeof(rbuf) - sizeof(*af)))
+ 		return (-1);
+ 	ptr = (char *)&rbuf[0];
+-	bcopy(buf, ptr + sizeof(u_int32_t), len);
++	memcpy(ptr + sizeof(u_int32_t), buf, len);
+ 	len += sizeof(u_int32_t);
+ 	af = (u_int32_t *)ptr;
+ 

package/pango/Makefile

@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		pango
-PKG_VERSION:=		1.26.1
+PKG_VERSION:=		1.28.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		629f653adfdcfd6e4d89e95f74b8d370
+PKG_MD5SUM:=		aa3dee16506275a36c6c9239c9e2dfdd
 PKG_DESCR:=		pango library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.pango.org
-PKG_SITES:=		${MASTER_SITE_GNOME:=/pango/1.26/}
+PKG_SITES:=		${MASTER_SITE_GNOME:=/pango/1.28/}
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly

package/pdnsd/files/pdnsd.conf

@@ -1,7 +1,8 @@
 global {
-	perm_cache=1024;
-	cache_dir="/var/cache/pdnsd";  # do not change this!
-	run_as="nobody";
+	perm_cache = 1024;
+	cache_dir = "/var/cache/pdnsd";  # do not change this!
+	run_as = "nobody";
+	strict_setuid = on;
 	server_ip = 127.0.0.1;  # Use eth0 here if you want to allow other
 				# machines on your network to query pdnsd.
 	status_ctl = on;
@@ -11,20 +12,25 @@ global {
 	min_ttl=15m;       # Retain cached entries at least 15 minutes.
 	max_ttl=1w;        # One week.
 	timeout=10;        # Global timeout option (10 seconds).
+	proc_limit = 20;
 }
 
-server {
-	label= "myisp";
-	ip = 192.168.0.1;  # Put your ISP's DNS-server address(es) here.
-#	proxy_only=on;     # Do not query any name servers beside your ISP's.
-	                   # This may be necessary if you are behind some
-	                   # kind of firewall and cannot receive replies
-	                   # from outside name servers.
-	timeout=4;         # Server timeout; this may be much shorter
-			   # that the global timeout option.
-	uptest=if;         # Test if the network interface is active.
-	interface=eth0;    # The name of the interface to check.
-	interval=10m;      # Check every 10 minutes.
-	purge_cache=off;   # Keep stale cache entries in case the ISP's
-			   # DNS servers go offline.
+# serve local host definitions
+source {
+	owner = "localhost";
+	serve_aliases = off; # skip everything after the first host for an IP
+	file = "/etc/hosts";
 }
+
+# for dns servers via dhcp
+#server {
+#	label = "dhcp";
+#	file = "/var/resolv.conf";
+#	exclude = ".lan";
+#	policy = fqdn_only;
+#	timeout = 4;
+#	uptest = if;
+#	interface = "eth0";
+#	interval = 60;
+#}
+

package/pdnsd/files/pdnsd.init

@@ -13,7 +13,10 @@ autostart)
 start)
 	[ -f /etc/pdnsd.conf ] || exit
 	mkdir -p /var/cache/pdnsd
-	pdnsd -s -t -d
+	touch /var/cache/pdnsd/pdnsd.cache
+	# this allows for strict_setuid
+	chown -R nobody:nogroup /var/cache/pdnsd
+	pdnsd -d
 	;;
 stop)
 	pkill pdnsd

package/pdnsd/patches/patch-src_dns_query_c

@@ -0,0 +1,12 @@
+use the temporary port, not always the global one over and over again
+--- pdnsd-1.2.7.orig/src/dns_query.c	2008-09-01 15:56:51.000000000 +0200
++++ pdnsd-1.2.7/src/dns_query.c	2010-03-19 21:44:38.837858828 +0100
+@@ -650,7 +650,7 @@ static int bind_socket(int s)
+ 				ELSE_IPV6 {
+ 					memset(&sin.sin6,0,sizeof(struct sockaddr_in6));
+ 					sin.sin6.sin6_family=AF_INET6;
+-					sin.sin6.sin6_port=htons(global.port);
++					sin.sin6.sin6_port=htons(prt);
+ 					sin.sin6.sin6_flowinfo=IPV6_FLOWINFO;
+ 					SET_SOCKA_LEN6(sin.sin6);
+ 					sinl=sizeof(struct sockaddr_in6);

package/tcsh/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		6.17.00
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c47de903e3d52f6824c8dd0c91eeb477
 PKG_DESCR:=		alternative csh
-PKG_SECTION:=		shell
+PKG_SECTION:=		shells
 PKG_DEPENDS:=		libncurses
 PKG_BUILDDEP+=		ncurses
 PKG_URL:=		http://www.tcsh.org/Welcome

package/uclibc++/patches/patch-include_unwind-cxx_h

@@ -0,0 +1,21 @@
+patch from OpenWrt
+--- uClibc++-0.2.2.orig/include/unwind-cxx.h	2007-06-04 00:51:12.000000000 +0200
++++ uClibc++-0.2.2/include/unwind-cxx.h	2010-04-02 12:44:02.704723285 +0200
+@@ -135,6 +135,7 @@ extern std::unexpected_handler __unexpec
+ 
+ // This is the exception class we report -- "GNUCC++\0".
+ const _Unwind_Exception_Class __gxx_exception_class
++#ifndef __ARM_EABI_UNWINDER__
+ = ((((((((_Unwind_Exception_Class) 'G' 
+ 	 << 8 | (_Unwind_Exception_Class) 'N')
+ 	<< 8 | (_Unwind_Exception_Class) 'U')
+@@ -143,6 +144,9 @@ const _Unwind_Exception_Class __gxx_exce
+      << 8 | (_Unwind_Exception_Class) '+')
+     << 8 | (_Unwind_Exception_Class) '+')
+    << 8 | (_Unwind_Exception_Class) '\0');
++#else
++= "GNUC++";
++#endif
+ 
+ // GNU C++ personality routine, Version 0.
+ extern "C" _Unwind_Reason_Code __gxx_personality_v0

package/valgrind/patches/patch-configure

@@ -1,16 +1,15 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- valgrind-3.3.1.orig/configure	2008-06-01 03:44:42.000000000 +0200
-+++ valgrind-3.3.1/configure	2009-12-12 00:28:43.000000000 +0100
-@@ -4129,7 +4129,7 @@ echo "${ECHO_T}ok (${host_os})" >&6
+--- valgrind-3.5.0.orig/configure	2009-08-19 15:44:07.000000000 +0200
++++ valgrind-3.5.0/configure	2010-04-03 09:55:06.363473068 +0200
+@@ -4215,7 +4215,7 @@ echo "${ECHO_T}ok (${host_os})" >&6
          echo "$as_me:$LINENO: checking for the kernel version" >&5
  echo $ECHO_N "checking for the kernel version... $ECHO_C" >&6
  
 -        kernel=`uname -r`
-+        kernel=2.6.32
++        kernel=2.6.33
  
          case "${kernel}" in
               2.6.*)
-@@ -4637,6 +4637,27 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+@@ -4841,6 +4841,27 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
  fi
  rm -f conftest*
  
@@ -38,11 +37,31 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -4742,6 +4763,17 @@ _ACEOF
- 	DEFAULT_SUPP="glibc-2.8.supp ${DEFAULT_SUPP}"
+@@ -5005,15 +5026,15 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 
+ #include <features.h>
+ #ifdef __GNU_LIBRARY__
+- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 10)
+-  GLIBC_210
++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11)
++  GLIBC_211
+  #endif
+ #endif
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "GLIBC_210" >/dev/null 2>&1; then
+-  GLIBC_VERSION="2.10"
++  $EGREP "GLIBC_211" >/dev/null 2>&1; then
++  GLIBC_VERSION="2.11"
+ fi
+ rm -f conftest*
+ 
+@@ -5174,6 +5195,17 @@ _ACEOF
  	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
  	;;
-+     2.11)
++     2.11*)
 +	echo "$as_me:$LINENO: result: 2.11 family" >&5
 +echo "${ECHO_T}2.11 family" >&6
 +
@@ -50,9 +69,18 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 +#define GLIBC_2_11 1
 +_ACEOF
 +
-+	DEFAULT_SUPP="glibc-2.8.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
 +	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
 +	;;
       aix5)
  	echo "$as_me:$LINENO: result: AIX 5.1 or 5.2 or 5.3" >&5
  echo "${ECHO_T}AIX 5.1 or 5.2 or 5.3" >&6
+@@ -5198,7 +5230,7 @@ _ACEOF
+      *)
+ 	echo "$as_me:$LINENO: result: unsupported version" >&5
+ echo "${ECHO_T}unsupported version" >&6
+-	{ { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.10" >&5
++	{ { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.11.1" >&5
+ echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.10" >&2;}
+    { (exit 1); exit 1; }; }
+ 	{ { echo "$as_me:$LINENO: error: or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" >&5

package/xcb-proto/Makefile

@@ -0,0 +1,15 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xcb-proto
+PKG_VERSION:=		1.6
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		8d29695e8faf5fcdce568c66eaeaa5ee
+PKG_DESCR:=		XCB headers
+PKG_URL:=		http://xcb.freedesktop.org/
+PKG_SITES:=		http://xcb.freedesktop.org/dist/
+
+include $(TOPDIR)/mk/package.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/xf86-input-keyboard/Makefile

@@ -13,7 +13,7 @@ PKG_BUILDDEP+=		xorg-server
 PKG_DEPENDS:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_TARGET_DEPENDS:=	alix1c lemote
+PKG_TARGET_DEPENDS:=	alix1c lemote ibmx40 shuttle
 
 include $(TOPDIR)/mk/package.mk
 

package/xf86-input-mouse/Makefile

@@ -13,7 +13,7 @@ PKG_DEPENDS:=		xorg-server
 PKG_BUILDDEP+=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_TARGET_DEPENDS:=	alix1c lemote
+PKG_TARGET_DEPENDS:=	alix1c lemote ibmx40 shuttle
 
 include $(TOPDIR)/mk/package.mk
 

package/xf86-video-fbdev/Makefile

@@ -13,7 +13,7 @@ PKG_DEPENDS:=		xorg-server
 PKG_BUILDDEP+=		xorg-server
 PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/driver/
 
-PKG_TARGET_DEPENDS:=	alix1c lemote
+PKG_TARGET_DEPENDS:=	alix1c lemote ibmx40
 
 include $(TOPDIR)/mk/package.mk
 

package/xf86-video-intel/Makefile

@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xf86-video-intel
+PKG_VERSION:=		2.9.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		b1926dc68cc10209fc2200729fb6162b
+PKG_DESCR:=		X11 driver for Intel VGA chip
+PKG_SECTION:=		x11
+PKG_DEPENDS:=		xorg-server libdrm
+PKG_BUILDDEP+=		xorg-server libdrm
+PKG_SITES:=		http://www.x.org/releases/X11R7.5/src/driver/
+
+PKG_TARGET_DEPENDS:=	ibmx40
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86_VIDEO_INTEL,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	${INSTALL_DIR} ${IDIR_XF86_VIDEO_INTEL}/usr/lib/xorg/modules/drivers
+	${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/intel_drv.so \
+		${IDIR_XF86_VIDEO_INTEL}/usr/lib/xorg/modules/drivers/
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/xf86-video-intel/patches/patch-configure

@@ -0,0 +1,42 @@
+--- xf86-video-intel-2.9.1.orig/configure	2009-10-26 12:53:35.000000000 +0100
++++ xf86-video-intel-2.9.1/configure	2010-04-21 19:57:36.000000000 +0200
+@@ -12283,9 +12283,6 @@ if test x$DRI != xno; then
+ $as_echo_n "checking for ${sdkdir}/dri.h... " >&6; }
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r "${sdkdir}/dri.h"; then
+   eval "$as_ac_File=yes"
+ else
+@@ -12307,9 +12304,6 @@ fi
+ $as_echo_n "checking for ${sdkdir}/sarea.h... " >&6; }
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r "${sdkdir}/sarea.h"; then
+   eval "$as_ac_File=yes"
+ else
+@@ -12331,9 +12325,6 @@ fi
+ $as_echo_n "checking for ${sdkdir}/dristruct.h... " >&6; }
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r "${sdkdir}/dristruct.h"; then
+   eval "$as_ac_File=yes"
+ else
+@@ -12927,9 +12918,6 @@ else
+ $as_echo_n "checking for $XORG_SGML_PATH/X11/defs.ent... " >&6; }
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r "$XORG_SGML_PATH/X11/defs.ent"; then
+   eval "$as_ac_File=yes"
+ else

package/xf86-video-intel/patches/patch-configure.orig

@@ -0,0 +1,22 @@
+--- xf86-video-intel-2.9.1.orig/configure	2009-10-26 12:53:35.000000000 +0100
++++ xf86-video-intel-2.9.1/configure	2010-04-21 19:57:01.000000000 +0200
+@@ -12283,9 +12283,6 @@ if test x$DRI != xno; then
+ $as_echo_n "checking for ${sdkdir}/dri.h... " >&6; }
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r "${sdkdir}/dri.h"; then
+   eval "$as_ac_File=yes"
+ else
+@@ -12331,9 +12328,6 @@ fi
+ $as_echo_n "checking for ${sdkdir}/dristruct.h... " >&6; }
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r "${sdkdir}/dristruct.h"; then
+   eval "$as_ac_File=yes"
+ else

package/xf86-video-intel/patches/patch-src_i830_h

@@ -0,0 +1,109 @@
+--- xf86-video-intel-2.9.1.orig/src/i830.h	2009-10-26 12:48:05.000000000 +0100
++++ xf86-video-intel-2.9.1/src/i830.h	2010-04-19 20:20:51.000000000 +0200
+@@ -61,6 +61,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #include "xorg-server.h"
+ #include <pciaccess.h>
+ 
++#ifdef XF86DRI
+ #include "xf86drm.h"
+ #include "sarea.h"
+ #define _XF86DRI_SERVER_
+@@ -69,16 +70,19 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #include "i830_dri.h"
+ #include "intel_bufmgr.h"
+ #include "i915_drm.h"
++#endif
+ 
+ #include "uxa.h"
+ Bool i830_uxa_init(ScreenPtr pScreen);
+ void i830_uxa_create_screen_resources(ScreenPtr pScreen);
+ void i830_uxa_block_handler (ScreenPtr pScreen);
++#ifdef XF86DRI
+ Bool i830_get_aperture_space(ScrnInfoPtr pScrn, drm_intel_bo **bo_table,
+ 			     int num_bos);
+ 
+ dri_bo *i830_get_pixmap_bo (PixmapPtr pixmap);
+ void i830_set_pixmap_bo(PixmapPtr pixmap, dri_bo *bo);
++#endif
+ 
+ typedef struct _I830OutputRec I830OutputRec, *I830OutputPtr;
+ 
+@@ -168,7 +172,9 @@ struct _i830_memory {
+     i830_memory *prev;
+     /** @} */
+ 
++#ifdef XF86DRI
+     dri_bo *bo;
++#endif
+     uint32_t alignment;
+     uint32_t gem_name;
+     Bool lifetime_fixed_offset;
+@@ -370,7 +376,9 @@ typedef struct _I830Rec {
+    /** Offset in the ring for the next DWORD emit */
+    uint32_t ring_next;
+ 
++#ifdef XF86DRI
+    dri_bufmgr *bufmgr;
++#endif
+ 
+    uint8_t *batch_ptr;
+    /** Byte offset in batch_ptr for the next dword to be emitted. */
+@@ -379,8 +387,10 @@ typedef struct _I830Rec {
+    unsigned int batch_emit_start;
+    /** Number of bytes to be emitted in the current BEGIN_BATCH. */
+    uint32_t batch_emitting;
++#ifdef XF86DRI
+    dri_bo *batch_bo;
+    dri_bo *last_batch_bo;
++#endif
+    /** Whether we're in a section of code that can't tolerate flushing */
+    Bool in_batch_atomic;
+    /** Ending batch_used that was verified by i830_start_batch_atomic() */
+@@ -451,6 +461,7 @@ typedef struct _I830Rec {
+    ScreenBlockHandlerProcPtr BlockHandler;
+    Bool overlayOn;
+ 
++#ifdef XF86DRI
+    struct {
+       drm_intel_bo *gen4_vs_bo;
+       drm_intel_bo *gen4_sf_bo;
+@@ -461,6 +472,7 @@ typedef struct _I830Rec {
+       drm_intel_bo *gen4_sampler_bo;
+       drm_intel_bo *gen4_sip_kernel_bo;
+    } video;
++#endif
+ 
+    /* Render accel state */
+    float scale_units[2][2];
+@@ -687,6 +699,7 @@ i830_pipe_a_require_activate (ScrnInfoPt
+ void
+ i830_pipe_a_require_deactivate (ScrnInfoPtr scrn);
+ 
++#ifdef XF86DRI
+ Bool I830DRI2ScreenInit(ScreenPtr pScreen);
+ void I830DRI2CloseScreen(ScreenPtr pScreen);
+ 
+@@ -696,6 +709,7 @@ extern void drmmode_closefb(ScrnInfoPtr 
+ extern int drmmode_output_dpms_status(xf86OutputPtr output);
+ void
+ drmmode_crtc_set_cursor_bo(xf86CrtcPtr crtc, dri_bo *cursor);
++#endif
+ 
+ extern Bool i830_crtc_on(xf86CrtcPtr crtc);
+ extern int i830_crtc_to_pipe(xf86CrtcPtr crtc);
+@@ -882,6 +896,7 @@ Bool i830_pixmap_tiled(PixmapPtr p);
+     if (pitch > KB(8)) I830FALLBACK("pitch exceeds 3d limit 8K\n");\
+ } while(0)
+ 
++#ifdef XF86DRI
+ /**
+  * Little wrapper around drm_intel_bo_reloc to return the initial value you
+  * should stuff into the relocation entry.
+@@ -913,6 +928,7 @@ intel_bo_alloc_for_data(ScrnInfoPtr scrn
+ 
+     return bo;
+ }
++#endif
+ 
+ extern const int I830PatternROP[16];
+ extern const int I830CopyROP[16];

package/xf86-video-intel/patches/patch-uxa_uxa-priv_h

@@ -0,0 +1,11 @@
+--- xf86-video-intel-2.9.1.orig/uxa/uxa-priv.h	2009-10-26 12:48:05.000000000 +0100
++++ xf86-video-intel-2.9.1/uxa/uxa-priv.h	2010-04-16 20:13:57.000000000 +0200
+@@ -46,7 +46,7 @@
+ #include <X11/extensions/shm.h>
+ #else
+ #define _XSHM_SERVER_
+-#include <X11/extensions/shmstr.h>
++#include <xorg/shmint.h>
+ #endif
+ #endif
+ #include "scrnintstr.h"

package/xf86driproto/Makefile

@@ -0,0 +1,18 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xf86driproto
+PKG_VERSION:=		2.1.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		309d552732666c3333d7dc63e80d042f
+PKG_DESCR:=		DRI protocol headers
+PKG_SECTION:=		libs
+PKG_URL:=		add project url
+PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/proto/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/xf86vidmodeproto/Makefile

@@ -0,0 +1,14 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xf86vidmodeproto
+PKG_VERSION:=		2.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		934b400f2f8d1bcab20bb056e0910291
+PKG_DESCR:=		videomode proto headers
+PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/proto/
+
+include $(TOPDIR)/mk/package.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/xorg-server/Makefile

@@ -17,6 +17,10 @@ PKG_BUILDDEP+=		libX11 randrproto renderproto fixesproto damageproto \
 			scrnsaverproto resourceproto fontsproto videoproto \
 			compositeproto evieext libxkbfile libXfont pixman \
 			libpciaccess openssl xf86dgaproto
+ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
+PKG_BUILDDEP+=		xf86driproto glproto dri2proto MesaLib
+PKG_DEPENDS+=		xf86driproto glproto dri2proto mesalib
+endif
 PKG_URL:=		http://www.x.org
 PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/xserver/
 
@@ -24,6 +28,9 @@ PKG_TARGET_DEPENDS:=	!foxboard
 
 CFLINE_XORG_SERVER:=	depends on ADK_TARGET_WITH_VGA
 
+PKG_FLAVOURS:=		WITH_DRI
+PKGFD_WITH_DRI:=	enable DRI/DRI2 support
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -38,8 +45,6 @@ CONFIGURE_ARGS+=	\
 			--disable-aiglx \
 			--disable-config-hal \
 			--disable-dpms \
-			--disable-dri \
-			--disable-dri2 \
 			--disable-glx \
 			--disable-xace \
 			--disable-xephyr \
@@ -58,6 +63,12 @@ CONFIGURE_ARGS+=	\
 			--with-os-vendor=OpenADK \
 			--with-vendor-web="http://openadk.org"
 
+ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
+CONFIGURE_ARGS+=	--enable-dri --enable-dri2
+else
+CONFIGURE_ARGS+=	--disable-dri --disable-dri2
+endif
+
 post-install:
 	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/etc/X11
 	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin
@@ -78,5 +89,9 @@ post-install:
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
 	-$(CP) $(TOPDIR)/target/$(ADK_TARGET)/xorg.conf \
 		$(IDIR_XORG_SERVER)/etc/X11
+ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
+	${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*dri*.so \
+		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
+endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/xorg-server/patches/patch-hw_xfree86_dri_dri_h

@@ -0,0 +1,11 @@
+--- xorg-server-1.7.5.orig/hw/xfree86/dri/dri.h	2009-08-11 06:00:23.000000000 +0200
++++ xorg-server-1.7.5/hw/xfree86/dri/dri.h	2010-04-21 19:59:22.000000000 +0200
+@@ -38,7 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #include <pciaccess.h>
+ 
+ #include "scrnintstr.h"
+-#include "xf86dri.h"
++#include <X11/dri/xf86dri.h>
+ 
+ typedef int DRISyncType;
+ 

package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c

@@ -0,0 +1,142 @@
+--- xorg-server-1.7.5.orig/hw/xfree86/loader/sdksyms.c	2010-02-16 02:42:49.000000000 +0100
++++ xorg-server-1.7.5/hw/xfree86/loader/sdksyms.c	2010-04-21 19:50:58.000000000 +0200
+@@ -429,8 +429,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &AbortDDX,
+     (void *) &ddxGiveUp,
+     (void *) &TimeSinceLastInputEvent,
+-    (void *) &strlcpy,
+-    (void *) &strlcat,
+     (void *) &LogInit,
+     (void *) &LogClose,
+     (void *) &LogSetParameter,
+@@ -634,7 +632,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &NewCurrentScreen,
+     (void *) &PointerConfinedToScreen,
+     (void *) &GetSpritePosition,
+-    (void *) &XineramaGetCursorScreen,
+     (void *) &GEExtensions,
+     (void *) &GERegisterExtension,
+     (void *) &GEInitEvent,
+@@ -724,7 +721,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &PickPointer,
+     (void *) &PickKeyboard,
+     (void *) &IsInterferingGrab,
+-    (void *) &ReinitializeRootWindow,
+     (void *) &ScreenRestructured,
+     (void *) &ffs,
+     (void *) &AddCallback,
+@@ -874,8 +870,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &CreateLinearGradientPicture,
+     (void *) &CreateRadialGradientPicture,
+     (void *) &CreateConicalGradientPicture,
+-    (void *) &PanoramiXRenderInit,
+-    (void *) &PanoramiXRenderReset,
+     (void *) &PictTransform_from_xRenderTransform,
+     (void *) &xRenderTransform_from_PictTransform,
+     (void *) &PictureTransformPoint,
+@@ -977,25 +971,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &ShmSegType,
+     (void *) &ShmCompletionCode,
+     (void *) &BadShmSegCode,
+-    (void *) &PanoramiXNumScreens,
+-    (void *) &panoramiXdataPtr,
+-    (void *) &PanoramiXPixWidth,
+-    (void *) &PanoramiXPixHeight,
+-    (void *) &PanoramiXTranslateVisualID,
+-    (void *) &PanoramiXConsolidate,
+-    (void *) &PanoramiXCreateConnectionBlock,
+-    (void *) &PanoramiXFindIDByScrnum,
+-    (void *) &XineramaRegisterConnectionBlockCallback,
+-    (void *) &XineramaDeleteResource,
+-    (void *) &XineramaReinitData,
+-    (void *) &XineramaScreenRegions,
+-    (void *) &XRC_DRAWABLE,
+-    (void *) &XRT_WINDOW,
+-    (void *) &XRT_PIXMAP,
+-    (void *) &XRT_GC,
+-    (void *) &XRT_COLORMAP,
+-    (void *) &XineramaVisualsEqualPtr,
+-    (void *) &XineramaGetImageData,
+     (void *) &xf86CreateI2CBusRec,
+     (void *) &xf86DestroyI2CBusRec,
+     (void *) &xf86I2CBusInit,
+@@ -1034,19 +1009,9 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &noTestExtensions,
+     (void *) &dixScreenOrigins,
+     (void *) &ConnectionInfo,
+-    (void *) &DPMSStandbyTime,
+-    (void *) &DPMSSuspendTime,
+-    (void *) &DPMSOffTime,
+-    (void *) &DPMSPowerLevel,
+-    (void *) &DPMSEnabled,
+-    (void *) &DPMSDisabledSwitch,
+-    (void *) &DPMSCapableFlag,
+-    (void *) &PanoramiXExtensionDisabledHack,
+     (void *) &noCompositeExtension,
+     (void *) &noDamageExtension,
+     (void *) &noDbeExtension,
+-    (void *) &noDPMSExtension,
+-    (void *) &noGlxExtension,
+     (void *) &noScreenSaverExtension,
+     (void *) &noMITShmExtension,
+     (void *) &noRRExtension,
+@@ -1054,9 +1019,7 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &noResExtension,
+     (void *) &noXFree86DGAExtension,
+     (void *) &noXFree86DRIExtension,
+-    (void *) &noXFree86VidModeExtension,
+     (void *) &noXFixesExtension,
+-    (void *) &noPanoramiXExtension,
+     (void *) &noXvExtension,
+     (void *) &noDRI2Extension,
+     (void *) &defaultTextFont,
+@@ -1193,7 +1156,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &ProcRRQueryOutputProperty,
+     (void *) &ProcRRConfigureOutputProperty,
+     (void *) &ProcRRDeleteOutputProperty,
+-    (void *) &RRXineramaExtensionInit,
+     (void *) &ExtensionModuleList,
+     (void *) &LoadSubModule,
+     (void *) &UnloadSubModule,
+@@ -1311,8 +1273,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &xf86ReconfigureLayout,
+     (void *) &xf86CVTMode,
+     (void *) &xf86DPMSInit,
+-    (void *) &DPMSSet,
+-    (void *) &DPMSSupported,
+     (void *) &DGAInit,
+     (void *) &DGAReInitModes,
+     (void *) &xf86SetDGAMode,
+@@ -1570,8 +1530,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &DMTModes,
+     (void *) &xf86ConfigFile,
+     (void *) &xf86AllowMouseOpenFail,
+-    (void *) &xf86VidModeDisabled,
+-    (void *) &xf86VidModeAllowNonLocal,
+     (void *) &xf86fpFlag,
+     (void *) &xf86sFlag,
+     (void *) &xf86bsEnableFlag,
+@@ -1935,7 +1893,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &ProcGrabButton,
+     (void *) &ProcUngrabButton,
+     (void *) &ProcRecolorCursor,
+-    (void *) &PostSyntheticMotion,
+     (void *) &SetDefaultFont,
+     (void *) &QueueFontWakeup,
+     (void *) &RemoveFontWakeup,
+@@ -2185,15 +2142,6 @@ _X_HIDDEN void *xorg_symbols[] = {
+     (void *) &SProcUngrabButton,
+     (void *) &SProcUngrabKey,
+     (void *) &SProcWarpPointer,
+-    (void *) &XaceHooks,
+-    (void *) &XaceHook,
+-    (void *) &XaceHookDispatch,
+-    (void *) &XaceHookPropertyAccess,
+-    (void *) &XaceHookSelectionAccess,
+-    (void *) &XaceHookAuditEnd,
+-    (void *) &XaceGetConnectionNumber,
+-    (void *) &XaceIsLocal,
+-    (void *) &XaceCensorImage,
+     (void *) &XkbIndentText,
+     (void *) &XkbAtomText,
+     (void *) &XkbKeysymText,

package/zlib/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		zlib
-PKG_VERSION:=		1.2.3
-PKG_RELEASE:=		6
-PKG_MD5SUM:=		dee233bf288ee795ac96a98cc2e369b6
+PKG_VERSION:=		1.2.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		763c6a0b4ad1cdf5549e3ab3f140f4cb
 PKG_DESCR:=		implementation of the deflate compression method
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.zlib.net
@@ -24,6 +24,10 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,ZLIB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_ZLIB_DEV}+=	zlib-dev-install
+
 CONFIG_STYLE:=		manual
 
 ifeq ($(ADK_NATIVE),)
@@ -34,20 +38,22 @@ ifeq ($(ADK_STATIC),)
 CONFIGURE_OPTS:=	--shared
 endif
 
+#--includedir=$(STAGING_DIR)/usr/include 
 do-configure:
 	(cd $(WRKBUILD); $(COPTS) \
 		CFLAGS="$(TARGET_CFLAGS) -fPIC" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
 		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
 		./configure \
-		--prefix=$(STAGING_DIR)/usr \
-		--includedir=$(STAGING_DIR)/usr/include \
+		--prefix=/usr \
 		$(CONFIGURE_OPTS) \
 	);
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib
 	${CP} ${WRKBUILD}/libz.so* ${IDIR_ZLIB}/usr/lib
+
+zlib-dev-install:
 	${INSTALL_DIR} ${IDIR_ZLIB_DEV}/usr/include
 	${CP} ${WRKBUILD}/*.h ${IDIR_ZLIB_DEV}/usr/include
 

package/zlib/patches/patch-Makefile_in

@@ -1,20 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- zlib-1.2.3.orig/Makefile.in	2005-07-18 04:25:21.000000000 +0200
-+++ zlib-1.2.3/Makefile.in	2008-12-31 16:32:48.417074167 +0100
-@@ -34,6 +34,7 @@ SHAREDLIBV=libz.so.1.2.3
- SHAREDLIBM=libz.so.1
- 
- AR=ar rc
-+ARFLAGS=rc
- RANLIB=ranlib
- TAR=tar
- SHELL=/bin/sh
-@@ -68,7 +69,7 @@ test: all
- 	fi
- 
- libz.a: $(OBJS) $(OBJA)
--	$(AR) $@ $(OBJS) $(OBJA)
-+	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
- 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
- 
- match.o: match.S

package/zlib/patches/patch-configure

@@ -1,38 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- zlib-1.2.3.orig/configure	2005-07-11 22:11:57.000000000 +0200
-+++ zlib-1.2.3/configure	2008-12-31 16:43:55.922789768 +0100
-@@ -73,32 +73,9 @@ esac
- 
- if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
-   CC="$cc"
--  SFLAGS=${CFLAGS-"-fPIC -O3"}
-+  SFLAGS=${CFLAGS-"-fPIC -D_REENTRANT"}
-   CFLAGS="$cflags"
--  case `(uname -s || echo unknown) 2>/dev/null` in
--  Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
--  CYGWIN* | Cygwin* | cygwin* | OS/2* )
--             EXE='.exe';;
--  QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
--         # (alain.bonnefoy@icbt.com)
--                 LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};;
--  HP-UX*)
--         LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
--         case `(uname -m || echo unknown) 2>/dev/null` in
--         ia64)
--                 shared_ext='.so'
--                 SHAREDLIB='libz.so';;
--         *)
--                 shared_ext='.sl'
--                 SHAREDLIB='libz.sl';;
--         esac;;
--  Darwin*)   shared_ext='.dylib'
--             SHAREDLIB=libz$shared_ext
--             SHAREDLIBV=libz.$VER$shared_ext
--             SHAREDLIBM=libz.$VER1$shared_ext
--             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};;
--  *)             LDSHARED=${LDSHARED-"$cc -shared"};;
--  esac
-+  LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"}
- else
-   # find system name and corresponding cc options
-   CC=${CC-cc}

rules.mk

@@ -31,8 +31,10 @@ ADK_TARGET_SUFFIX:=	$(strip $(subst ",, $(ADK_TARGET_SUFFIX)))
 ADK_COMPRESSION_TOOL:=	$(strip $(subst ",, $(ADK_COMPRESSION_TOOL)))
 
 ifeq ($(strip ${ADK_HAVE_DOT_CONFIG}),y)
+ifneq ($(strip $(wildcard $(TOPDIR)/target/$(ADK_TARGET)/target.mk)),)
 include $(TOPDIR)/target/$(ADK_TARGET)/target.mk
 endif
+endif
 
 include $(TOPDIR)/mk/vars.mk
 

scripts/scan-pkgs.sh

@@ -33,6 +33,11 @@ if [[ -n $ADK_NATIVE ]];then
 	fi
 fi
 
+if [[ -n $ADK_PACKAGE_FIREFOX ]]; then
+	NEED_ZIP="$NEED_ZIP firefox"
+	NEED_LIBIDL="$NEED_LIBIDL firefox"
+fi
+
 if [[ -n $ADK_PACKAGE_LIBUSB ]]; then
 	NEED_BISON="$NEED_BISON libusb"
 fi
@@ -158,6 +163,20 @@ if [[ -n $NEED_BISON ]]; then
 	fi
 fi
 
+if [[ -n $NEED_ZIP ]]; then
+	if ! which zip >/dev/null 2>&1; then
+		echo >&2 You need zip to build $NEED_ZIP
+		out=1
+	fi
+fi
+
+if [[ -n $NEED_LIBIDL ]]; then
+	if ! which libIDL-config-2 >/dev/null 2>&1; then
+		echo >&2 You need libIDL-config-2 to build $NEED_LIBIDL
+		out=1
+	fi
+fi
+
 if [[ -n $NEED_GPERF ]]; then
 	if ! which gperf >/dev/null 2>&1; then
 		echo >&2 You need gperf to build $NEED_GPERF

target/Config.in

@@ -128,6 +128,9 @@ config ADK_zaurus
 config ADK_foxg20
 	tristate
 
+config ADK_ibmx40
+	tristate
+
 config ADK_foxboard
 	tristate
 
@@ -183,6 +186,7 @@ config ADK_TARGET
 	default "rb433"  if ADK_rb433
 	default "zaurus"  if ADK_arm
 	default "lemote"  if ADK_lemote
+	default "ibmx40"  if ADK_ibmx40
 	default "wag54g"  if ADK_wag54g
 	default "ag241"  if ADK_ag241
 	default "rescue-x86"  if ADK_x86_rescue
@@ -228,7 +232,7 @@ config ADK_LINUX_ALIX
 	  Support for Alix and Wrap boards.
 	  http://www.pcengines.ch
 
-config ADK_LINUX_ARM_FOXBOARD
+config ADK_LINUX_ARM_FOXG20
 	bool "Foxboard (FOXG20)"
 	select ADK_foxg20
 	select ADK_EABI
@@ -241,11 +245,10 @@ config ADK_LINUX_ARM_FOXBOARD
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_MII
 	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_WATCHDOG
 	help
 	  Support for Foxboard target (foxg20).
 	  http://foxg20.acmesystems.it/doku.php
-	  Status: development
+	  Status: stable
 
 config ADK_LINUX_CRIS_FOXBOARD
 	bool "Foxboard (ETRAX LX100)"
@@ -352,6 +355,22 @@ config ADK_LINUX_TOOLCHAIN
 	help
 	 Toolchain only support
 
+config ADK_LINUX_X86_IBMX40
+	bool "IBM X40 laptop"
+	select ADK_ibmx40
+	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_PCI
+	select ADK_TARGET_WITH_INPUT
+	select ADK_KERNEL_INPUT_KEYBOARD
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_NET_PCI
+	select ADK_KERNEL_NET_ETHERNET
+	help
+	  Support for a IBM X40 laptop.
+	  Status: development
+
 config ADK_LINUX_X86_64_SHUTTLE
 	bool "Shuttle PC"
 	select ADK_shuttle
@@ -507,6 +526,7 @@ config ADK_LINUX_ARM_QEMU
 	select ADK_arm_qemu
 	select ADK_EABI
 	select ADK_KERNEL_INPUT_KEYBOARD
+	select ADK_KERNEL_CRC32
 	help
 	 Qemu support for ARM architecture.
 	 Right now this is optimized for Zaurus PDA spitz. 
@@ -756,13 +776,8 @@ config ADK_TARGET_LIB_UCLIBC
 config ADK_TARGET_LIB_EGLIBC
 	bool "Embedded GNU C library"
 	select ADK_eglibc
-	depends on ADK_LINUX_X86_QEMU || \
-		ADK_LINUX_ARM_QEMU || \
-		ADK_LINUX_MIPS_QEMU || \
-		ADK_LINUX_MIPS64_QEMU || \
-		ADK_LINUX_MIPSEL_QEMU || \
-		ADK_LINUX_MIPS64EL_QEMU || \
-		ADK_LINUX_X86_64_QEMU || \
+	depends on ADK_LINUX_QEMU || \
+		ADK_LINUX_X86_IBMX40 || \
 		ADK_LINUX_X86_ALIX1C || \
 		ADK_LINUX_X86_ALIX2D || \
 		ADK_LINUX_X86_ALIX2D13 || \
@@ -770,9 +785,9 @@ config ADK_TARGET_LIB_EGLIBC
 		ADK_LINUX_MIPS_RB411 || \
 		ADK_LINUX_MIPS_RB433 || \
 		ADK_LINUX_MIPS_RB532 || \
-		ADK_LINUX_RESCUE || \
 		ADK_LINUX_X86_64_SHUTTLE || \
 		ADK_LINUX_MIPS64_LEMOTE || \
+		ADK_LINUX_RESCUE || \
 		ADK_LINUX_TOOLCHAIN 
 	help
 	 http://www.eglibc.org
@@ -780,15 +795,15 @@ config ADK_TARGET_LIB_EGLIBC
 config ADK_TARGET_LIB_GLIBC
 	bool "GNU C library"
 	select ADK_glibc
-	depends on ADK_LINUX_X86_QEMU || \
-		ADK_LINUX_X86_64_QEMU || \
+	depends on ADK_LINUX_QEMU || \
+		ADK_LINUX_X86_IBMX40 || \
 		ADK_LINUX_X86_ALIX1C || \
 		ADK_LINUX_X86_ALIX2D || \
 		ADK_LINUX_X86_ALIX2D13 || \
 		ADK_LINUX_X86_WRAP || \
 		ADK_LINUX_MIPS_RB532 || \
-		ADK_LINUX_RESCUE || \
 		ADK_LINUX_X86_64_SHUTTLE || \
+		ADK_LINUX_RESCUE || \
 		ADK_LINUX_MIPS64_LEMOTE || \
 		ADK_LINUX_TOOLCHAIN 
 	help
@@ -825,6 +840,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 	select ADK_LINUX_INITRAMFS_BUILTIN
 	depends on \
 		ADK_LINUX_QEMU || \
+		ADK_LINUX_X86_IBMX40 || \
 		ADK_LINUX_X86_64_SHUTTLE || \
 		ADK_LINUX_NATIVE || \
 		ADK_LINUX_MIPS64_LEMOTE || \
@@ -855,7 +871,7 @@ config ADK_TARGET_ROOTFS_NFSROOT
 	bool "NFS root"
 	depends on \
 		ADK_LINUX_CRIS_FOXBOARD || \
-		ADK_LINUX_ARM_FOXBOARD || \
+		ADK_LINUX_ARM_FOXG20 || \
 		ADK_LINUX_X86_ALIX1C || \
 		ADK_LINUX_X86_ALIX2D || \
 		ADK_LINUX_X86_ALIX2D13 || \
@@ -876,6 +892,20 @@ config ADK_TARGET_ROOTFS_NFSROOT
 	help
 	  Root filesystem mounted via NFS. (DHCP)
 
+config ADK_TARGET_ROOTFS_USB
+	bool "root on USB stick"
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_KERNEL_USB
+	select ADK_KERNEL_USB_EHCI_HCD
+	select ADK_KERNEL_USB_UHCI_HCD
+	select ADK_KERNEL_USB_STORAGE
+	select ADK_KERNEL_EXT2_FS
+	depends on ADK_LINUX_X86_IBMX40
+	help
+	  Boot target from USB stick.
+
 config ADK_TARGET_ROOTFS_EXT2_BLOCK
 	bool "read-write filesystem for block devices with ext2"
 	depends on \
@@ -883,7 +913,7 @@ config ADK_TARGET_ROOTFS_EXT2_BLOCK
 		ADK_LINUX_X86_ALIX2D || \
 		ADK_LINUX_X86_ALIX2D13 || \
 		ADK_LINUX_X86_WRAP || \
-		ADK_LINUX_ARM_FOXBOARD || \
+		ADK_LINUX_ARM_FOXG20 || \
 		ADK_LINUX_MIPS_RB532
 	select ADK_KERNEL_EXT2_FS
 	select ADK_KERNEL_SCSI
@@ -896,6 +926,7 @@ config ADK_TARGET_ROOTFS_ARCHIVE
 	depends on \
 		ADK_LINUX_QEMU || \
 		ADK_LINUX_XSCALE_ZAURUS || \
+		ADK_LINUX_X86_IBMX40 || \
 		ADK_LINUX_MIPS64_LEMOTE || \
 		ADK_LINUX_X86_64_SHUTTLE
 	help
@@ -903,7 +934,8 @@ config ADK_TARGET_ROOTFS_ARCHIVE
 
 config ADK_TARGET_ROOTFS_ENCRYPTED
 	bool "Encrypted read-write root filesystem"
-	depends on ADK_LINUX_MIPS64_LEMOTE
+	depends on ADK_LINUX_MIPS64_LEMOTE || \
+		ADK_LINUX_X86_IBMX40
 	select ADK_LINUX_INITRAMFS_BUILTIN
 	select ADK_PACKAGE_CRYPTINIT
 	select ADK_KERNEL_BLK_DEV_DM

target/bulk.lst

@@ -3,6 +3,7 @@ foxboard	uclibc		nfsroot
 foxg20		uclibc		nfsroot
 rb532		uclibc		nfsroot
 rb532		eglibc		nfsroot
+rb532		glibc		nfsroot
 alix1c		uclibc		nfsroot
 alix1c		eglibc		nfsroot
 alix1c		glibc		nfsroot
@@ -17,10 +18,13 @@ wrap		eglibc		nfsroot
 wrap		glibc		nfsroot
 arm_qemu	uclibc		archive
 arm_qemu	eglibc		archive
+arm_qemu	glibc		archive
 mips_qemu	uclibc		archive
 mips_qemu	eglibc		archive
+mips_qemu	glibc		archive
 mipsel_qemu	uclibc		archive
 mipsel_qemu	eglibc		archive
+mipsel_qemu	glibc		archive
 x86_qemu	uclibc		archive
 x86_qemu	eglibc		archive
 x86_qemu	glibc		archive

target/ibmx40/Makefile

@@ -0,0 +1,81 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+include $(TOPDIR)/mk/kernel.mk
+include $(TOPDIR)/mk/modules.mk
+include $(TOPDIR)/mk/kernel-build.mk
+include $(TOPDIR)/mk/image.mk
+
+kernel-install:
+	@cp $(LINUX_DIR)/arch/x86/boot/bzImage $(TARGET_DIR)/boot/vmlinuz-adk
+
+createinit:
+	@-rm $(LINUX_DIR)/usr/initramfs_data.cpio.*
+	$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_COMPRESSION_LZMA=y' >> $(LINUX_DIR)/.config
+	echo N |$(MAKE) -C $(LINUX_DIR) V=0 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
+		CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) 
+	$(MAKE) -C $(LINUX_DIR) V=0 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
+		CC="$(TARGET_CC)" $(MAKE_TRACE)
+	$(CP) $(LINUX_DIR)/arch/x86/boot/compressed/vmlinux \
+		$(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+
+createinitcrypt:
+	$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="./initramfs_list"#' $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
+	echo N |$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
+		CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) 
+	$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
+		CC="$(TARGET_CC)" $(MAKE_TRACE)
+	@cp $(LINUX_DIR)/arch/x86/boot/compressed/vmlinux \
+		$(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+
+ifeq ($(FS),archive)
+imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
+	@echo 'Login as user root with password linux123 via ssh or console'
+endif
+
+ifeq ($(FS),usb)
+imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
+	@echo "To install everything to USB use scripts/install.sh"
+	@echo 'Login as user root with password linux123 via ssh or console'
+endif
+
+ifeq ($(FS),initramfs-piggyback)
+imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit
+	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
+	@echo 'Login as user root with password linux123 via ssh or console'
+endif
+
+ifeq ($(FS),encrypted)
+imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt
+	@echo 'The kernel+cryptinit file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
+	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSUSERTARBALL)"
+	@echo 'Boot your IBM X40 via NFS or USB.'
+	@echo 'Then create at least three partitions with fdisk:'
+	@echo '/dev/sda1 (ext2)'
+	@echo '/dev/sda2 (encrypted root)'
+	@echo '/dev/sda3 (swap)'
+	@echo 'mkdir /mnt/{boot,root}'
+	@echo 'mke2fs /dev/sda1'
+	@echo 'cryptsetup luksFormat /dev/sda2'
+	@echo 'cryptsetup luksFormat /dev/sda3'
+	@echo 'cryptsetup luksOpen /dev/sda2 root'
+	@echo 'cryptsetup luksOpen /dev/sda3 swap'
+	@echo 'mkfs.xfs /dev/mapper/root'
+	@echo 'mkswap /dev/mapper/swap'
+	@echo 'mount /dev/sda1 /mnt/boot'
+	@echo 'mount /dev/mapper/crypt /mnt/root'
+	@echo 'mkdir /mnt/boot/boot'
+	@echo 
+	@echo 'Copy $(ROOTFSUSERTARBALL) via scp to /mnt/root and extract it'
+	@echo 'cd /mnt/root ; gunzip $(ROOTFSUSERTARBALL); tar xpvf $(ROOTFSUSERTARBALL)'
+	@echo 'cd /mnt/root ; mknod -m 644 console c 5 1'
+	@echo 'Login as user root with password linux123 via ssh or console'
+endif

target/ibmx40/files/etc/inittab

@@ -0,0 +1,4 @@
+::sysinit:/etc/init.d/rcS
+::shutdown:/etc/init.d/rcK
+tty1::respawn:/sbin/getty -i -L tty1 115200 vt100
+

target/ibmx40/files/etc/mdev.conf

@@ -0,0 +1,14 @@
+rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
+device-mapper 0:0 660 @mkdir /dev/mapper
+tun 0:0 660 >net/tun
+null 0:0 777
+zero 0:0 666
+u?random 0:0 644
+console 0:0 0600
+kmem 0:0 000
+mem 0:0 0640
+port 0:0 0640
+ptmx 0:0 666
+tty 0:0 0666
+ttyS* 0:0 640
+.* 0:0 644 @/lib/mdev/init

target/ibmx40/files/etc/network/interfaces

@@ -0,0 +1,5 @@
+auto lo
+iface lo inet loopback
+
+auto eth0
+iface eth0 inet dhcp