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

package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c

@@ -1,5 +1,5 @@
 --- Mesa-8.0.5.orig/src/gallium/auxiliary/util/u_debug_symbol.c	2012-10-24 21:03:59.000000000 +0200
-+++ Mesa-8.0.5/src/gallium/auxiliary/util/u_debug_symbol.c	2013-09-25 17:45:12.000000000 +0200
++++ Mesa-8.0.5/src/gallium/auxiliary/util/u_debug_symbol.c	2013-10-08 12:13:11.000000000 +0200
 @@ -151,23 +151,6 @@ debug_symbol_name_dbghelp(const void *ad
  }
  #endif
@@ -24,3 +24,16 @@
  void
  debug_symbol_name(const void *addr, char* buf, unsigned size)
  {
+@@ -176,12 +159,6 @@ debug_symbol_name(const void *addr, char
+    if(buf[0])
+       return;
+ #endif
+-
+-#ifdef __GLIBC__
+-   debug_symbol_name_glibc(addr, buf, size);
+-   if(buf[0])
+-      return;
+-#endif
+ 
+    util_snprintf(buf, size, "%p", addr);
+    buf[size - 1] = 0;

package/eglibc/Makefile

@@ -47,7 +47,8 @@ ifeq ($(ADK_LOCALES),y)
 endif
 endif
 	${INSTALL_DIR} $(IDIR_EGLIBC)/etc 
-	${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/{gai,nscd,nsswitch}.conf ${IDIR_EGLIBC}/etc
+	${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_EGLIBC}/etc
+	${INSTALL_DATA} ./files/nssswitch.conf ${IDIR_EGLIBC}/etc
 
 eglibc-static-install:
 	${INSTALL_DIR} $(IDIR_EGLIBC_STATIC)/usr/lib

package/eglibc/files/nsswitch.conf

@@ -0,0 +1,20 @@
+# /etc/nsswitch.conf
+#
+# Example configuration of GNU Name Service Switch functionality.
+#
+
+passwd:		files
+group:		files
+initgroups:	files
+shadow:		files
+gshadow:	files
+
+hosts:		files dns
+networks:	files dns
+
+protocols:	files
+services:	files
+ethers:		files
+rpc:		files
+
+netgroup:	files

package/firefox/Makefile

@@ -4,17 +4,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		5.0.1
+PKG_VERSION:=		24.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6d1f43e402cec84459a3d7f950bd5192
+PKG_MD5SUM:=		06a4c0fe8d3a979aea2fce8d0fdbf328
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk libpng libtiff libxcursor libffi
-PKG_DEPENDS+=		nspr nss libjpeg libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme
-PKG_DEPENDS+=		libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf libintl librt libgcc
-PKG_DEPENDS+=		harfbuzz
-PKG_BUILDDEP:=		alsa-lib dbus-glib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf
-PKG_BUILDDEP+=		nspr nss jpeg libXt fontconfig sqlite atk libpng hicolor-icon-theme
+PKG_DEPENDS:=		libpthread alsa-lib glib libgtk libpng libtiff libxcursor libffi
+PKG_DEPENDS+=		nspr nss libjpeg-turbo libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme
+PKG_DEPENDS+=		libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf librt libgcc
+PKG_DEPENDS+=		harfbuzz mesalib libvpx libbz2 ca-certificates
+PKG_BUILDDEP:=		alsa-lib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf
+PKG_BUILDDEP+=		nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme
+PKG_BUILDDEP+=		libvpx pango gettext-tiny bzip2
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
 PKG_NOPARALLEL:=	1
@@ -31,6 +32,13 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq ($(ADK_DEBUG),y)
+CONFIGURE_ARGS+=	--enable-debug --enable-logging
+else
+CONFIGURE_ARGS+=	--disable-debug --disable-logging
+endif
+
+
 CONFIGURE_ENV+=		CROSS_COMPILE=1 \
 			HOST_CC="${CC_FOR_BUILD}" \
 			HOST_CPPFLAGS="${CPPFLAGS_FOR_BUILD}" \
@@ -45,27 +53,36 @@ CONFIGURE_ENV+=		CROSS_COMPILE=1 \
 			ac_cv_sqlite_secure_delete=yes \
 			ac_cv_sqlite_threadsafe=yes \
 			ac_cv_sqlite_enable_fts3=yes \
-			ac_cv_sqlite_enable_unlock_notify=yes \
-			ac_cv_thread_keyword=no \
-			ac_cv_sizeof_int_p=4
+			ac_cv_sqlite_enable_unlock_notify=yes
 CONFIGURE_ARGS+=	--enable-application=browser \
 			--enable-official-branding \
 			--with-system-zlib \
+			--with-system-bz2 \
+			--with-system-png \
 			--with-system-cairo \
 			--with-system-pixman \
 			--with-system-jpeg \
 			--with-system-nss \
 			--with-system-nspr \
+			--with-system-pango \
+			--with-system-libvpx \
+			--enable-system-ffi \
 			--enable-system-sqlite \
+			--disable-libnotify \
 			--with-libIDL-prefix=${STAGING_TARGET_DIR}/usr \
 			--with-glib-prefix=${STAGING_TARGET_DIR}/usr \
+			--enable-chrome-format=jar \
+			--enable-necko-protocols=all \
 			--enable-libxul \
-			--disable-libnotify \
+			--enable-alsa \
+			--disable-pulseaudio \
+			--disable-gstreamer \
+			--disable-gio \
+			--disable-gconf \
 			--disable-accessibility \
 			--disable-smil \
 			--disable-dbus \
-			--disable-debug \
-			--disable-logging \
+			--disable-gamepad \
 			--disable-strip \
 			--disable-install-strip \
 			--disable-tests \
@@ -73,6 +90,7 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-static \
 			--disable-gnomeui \
 			--disable-gnomevfs \
+			--disable-gstreamer \
 			--disable-optimize \
 			--disable-necko-wifi \
 			--disable-svg \
@@ -80,14 +98,18 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-jemalloc \
 			--disable-crashreporter \
 			--disable-updater \
-			--disable-libjpeg-turbo \
 			--disable-xpcom-fastload \
-			--disable-elf-hack
+			--disable-url-classifier \
+			--disable-safe-browsing \
+			--disable-elf-hack 
 
 TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
 XAKE_FLAGS+=		OS_RELEASE="2.6" HOST_CC=$(CC_FOR_BUILD) HOST_LDFLAGS=$(LDFLAGS_FOR_BUILD)
 XAKE_FLAGS+=            ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS} -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC"
 
+pre-build:
+	-mkdir ${WRKBUILD}/js/src/.deps
+
 firefox-install:
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib

package/firefox/patches/patch-configure

@@ -1,21 +0,0 @@
---- mozilla-release.orig/configure	2011-07-08 03:30:27.000000000 +0200
-+++ mozilla-release/configure	2013-04-04 16:11:25.000000000 +0200
-@@ -12617,7 +12617,7 @@ fi
- 
- if test "x$ac_cv_va_val_copy" = "xno"; then
-    cat >> confdefs.h <<\EOF
--#define HAVE_VA_LIST_AS_ARRAY 1
-+#define HAVE_VA_LIST_AS_ARRAY 0
- EOF
- 
- fi
-@@ -23504,6 +23504,9 @@ fi
-     fi
- fi
- 
-+HOST_LIBIDL_CFLAGS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --cflags`
-+HOST_LIBIDL_LIBS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${BUILD_LIBIDL_CONFIG} --libs`
-+
- if test -n "$CROSS_COMPILE"; then
-     case "$target" in
-     *-mingw*)

package/firefox/patches/patch-content_base_public_nsContentUtils_h

@@ -1,11 +0,0 @@
---- mozilla-release.orig/content/base/public/nsContentUtils.h	2011-07-08 03:15:15.000000000 +0200
-+++ mozilla-release/content/base/public/nsContentUtils.h	2011-07-29 15:50:34.000000000 +0200
-@@ -1928,7 +1928,7 @@ inline NS_HIDDEN_(PRBool) NS_FloatIsFini
- #ifdef WIN32
-   return _finite(f);
- #else
--  return finite(f);
-+  return isfinite(f);
- #endif
- }
- 

