full build on Darwin fixes

94 files changed, 8073 insertions, 1197 deletions

diff --git a/mk/mirrors.mk b/mk/mirrors.mk
index 6fcc6c01e..818a6ead6 100644
--- a/mk/mirrors.mk
+++ b/mk/mirrors.mk
@@ -44,8 +44,6 @@ MASTER_SITE_GNU?=	\
   	ftp://ftp.sunet.se/pub/gnu/ \
 
 MASTER_SITE_SOURCEFORGE?=	\
-	http://puzzle.dl.sourceforge.net/sourceforge/ \
-	http://optusnet.dl.sourceforge.net/sourceforge/ \
 	http://heanet.dl.sourceforge.net/sourceforge/ \
 	http://jaist.dl.sourceforge.net/sourceforge/ \
 	http://nchc.dl.sourceforge.net/sourceforge/ \
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index a4fa983e3..092cd03ac 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bluez
-PKG_VERSION:=		4.96
+PKG_VERSION:=		4.101
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		296111afac49e3f9035085ac14daf518
+PKG_MD5SUM:=		fb42cb7038c380eb0e2fa208987c96ad
 PKG_DESCR:=		bluetooth libraries and applications
 PKG_SECTION:=		bluetooth
 PKG_DEPENDS:=		kmod-bt libusb glib dbus
diff --git a/package/bluez/patches/patch-ltmain_sh b/package/bluez/patches/patch-ltmain_sh
deleted file mode 100644
index 650de61e1..000000000
--- a/package/bluez/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- bluez-4.89.orig/ltmain.sh	2011-02-20 15:49:33.000000000 +0100
-+++ bluez-4.89/ltmain.sh	2011-03-03 22:50:01.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/bluez/patches/patch-scripts_bluetooth_rules b/package/bluez/patches/patch-scripts_bluetooth_rules
deleted file mode 100644
index 348da2486..000000000
--- a/package/bluez/patches/patch-scripts_bluetooth_rules
+++ /dev/null
@@ -1,9 +0,0 @@
---- bluez-4.89.orig/scripts/bluetooth.rules	2011-02-20 15:49:58.000000000 +0100
-+++ bluez-4.89/scripts/bluetooth.rules	2011-03-03 22:48:19.000000000 +0100
-@@ -1,4 +1,4 @@
- # Run helper every time a Bluetooth device appears
- # On remove actions, bluetoothd should go away by itself
--ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/usr/local/sbin/bluetoothd --udev"
--ACTION=="change", SUBSYSTEM=="bluetooth", RUN+="/usr/local/sbin/bluetoothd --udev"
-+ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/bluetoothd --udev"
-+ACTION=="change", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/bluetoothd --udev"
diff --git a/package/bzr/Makefile b/package/bzr/Makefile
index a1af88c2e..c6b3bcb5a 100644
--- a/package/bzr/Makefile
+++ b/package/bzr/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		bzr
 PKG_VERSION:=		2.5.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ce62de3329096e384967e5f1a65658db
+PKG_MD5SUM:=		ac5079858364a046071000d5cdccb67b
 PKG_DESCR:=		bazaar
 PKG_SECTION:=		scm
 PKG_BUILDDEP:=		python2
diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile
index 2ded1f78b..940e1772d 100644
--- a/package/conntrack-tools/Makefile
+++ b/package/conntrack-tools/Makefile
@@ -4,13 +4,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		conntrack-tools
-PKG_VERSION:=		1.0.0
+PKG_VERSION:=		1.2.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		5add24d4761baf17af630d5627a71752
+PKG_MD5SUM:=		48d414cb7a354001babf184ae6c16db9
 PKG_DESCR:=		Connection tracking userspace tools
 PKG_SECTION:=		firewall
