resolve merge conflict

84 files changed, 6008 insertions, 4980 deletions

diff --git a/package/Config.in b/package/Config.in
index e5ffd2e07..37f1e4e92 100644
--- a/package/Config.in
+++ b/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"
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
new file mode 100644
index 000000000..097331cde
--- /dev/null
+++ b/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
diff --git a/package/MesaLib/patches/patch-src_glsl_Makefile_template b/package/MesaLib/patches/patch-src_glsl_Makefile_template
new file mode 100644
index 000000000..bcb3256d6
--- /dev/null
+++ b/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
+ 
diff --git a/package/MesaLib/patches/patch-src_glsl_apps_Makefile b/package/MesaLib/patches/patch-src_glsl_apps_Makefile
new file mode 100644
index 000000000..175965dc5
--- /dev/null
+++ b/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 #####
diff --git a/package/MesaLib/patches/patch-src_mesa_drivers_dri_savage_savageioctl_c b/package/MesaLib/patches/patch-src_mesa_drivers_dri_savage_savageioctl_c
new file mode 100644
index 000000000..1d72208c7
--- /dev/null
+++ b/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)
diff --git a/package/MesaLib/patches/patch-src_mesa_main_imports_c b/package/MesaLib/patches/patch-src_mesa_main_imports_c
new file mode 100644
index 000000000..71c832adf
--- /dev/null
+++ b/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);
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 595bae027..425683f24 100644
--- a/package/asterisk/Makefile
+++ b/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}))
diff --git a/package/asterisk/files/asterisk.conffiles b/package/asterisk/files/asterisk.conffiles
index 2cb705f9c..55949fde7 100644
--- a/package/asterisk/files/asterisk.conffiles
+++ b/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
diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile
index b7517b3b3..3e40e7a15 100644
--- a/package/autoconf/Makefile
+++ b/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/
diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot
index 2ef6538e0..ed55ccc88 100644
--- a/package/base-files/src/etc/init.d/boot
+++ b/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
 
diff --git a/package/base-files/src/etc/sysctl.conf b/package/base-files/src/etc/sysctl.conf
index 73260cf9d..f45e98632 100644
--- a/package/base-files/src/etc/sysctl.conf
+++ b/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
diff --git a/package/bc/Makefile b/package/bc/Makefile
index dbe613550..8912693c0 100644
--- a/package/bc/Makefile
+++ b/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/
 
diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile
index 0496f58fb..c923305b2 100644
--- a/package/bogofilter/Makefile
+++ b/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
 CONF