package/firefox/patches/patch-content_media_nsAudioStream_cpp

@@ -1,11 +0,0 @@
---- mozilla-release.orig/content/media/nsAudioStream.cpp	2011-07-08 03:15:16.000000000 +0200
-+++ mozilla-release/content/media/nsAudioStream.cpp	2011-07-29 15:50:34.000000000 +0200
-@@ -566,7 +566,7 @@ PRInt64 nsAudioStreamLocal::GetSampleOff
- #if defined(XP_WIN)
-   positionType = SA_POSITION_WRITE_HARDWARE;
- #endif
--  PRInt64 position = 0;
-+  int64_t position = 0;
-   if (sa_stream_get_position(static_cast<sa_stream_t*>(mAudioHandle),
-                              positionType, &position) == SA_SUCCESS) {
-     return position / sizeof(short);

package/firefox/patches/patch-ipc_chromium_src_base_debug_util_posix_cc

@@ -1,35 +0,0 @@
---- mozilla-2.0.orig/ipc/chromium/src/base/debug_util_posix.cc	2011-03-19 00:33:46.000000000 +0100
-+++ mozilla-2.0/ipc/chromium/src/base/debug_util_posix.cc	2011-04-24 07:55:10.000000000 +0200
-@@ -11,10 +11,6 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
--#ifndef ANDROID
--#include <execinfo.h>
--#include <sys/sysctl.h>
--#endif
- 
- #include "base/basictypes.h"
- #include "base/eintr_wrapper.h"
-@@ -119,11 +115,7 @@ StackTrace::StackTrace() {
-   const int kMaxCallers = 256;
- 
-   void* callers[kMaxCallers];
--#ifndef ANDROID
--  int count = backtrace(callers, kMaxCallers);
--#else
-   int count = 0;
--#endif
- 
-   // Though the backtrace API man page does not list any possible negative
-   // return values, we still still exclude them because they would break the
-@@ -138,9 +130,6 @@ StackTrace::StackTrace() {
- 
- void StackTrace::PrintBacktrace() {
-   fflush(stderr);
--#ifndef ANDROID
--  backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO);
--#endif
- }
- 
- void StackTrace::OutputToStream(std::ostream* os) {

package/firefox/patches/patch-ipc_chromium_src_base_file_util_cc

@@ -1,12 +0,0 @@
---- mozilla-release.orig/ipc/chromium/src/base/file_util.cc	2011-07-08 03:15:22.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/file_util.cc	2012-10-03 13:44:11.000000000 +0200
-@@ -8,9 +8,7 @@
- #include <io.h>
- #endif
- #include <stdio.h>
--#if defined(ANDROID)
- #include <unistd.h>
--#endif
- 
- #include <fstream>
- 

package/firefox/patches/patch-ipc_chromium_src_base_file_util_linux_cc

@@ -1,10 +0,0 @@
---- mozilla-release.orig/ipc/chromium/src/base/file_util_linux.cc	2011-07-08 03:15:22.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/file_util_linux.cc	2012-10-03 13:50:20.000000000 +0200
-@@ -5,6 +5,7 @@
- #include "base/file_util.h"
- 
- #include <fcntl.h>
-+#include <unistd.h>
- 
- #include <string>
- #include <vector>

package/firefox/patches/patch-ipc_chromium_src_base_process_util_h

@@ -1,21 +0,0 @@
---- mozilla-release.orig/ipc/chromium/src/base/process_util.h	2011-07-08 03:15:22.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/process_util.h	2011-07-29 16:26:23.000000000 +0200
-@@ -62,7 +62,8 @@ enum ProcessArchitecture {
-   PROCESS_ARCH_I386 = 0x1,
-   PROCESS_ARCH_X86_64 = 0x2,
-   PROCESS_ARCH_PPC = 0x4,
--  PROCESS_ARCH_ARM = 0x8
-+  PROCESS_ARCH_ARM = 0x8,
-+  PROCESS_ARCH_MIPS = 0xf
- };
- 
- static ProcessArchitecture GetCurrentProcessArchitecture()
-@@ -76,6 +77,8 @@ static ProcessArchitecture GetCurrentPro
-   currentArchitecture = base::PROCESS_ARCH_PPC;
- #elif defined(ARCH_CPU_ARMEL)
-   currentArchitecture = base::PROCESS_ARCH_ARM;
-+#elif defined(ARCH_CPU_MIPS)
-+  currentArchitecture = base::PROCESS_ARCH_MIPS;
- #endif
-   return currentArchitecture;
- }

package/firefox/patches/patch-ipc_chromium_src_base_time_posix_cc

@@ -1,11 +0,0 @@
---- mozilla-release.orig/ipc/chromium/src/base/time_posix.cc	2011-07-08 03:15:22.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/time_posix.cc	2012-10-03 13:54:12.000000000 +0200
-@@ -164,7 +164,7 @@ TimeTicks TimeTicks::Now() {
-   // With numer and denom = 1 (the expected case), the 64-bit absolute time
-   // reported in nanoseconds is enough to last nearly 585 years.
- 
--#elif defined(OS_POSIX) && \
-+#elif defined(__linux__) || defined(OS_POSIX) && \
-       defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
- 
-   struct timespec ts;

package/firefox/patches/patch-ipc_chromium_src_build_build_config_h

@@ -1,15 +0,0 @@
---- mozilla-release.orig/ipc/chromium/src/build/build_config.h	2011-07-08 03:15:22.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/build/build_config.h	2011-07-29 16:23:31.000000000 +0200
-@@ -60,6 +60,12 @@
- #elif defined(__ppc__)
- #define ARCH_CPU_PPC 1
- #define ARCH_CPU_32_BITS 1
-+#elif defined(__mips__)
-+#define ARCH_CPU_MIPS 1
-+#define ARCH_CPU_32_BITS 1
-+#elif defined(__mips64__)
-+#define ARCH_CPU_MIPS 1
-+#define ARCH_CPU_64_BITS 1
- #else
- #error Please add support for your architecture in build/build_config.h
- #endif

package/firefox/patches/patch-js_src_Makefile_in

@@ -1,11 +0,0 @@
---- mozilla-release.orig/js/src/Makefile.in	2011-07-08 03:15:23.000000000 +0200
-+++ mozilla-release/js/src/Makefile.in	2011-07-29 15:50:36.000000000 +0200
-@@ -391,7 +391,7 @@ CPPSRCS += 	checks.cc \
- # END enclude sources for V8 dtoa
- #############################################
- 
--ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
-+ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU)))
- 
- VPATH +=	$(srcdir)/assembler \
- 		$(srcdir)/assembler/wtf \

