Merge branch 'master' of git+ssh://openadk.org/git/openadk

7 files changed, 39 insertions, 12 deletions

diff --git a/package/busybox/patches/015-path_h_musl.patch b/package/busybox/patches/015-path_h_musl.patch
new file mode 100644
index 000000000..a3e581795
--- /dev/null
+++ b/package/busybox/patches/015-path_h_musl.patch
@@ -0,0 +1,11 @@
+diff -Nur busybox-1.20.2.orig/networking/ifplugd.c busybox-1.20.2/networking/ifplugd.c
+--- busybox-1.20.2.orig/networking/ifplugd.c	2012-07-02 16:08:25.000000000 +0200
++++ busybox-1.20.2/networking/ifplugd.c	2013-09-22 11:43:24.000000000 +0200
+@@ -34,6 +34,7 @@
+ #include "libbb.h"
+ 
+ #include "fix_u32.h"
++#include <paths.h>
+ #include <linux/if.h>
+ #include <linux/mii.h>
+ #include <linux/ethtool.h>
diff --git a/package/easy-rsa/Makefile b/package/easy-rsa/Makefile
index 9b350cd92..19da2d8f8 100644
--- a/package/easy-rsa/Makefile
+++ b/package/easy-rsa/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		easy-rsa
-PKG_VERSION:=		2.0
+PKG_VERSION:=		2.0.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0937fb2f91d534d4fb961e047f714946
+PKG_MD5SUM:=		cd55a94b0785a0b1e1076b4dc018d531
 PKG_DESCR:=		openssl ca scripts
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		openssl-util
diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in
index 70d1a3394..a65437985 100644
--- a/package/libX11/patches/patch-src_util_Makefile_in
+++ b/package/libX11/patches/patch-src_util_Makefile_in
@@ -1,5 +1,5 @@
 --- libX11-1.5.0.orig/src/util/Makefile.in	2012-06-02 08:37:33.000000000 +0200
-+++ libX11-1.5.0/src/util/Makefile.in	2013-04-29 18:01:13.000000000 +0200
++++ libX11-1.5.0/src/util/Makefile.in	2013-10-04 09:47:19.000000000 +0200
 @@ -144,7 +144,7 @@ LD = @LD@
  LDFLAGS = @LDFLAGS_FOR_BUILD@
  LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
@@ -9,15 +9,17 @@
  LIBTOOL = @LIBTOOL@
  LIB_MAN_DIR = @LIB_MAN_DIR@
  LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
-@@ -266,7 +266,6 @@ top_build_prefix = @top_build_prefix@
+@@ -265,9 +265,6 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- makekeys_CFLAGS = \
+-makekeys_CFLAGS = \
 -	$(X11_CFLAGS) \
- 	$(CWARNFLAGS)
+-	$(CWARNFLAGS)
  
  makekeys_CPPFLAGS = \
-@@ -355,18 +354,18 @@ distclean-compile:
+ 	-I$(top_srcdir)/include
+@@ -355,18 +352,18 @@ distclean-compile:
  @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
  
  makekeys-makekeys.o: makekeys.c
diff --git a/package/libnotify/Makefile b/package/libnotify/Makefile
index 2be5cb7fc..038a3dd85 100644
--- a/package/libnotify/Makefile
+++ b/package/libnotify/Makefile
@@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libnotify
 PKG_VERSION:=		0.4.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		472e2c1f808848365572a9b024d9e8f5
 PKG_DESCR:=		notify library
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		gtk+
+PKG_BUILDDEP:=		gtk+ dbus-glib
 PKG_URL:=		http://www.galago-project.org/
 PKG_SITES:=		http://www.galago-project.org/files/releases/source/libnotify/
 PKG_NEED_CXX:=		1
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index fddf9656b..380003b4f 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -8,9 +8,13 @@ else
 ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
 include ${TOPDIR}/toolchain/eglibc/Makefile.inc
 else
+ifeq ($(ADK_TARGET_LIB_MUSL),y)
+include ${TOPDIR}/toolchain/musl/Makefile.inc
+else
 include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif
 endif
+endif
 
 PKG_NAME:=		libstdcxx
 PKG_DESCR:=		C++ support library
@@ -35,7 +39,7 @@ else
 	(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.17 libstdc++.so.6)
 	(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.17 libstdc++.so)
 	(cd ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/; ln -sf libstdc++.so.6.0.17 libstdc++.so)
-	$(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
+	$(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so.6.0.17 ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
 	-@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py
 endif
 
diff --git a/package/tzdata/patches/patch-Makefile b/package/tzdata/patches/patch-Makefile
index 1938011c5..556028d22 100644
--- a/package/tzdata/patches/patch-Makefile
+++ b/package/tzdata/patches/patch-Makefile
@@ -1,5 +1,5 @@
 --- w-tzdata-2013d-1.orig/Makefile	2013-07-05 16:38:01.000000000 +0200
-+++ w-tzdata-2013d-1/Makefile	2013-08-14 12:58:49.000000000 +0200
++++ w-tzdata-2013d-1/Makefile	2013-10-04 11:29:22.000000000 +0200
 @@ -231,7 +231,7 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-co
  # before the first Monday in January when a "%V" format is used and January 1
  # falls on a Friday, Saturday, or Sunday.
@@ -18,7 +18,7 @@
  
  # The name of a Posix-compliant `awk' on your system.
  AWK=		awk
-@@ -330,7 +330,7 @@ ENCHILADA=	$(COMMON) $(DOCS) $(SOURCES)
+@@ -330,7 +330,7 @@ ENCHILADA=	$(COMMON) $(DOCS) $(SOURCES) 
  
  SHELL=		/bin/sh
  
diff --git a/package/tzdata/patches/patch-localtime_c b/package/tzdata/patches/patch-localtime_c
new file mode 100644
index 000000000..62ddda50c
--- /dev/null
+++ b/package/tzdata/patches/patch-localtime_c
@@ -0,0 +1,10 @@
+--- w-tzdata-2013d-1.orig/localtime.c	2013-05-28 06:26:18.000000000 +0200
++++ w-tzdata-2013d-1/localtime.c	2013-10-04 11:35:35.000000000 +0200
+@@ -10,6 +10,7 @@
+ 
+ /*LINTLIBRARY*/
+ 
++#include <stdint.h>
+ #include "private.h"
+ #include "tzfile.h"
+ #include "fcntl.h"