-PKG_DEPENDS:=		libnetfilter-conntrack
-PKG_BUILDDEP:=		libnetfilter_conntrack
+PKG_DEPENDS:=		libnetfilter-conntrack libnetfilter-cttimeout libmnl
+PKG_BUILDDEP:=		libnetfilter_conntrack libnetfilter_cttimeout libmnl
 PKG_URL:=		http://conntrack-tools.netfilter.org/
 PKG_SITES:=		http://www.netfilter.org/projects/conntrack-tools/files/
 
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index c50c849a6..d7991c2d7 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -20,7 +20,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DANSGUARDIAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc
+LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc -lgcc_s
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
 LIBRARIES+=-lssp
 endif
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index de7c1ba29..fd30af5c2 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DILLO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	-liconv
+TARGET_LDFLAGS+=	-liconv -lpng
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_DILLO)/usr/bin
diff --git a/package/dmidecode/patches/patch-Makefile.orig b/package/dmidecode/patches/patch-Makefile.orig
deleted file mode 100644
index cf37262cb..000000000
--- a/package/dmidecode/patches/patch-Makefile.orig
+++ /dev/null
@@ -1,22 +0,0 @@
---- dmidecode-2.11.orig/Makefile	2010-10-11 16:08:16.000000000 +0200
-+++ dmidecode-2.11/Makefile	2011-10-17 19:22:27.000000000 +0200
-@@ -12,8 +12,8 @@
- #   (at your option) any later version.
- #
- 
--CC      = gcc
--CFLAGS  = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
-+CC      ?= gcc
-+CFLAGS  ?= -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
-           -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
- #CFLAGS += -DBIGENDIAN
- #CFLAGS += -DALIGNMENT_WORKAROUND
-@@ -26,7 +26,7 @@ CFLAGS += -O2
- LDFLAGS =
- 
- DESTDIR =
--prefix  = /usr/local
-+prefix  = /usr
- sbindir = $(prefix)/sbin
- mandir  = $(prefix)/share/man
- man8dir = $(mandir)/man8
diff --git a/package/drbd/Makefile b/package/drbd/Makefile
index c22d385ac..b8d0cba91 100644
--- a/package/drbd/Makefile
+++ b/package/drbd/Makefile
@@ -4,20 +4,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		drbd
-PKG_VERSION:=		8.3.10
+PKG_VERSION:=		8.4.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		7d80edc2da10de5bfffe0ca9e9996fed
+PKG_MD5SUM:=		3af0cc49ee0b5005ea108c5ba92aa755
 PKG_DESCR:=		DRBD admin tools
 PKG_SECTION:=		fs
 PKG_URL:=		http://www.drbd.org/
-PKG_SITES:=		http://oss.linbit.com/drbd/8.3/
+PKG_SITES:=		http://oss.linbit.com/drbd/8.4/
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DRBD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+XAKE_FLAGS+=		GENETLINK_H=$(STAGING_DIR)/usr/include/linux/genetlink.h
 CONFIGURE_ARGS+=	--with-distro=generic \
 			--with-pacemaker \
+			--without-heartbeat \
 			--without-km \
 			--without-xen \
 			--without-udev