package/firefox/patches/patch-js_src_ctypes_CTypes_cpp

@@ -1,11 +0,0 @@
---- mozilla-2.0.orig/js/src/ctypes/CTypes.cpp	2011-03-19 00:33:47.000000000 +0100
-+++ mozilla-2.0/js/src/ctypes/CTypes.cpp	2011-06-15 05:56:10.076952202 +0200
-@@ -464,7 +464,7 @@ static inline bool FloatIsFinite(jsdoubl
- #ifdef WIN32
-   return _finite(f) != 0;
- #else
--  return finite(f);
-+  return isfinite(f);
- #endif
- }
- 

package/firefox/patches/patch-js_src_jscpucfg_cpp

@@ -1,14 +0,0 @@
---- mozilla-release.orig/js/src/jscpucfg.cpp	2011-07-08 03:15:24.000000000 +0200
-+++ mozilla-release/js/src/jscpucfg.cpp	2013-02-08 09:41:16.000000000 +0100
-@@ -177,6 +177,11 @@ int main(int argc, char **argv)
- 
-     printf("#endif /* js_cpucfg___ */\n");
- 
-+#if defined __GNUC__ && defined __x86_64__
-+    printf("#define HAVE_VA_LIST_AS_ARRAY\n");
-+    printf("\n");
-+#endif
-+
-     return EXIT_SUCCESS;
- }
- 

package/firefox/patches/patch-js_src_jsnum_h

@@ -1,11 +0,0 @@
---- mozilla-2.0.orig/js/src/jsnum.h	2011-03-19 00:33:50.000000000 +0100
-+++ mozilla-2.0/js/src/jsnum.h	2011-04-23 23:18:01.000000000 +0200
-@@ -101,7 +101,7 @@ JSDOUBLE_IS_FINITE(jsdouble d)
- #ifdef WIN32
-     return _finite(d);
- #else
--    return finite(d);
-+    return isfinite(d);
- #endif
- }
- 

package/firefox/patches/patch-js_src_jsprf_cpp

@@ -1,20 +0,0 @@
---- mozilla-release.orig/js/src/jsprf.cpp	2011-07-08 03:15:24.000000000 +0200
-+++ mozilla-release/js/src/jsprf.cpp	2013-04-04 16:21:34.000000000 +0200
-@@ -54,17 +54,7 @@
- 
- using namespace js;
- 
--/*
--** Note: on some platforms va_list is defined as an array,
--** and requires array notation.
--*/
--#ifdef HAVE_VA_COPY
--#define VARARGS_ASSIGN(foo, bar)        VA_COPY(foo,bar)
--#elif defined(HAVE_VA_LIST_AS_ARRAY)
--#define VARARGS_ASSIGN(foo, bar)        foo[0] = bar[0]
--#else
- #define VARARGS_ASSIGN(foo, bar)        (foo) = (bar)
--#endif
- 
- /*
- ** WARNING: This code may *NOT* call JS_LOG (because JS_LOG calls it)

package/firefox/patches/patch-js_src_xpconnect_src_xpcconvert_cpp

@@ -1,20 +0,0 @@
---- mozilla-release.orig/js/src/xpconnect/src/xpcconvert.cpp	2011-07-08 03:15:26.000000000 +0200
-+++ mozilla-release/js/src/xpconnect/src/xpcconvert.cpp	2013-04-04 16:30:18.000000000 +0200
-@@ -1842,17 +1842,7 @@ XPCConvert::JSErrorToXPCException(XPCCal
- 
- /***************************************************************************/
- 
--/*
--** Note: on some platforms va_list is defined as an array,
--** and requires array notation.
--*/
--#ifdef HAVE_VA_COPY
--#define VARARGS_ASSIGN(foo, bar)	VA_COPY(foo,bar)
--#elif defined(HAVE_VA_LIST_AS_ARRAY)
--#define VARARGS_ASSIGN(foo, bar)	foo[0] = bar[0]
--#else
- #define VARARGS_ASSIGN(foo, bar)	(foo) = (bar)
--#endif
- 
- // We assert below that these formats all begin with "%i".
- const char* XPC_ARG_FORMATTER_FORMAT_STRINGS[] = {"%ip", "%iv", "%is", nsnull};

