summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2014-10-16 11:49:03 +0100
committerVincent Sanders <vince@kyllikki.org>2014-10-16 11:49:03 +0100
commit914851010d943d034a35bfb0fd7002edd245c67f (patch)
treed7e1577390f73fefe71145d7457728c029c29362
parent1f6a1c8701f01a8828d100fdf7eb0c8aba4059c4 (diff)
downloadtoolchains-914851010d943d034a35bfb0fd7002edd245c67f.tar.gz
toolchains-914851010d943d034a35bfb0fd7002edd245c67f.tar.bz2
Update SDK library versions for openssl, libpng , libcurl and freetype to address security issues
This has been sucessfully test built for everything except atari where libiconv no longer builds because of a missing PATH_MAX definition but I can find no difference in the libiconv build so it must be related to the cross complier/libmint build although the generated includes also look sensible so I am leaving it for now.
-rw-r--r--m68k-atari-mint/Makefile3
-rwxr-xr-xm68k-atari-mint/fetchsrc2
-rw-r--r--sdk/Makefile8
-rw-r--r--sdk/recipes/patches/libcurl/7.34.0-ipv6-trynextip.p27
-rw-r--r--sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/jsapi.h.p37
-rw-r--r--sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsapi.h.p37
6 files changed, 81 insertions, 33 deletions
diff --git a/m68k-atari-mint/Makefile b/m68k-atari-mint/Makefile
index c4584b0..7618cf3 100644
--- a/m68k-atari-mint/Makefile
+++ b/m68k-atari-mint/Makefile
@@ -31,7 +31,8 @@ UPSTREAM_MINTBIN_VERSION := CVS-20110527
UPSTREAM_MINTBIN_TARBALL := mintbin-$(UPSTREAM_MINTBIN_VERSION).tar.gz
UPSTREAM_MINTBIN_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_MINTBIN_TARBALL)
-UPSTREAM_MINTLIB_VERSION := CVS-20131219
+#UPSTREAM_MINTLIB_VERSION := CVS-20131219
+UPSTREAM_MINTLIB_VERSION := CVS-20141006
UPSTREAM_MINTLIB_TARBALL := mintlib-$(UPSTREAM_MINTLIB_VERSION).tar.gz
UPSTREAM_MINTLIB_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_MINTLIB_TARBALL)
diff --git a/m68k-atari-mint/fetchsrc b/m68k-atari-mint/fetchsrc
index bbe8f6b..e71d85f 100755
--- a/m68k-atari-mint/fetchsrc
+++ b/m68k-atari-mint/fetchsrc
@@ -11,6 +11,6 @@ if [ $? -ne 0 ];then
wget -q -O ${4} ${3}
if [ $? -ne 0 ];then
rm ${4}
- return 1
+ exit 1
fi
fi
diff --git a/sdk/Makefile b/sdk/Makefile
index 5ce0c73..29507b6 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -26,11 +26,11 @@ endif
VERSION_ZLIB := 1.2.8
VERSION_LIBICONV := 1.14
VERSION_LIBTRE := 0.8.0
-VERSION_OPENSSL := 1.0.1g
-VERSION_LIBPNG := 1.6.10
+VERSION_OPENSSL := 1.0.1i
+VERSION_LIBPNG := 1.6.13
VERSION_LIBJPEG := 8d
VERSION_LIBCARES := 1.10.0
-VERSION_LIBCURL := 7.34.0
+VERSION_LIBCURL := 7.38.0
VERSION_LIBGNURX := 2.5.1
VERSION_LIBPBL := 1_04
VERSION_LIBCF := CVS-20130415
@@ -38,7 +38,7 @@ VERSION_LIBEXPAT := 2.1.0
VERSION_LDG := 2.32
VERSION_WINDOM := 2.0.1
VERSION_HERMES := 1.3.3
-VERSION_FREETYPE := 2.5.2
+VERSION_FREETYPE := 2.5.3
VERSION_NSPR := 4.9.3
#VERSION_SPIDERMONKEY := 1.8.5
VERSION_SPIDERMONKEY := 1.7.0
diff --git a/sdk/recipes/patches/libcurl/7.34.0-ipv6-trynextip.p b/sdk/recipes/patches/libcurl/7.34.0-ipv6-trynextip.p
deleted file mode 100644
index 7135203..0000000
--- a/sdk/recipes/patches/libcurl/7.34.0-ipv6-trynextip.p
+++ /dev/null
@@ -1,27 +0,0 @@
-Origin: https://github.com/bagder/curl/commit/2d435c7fb5b7691e8ca1f3052e1eb5bcd8a4ea27.diff
-
-diff --git a/lib/connect.c b/lib/connect.c
-index 33f7aec..05666eb 100644
---- lib/connect.c
-+++ lib/connect.c
-@@ -5,7 +5,7 @@
- * | (__| |_| | _ <| |___
- * \___|\___/|_| \_\_____|
- *
-- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
-+ * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
-@@ -556,7 +556,11 @@ static CURLcode trynextip(struct connectdata *conn,
- else {
- /* happy eyeballs - try the other protocol family */
- int firstfamily = conn->tempaddr[0]->ai_family;
-+#ifdef ENABLE_IPV6
- family = (firstfamily == AF_INET) ? AF_INET6 : AF_INET;
-+#else
-+ family = firstfamily;
-+#endif
- ai = conn->tempaddr[0]->ai_next;
- }
-
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/jsapi.h.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/jsapi.h.p
new file mode 100644
index 0000000..e62520b
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/jsapi.h.p
@@ -0,0 +1,37 @@
+--- js/src/jsapi.h.orig 2014-10-15 16:23:17.799241148 +0100
++++ js/src/jsapi.h 2014-10-15 16:25:08.771240608 +0100
+@@ -214,7 +214,7 @@
+ * comment in jstypes.h regarding safe int64 usage.
+ */
+ extern JS_PUBLIC_API(int64)
+-JS_Now();
++JS_Now(void);
+
+ /* Don't want to export data, so provide accessors for non-inline jsvals. */
+ extern JS_PUBLIC_API(jsval)
+@@ -971,11 +971,11 @@
+ JSEqualityOp equality;
+ JSObjectOp outerObject;
+ JSObjectOp innerObject;
+- void (*reserved0)();
+- void (*reserved1)();
+- void (*reserved2)();
+- void (*reserved3)();
+- void (*reserved4)();
++ void (*reserved0)(void);
++ void (*reserved1)(void);
++ void (*reserved2)(void);
++ void (*reserved3)(void);
++ void (*reserved4)(void);
+ };
+
+ #define JSCLASS_HAS_PRIVATE (1<<0) /* objects have private slot */
+@@ -1962,7 +1962,7 @@
+ * to get UTF-8 support.
+ */
+ JS_PUBLIC_API(JSBool)
+-JS_CStringsAreUTF8();
++JS_CStringsAreUTF8(void);
+
+ /*
+ * Character encoding support.
diff --git a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsapi.h.p b/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsapi.h.p
new file mode 100644
index 0000000..e62520b
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsapi.h.p
@@ -0,0 +1,37 @@
+--- js/src/jsapi.h.orig 2014-10-15 16:23:17.799241148 +0100
++++ js/src/jsapi.h 2014-10-15 16:25:08.771240608 +0100
+@@ -214,7 +214,7 @@
+ * comment in jstypes.h regarding safe int64 usage.
+ */
+ extern JS_PUBLIC_API(int64)
+-JS_Now();
++JS_Now(void);
+
+ /* Don't want to export data, so provide accessors for non-inline jsvals. */
+ extern JS_PUBLIC_API(jsval)
+@@ -971,11 +971,11 @@
+ JSEqualityOp equality;
+ JSObjectOp outerObject;
+ JSObjectOp innerObject;
+- void (*reserved0)();
+- void (*reserved1)();
+- void (*reserved2)();
+- void (*reserved3)();
+- void (*reserved4)();
++ void (*reserved0)(void);
++ void (*reserved1)(void);
++ void (*reserved2)(void);
++ void (*reserved3)(void);
++ void (*reserved4)(void);
+ };
+
+ #define JSCLASS_HAS_PRIVATE (1<<0) /* objects have private slot */
+@@ -1962,7 +1962,7 @@
+ * to get UTF-8 support.
+ */
+ JS_PUBLIC_API(JSBool)
+-JS_CStringsAreUTF8();
++JS_CStringsAreUTF8(void);
+
+ /*
+ * Character encoding support.