diff --git a/package/drbd/patches/patch-configure b/package/drbd/patches/patch-configure
index 67bff21ce..ac69badd6 100644
--- a/package/drbd/patches/patch-configure
+++ b/package/drbd/patches/patch-configure
@@ -1,6 +1,6 @@
---- drbd-8.3.10.orig/configure	2011-01-28 12:17:35.000000000 +0100
-+++ drbd-8.3.10/configure	2011-05-25 12:54:02.000000000 +0200
-@@ -3368,7 +3368,7 @@ fi
+--- drbd-8.4.1.orig/configure	2011-12-20 12:43:14.000000000 +0100
++++ drbd-8.4.1/configure	2012-07-24 23:02:23.000000000 +0200
+@@ -3389,7 +3389,7 @@ fi
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/package/drbd/patches/patch-drbd_Makefile b/package/drbd/patches/patch-drbd_Makefile
index 62f61cab4..753454cd1 100644
--- a/package/drbd/patches/patch-drbd_Makefile
+++ b/package/drbd/patches/patch-drbd_Makefile
@@ -1,19 +1,13 @@
---- drbd-8.3.10.orig/drbd/Makefile	2011-01-26 14:57:59.000000000 +0100
-+++ drbd-8.3.10/drbd/Makefile	2011-10-23 10:22:50.000000000 +0200
-@@ -65,7 +65,6 @@ else
- 
-   # for some reason some of the commands below only work correctly in bash,
-   # and not in e.g. dash. I'm too lazy to fix it to be compatible.
--  SHELL=/bin/bash
- 
-   DRBDSRC := $(shell pwd)
- 
-@@ -133,7 +132,7 @@ else
+--- drbd-8.4.1.orig/drbd/Makefile	2011-11-17 10:01:55.000000000 +0100
++++ drbd-8.4.1/drbd/Makefile	2012-07-24 23:03:11.000000000 +0200
+@@ -116,8 +116,8 @@ else
+ 	else									\
  		grep return $@ ;						\
  	fi ;									\
- 	echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}";	\
+-	echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}";	\
 -	mv --force $@.new $@
-+	mv -f $@.new $@
++	printf "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}";	\
++	mv $@.new $@
  
    kbuild: drbd_buildtag.c
  	@rm -f .drbd_kernelrelease*
diff --git a/package/drbd/patches/patch-drbd_drbd_buildtag_c b/package/drbd/patches/patch-drbd_drbd_buildtag_c
index 425a04abe..86dd50121 100644
--- a/package/drbd/patches/patch-drbd_drbd_buildtag_c
+++ b/package/drbd/patches/patch-drbd_drbd_buildtag_c
@@ -1,9 +1,11 @@
---- drbd-8.3.10.orig/drbd/drbd_buildtag.c	2011-01-28 12:17:35.000000000 +0100
-+++ drbd-8.3.10/drbd/drbd_buildtag.c	2011-05-23 17:11:52.000000000 +0200
+--- drbd-8.4.1.orig/drbd/drbd_buildtag.c	2011-12-20 12:43:15.000000000 +0100
++++ drbd-8.4.1/drbd/drbd_buildtag.c	2012-07-24 23:03:27.000000000 +0200
 @@ -3,5 +3,5 @@
  const char *drbd_buildtag(void)
  {
- 	return "GIT-hash: 5c0b0469666682443d4785d90a2c603378f9017b"
--		" build by phil@fat-tyre, 2011-01-28 12:17:35";
-+		" build by wbx@neon, 2011-05-23 17:11:52";
- }
+ 	return "GIT-hash: 91b4c048c1a0e06777b5f65d312b38d47abaea80"
+-		" build by phil@fat-tyre, 2011-12-20 12:43:15";
+-}
++		" build by wbx@neon, 2012-07-24 23:03:27";
++}
+\ No newline at end of file
diff --git a/package/drbd/patches/patch-user_Makefile_in b/package/drbd/patches/patch-user_Makefile_in
deleted file mode 100644
index 9471b2aa0..000000000
--- a/package/drbd/patches/patch-user_Makefile_in
+++ /dev/null
@@ -1,24 +0,0 @@
---- drbd-8.3.10.orig/user/Makefile.in	2011-01-26 14:57:59.000000000 +0100
-+++ drbd-8.3.10/user/Makefile.in	2011-05-23 17:11:50.000000000 +0200
-@@ -73,7 +73,7 @@ drbd_strings.c: ../drbd/drbd_strings.c
- 	cp $^ $@
- 
- drbdadm: $(drbdadm-obj)
--	$(CC) -o $@ $^
-+	$(CC) $(LDFLAGS) -o $@ $^
- 
- drbdadm_scanner.c: drbdadm_scanner.fl drbdadm_parser.h
- 	flex -s -odrbdadm_scanner.c drbdadm_scanner.fl
-@@ -82,10 +82,10 @@ drbdm