package/firefox/patches/patch-security_coreconf_Linux_mk

@@ -1,15 +0,0 @@
---- mozilla-1.9.2.orig/security/coreconf/Linux.mk	2010-12-03 16:48:49.000000000 +0100
-+++ mozilla-1.9.2/security/coreconf/Linux.mk	2011-01-20 20:18:26.904905227 +0100
-@@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1)
- 	IMPL_STRATEGY = _PTH
- endif
- 
--CC			= gcc
--CCC			= g++
--RANLIB			= ranlib
-+CC			?= gcc
-+CCC			?= g++
-+RANLIB			?= ranlib
- 
- DEFAULT_COMPILER = gcc
- 

package/firefox/patches/patch-security_coreconf_command_mk

@@ -1,11 +0,0 @@
---- mozilla-1.9.2.orig/security/coreconf/command.mk	2010-12-03 16:48:49.000000000 +0100
-+++ mozilla-1.9.2/security/coreconf/command.mk	2011-01-20 20:18:56.214904993 +0100
-@@ -48,7 +48,7 @@ LINK_EXE      = $(LINK) $(OS_LFLAGS) $(L
- CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
- 		$(XCFLAGS)
- PERL          = perl
--RANLIB        = echo
-+RANLIB        = ranlib
- TAR           = /bin/tar
- #
- # For purify

package/firefox/patches/patch-security_nss_lib_freebl_stubs_c

@@ -1,11 +0,0 @@
---- mozilla-2.0.orig/security/nss/lib/freebl/stubs.c	2011-03-19 00:34:05.000000000 +0100
-+++ mozilla-2.0/security/nss/lib/freebl/stubs.c	2011-04-23 23:18:01.000000000 +0200
-@@ -539,7 +539,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/firefox/patches/patch-xpcom_ds_nsMathUtils_h

@@ -1,11 +0,0 @@
---- mozilla-release.orig/xpcom/ds/nsMathUtils.h	2011-07-08 03:15:44.000000000 +0200
-+++ mozilla-release/xpcom/ds/nsMathUtils.h	2011-08-01 14:40:58.343424403 +0200
-@@ -170,7 +170,7 @@ inline NS_HIDDEN_(bool) NS_finite(double
-     // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
-     return !!_finite(d);
- #else
--    return finite(d);
-+    return isfinite(d);
- #endif
- }
- 

package/firefox/patches/patch-xpcom_threads_nsThread_cpp

@@ -1,17 +0,0 @@
---- mozilla-2.0.orig/xpcom/threads/nsThread.cpp	2011-03-19 00:34:14.000000000 +0100
-+++ mozilla-2.0/xpcom/threads/nsThread.cpp	2011-06-15 19:51:07.078202253 +0200
-@@ -50,11 +50,13 @@
-                       _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) &&           \
-                       !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
- 
-+#include <features.h>
- #if defined(XP_UNIX) && !defined(ANDROID) && !defined(DEBUG) && HAVE_UALARM \
-   && defined(_GNU_SOURCE)
--# define MOZ_CANARY
- # include <unistd.h>
-+#if !defined(__UCLIBC__)
- # include <execinfo.h>
-+#endif
- # include <signal.h>
- # include <fcntl.h>
- # include "nsXULAppAPI.h"

package/glibc/Makefile

@@ -22,8 +22,6 @@ $(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPEN
 $(eval $(call PKG_template,GLIBC_DEV,glibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,GLIBC_STATIC,$(PKG_NAME)-static,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-#TARGET_CFLAGS:=	$(filter-out -fstack-protector,$(TARGET_CFLAGS))
-#TARGET_CFLAGS:=	$(filter-out -flto,$(TARGET_CFLAGS))
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
 CONFIG_STYLE:=		manual
@@ -55,7 +53,8 @@ ifeq ($(ADK_LOCALES),y)
 endif
 endif
 	${INSTALL_DIR} ${IDIR_GLIBC}/etc
-	${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/{gai,nscd,nsswitch}.conf ${IDIR_GLIBC}/etc
+	${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_GLIBC}/etc
+	${INSTALL_DATA} ./files/nsswitch.conf ${IDIR_GLIBC}/etc
 
 glibc-static-install:
 	${INSTALL_DIR} $(IDIR_GLIBC_STATIC)/usr/lib

package/glibc/files/nsswitch.conf

@@ -0,0 +1,20 @@
+# /etc/nsswitch.conf
+#
+# Example configuration of GNU Name Service Switch functionality.
+#
+
+passwd:		files
+group:		files
+initgroups:	files
+shadow:		files
+gshadow:	files
+
+hosts:		files dns
+networks:	files dns
+
+protocols:	files
+services:	files
+ethers:		files
+rpc:		files
+
+netgroup:	files

package/harfbuzz/Makefile

@@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		harfbuzz
 PKG_VERSION:=		0.9.9
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		e901ffe556d706b7d43b272f83be7f09
 PKG_DESCR:=		OpenType text shaping engine
 PKG_SECTION:=		libs
 PKG_SITES:=		http://www.freedesktop.org/software/harfbuzz/release/
-PKG_DEPENDS:=		libstdcxx
-PKG_BUILDDEP:=		libstdcxx
+PKG_DEPENDS:=		libstdcxx cairo
+PKG_BUILDDEP:=		libstdcxx cairo
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 

package/libdrm/patches/patch-ltmain_sh

@@ -1,11 +0,0 @@
---- libdrm-2.4.22.orig/ltmain.sh	2010-01-21 11:04:52.000000000 +0100
-+++ libdrm-2.4.22/ltmain.sh	2011-01-14 01:13:30.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"

package/libjpeg-turbo/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:=		libjpeg-turbo
+PKG_VERSION:=		1.3.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e1e65cc711a1ade1322c06ad4a647741
+PKG_DESCR:=		a JPEG library
+PKG_SECTION:=		libs
+PKG_URL:=		http://libjpeg-turbo.virtualgl.org/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBJPEG_TURBO,libjpeg-turbo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+libjpeg-turbo-install:
+	$(INSTALL_DIR) $(IDIR_LIBJPEG_TURBO)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/lib{turbo,}jpeg*.so* \
+		$(IDIR_LIBJPEG_TURBO)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/nspr/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		nspr
-PKG_VERSION:=		4.9.5
+PKG_VERSION:=		4.9.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b6ccfa8fcbbeb17ebeb19a3edff612bd
+PKG_MD5SUM:=		62b1e9d376d503d972f90c3c0031d879
 PKG_DESCR:=		Netscape Portable Runtime library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.mozilla.org/projects/nspr/

package/nss/Makefile

@@ -4,12 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		nss
-PKG_VERSION:=		3.14.1
+PKG_VERSION:=		3.15.2
 PKG_RELEASE:=		1
 PKG_MAJ_VERSION:=	3
-PKG_MIN_VERSION:=	14
-PKG_PATCH_VERSION:=	1
-PKG_MD5SUM:=		f6f3a942d1eba3e26aa0382a5b5461d9
+PKG_MIN_VERSION:=	15
+PKG_PATCH_VERSION:=	2
+PKG_MD5SUM:=		154223568f9734c76c164b46c774450c
 PKG_DESCR:=		Network Security Services (NSS) library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		nspr zlib sqlite
@@ -21,7 +21,7 @@ PKG_NOPARALLEL:=	1
 PKG_HOST_DEPENDS:=	!cygwin
 PKG_ARCH_DEPENDS:=	!cris
 
-WRKSRC=			${WRKDIST}/mozilla/security/nss
+WRKSRC=			${WRKDIST}/nss
 
 include $(TOPDIR)/mk/package.mk
 
@@ -46,14 +46,14 @@ XAKE_FLAGS+=		ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"
 XAKE_FLAGS+=		NSS_DISABLE_DBM=1 OS_TEST=${CPU_ARCH} OS_TARGET=Linux OS_RELEASE=2.6 OS_ARCH=Linux
 XAKE_FLAGS+=		ARTOOL="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib" NSS_USE_SYSTEM_SQLITE=1
 XAKE_FLAGS+=		NSS_USE_SYSTEM_ZLIB=1
-ALL_TARGET:=		build_coreconf all
+ALL_TARGET:=		all
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_NSS)/usr/lib
-	${INSTALL_DATA} ${WRKDIST}/dist/lib/lib{ssl3,smime3,nss3,nssutil3,softokn3}.so \
+	${INSTALL_DATA} ${WRKDIST}/dist/lib/lib{nsssysinit,nssckbi,freebl3,ssl3,smime3,nss3,nssutil3,softokn3}.so \
 		$(IDIR_NSS)/usr/lib
 	${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/include/nss
-	${INSTALL_DATA} ${WRKDIST}/mozilla/dist/public/nss/* \
+	${INSTALL_DATA} ${WRKDIST}/dist/public/nss/* \
 		${STAGING_TARGET_DIR}/usr/include/nss
 	# needed for firefox and corosync
 	${INSTALL_DIR} ${WRKINST}/usr/bin

package/nss/patches/001-lfs-nss-config+nss_pc.patch

@@ -1,241 +0,0 @@
-diff -Nur nss-3.14.1.orig//mozilla/security/nss/config/Makefile nss-3.14.1/mozilla/security/nss/config/Makefile
---- nss-3.14.1.orig//mozilla/security/nss/config/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ nss-3.14.1/mozilla/security/nss/config/Makefile	2013-02-01 18:15:55.000000000 +0100
-@@ -0,0 +1,41 @@
-+CORE_DEPTH = ../..
-+DEPTH      = ../..
-+
-+include $(CORE_DEPTH)/coreconf/config.mk
-+
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
-+PREFIX = /usr
-+
-+all: install libs
-+
-+export:
-+install:
-+	# Create the nss.pc file
-+	mkdir -p $(DIST)/lib/pkgconfig
-+	sed -e "s,@prefix@,$(PREFIX)," \
-+	    -e "s,@exec_prefix@,\$${prefix}," \
-+	    -e "s,@libdir@,\$${prefix}/lib," \
-+	    -e "s,@includedir@,\$${prefix}/include/nss," \
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+	    nss.pc.in > nss.pc
-+	chmod 0644 nss.pc
-+	cp nss.pc $(DIST)/lib/pkgconfig
-+
-+	# Create the nss-config script
-+	mkdir -p $(DIST)/bin
-+	sed -e "s,@prefix@,$(PREFIX)," \
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+	    nss-config.in > nss-config
-+	chmod 0755 nss-config
-+	cp nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export install libs
-+
-diff -Nur nss-3.14.1.orig//mozilla/security/nss/config/nss-config.in nss-3.14.1/mozilla/security/nss/config/nss-config.in
---- nss-3.14.1.orig//mozilla/security/nss/config/nss-config.in	1970-01-01 01:00:00.000000000 +0100
-+++ nss-3.14.1/mozilla/security/nss/config/nss-config.in	2013-02-01 18:15:55.000000000 +0100
-@@ -0,0 +1,153 @@
-+#!/bin/sh
-+
-+prefix=@prefix@
-+
-+major_version=@NSS_MAJOR_VERSION@
-+minor_version=@NSS_MINOR_VERSION@
-+patch_version=@NSS_PATCH_VERSION@
-+
-+usage()
-+{
-+	cat <<EOF
-+Usage: nss-config [OPTIONS] [LIBRARIES]
-+Options:
-+	[--prefix[=DIR]]
-+	[--exec-prefix[=DIR]]
-+	[--includedir[=DIR]]
-+	[--libdir[=DIR]]
-+	[--version]
-+	[--libs]
-+	[--cflags]
-+Dynamic Libraries:
-+	nss
-+	nssutil
-+	smime
-+	ssl
-+	softokn
-+EOF
-+	exit $1
-+}
-+
-+if test $# -eq 0; then
-+	usage 1 1>&2
-+fi
-+
-+lib_nss=yes
-+lib_nssutil=yes
-+lib_smime=yes
-+lib_ssl=yes
-+lib_softokn=yes
-+
-+while test $# -gt 0; do
-+  case "$1" in
-+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+  *) optarg= ;;
-+  esac
-+
-+  case $1 in
-+    --prefix=*)
-+      prefix=$optarg
-+      ;;
-+    --prefix)
-+      echo_prefix=yes
-+      ;;
-+    --exec-prefix=*)
-+      exec_prefix=$optarg
-+      ;;
-+    --exec-prefix)
-+      echo_exec_prefix=yes
-+      ;;
-+    --includedir=*)
-+      includedir=$optarg
-+      ;;
-+    --includedir)
-+      echo_includedir=yes
-+      ;;
-+    --libdir=*)
-+      libdir=$optarg
-+      ;;
-+    --libdir)
-+      echo_libdir=yes
-+      ;;
-+    --version)
-+      echo ${major_version}.${minor_version}.${patch_version}
-+      ;;
-+    --cflags)
-+      echo_cflags=yes
-+      ;;
-+    --libs)
-+      echo_libs=yes
-+      ;;
-+    nss)
-+      lib_nss=yes
-+      ;;
-+    nssutil)
-+      lib_nssutil=yes
-+      ;;
-+    smime)
-+      lib_smime=yes
-+      ;;
-+    ssl)
-+      lib_ssl=yes
-+      ;;
-+    softokn)
-+      lib_softokn=yes
-+      ;;
-+    *)
-+      usage 1 1>&2
-+      ;;
-+  esac
-+  shift
-+done
-+
-+# Set variables that may be dependent upon other variables
-+if test -z "$exec_prefix"; then
-+    exec_prefix=`pkg-config --variable=exec_prefix nss`
-+fi
-+if test -z "$includedir"; then
-+    includedir=`pkg-config --variable=includedir nss`
-+fi
-+if test -z "$libdir"; then
-+    libdir=`pkg-config --variable=libdir nss`
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+    echo $prefix
-+fi
-+
-+if test "$echo_exec_prefix" = "yes"; then
-+    echo $exec_prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+    echo $includedir
-+fi
-+
-+if test "$echo_libdir" = "yes"; then
-+    echo $libdir
-+fi
-+
-+if test "$echo_cflags" = "yes"; then
-+    echo -I$includedir
-+fi
-+
-+if test "$echo_libs" = "yes"; then
-+      libdirs="-L$libdir"
-+      if test -n "$lib_nss"; then
-+	libdirs="$libdirs -lnss${major_version}"
-+      fi
-+      if test -n "$lib_nssutil"; then
-+        libdirs="$libdirs -lnssutil${major_version}"
-+      fi
-+      if test -n "$lib_smime"; then
-+	libdirs="$libdirs -lsmime${major_version}"
-+      fi
-+      if test -n "$lib_ssl"; then
-+	libdirs="$libdirs -lssl${major_version}"
-+      fi
-+      if test -n "$lib_softokn"; then
-+        libdirs="$libdirs -lsoftokn${major_version}"
-+      fi
-+      echo $libdirs
-+fi      
-+
-diff -Nur nss-3.14.1.orig//mozilla/security/nss/config/nss.pc.in nss-3.14.1/mozilla/security/nss/config/nss.pc.in
---- nss-3.14.1.orig//mozilla/security/nss/config/nss.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ nss-3.14.1/mozilla/security/nss/config/nss.pc.in	2013-02-01 18:15:55.000000000 +0100
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSS
-+Description: Network Security Services
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
-+Requires: nspr >= 4.8
-+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
-+Cflags: -I${includedir}
-+
-diff -Nur nss-3.14.1.orig//mozilla/security/nss/Makefile nss-3.14.1/mozilla/security/nss/Makefile
---- nss-3.14.1.orig//mozilla/security/nss/Makefile	2012-11-14 02:14:07.000000000 +0100
-+++ nss-3.14.1/mozilla/security/nss/Makefile	2013-02-01 18:15:52.000000000 +0100
-@@ -44,7 +44,7 @@
- # (7) Execute "local" rules. (OPTIONAL).                              #
- #######################################################################
- 
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf build_dbm all
- 
- nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
- 
-diff -Nur nss-3.14.1.orig//mozilla/security/nss/manifest.mn nss-3.14.1/mozilla/security/nss/manifest.mn
---- nss-3.14.1.orig//mozilla/security/nss/manifest.mn	2012-03-20 15:46:49.000000000 +0100
-+++ nss-3.14.1/mozilla/security/nss/manifest.mn	2013-02-01 18:15:55.000000000 +0100
-@@ -10,6 +10,6 @@
- 
- RELEASE = nss
- 
--DIRS = lib cmd
-+DIRS = lib cmd config
- 
- 

package/nss/patches/patch-mozilla_security_coreconf_Linux_mk

@@ -1,33 +0,0 @@
---- nss-3.12.8.orig/mozilla/security/coreconf/Linux.mk	2010-08-13 03:32:29.000000000 +0200
-+++ nss-3.12.8/mozilla/security/coreconf/Linux.mk	2010-10-04 22:49:50.378508674 +0200
-@@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1)
- 	IMPL_STRATEGY = _PTH
- endif
- 
--CC			= gcc
--CCC			= g++
--RANLIB			= ranlib
-+CC			?= gcc
-+CCC			?= g++
-+RANLIB			?= ranlib
- 
- DEFAULT_COMPILER = gcc
- 
-@@ -137,7 +137,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
-@@ -152,7 +152,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))
--LDFLAGS			+= $(ARCHFLAG)
-+#LDFLAGS			+= $(ARCHFLAG)
- 
- # On Maemo, we need to use the -rpath-link flag for even the standard system
- # library directories.

package/nss/patches/patch-mozilla_security_coreconf_UNIX_mk

@@ -1,12 +0,0 @@
---- nss-3.12.8.orig/mozilla/security/coreconf/UNIX.mk	2008-10-03 21:12:41.000000000 +0200
-+++ nss-3.12.8/mozilla/security/coreconf/UNIX.mk	2010-12-12 01:54:56.000000000 +0100
-@@ -38,7 +38,8 @@
- XP_DEFINE  += -DXP_UNIX
- LIB_SUFFIX  = a
- DLL_SUFFIX  = so
--AR          = ar cr $@
-+ARTOOL      = ar
-+AR          = $(ARTOOL) cr $@
- LDOPTS     += -L$(SOURCE_LIB_DIR)
- 
- ifdef BUILD_OPT

package/nss/patches/patch-mozilla_security_coreconf_arch_mk

@@ -1,11 +0,0 @@
---- nss-3.12.4.orig/mozilla/security/coreconf/arch.mk	2009-06-05 04:14:49.000000000 +0200
-+++ nss-3.12.4/mozilla/security/coreconf/arch.mk	2009-11-20 18:51:43.000000000 +0100
-@@ -324,7 +324,7 @@ endif
- # IMPL_STRATEGY may be defined too.
- #
- 
--OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
-+OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(LIBC_TAG).OBJ
- 
- ifeq (,$(filter-out WIN%,$(OS_TARGET)))
- ifndef BUILD_OPT

package/nss/patches/patch-mozilla_security_coreconf_command_mk

@@ -1,11 +0,0 @@
---- nss-3.12.8.orig/mozilla/security/coreconf/command.mk	2007-10-23 23:55:00.000000000 +0200
-+++ nss-3.12.8/mozilla/security/coreconf/command.mk	2010-10-12 14:44:35.000000000 +0200
-@@ -48,7 +48,7 @@ LINK_EXE      = $(LINK) $(OS_LFLAGS) $(L
- CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
- 		$(XCFLAGS)
- PERL          = perl
--RANLIB        = echo
-+RANLIB        = ranlib
- TAR           = /bin/tar
- #
- # For purify

package/nss/patches/patch-mozilla_security_coreconf_nsinstall_Makefile

@@ -1,11 +0,0 @@
---- nss-3.12.4.orig/mozilla/security/coreconf/nsinstall/Makefile	2005-10-06 00:25:37.000000000 +0200
-+++ nss-3.12.4/mozilla/security/coreconf/nsinstall/Makefile	2009-11-20 19:18:06.000000000 +0100
-@@ -62,7 +62,7 @@ CC=$(NATIVE_CC)
- endif
- 
- ifdef NATIVE_FLAGS
--OS_CFLAGS=$(NATIVE_FLAGS)
-+CFLAGS=$(NATIVE_FLAGS)
- endif
- 
- include $(DEPTH)/coreconf/rules.mk

package/nss/patches/patch-mozilla_security_coreconf_rules_mk

@@ -1,20 +0,0 @@
---- nss-3.12.8.orig/mozilla/security/coreconf/rules.mk	2010-04-26 01:37:40.000000000 +0200
-+++ nss-3.12.8/mozilla/security/coreconf/rules.mk	2010-10-03 23:41:05.000000000 +0200
-@@ -281,7 +281,7 @@ ifdef MT
- 	fi
- endif	# MSVC with manifest tool
- else
--	$(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
-+	$(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
- endif
- 
- get_objs:
-@@ -338,7 +338,7 @@ ifdef MT
- endif	# MSVC with manifest tool
- endif
- else
--	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
-+	$(MKSHLIB) -o $@ $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
- 	chmod +x $@
- ifeq ($(OS_TARGET),Darwin)
- ifdef MAPFILE

package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh

@@ -1,10 +0,0 @@
---- 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}"
-+    #"${2}"/shlibsign -v -i "${5}"
-     ;;
- esac

package/nss/patches/patch-mozilla_security_nss_lib_freebl_stubs_c

@@ -1,11 +0,0 @@
---- nss-3.12.8.orig/mozilla/security/nss/lib/freebl/stubs.c	2010-04-29 02:17:52.000000000 +0200
-+++ nss-3.12.8/mozilla/security/nss/lib/freebl/stubs.c	2010-10-03 23:19:08.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/nss/patches/patch-nss_coreconf_Linux_mk

@@ -0,0 +1,24 @@
+--- nss-3.15.2.orig/nss/coreconf/Linux.mk	2013-09-25 15:57:55.000000000 +0200
++++ nss-3.15.2/nss/coreconf/Linux.mk	2013-09-27 19:08:33.000000000 +0200
+@@ -16,9 +16,9 @@ ifeq ($(USE_PTHREADS),1)
+ 	IMPL_STRATEGY = _PTH
+ endif
+ 
+-CC			= gcc
+-CCC			= g++
+-RANLIB			= ranlib
++CC			?= gcc
++CCC			?= g++
++RANLIB			?= ranlib
+ 
+ DEFAULT_COMPILER = gcc
+ 
+@@ -144,7 +144,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))
+-LDFLAGS			+= $(ARCHFLAG)
++#LDFLAGS			+= $(ARCHFLAG)
+ 
+ # On Maemo, we need to use the -rpath-link flag for even the standard system
+ # library directories.

package/nss/patches/patch-nss_coreconf_UNIX_mk

@@ -0,0 +1,12 @@
+--- nss-3.15.2.orig/nss/coreconf/UNIX.mk	2013-09-25 15:57:55.000000000 +0200
++++ nss-3.15.2/nss/coreconf/UNIX.mk	2013-09-27 19:15:14.000000000 +0200
+@@ -6,7 +6,8 @@
+ XP_DEFINE  += -DXP_UNIX
+ LIB_SUFFIX  = a
+ DLL_SUFFIX  = so
+-AR          = ar cr $@
++ARTOOL      = ar
++AR          = $(ARTOOL) cr $@
+ LDOPTS     += -L$(SOURCE_LIB_DIR)
+ 
+ ifdef BUILD_OPT

package/nss/patches/patch-nss_coreconf_command_mk

@@ -0,0 +1,11 @@
+--- nss-3.15.2.orig/nss/coreconf/command.mk	2013-09-25 15:57:55.000000000 +0200
++++ nss-3.15.2/nss/coreconf/command.mk	2013-09-27 19:07:39.000000000 +0200
+@@ -16,7 +16,7 @@ LINK_EXE      = $(LINK) $(OS_LFLAGS) $(L
+ CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
+ 		$(XCFLAGS)
+ PERL          = perl
+-RANLIB        = echo
++RANLIB        = ranlib
+ TAR           = /bin/tar
+ #
+ # For purify

package/nss/patches/patch-nss_manifest_mn

@@ -0,0 +1,8 @@
+--- nss-3.15.2.orig/nss/manifest.mn	2013-09-25 15:57:55.000000000 +0200
++++ nss-3.15.2/nss/manifest.mn	2013-09-30 16:02:15.000000000 +0200
+@@ -10,4 +10,4 @@ IMPORTS =	nspr20/v4.8 \
+ 
+ RELEASE = nss
+ 
+-DIRS = coreconf lib cmd
++DIRS = coreconf lib cmd config

package/nss/src/nss/config/Makefile

@@ -0,0 +1,41 @@
+CORE_DEPTH = ..
+DEPTH      = ..
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
+PREFIX = /usr
+
+all: install libs
+
+export:
+install:
+	# Create the nss.pc file
+	mkdir -p $(DIST)/lib/pkgconfig
+	sed -e "s,@prefix@,$(PREFIX)," \
+	    -e "s,@exec_prefix@,\$${prefix}," \
+	    -e "s,@libdir@,\$${prefix}/lib," \
+	    -e "s,@includedir@,\$${prefix}/include/nss," \
+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
+	    nss.pc.in > nss.pc
+	chmod 0644 nss.pc
+	cp nss.pc $(DIST)/lib/pkgconfig
+
+	# Create the nss-config script
+	mkdir -p $(DIST)/bin
+	sed -e "s,@prefix@,$(PREFIX)," \
+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
+	    nss-config.in > nss-config
+	chmod 0755 nss-config
+	cp nss-config $(DIST)/bin
+
+libs:
+
+dummy: all export install libs
+

package/nss/src/nss/config/nss-config.in

@@ -0,0 +1,155 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@NSS_MAJOR_VERSION@
+minor_version=@NSS_MINOR_VERSION@
+patch_version=@NSS_PATCH_VERSION@
+
+usage()
+{
+	cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--includedir[=DIR]]
+	[--libdir[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+Dynamic Libraries:
+	nss
+	nssutil
+	smime
+	ssl
+	softokn
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+lib_nss=yes
+lib_nssutil=yes
+lib_smime=yes
+lib_ssl=yes
+lib_softokn=yes
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --includedir=*)
+      includedir=$optarg
+      ;;
+    --includedir)
+      echo_includedir=yes
+      ;;
+    --libdir=*)
+      libdir=$optarg
+      ;;
+    --libdir)
+      echo_libdir=yes
+      ;;
+    --version)
+      echo ${major_version}.${minor_version}.${patch_version}
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    nss)
+      lib_nss=yes
+      ;;
+    nssutil)
+      lib_nssutil=yes
+      ;;
+    smime)
+      lib_smime=yes
+      ;;
+    ssl)
+      lib_ssl=yes
+      ;;
+    softokn)
+      lib_softokn=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+    exec_prefix=`pkg-config --variable=exec_prefix nss`
+fi
+if test -z "$includedir"; then
+    includedir=`pkg-config --variable=includedir nss`
+fi
+if test -z "$libdir"; then
+    libdir=`pkg-config --variable=libdir nss`
+fi
+
+if test "$echo_prefix" = "yes"; then
+    echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+    echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+    echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+    echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+    echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+      libdirs="-L$libdir"
+      if test -n "$lib_nss"; then
+	libdirs="$libdirs -lnss${major_version}"
+      fi
+      if test -n "$lib_nssutil"; then
+        libdirs="$libdirs -lnssutil${major_version}"
+      fi
+      if test -n "$lib_smime"; then
+	libdirs="$libdirs -lsmime${major_version}"
+      fi
+      if test -n "$lib_ssl"; then
+	libdirs="$libdirs -lssl${major_version}"
+	prefix=@prefix@
+      fi
+
+      if test -n "$lib_softokn"; then
+        libdirs="$libdirs -lsoftokn${major_version}"
+      fi
+      echo $libdirs
+fi      
+

package/nss/src/nss/config/nss.pc.in

@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: NSS
+Description: Network Security Services
+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
+Requires: nspr >= 4.8
+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
+Cflags: -I${includedir}
+

package/sqlite/Makefile

@@ -4,17 +4,17 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		sqlite
-PKG_VERSION:=		3.7.14
+PKG_VERSION:=		3.8.0.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6464d429b1396a8db35864e791673b65
+PKG_MD5SUM:=		6d6cc639a4da04fbbdda7b1a1a01b386
 PKG_DESCR:=		embeddable SQL database (cli)
 PKG_SECTION:=		db
 PKG_BUILDDEP:=		ncurses readline
 PKG_URL:=		http://www.sqlite.org/
-PKG_SITES:=		http://www.sqlite.org/
+PKG_SITES:=		http://www.sqlite.org/2013/
 
-DISTFILES:=		sqlite-autoconf-3071400.tar.gz
-WRKDIST=		${WRKDIR}/sqlite-autoconf-3071400
+DISTFILES:=		sqlite-autoconf-3080002.tar.gz
+WRKDIST=		${WRKDIR}/sqlite-autoconf-3080002
 
 PKG_SUBPKGS:=		SQLITE_CLI LIBSQLITE LIBSQLITE_DEV
 PKGSD_LIBSQLITE:=	sqlite library

package/sqlite/patches/patch-ltmain_sh

@@ -1,11 +0,0 @@
---- sqlite-autoconf-3070500.orig/ltmain.sh	2008-11-19 19:13:36.000000000 +0100
-+++ sqlite-autoconf-3070500/ltmain.sh	2011-03-08 14:26:09.000000000 +0100
-@@ -1663,7 +1663,7 @@ EOF
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @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*)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.

package/xf86-video-cirrus/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		xf86-video-cirrus
 PKG_VERSION:=		1.4.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c63a29917c48d0c317445991fc36d09a
+PKG_MD5SUM:=		439e3f5e29161f503bcfe23229dc7b17
 PKG_DESCR:=		X11 driver for Cirrus VGA chips
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server

package/xf86-video-cirrus/patches/patch-ltmain_sh

@@ -1,11 +0,0 @@
---- xf86-video-cirrus-1.3.2.orig/ltmain.sh	2008-08-30 00:27:25.000000000 +0200
-+++ xf86-video-cirrus-1.3.2/ltmain.sh	2011-01-17 17:38:35.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @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)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.