From c64f1022200c80c32184aa8dad44900b96c35d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 4 Aug 2015 22:29:56 +0200 Subject: [PATCH 01/72] package/uboot-tools: bump to version 2015.07 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also: - update patch #1 - remove patch #3 and #4 -> applied upstream Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- .../0001-drop-configh-from-tools.patch | 25 ++++++- package/uboot-tools/0003-Fix-musl-build.patch | 71 ------------------- ...nfig-when-available-to-get-SSL-flags.patch | 39 ---------- package/uboot-tools/uboot-tools.hash | 2 +- package/uboot-tools/uboot-tools.mk | 2 +- 5 files changed, 24 insertions(+), 115 deletions(-) delete mode 100644 package/uboot-tools/0003-Fix-musl-build.patch delete mode 100644 package/uboot-tools/0004-tools-use-pkg-config-when-available-to-get-SSL-flags.patch diff --git a/package/uboot-tools/0001-drop-configh-from-tools.patch b/package/uboot-tools/0001-drop-configh-from-tools.patch index a36332fb8c..e77a301760 100644 --- a/package/uboot-tools/0001-drop-configh-from-tools.patch +++ b/package/uboot-tools/0001-drop-configh-from-tools.patch @@ -1,18 +1,33 @@ +From 2e54434e4dd178773e8e11e48afc81299771f3e7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Tue, 4 Aug 2015 22:13:20 +0200 +Subject: [PATCH 1/1] drop configh from tools +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + We need to build u-boot tools without a board configuration for the target. fw_env just uses config.h to define the default environment of the created image, so it really isn't mandatory. Signed-off-by: Gustavo Zacarias +[Jörg Krause: update for version 2015.07] +Signed-off-by: Jörg Krause +--- + tools/env/fw_env.h | 11 ----------- + 1 file changed, 11 deletions(-) diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h -index aff471b..dfe7439 100644 +index 60c0517..1c5daaa 100644 --- a/tools/env/fw_env.h +++ b/tools/env/fw_env.h -@@ -5,14 +5,6 @@ +@@ -5,17 +5,6 @@ * SPDX-License-Identifier: GPL-2.0+ */ -/* Pull in the current config to define the default environment */ +-#include +- -#ifndef __ASSEMBLY__ -#define __ASSEMBLY__ /* get only #defines from config.h */ -#include @@ -20,6 +35,10 @@ index aff471b..dfe7439 100644 -#else -#include -#endif - +- /* * To build the utility with the static configuration + * comment out the next line. +-- +2.5.0 + diff --git a/package/uboot-tools/0003-Fix-musl-build.patch b/package/uboot-tools/0003-Fix-musl-build.patch deleted file mode 100644 index 7c07dafd42..0000000000 --- a/package/uboot-tools/0003-Fix-musl-build.patch +++ /dev/null @@ -1,71 +0,0 @@ -From bf738fda390787a10db0c9a4be9fcafd6707a90e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Sat, 18 Apr 2015 08:00:46 +0200 -Subject: [PATCH 1/1] Fix musl build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This patch fixes cross-compiling U-Boot tools with the musl C library: - * including is needed for ulong - * defining _GNU_SOURCE is needed for loff_t - -Signed-off-by: Jörg Krause ---- - include/image.h | 1 + - tools/env/fw_env.c | 2 ++ - tools/imagetool.h | 1 + - tools/proftool.c | 1 + - 4 files changed, 5 insertions(+) - -diff --git a/include/image.h b/include/image.h -index 3844be6..ac2fd6e 100644 ---- a/include/image.h -+++ b/include/image.h -@@ -18,6 +18,7 @@ - - #include "compiler.h" - #include -+#include - - /* Define this to avoid #ifdefs later on */ - struct lmb; -diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c -index 1173eea..daa02a7 100644 ---- a/tools/env/fw_env.c -+++ b/tools/env/fw_env.c -@@ -8,6 +8,8 @@ - * SPDX-License-Identifier: GPL-2.0+ - */ - -+#define _GNU_SOURCE -+ - #include - #include - #include -diff --git a/tools/imagetool.h b/tools/imagetool.h -index 3e15b4e..b7874f4 100644 ---- a/tools/imagetool.h -+++ b/tools/imagetool.h -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/tools/proftool.c b/tools/proftool.c -index 3482951..9ce7a77 100644 ---- a/tools/proftool.c -+++ b/tools/proftool.c -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - #include - #include --- -2.3.5 diff --git a/package/uboot-tools/0004-tools-use-pkg-config-when-available-to-get-SSL-flags.patch b/package/uboot-tools/0004-tools-use-pkg-config-when-available-to-get-SSL-flags.patch deleted file mode 100644 index 9eb74834da..0000000000 --- a/package/uboot-tools/0004-tools-use-pkg-config-when-available-to-get-SSL-flags.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 99bc38ac6ebdd3b5d741cb9e50d842fa13d409f7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 12 May 2015 22:54:29 +0200 -Subject: [PATCH] tools: use pkg-config when available to get SSL flags - -Instead of hardcoding -lssl -lcrypto as the flags needed to build -mkimage with FIT signature enabled, use pkg-config when -available. This allows to properly support cases where static linking -is used, which requires linking with -lz, since OpenSSL uses zlib -internally. - -We gracefully fallback on the previous behavior of hardcoding -lssl --lcrypto if pkg-config is not available or fails with an error. - -Patch submitted upstream at -http://lists.denx.de/pipermail/u-boot/2015-May/214489.html - -Signed-off-by: Thomas Petazzoni ---- - tools/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/Makefile b/tools/Makefile -index 4bbb153..8ff9c2e 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -122,7 +122,8 @@ endif - - # MXSImage needs LibSSL - ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),) --HOSTLOADLIBES_mkimage += -lssl -lcrypto -+HOSTLOADLIBES_mkimage += \ -+ $(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto") - endif - - HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage) --- -2.1.0 - diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash index 9cc96f64c7..3b687d52df 100644 --- a/package/uboot-tools/uboot-tools.hash +++ b/package/uboot-tools/uboot-tools.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 0a1a70df586655f527befa6f12e184e96ed61b126e5a567382321b17200f5d60 u-boot-2015.04.tar.bz2 +sha256 0b48c9bd717f2c322ef791f8282e14c88be942dc7d1226df7e31a812a3af94d9 u-boot-2015.07.tar.bz2 diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 3ae346e210..5a239aba66 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2015.04 +UBOOT_TOOLS_VERSION = 2015.07 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPLv2+ From 3e978ab536e711affd6b927de856a509ecc133b2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 7 Aug 2015 10:37:30 -0300 Subject: [PATCH 02/72] znc: bump to version 1.6.1 Bump to release tarball version. Add hash file. Update and rework time.h patch for upstream inclusion (hopefully) by splitting the CSocket patch out. (https://github.com/znc/znc/pull/1021) Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- ...Add-time.h-includes-where-appropiate.patch | 194 +++++++++++ package/znc/0001-time.patch | 303 ------------------ package/znc/0002-csocket-timeh.patch | 19 ++ package/znc/Config.in | 5 +- package/znc/znc.hash | 2 + package/znc/znc.mk | 17 +- 6 files changed, 223 insertions(+), 317 deletions(-) create mode 100644 package/znc/0001-Add-time.h-includes-where-appropiate.patch delete mode 100644 package/znc/0001-time.patch create mode 100644 package/znc/0002-csocket-timeh.patch create mode 100644 package/znc/znc.hash diff --git a/package/znc/0001-Add-time.h-includes-where-appropiate.patch b/package/znc/0001-Add-time.h-includes-where-appropiate.patch new file mode 100644 index 0000000000..c8ba6d450a --- /dev/null +++ b/package/znc/0001-Add-time.h-includes-where-appropiate.patch @@ -0,0 +1,194 @@ +From 9a51195e916f14a36c2a2a809f2393e5ed2424a3 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Thu, 6 Aug 2015 11:20:54 -0300 +Subject: [PATCH] Add includes where appropiate + +Signed-off-by: Gustavo Zacarias +--- + modules/adminlog.cpp | 1 + + modules/ctcpflood.cpp | 1 + + modules/flooddetach.cpp | 1 + + modules/lastseen.cpp | 1 + + modules/log.cpp | 1 + + modules/simple_away.cpp | 1 + + src/Buffer.cpp | 1 + + src/FileUtils.cpp | 1 + + src/IRCSock.cpp | 1 + + src/User.cpp | 1 + + src/WebModules.cpp | 1 + + src/ZNCDebug.cpp | 1 + + src/main.cpp | 1 + + src/znc.cpp | 1 + + 14 files changed, 14 insertions(+) + +diff --git a/modules/adminlog.cpp b/modules/adminlog.cpp +index d08369e..1636799 100644 +--- a/modules/adminlog.cpp ++++ b/modules/adminlog.cpp +@@ -20,6 +20,7 @@ + #include + + #include ++#include + + class CAdminLogMod : public CModule { + public: +diff --git a/modules/ctcpflood.cpp b/modules/ctcpflood.cpp +index 7697ef8..c105ef7 100644 +--- a/modules/ctcpflood.cpp ++++ b/modules/ctcpflood.cpp +@@ -16,6 +16,7 @@ + + #include + #include ++#include + + class CCtcpFloodMod : public CModule { + public: +diff --git a/modules/flooddetach.cpp b/modules/flooddetach.cpp +index 9c41734..cd88bd2 100644 +--- a/modules/flooddetach.cpp ++++ b/modules/flooddetach.cpp +@@ -16,6 +16,7 @@ + + #include + #include ++#include + + using std::map; + +diff --git a/modules/lastseen.cpp b/modules/lastseen.cpp +index 416a111..414310f 100644 +--- a/modules/lastseen.cpp ++++ b/modules/lastseen.cpp +@@ -16,6 +16,7 @@ + + #include + #include ++#include + + using std::map; + using std::pair; +diff --git a/modules/log.cpp b/modules/log.cpp +index 2f3124a..e238bb1 100644 +--- a/modules/log.cpp ++++ b/modules/log.cpp +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + + using std::vector; +diff --git a/modules/simple_away.cpp b/modules/simple_away.cpp +index 57d6e7a..2f73b0a 100644 +--- a/modules/simple_away.cpp ++++ b/modules/simple_away.cpp +@@ -16,6 +16,7 @@ + + #include + #include ++#include + + #define SIMPLE_AWAY_DEFAULT_REASON "Auto away at %s" + #define SIMPLE_AWAY_DEFAULT_TIME 60 +diff --git a/src/Buffer.cpp b/src/Buffer.cpp +index 4715f76..dc14642 100644 +--- a/src/Buffer.cpp ++++ b/src/Buffer.cpp +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + + CBufLine::CBufLine(const CString& sFormat, const CString& sText, const timeval* ts) : m_sFormat(sFormat), m_sText(sText), m_time() { + if (ts == nullptr) +diff --git a/src/FileUtils.cpp b/src/FileUtils.cpp +index d358aa4..92218f3 100644 +--- a/src/FileUtils.cpp ++++ b/src/FileUtils.cpp +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #ifndef HAVE_LSTAT + # define lstat(a, b) stat(a, b) +diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp +index 738b5bf..c97b8fe 100644 +--- a/src/IRCSock.cpp ++++ b/src/IRCSock.cpp +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + using std::set; + using std::vector; +diff --git a/src/User.cpp b/src/User.cpp +index f3b5b91..580b52d 100644 +--- a/src/User.cpp ++++ b/src/User.cpp +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + + using std::vector; +diff --git a/src/WebModules.cpp b/src/WebModules.cpp +index 832a2e1..74e56de 100644 +--- a/src/WebModules.cpp ++++ b/src/WebModules.cpp +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/src/ZNCDebug.cpp b/src/ZNCDebug.cpp +index 6e36b57..be2f77f 100644 +--- a/src/ZNCDebug.cpp ++++ b/src/ZNCDebug.cpp +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + + bool CDebug::stdoutIsTTY = true; + bool CDebug::debug = +diff --git a/src/main.cpp b/src/main.cpp +index 465e1a0..cbe72bf 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -16,6 +16,7 @@ + + #include + #include ++#include + + #if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD) + #include +diff --git a/src/znc.cpp b/src/znc.cpp +index 624b92c..4c1ffcd 100644 +--- a/src/znc.cpp ++++ b/src/znc.cpp +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + +-- +2.4.6 + diff --git a/package/znc/0001-time.patch b/package/znc/0001-time.patch deleted file mode 100644 index 38661398a1..0000000000 --- a/package/znc/0001-time.patch +++ /dev/null @@ -1,303 +0,0 @@ -From 18d6daf4793fb7e9750175bd46b17fe1965b78dd Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 6 May 2014 22:00:11 +0200 -Subject: [PATCH] Add missing includes - -Submitted upstream at https://github.com/znc/znc/pull/569. - -Signed-off-by: Thomas Petazzoni ---- - modules/adminlog.cpp | 1 + - modules/awaystore.cpp | 2 ++ - modules/crypt.cpp | 2 ++ - modules/ctcpflood.cpp | 2 ++ - modules/flooddetach.cpp | 2 ++ - modules/lastseen.cpp | 2 ++ - modules/log.cpp | 2 ++ - modules/savebuff.cpp | 2 ++ - modules/schat.cpp | 2 ++ - modules/simple_away.cpp | 2 ++ - src/Buffer.cpp | 2 ++ - src/Csocket.cpp | 2 ++ - src/FileUtils.cpp | 2 ++ - src/HTTPSock.cpp | 1 + - src/IRCSock.cpp | 2 ++ - src/User.cpp | 1 + - src/Utils.cpp | 2 ++ - src/WebModules.cpp | 2 ++ - src/ZNCDebug.cpp | 1 + - src/main.cpp | 1 + - src/znc.cpp | 2 ++ - 21 files changed, 37 insertions(+) - -diff --git a/modules/adminlog.cpp b/modules/adminlog.cpp -index 77577b1..16dd665 100644 ---- a/modules/adminlog.cpp -+++ b/modules/adminlog.cpp -@@ -20,6 +20,7 @@ - #include - - #include -+#include - - class CAdminLogMod : public CModule { - public: -diff --git a/modules/awaystore.cpp b/modules/awaystore.cpp -index da75260..56349df 100644 ---- a/modules/awaystore.cpp -+++ b/modules/awaystore.cpp -@@ -30,6 +30,8 @@ - #include - #include - -+#include -+ - using std::vector; - using std::map; - -diff --git a/modules/crypt.cpp b/modules/crypt.cpp -index fcc664b..8f9018f 100644 ---- a/modules/crypt.cpp -+++ b/modules/crypt.cpp -@@ -34,6 +34,8 @@ - #include - #include - -+#include -+ - #define REQUIRESSL 1 - #define NICK_PREFIX_KEY "[nick-prefix]" - -diff --git a/modules/ctcpflood.cpp b/modules/ctcpflood.cpp -index ac154e2..f2ce27f 100644 ---- a/modules/ctcpflood.cpp -+++ b/modules/ctcpflood.cpp -@@ -17,6 +17,8 @@ - #include - #include - -+#include -+ - class CCtcpFloodMod : public CModule { - public: - MODCONSTRUCTOR(CCtcpFloodMod) { -diff --git a/modules/flooddetach.cpp b/modules/flooddetach.cpp -index f4ed892..0ffb651 100644 ---- a/modules/flooddetach.cpp -+++ b/modules/flooddetach.cpp -@@ -17,6 +17,8 @@ - #include - #include - -+#include -+ - using std::map; - - class CFloodDetachMod : public CModule { -diff --git a/modules/lastseen.cpp b/modules/lastseen.cpp -index bd6eb9b..b3b209f 100644 ---- a/modules/lastseen.cpp -+++ b/modules/lastseen.cpp -@@ -17,6 +17,8 @@ - #include - #include - -+#include -+ - using std::map; - using std::pair; - using std::multimap; -diff --git a/modules/log.cpp b/modules/log.cpp -index 260b577..e718d76 100644 ---- a/modules/log.cpp -+++ b/modules/log.cpp -@@ -21,6 +21,8 @@ - #include - #include - -+#include -+ - using std::vector; - - class CLogMod: public CModule { -diff --git a/modules/savebuff.cpp b/modules/savebuff.cpp -index 8a85153..2e0ed5c 100644 ---- a/modules/savebuff.cpp -+++ b/modules/savebuff.cpp -@@ -29,6 +29,8 @@ - #include - #include - -+#include -+ - using std::vector; - - #define CRYPT_VERIFICATION_TOKEN "::__:SAVEBUFF:__::" -diff --git a/modules/schat.cpp b/modules/schat.cpp -index 98d03b4..5a7f1a0 100644 ---- a/modules/schat.cpp -+++ b/modules/schat.cpp -@@ -25,6 +25,8 @@ - #include - #include - -+#include -+ - using std::pair; - using std::stringstream; - using std::map; -diff --git a/modules/simple_away.cpp b/modules/simple_away.cpp -index a1e5927..67faeea 100644 ---- a/modules/simple_away.cpp -+++ b/modules/simple_away.cpp -@@ -17,6 +17,8 @@ - #include - #include - -+#include -+ - #define SIMPLE_AWAY_DEFAULT_REASON "Auto away at %s" - #define SIMPLE_AWAY_DEFAULT_TIME 60 - -diff --git a/src/Buffer.cpp b/src/Buffer.cpp -index eefbb29..55ecd72 100644 ---- a/src/Buffer.cpp -+++ b/src/Buffer.cpp -@@ -17,6 +17,8 @@ - #include - #include - -+#include -+ - CBufLine::CBufLine(const CString& sFormat, const CString& sText, const timeval* ts) { - m_sFormat = sFormat; - m_sText = sText; -diff --git a/src/Csocket.cpp b/src/Csocket.cpp -index 2e4cb14..ca6ed38 100644 ---- a/src/Csocket.cpp -+++ b/src/Csocket.cpp -@@ -53,6 +53,8 @@ - #include - #endif /* HAVE_ICU */ - -+#include -+ - #include - - #define CS_SRANDBUFFER 128 -diff --git a/src/FileUtils.cpp b/src/FileUtils.cpp -index 7224a49..4c8f1d3 100644 ---- a/src/FileUtils.cpp -+++ b/src/FileUtils.cpp -@@ -23,6 +23,8 @@ - #include - #include - -+#include -+ - #ifndef HAVE_LSTAT - # define lstat(a, b) stat(a, b) - #endif -diff --git a/src/HTTPSock.cpp b/src/HTTPSock.cpp -index ab03130..36bf52b 100644 ---- a/src/HTTPSock.cpp -+++ b/src/HTTPSock.cpp -@@ -18,6 +18,7 @@ - #include - #include - -+#include - - #ifdef HAVE_ZLIB - #include -diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp -index 2ef12f6..d0c56a7 100644 ---- a/src/IRCSock.cpp -+++ b/src/IRCSock.cpp -@@ -20,6 +20,8 @@ - #include - #include - -+#include -+ - using std::set; - using std::vector; - using std::map; -diff --git a/src/User.cpp b/src/User.cpp -index cf664f1..4a64f83 100644 ---- a/src/User.cpp -+++ b/src/User.cpp -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - using std::vector; - using std::set; -diff --git a/src/Utils.cpp b/src/Utils.cpp -index 33c83de..e0862dd 100644 ---- a/src/Utils.cpp -+++ b/src/Utils.cpp -@@ -26,6 +26,8 @@ - #include - #include - -+#include -+ - using std::map; - using std::stringstream; - using std::vector; -diff --git a/src/WebModules.cpp b/src/WebModules.cpp -index d61ba23..ddd88e0 100644 ---- a/src/WebModules.cpp -+++ b/src/WebModules.cpp -@@ -22,6 +22,8 @@ - #include - #include - -+#include -+ - using std::pair; - using std::vector; - -diff --git a/src/ZNCDebug.cpp b/src/ZNCDebug.cpp -index 01d06b4..cc83298 100644 ---- a/src/ZNCDebug.cpp -+++ b/src/ZNCDebug.cpp -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - bool CDebug::stdoutIsTTY = true; - bool CDebug::debug = -diff --git a/src/main.cpp b/src/main.cpp -index ac9d691..7d74f8e 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -16,6 +16,7 @@ - - #include - #include -+#include - - using std::cout; - using std::endl; -diff --git a/src/znc.cpp b/src/znc.cpp -index 9e66f3d..dce1372 100644 ---- a/src/znc.cpp -+++ b/src/znc.cpp -@@ -21,6 +21,8 @@ - #include - #include - -+#include -+ - using std::endl; - using std::cout; - using std::map; --- -1.9.2 - diff --git a/package/znc/0002-csocket-timeh.patch b/package/znc/0002-csocket-timeh.patch new file mode 100644 index 0000000000..cbd435fc82 --- /dev/null +++ b/package/znc/0002-csocket-timeh.patch @@ -0,0 +1,19 @@ +Include time.h since time_t is used. + +Status: not upstream, seems to be fixed in newer CSocket versions in a +different way but it hasn't been updated/bundled in znc yet. + +Signed-off-by: Gustavo Zacarias + +diff -Nura znc-1.6.1.orig/src/Csocket.cpp znc-1.6.1.cs/src/Csocket.cpp +--- znc-1.6.1.orig/src/Csocket.cpp 2015-08-06 10:14:45.256246307 -0300 ++++ znc-1.6.1.cs/src/Csocket.cpp 2015-08-06 10:27:25.380446888 -0300 +@@ -54,6 +54,8 @@ + #include + #endif /* HAVE_ICU */ + ++#include ++ + #include + + #define CS_SRANDBUFFER 128 diff --git a/package/znc/Config.in b/package/znc/Config.in index 274e5370b2..4328c8b6fa 100644 --- a/package/znc/Config.in +++ b/package/znc/Config.in @@ -2,11 +2,12 @@ config BR2_PACKAGE_ZNC bool "znc" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS help Advanced IRC bouncer http://www.znc.in -comment "znc needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "znc needs a toolchain w/ C++, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS depends on BR2_USE_MMU diff --git a/package/znc/znc.hash b/package/znc/znc.hash new file mode 100644 index 0000000000..9d2b4a249d --- /dev/null +++ b/package/znc/znc.hash @@ -0,0 +1,2 @@ +# Locally calculated after checking pgp signature +sha256 ba49397364f48d6d32ae5242bc1166f21d972f85dd390d6bbe68a63ecbb6c140 znc-1.6.1.tar.gz diff --git a/package/znc/znc.mk b/package/znc/znc.mk index 779a7b128d..106be2de58 100644 --- a/package/znc/znc.mk +++ b/package/znc/znc.mk @@ -4,25 +4,18 @@ # ################################################################################ -ZNC_VERSION = b396cafdb249544164ed02942a5babba59e519a3 -ZNC_SITE = $(call github,znc,znc,$(ZNC_VERSION)) +ZNC_VERSION = 1.6.1 +ZNC_SITE = http://znc.in/releases ZNC_LICENSE = Apache-2.0 ZNC_LICENSE_FILES = LICENSE -ZNC_DEPENDENCIES = host-pkgconf host-autoconf host-automake +ZNC_DEPENDENCIES = host-pkgconf ZNC_CONF_OPTS = --disable-perl -# The standard _AUTORECONF = YES invocation doesn't work for this -# package, because it does not use automake in a normal way. -define ZNC_RUN_AUTOGEN - cd $(@D) && PATH=$(BR_PATH) ./autogen.sh -endef -ZNC_PRE_CONFIGURE_HOOKS += ZNC_RUN_AUTOGEN - ifeq ($(BR2_PACKAGE_ICU),y) ZNC_DEPENDENCIES += icu -ZNC_CONF_OPTS += --enable-icu +ZNC_CONF_OPTS += --enable-charset else -ZNC_CONF_OPTS += --disable-icu +ZNC_CONF_OPTS += --disable-charset endif ifeq ($(BR2_PACKAGE_OPENSSL),y) From 85e7763e3127a633768322e111bf40d53c4cc188 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 7 Aug 2015 10:37:31 -0300 Subject: [PATCH 03/72] openvpn: bump to version 2.3.8 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 9a917b95df..49227ea79b 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 4062ce972500f98988e9c6e9dd1040be25582f0d49aa7e69f3f4cff96e9aebee openvpn-2.3.7.tar.xz +sha256 a8620cc6b79beea91de8487f8fd2400a2e1ffdef109917021435cb31417cbb99 openvpn-2.3.8.tar.xz diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 336d491ae3..1caa9a0336 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.3.7 +OPENVPN_VERSION = 2.3.8 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf From 208fc3075247e2f2226af706278d1e13f3746942 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 7 Aug 2015 10:37:32 -0300 Subject: [PATCH 04/72] whois: bump to version 5.2.10 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/whois/whois.hash | 4 ++-- package/whois/whois.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/whois/whois.hash b/package/whois/whois.hash index 79c9aca6da..f04980d1d6 100644 --- a/package/whois/whois.hash +++ b/package/whois/whois.hash @@ -1,2 +1,2 @@ -# From http://ftp.debian.org/debian/pool/main/w/whois/whois_5.2.9.dsc -sha256 eee5446bf76ca7d38052767d6e2c542297d3a54ce928cada0ff24d2f1749d359 whois_5.2.9.tar.xz +# From http://ftp.debian.org/debian/pool/main/w/whois/whois_5.2.10.dsc +sha256 8acb42bc693f73f3141b413f7df11b5582b9b738d9bf0d60e9017a8af4cb53b9 whois_5.2.10.tar.xz diff --git a/package/whois/whois.mk b/package/whois/whois.mk index 274349fe39..738d464add 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.2.9 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20150608T042724Z/pool/main/w/whois +WHOIS_VERSION = 5.2.10 +WHOIS_SITE = http://snapshot.debian.org/archive/debian/20150730T034655Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz # take precedence over busybox implementation WHOIS_DEPENDENCIES = host-gettext $(if $(BR2_PACKAGE_BUSYBOX),busybox) From 2190e90c7cf09d773a6513c0e46e64d6c797c877 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 7 Aug 2015 10:37:33 -0300 Subject: [PATCH 05/72] glibc: add version 2.22 Switch default to version 2.21 and drop 2.20. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/glibc/2.20/0001-CVE-2014-7817.patch | 173 -------------------- package/glibc/2.20/0002-CVE-2014-9402.patch | 24 --- package/glibc/2.20/0003-CVE-2015-1472.patch | 88 ---------- package/glibc/Config.in | 14 +- package/glibc/glibc.hash | 2 +- 5 files changed, 7 insertions(+), 294 deletions(-) delete mode 100644 package/glibc/2.20/0001-CVE-2014-7817.patch delete mode 100644 package/glibc/2.20/0002-CVE-2014-9402.patch delete mode 100644 package/glibc/2.20/0003-CVE-2015-1472.patch diff --git a/package/glibc/2.20/0001-CVE-2014-7817.patch b/package/glibc/2.20/0001-CVE-2014-7817.patch deleted file mode 100644 index cd20c42c20..0000000000 --- a/package/glibc/2.20/0001-CVE-2014-7817.patch +++ /dev/null @@ -1,173 +0,0 @@ -Patch from https://bugzilla.redhat.com/show_bug.cgi?id=1157689 - -Signed-off-by: Gustavo Zacarias - -WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING !!! -EMBARGOED !!! EMBARGOED !!! EMARGOED !!! EMBARGOED !!! EMBARGOED !!! -SECURITY !!! SECURITY !!! SECURITY !!! SECURITY !!! SECURITY !!! - -CVE-2014-7817: - -The function wordexp() fails to properly handle the WRDE_NOCMD -flag when processing arithmetic inputs in the form of "$((... ``))" -where "..." can be anything valid. The backticks in the arithmetic -epxression are evaluated by in a shell even if WRDE_NOCMD forbade -command substitution. This allows an attacker to attempt to pass -dangerous commands via constructs of the above form, and bypass -the WRDE_NOCMD flag. This patch fixes this by checking for WRDE_NOCMD -in parse_arith(). The patch also hardens parse_backticks() and -parse_comm() to check for WRDE_NOCMD flag and return an error instead -of ever running a shell. - -We expand the testsuite and add 3 new regression tests of roughtly -the same form but with a couple of nested levels. - -On top of the 3 new tests we add fork validation to the WRDE_NOCMD -testing. If any forks are detected during the execution of a wordexp() -call with WRDE_NOCMD, the test is marked as failed. This is slightly -heuristic since vfork might be used, but it provides a higher level -of assurance that no shells were executed as part of command substitution -with WRDE_NOCMD in effect. In addition it doesn't require libpthread or -libdl, instead we use the public implementation namespace function -__register_atfork (already part of the public ABI for libpthread). - -Tested on x86_64 with no regressions. - -2014-10-27 Carlos O'Donell - - * wordexp-test.c (__dso_handle): Add prototype. - (__register_atfork): Likewise. - (__app_register_atfork): New function. - (registered_forks): New global. - (register_fork): New function. - (test_case): Add 3 new tests for WRDE_CMDSUB. - (main): Call __app_register_atfork. - (testit): If WRDE_NOCMD set registered_forks to zero, run test, and - if fork count is non-zero fail the test. - * posix/wordexp.c (parse_arith): Return WRDE_NOCMD if WRDE_NOCMD flag - is set and parsing '`'. - (parse_comm): Return WRDE_NOCMD if WRDE_NOCMD flag is set. - (parse_backtick): Return WRDE_NOCMD if WRDE_NOCMD flag is set and - parsing '`'. - -diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c -index 4957006..5ce2a1b 100644 ---- a/posix/wordexp-test.c -+++ b/posix/wordexp-test.c -@@ -27,6 +27,25 @@ - - #define IFS " \n\t" - -+extern void *__dso_handle __attribute__ ((__weak__, __visibility__ ("hidden"))); -+extern int __register_atfork (void (*) (void), void (*) (void), void (*) (void), void *); -+ -+static int __app_register_atfork (void (*prepare) (void), void (*parent) (void), void (*child) (void)) -+{ -+ return __register_atfork (prepare, parent, child, -+ &__dso_handle == NULL ? NULL : __dso_handle); -+} -+ -+/* Number of forks seen. */ -+static int registered_forks; -+ -+/* For each fork increment the fork count. */ -+static void -+register_fork (void) -+{ -+ registered_forks++; -+} -+ - struct test_case_struct - { - int retval; -@@ -206,6 +225,12 @@ struct test_case_struct - { WRDE_SYNTAX, NULL, "$((2+))", 0, 0, { NULL, }, IFS }, - { WRDE_SYNTAX, NULL, "`", 0, 0, { NULL, }, IFS }, - { WRDE_SYNTAX, NULL, "$((010+4+))", 0, 0, { NULL }, IFS }, -+ /* Test for CVE-2014-7817. We test 3 combinations of command -+ substitution inside an arithmetic expression to make sure that -+ no commands are executed and error is returned. */ -+ { WRDE_CMDSUB, NULL, "$((`echo 1`))", WRDE_NOCMD, 0, { NULL, }, IFS }, -+ { WRDE_CMDSUB, NULL, "$((1+`echo 1`))", WRDE_NOCMD, 0, { NULL, }, IFS }, -+ { WRDE_CMDSUB, NULL, "$((1+$((`echo 1`))))", WRDE_NOCMD, 0, { NULL, }, IFS }, - - { -1, NULL, NULL, 0, 0, { NULL, }, IFS }, - }; -@@ -258,6 +283,15 @@ main (int argc, char *argv[]) - return -1; - } - -+ /* If we are not allowed to do command substitution, we install -+ fork handlers to verify that no forks happened. No forks should -+ happen at all if command substitution is disabled. */ -+ if (__app_register_atfork (register_fork, NULL, NULL) != 0) -+ { -+ printf ("Failed to register fork handler.\n"); -+ return -1; -+ } -+ - for (test = 0; test_case[test].retval != -1; test++) - if (testit (&test_case[test])) - ++fail; -@@ -367,6 +401,9 @@ testit (struct test_case_struct *tc) - - printf ("Test %d (%s): ", ++tests, tc->words); - -+ if (tc->flags & WRDE_NOCMD) -+ registered_forks = 0; -+ - if (tc->flags & WRDE_APPEND) - { - /* initial wordexp() call, to be appended to */ -@@ -378,6 +415,13 @@ testit (struct test_case_struct *tc) - } - retval = wordexp (tc->words, &we, tc->flags); - -+ if ((tc->flags & WRDE_NOCMD) -+ && (registered_forks > 0)) -+ { -+ printf ("FAILED fork called for WRDE_NOCMD\n"); -+ return 1; -+ } -+ - if (tc->flags & WRDE_DOOFFS) - start_offs = sav_we.we_offs; - -diff --git a/posix/wordexp.c b/posix/wordexp.c -index b6b65dd..d6a158f 100644 ---- a/posix/wordexp.c -+++ b/posix/wordexp.c -@@ -693,6 +693,12 @@ parse_arith (char **word, size_t *word_length, size_t *max_length, - break; - - case '`': -+ if (flags & WRDE_NOCMD) -+ { -+ free (expr); -+ return WRDE_NOCMD; -+ } -+ - (*offset)++; - error = parse_backtick (&expr, &expr_length, &expr_maxlen, - words, offset, flags, NULL, NULL, NULL); -@@ -1144,6 +1150,10 @@ parse_comm (char **word, size_t *word_length, size_t *max_length, - size_t comm_maxlen; - char *comm = w_newword (&comm_length, &comm_maxlen); - -+ /* Do nothing if command substitution should not succeed. */ -+ if (flags & WRDE_NOCMD) -+ return WRDE_CMDSUB; -+ - for (; words[*offset]; ++(*offset)) - { - switch (words[*offset]) -@@ -2121,6 +2131,9 @@ parse_backtick (char **word, size_t *word_length, size_t *max_length, - switch (words[*offset]) - { - case '`': -+ if (flags & WRDE_NOCMD) -+ return WRDE_NOCMD; -+ - /* Go -- give the script to the shell */ - error = exec_comm (comm, word, word_length, max_length, flags, - pwordexp, ifs, ifs_white); diff --git a/package/glibc/2.20/0002-CVE-2014-9402.patch b/package/glibc/2.20/0002-CVE-2014-9402.patch deleted file mode 100644 index d6d753e2b5..0000000000 --- a/package/glibc/2.20/0002-CVE-2014-9402.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix CVE-2014-9402 - denial of service in getnetbyname function. -Backport from https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=11e3417af6e354f1942c68a271ae51e892b2814d -See https://bugzilla.redhat.com/show_bug.cgi?id=1175369 - -Signed-off-by: Gustavo Zacarias - -diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c -index 0a77c8b..08cf0a6 100644 ---- a/resolv/nss_dns/dns-network.c -+++ b/resolv/nss_dns/dns-network.c -@@ -398,8 +398,8 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result, - - case BYNAME: - { -- char **ap = result->n_aliases++; -- while (*ap != NULL) -+ char **ap; -+ for (ap = result->n_aliases; *ap != NULL; ++ap) - { - /* Check each alias name for being of the forms: - 4.3.2.1.in-addr.arpa = net 1.2.3.4 --- -1.7.1 - diff --git a/package/glibc/2.20/0003-CVE-2015-1472.patch b/package/glibc/2.20/0003-CVE-2015-1472.patch deleted file mode 100644 index b2f8e49d46..0000000000 --- a/package/glibc/2.20/0003-CVE-2015-1472.patch +++ /dev/null @@ -1,88 +0,0 @@ -Fix CVE-2015-1472 - heap buffer overflow in wscanf -Backport from upstream: -https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=5bd80bfe9ca0d955bfbbc002781bc7b01b6bcb06 -See: https://bugzilla.redhat.com/show_bug.cgi?id=1188235 - -Signed-off-by: Gustavo Zacarias - -diff --git a/stdio-common/tst-sscanf.c b/stdio-common/tst-sscanf.c -index aece3f2..8a2eb9e 100644 ---- a/stdio-common/tst-sscanf.c -+++ b/stdio-common/tst-sscanf.c -@@ -233,5 +233,38 @@ main (void) - } - } - -+ /* BZ #16618 -+ The test will segfault during SSCANF if the buffer overflow -+ is not fixed. The size of `s` is such that it forces the use -+ of malloc internally and this triggers the incorrect computation. -+ Thus the value for SIZE is arbitrariy high enough that malloc -+ is used. */ -+ { -+#define SIZE 131072 -+ CHAR *s = malloc ((SIZE + 1) * sizeof (*s)); -+ if (s == NULL) -+ abort (); -+ for (size_t i = 0; i < SIZE; i++) -+ s[i] = L('0'); -+ s[SIZE] = L('\0'); -+ int i = 42; -+ /* Scan multi-digit zero into `i`. */ -+ if (SSCANF (s, L("%d"), &i) != 1) -+ { -+ printf ("FAIL: bug16618: SSCANF did not read one input item.\n"); -+ result = 1; -+ } -+ if (i != 0) -+ { -+ printf ("FAIL: bug16618: Value of `i` was not zero as expected.\n"); -+ result = 1; -+ } -+ free (s); -+ if (result != 1) -+ printf ("PASS: bug16618: Did not crash.\n"); -+#undef SIZE -+ } -+ -+ - return result; - } -diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c -index cd129a8..0e204e7 100644 ---- a/stdio-common/vfscanf.c -+++ b/stdio-common/vfscanf.c -@@ -272,9 +272,10 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr, - if (__glibc_unlikely (wpsize == wpmax)) \ - { \ - CHAR_T *old = wp; \ -- size_t newsize = (UCHAR_MAX + 1 > 2 * wpmax \ -- ? UCHAR_MAX + 1 : 2 * wpmax); \ -- if (use_malloc || !__libc_use_alloca (newsize)) \ -+ bool fits = __glibc_likely (wpmax <= SIZE_MAX / sizeof (CHAR_T) / 2); \ -+ size_t wpneed = MAX (UCHAR_MAX + 1, 2 * wpmax); \ -+ size_t newsize = fits ? wpneed * sizeof (CHAR_T) : SIZE_MAX; \ -+ if (!__libc_use_alloca (newsize)) \ - { \ - wp = realloc (use_malloc ? wp : NULL, newsize); \ - if (wp == NULL) \ -@@ -286,14 +287,13 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr, - } \ - if (! use_malloc) \ - MEMCPY (wp, old, wpsize); \ -- wpmax = newsize; \ -+ wpmax = wpneed; \ - use_malloc = true; \ - } \ - else \ - { \ - size_t s = wpmax * sizeof (CHAR_T); \ -- wp = (CHAR_T *) extend_alloca (wp, s, \ -- newsize * sizeof (CHAR_T)); \ -+ wp = (CHAR_T *) extend_alloca (wp, s, newsize); \ - wpmax = s / sizeof (CHAR_T); \ - if (old != NULL) \ - MEMCPY (wp, old, wpsize); \ --- -1.9.4 - diff --git a/package/glibc/Config.in b/package/glibc/Config.in index 8cc8ccef3c..72fd3dfff1 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -32,17 +32,15 @@ config BR2_PACKAGE_GLIBC choice prompt "glibc version" - default BR2_GLIBC_VERSION_2_20 - -config BR2_GLIBC_VERSION_2_20 - depends on !BR2_nios2 - # Broken see https://bugs.busybox.net/show_bug.cgi?id=7941 - depends on !BR2_sparc - bool "2.20" + default BR2_GLIBC_VERSION_2_21 config BR2_GLIBC_VERSION_2_21 bool "2.21" +config BR2_GLIBC_VERSION_2_22 + bool "2.22" + depends on !BR2_sparc # broken + endchoice endif @@ -51,5 +49,5 @@ config BR2_GLIBC_VERSION_STRING string default "2.18-svnr23787" if BR2_EGLIBC_VERSION_2_18 default "2.19-svnr25243" if BR2_EGLIBC_VERSION_2_19 - default "2.20" if BR2_GLIBC_VERSION_2_20 default "2.21" if BR2_GLIBC_VERSION_2_21 + default "2.22" if BR2_GLIBC_VERSION_2_22 diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 525a5ed3a3..979202e43d 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -4,5 +4,5 @@ md5 b395b021422a027d89884992e91734fc eglibc-2.18-svnr23787.tar.bz2 sha1 224d9e655e8f0ad04ffde47b97a11c64e2255b56 eglibc-2.18-svnr23787.tar.bz2 md5 197836c2ba42fb146e971222647198dd eglibc-2.19-svnr25243.tar.bz2 sha1 8013c1935b46fd50d2d1fbfad3b0af362b75fb28 eglibc-2.19-svnr25243.tar.bz2 -sha256 f84b6d42aecc288d593c397b0a3d02260a33ee686bce0c634eb9b32798f36ba5 glibc-2.20.tar.xz sha256 aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8 glibc-2.21.tar.xz +sha256 eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948 glibc-2.22.tar.xz From e21ef305ab6544c6433d6e1f6bdacff3cc460053 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 7 Aug 2015 10:37:34 -0300 Subject: [PATCH 06/72] squid: bump to version 3.5.7 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/squid/squid.hash | 6 +++--- package/squid/squid.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/squid/squid.hash b/package/squid/squid.hash index d5738c763d..472df2d579 100644 --- a/package/squid/squid.hash +++ b/package/squid/squid.hash @@ -1,3 +1,3 @@ -# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.6.tar.xz.asc -md5 93e18bd257857e35bb634ddb8a348563 squid-3.5.6.tar.xz -sha1 c5f3ab47e61a08fa6a8767d45befeffd7d26fd9f squid-3.5.6.tar.xz +# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.7.tar.xz.asc +md5 e24943386555ca922130a7e034badba7 squid-3.5.7.tar.xz +sha1 e7dcc0cbcee6fd10a8c8bf3e9bff0dc6359ccc48 squid-3.5.7.tar.xz diff --git a/package/squid/squid.mk b/package/squid/squid.mk index e201673730..d345d15c37 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -5,7 +5,7 @@ ################################################################################ SQUID_VERSION_MAJOR = 3.5 -SQUID_VERSION = $(SQUID_VERSION_MAJOR).6 +SQUID_VERSION = $(SQUID_VERSION_MAJOR).7 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR) SQUID_LICENSE = GPLv2+ From 08c3226ba25c22a58c17f221795433aeb6c21075 Mon Sep 17 00:00:00 2001 From: Jonathan Ben Avraham Date: Wed, 5 Aug 2015 07:17:20 +0300 Subject: [PATCH 07/72] jpeg-turbo: bump version from 1.4.0 to 1.4.1 Signed-off-by: Jonathan Ben Avraham Signed-off-by: Thomas Petazzoni --- package/jpeg-turbo/jpeg-turbo.hash | 8 +++++--- package/jpeg-turbo/jpeg-turbo.mk | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/jpeg-turbo/jpeg-turbo.hash b/package/jpeg-turbo/jpeg-turbo.hash index bbc62f2bf9..dd61b2c7aa 100644 --- a/package/jpeg-turbo/jpeg-turbo.hash +++ b/package/jpeg-turbo/jpeg-turbo.hash @@ -1,3 +1,5 @@ -# From http://sourceforge.net/projects/libjpeg-turbo/files/1.4.0/ -sha1 a9ed7a99a6090e0848836c5df8e836f300a098b9 libjpeg-turbo-1.4.0.tar.gz -md5 039153dabe61e1ac8d9323b5522b56b0 libjpeg-turbo-1.4.0.tar.gz +# From http://sourceforge.net/projects/libjpeg-turbo/files/1.4.1/ +sha1 363a149f644211462c45138a19674f38100036d3 libjpeg-turbo-1.4.1.tar.gz +md5 b1f6b84859a16b8ebdcda951fa07c3f2 libjpeg-turbo-1.4.1.tar.gz +# Locally computed +sha256 4bf5bad4ce85625bffbbd9912211e06790e00fb982b77724af7211034efafb08 libjpeg-turbo-1.4.1.tar.gz diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index dd3ae194cc..25434b1967 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JPEG_TURBO_VERSION = 1.4.0 +JPEG_TURBO_VERSION = 1.4.1 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz JPEG_TURBO_SITE = http://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) JPEG_TURBO_LICENSE = jpeg-license (BSD-3c-like) From 9b8be0bf50e7aebbe7525fae968d1b4bea33d38d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Aug 2015 17:12:47 +0200 Subject: [PATCH 08/72] package/softether: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/softether/softether.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/softether/softether.mk b/package/softether/softether.mk index 17a450fe5d..489341e7e7 100644 --- a/package/softether/softether.mk +++ b/package/softether/softether.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOFTETHER_VERSION = 18b120e5f747a84d26302ec706f6c1c91d642ace +SOFTETHER_VERSION = 4b65e251f240d0b36c704acd598f4ceb07c41413 SOFTETHER_SITE = $(call github,SoftEtherVPN,SoftEtherVPN,$(SOFTETHER_VERSION)) SOFTETHER_PATCH = \ https://github.com/dajhorn/SoftEtherVPN/commit/c5e5d7e93c6f3302adf5821c29c4efdb7630e418.patch \ From 81aa2c8bc4d850230ca49a49334a01e00d13554a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Aug 2015 17:12:48 +0200 Subject: [PATCH 09/72] package/tor: bump version to 0.2.6.10 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 341a611431..637efe44df 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 4a6c29ad89a98d7832c599d9480d6d8e55355fb3b8f4b506c5df557f15942f9c tor-0.2.6.9.tar.gz +sha256 0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d tor-0.2.6.10.tar.gz diff --git a/package/tor/tor.mk b/package/tor/tor.mk index a4643913df..7db0964792 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.2.6.9 +TOR_VERSION = 0.2.6.10 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3c TOR_LICENSE_FILES = LICENSE From 1193328c03c54d03d94ddef8a0c52a119186df88 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Aug 2015 22:09:45 +0200 Subject: [PATCH 10/72] package/libglew: bump version to 1.12.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libglew/libglew.hash | 2 +- package/libglew/libglew.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libglew/libglew.hash b/package/libglew/libglew.hash index 9ac811ca7a..68c3e7a227 100644 --- a/package/libglew/libglew.hash +++ b/package/libglew/libglew.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 99c41320b63f6860869b5fb9af9a1854b15582796c64ee3dfd7096dc0c89f307 glew-1.10.0.tgz +sha256 af58103f4824b443e7fa4ed3af593b8edac6f3a7be3b30911edbc7344f48e4bf glew-1.12.0.tgz diff --git a/package/libglew/libglew.mk b/package/libglew/libglew.mk index 938ec67549..4d26ed855c 100644 --- a/package/libglew/libglew.mk +++ b/package/libglew/libglew.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGLEW_VERSION = 1.10.0 +LIBGLEW_VERSION = 1.12.0 LIBGLEW_SOURCE = glew-$(LIBGLEW_VERSION).tgz LIBGLEW_SITE = http://sourceforge.net/projects/glew/files/glew/$(LIBGLEW_VERSION) LIBGLEW_LICENSE = BSD-3c, MIT From a42c59dba1f31f307e568e4f1d544f511ef2b98b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 4 Aug 2015 11:57:27 +0200 Subject: [PATCH 11/72] package/poco: bump to version 1.6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also: * switch from sourceforge to github * remove hash (github-helper) * remove upstream applied patches * re-number remaining patches * add patch to fix build issue with `--bundled` config option [Thomas: really remove hash file, since we're fetching from Github.] Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/poco/0001-aarch64.patch | 39 --------- ...-add-the-staging-path-to-search-path.patch | 38 +++++++++ .../poco/0002-add-cross-build-config.patch | 82 ------------------- ...002-poco-don-t-build-debug-libraries.patch | 33 ++++++++ ...ting-declaration-with-unbundled-pcre.patch | 56 +++++++++++++ .../poco/0003-add-staging-search-path.patch | 23 ------ package/poco/0004-dont-build-debug-libs.patch | 19 ----- package/poco/poco.hash | 2 - package/poco/poco.mk | 10 +-- 9 files changed, 131 insertions(+), 171 deletions(-) delete mode 100644 package/poco/0001-aarch64.patch create mode 100644 package/poco/0001-poco-add-the-staging-path-to-search-path.patch delete mode 100644 package/poco/0002-add-cross-build-config.patch create mode 100644 package/poco/0002-poco-don-t-build-debug-libraries.patch create mode 100644 package/poco/0003-Fix-conflicting-declaration-with-unbundled-pcre.patch delete mode 100644 package/poco/0003-add-staging-search-path.patch delete mode 100644 package/poco/0004-dont-build-debug-libs.patch delete mode 100644 package/poco/poco.hash diff --git a/package/poco/0001-aarch64.patch b/package/poco/0001-aarch64.patch deleted file mode 100644 index f629f7ba92..0000000000 --- a/package/poco/0001-aarch64.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 37899eda9563d9134cb5864751b6432cabfaac3e Mon Sep 17 00:00:00 2001 -From: Will Newton -Date: Tue, 21 May 2013 22:11:05 +0100 -Subject: [PATCH] Foundation/include/Poco/Platform.h: Add support for AArch64. - -Add support for big and little endian AArch64 preprocessor defines. ---- - Foundation/include/Poco/Platform.h | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h -index f34f277..8ddb4cb 100644 ---- a/Foundation/include/Poco/Platform.h -+++ b/Foundation/include/Poco/Platform.h -@@ -145,6 +145,7 @@ - #define POCO_ARCH_S390 0x0c - #define POCO_ARCH_SH 0x0d - #define POCO_ARCH_NIOS2 0x0e -+#define POCO_ARCH_AARCH64 0x0f - - - #if defined(__ALPHA) || defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA) -@@ -207,7 +208,12 @@ - #else - #define POCO_ARCH_BIG_ENDIAN 1 - #endif -- -+#elif defined(__AARCH64EL__) -+ #define POCO_ARCH POCO_ARCH_AARCH64 -+ #define POCO_ARCH_LITTLE_ENDIAN 1 -+#elif defined(__AARCH64EB__) -+ #define POCO_ARCH POCO_ARCH_AARCH64 -+ #define POCO_ARCH_BIG_ENDIAN 1 - #endif - - --- -1.8.1.4 - diff --git a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch b/package/poco/0001-poco-add-the-staging-path-to-search-path.patch new file mode 100644 index 0000000000..5695b62618 --- /dev/null +++ b/package/poco/0001-poco-add-the-staging-path-to-search-path.patch @@ -0,0 +1,38 @@ +From b8417607ec8840e6a1e27cf03b6958c794a33e49 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 4 Aug 2015 10:14:00 +0200 +Subject: [PATCH 1/2] poco: add the staging path to search path +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add the mysql headers and client libraries to the search path of the +preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables +must be set from the make command line. + +[Peter: Remove host dirs, add MYSQL_INCDIR] +Signed-off-by: Baruch Siach +[Jörg: Update to version 1.6.1 from github] +Signed-off-by: Jörg Krause +--- + Data/MySQL/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile +index 0b18ca5..094e807 100644 +--- a/Data/MySQL/Makefile ++++ b/Data/MySQL/Makefile +@@ -8,8 +8,8 @@ + + include $(POCO_BASE)/build/rules/global + +-SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient +-INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include ++SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient ++INCLUDE += -I$(MYSQL_INCDIR) + SYSFLAGS += -DTHREADSAFE -DNO_TCL + + objects = Binder Extractor SessionImpl Connector \ +-- +2.5.0 + diff --git a/package/poco/0002-add-cross-build-config.patch b/package/poco/0002-add-cross-build-config.patch deleted file mode 100644 index a08783833b..0000000000 --- a/package/poco/0002-add-cross-build-config.patch +++ /dev/null @@ -1,82 +0,0 @@ -From: Baruch Siach -Subject: [PATCH] poco: add Linux configuration file for generic cross build - -This patch adds the Linux-CrossEnv config file to poco. This file is identical -to the Linux one, except the added CROSSENV variable that allows setting of -the toolchain prefix. - -Signed-off-by: Baruch Siach ---- -diff -Nuar poco-1.4.1p1-dist/build/config/Linux-CrossEnv poco-1.4.1p1/build/config/Linux-CrossEnv ---- poco-1.4.1p1-dist/build/config/Linux-CrossEnv 1970-01-01 02:00:00.000000000 +0200 -+++ poco-1.4.1p1/build/config/Linux-CrossEnv 2011-08-02 18:51:03.682047719 +0300 -@@ -0,0 +1,69 @@ -+# -+# Linux -+# -+# Make settings for cross compiled Linux -+# -+# -+ -+# -+# General Settings -+# -+LINKMODE ?= SHARED -+ -+# -+# Define Tools -+# -+CC = $(CROSSENV)gcc -+CXX = $(CROSSENV)g++ -+LINK = $(CXX) -+LIB = $(CROSSENV)ar -cr -+RANLIB = $(CROSSENV)ranlib -+SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@ -+SHLIBLN = $(POCO_BASE)/build/script/shlibln -+STRIP = $(CROSSENV)strip -+DEP = $(POCO_BASE)/build/script/makedepend.gcc -+SHELL = sh -+RM = rm -rf -+CP = cp -+MKDIR = mkdir -p -+ -+# -+# Extension for Shared Libraries -+# -+SHAREDLIBEXT = .so.$(target_version) -+SHAREDLIBLINKEXT = .so -+ -+# -+# Compiler and Linker Flags -+# -+CFLAGS = -+CFLAGS32 = -+CFLAGS64 = -+CXXFLAGS = -Wall -Wno-sign-compare -+CXXFLAGS32 = -+CXXFLAGS64 = -+LINKFLAGS = -+LINKFLAGS32 = -+LINKFLAGS64 = -+STATICOPT_CC = -+STATICOPT_CXX = -+STATICOPT_LINK = -static -+SHAREDOPT_CC = -fPIC -+SHAREDOPT_CXX = -fPIC -+SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH) -+DEBUGOPT_CC = -g -D_DEBUG -+DEBUGOPT_CXX = -g -D_DEBUG -+DEBUGOPT_LINK = -g -+RELEASEOPT_CC = -O2 -DNDEBUG -+RELEASEOPT_CXX = -O2 -DNDEBUG -+RELEASEOPT_LINK = -O2 -+ -+# -+# System Specific Flags -+# -+SYSFLAGS = -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DPOCO_HAVE_FD_EPOLL -+ -+# -+# System Specific Libraries -+# -+SYSLIBS = -lpthread -ldl -lrt diff --git a/package/poco/0002-poco-don-t-build-debug-libraries.patch b/package/poco/0002-poco-don-t-build-debug-libraries.patch new file mode 100644 index 0000000000..11bb7e9d1a --- /dev/null +++ b/package/poco/0002-poco-don-t-build-debug-libraries.patch @@ -0,0 +1,33 @@ +From e84c85cfa6742becbd4f82047ce92290bb3ec19a Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 4 Aug 2015 10:15:17 +0200 +Subject: [PATCH 2/2] poco: don't build debug libraries +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Remove the debug libraries build dependency from the default target. + +Signed-off-by: Baruch Siach +[Jörg: Update to version 1.6.1 from github] +Signed-off-by: Jörg Krause +--- + build/rules/compile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/rules/compile b/build/rules/compile +index 1945e3c..e0d7fbc 100644 +--- a/build/rules/compile ++++ b/build/rules/compile +@@ -14,7 +14,7 @@ + + all: $(DEFAULT_TARGET) + all_static: static_debug static_release +-all_shared: shared_debug shared_release ++all_shared: shared_release + all_debug: static_debug shared_debug + all_release: static_release shared_release + +-- +2.5.0 + diff --git a/package/poco/0003-Fix-conflicting-declaration-with-unbundled-pcre.patch b/package/poco/0003-Fix-conflicting-declaration-with-unbundled-pcre.patch new file mode 100644 index 0000000000..669e53ac68 --- /dev/null +++ b/package/poco/0003-Fix-conflicting-declaration-with-unbundled-pcre.patch @@ -0,0 +1,56 @@ +From 4e1165e1081e75de842567b16ae963cbed54e2a3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Tue, 4 Aug 2015 11:09:12 +0200 +Subject: [PATCH 3/3] Fix conflicting declaration with unbundled pcre +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Building poco 1.6.1 with the `--unbundled` config options fails due to an +conflicting declaration of `pcre`: + +```sh +In file included from src/RegularExpression.cpp:21:0: +/usr/include/pcre.h:325:26: error: conflicting declaration ‘typedef struct real_pcre pcre’ + typedef struct real_pcre pcre; + ^ +In file included from src/RegularExpression.cpp:17:0: +include/Poco/RegularExpression.h:37:34: note: previous declaration as ‘typedef struct real_pcre8_or_16 pcre’ + typedef struct real_pcre8_or_16 pcre; +``` + +Upstream status: +https://github.com/pocoproject/poco/pull/897 + +Signed-off-by: Jörg Krause +--- + Foundation/include/Poco/RegularExpression.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Foundation/include/Poco/RegularExpression.h b/Foundation/include/Poco/RegularExpression.h +index e1bc063..989ed52 100644 +--- a/Foundation/include/Poco/RegularExpression.h ++++ b/Foundation/include/Poco/RegularExpression.h +@@ -26,7 +26,9 @@ + #include "Poco/Foundation.h" + #include + +- ++#if defined(POCO_UNBUNDLED) ++#include ++#else + // + // Copy these definitions from pcre.h + // to avoid pulling in the entire header file +@@ -37,7 +39,7 @@ extern "C" + typedef struct real_pcre8_or_16 pcre; + struct pcre_extra; + } +- ++#endif + + namespace Poco { + +-- +2.5.0 + diff --git a/package/poco/0003-add-staging-search-path.patch b/package/poco/0003-add-staging-search-path.patch deleted file mode 100644 index a9397b4f1c..0000000000 --- a/package/poco/0003-add-staging-search-path.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Baruch Siach -Subject: [PATCH] poco: add the staging path to search path - -Add the mysql headers and client libraries to the search path of the -preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables -must be set from the make command line. - -[Peter: Remove host dirs, add MYSQL_INCDIR] -Signed-off-by: Baruch Siach ---- ---- poco-1.4.4-all-dist/Data/MySQL/Makefile 2012-09-20 01:30:42.000000000 +0300 -+++ poco-1.4.4-all/Data/MySQL/Makefile 2012-10-11 14:36:10.343153420 +0200 -@@ -8,8 +8,8 @@ - - include $(POCO_BASE)/build/rules/global - --SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient --INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include -+SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient -+INCLUDE += -I$(MYSQL_INCDIR) - SYSFLAGS += -DTHREADSAFE -DNO_TCL - - objects = Binder Extractor SessionImpl Connector \ diff --git a/package/poco/0004-dont-build-debug-libs.patch b/package/poco/0004-dont-build-debug-libs.patch deleted file mode 100644 index 7480963721..0000000000 --- a/package/poco/0004-dont-build-debug-libs.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Baruch Siach -Subject: [PATCH] poco: don't build debug libraries - -Remove the debug libraries build dependency from the default target. - -Signed-off-by: Baruch Siach ---- - ---- poco-1.4.1p1-dist/build/rules/compile 2011-02-09 11:12:24.000000000 +0200 -+++ poco-1.4.1p1/build/rules/compile 2011-08-03 07:51:42.946044176 +0300 -@@ -14,7 +14,7 @@ - - all: $(DEFAULT_TARGET) - all_static: static_debug static_release --all_shared: shared_debug shared_release -+all_shared: shared_release - all_debug: static_debug shared_debug - all_release: static_release shared_release - diff --git a/package/poco/poco.hash b/package/poco/poco.hash deleted file mode 100644 index 957293d5b0..0000000000 --- a/package/poco/poco.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 6791c35e790b055ae9c55abe0bccc453e9616f0183d85a1eeea69ad084e994fe poco-1.4.6p1-all.tar.gz diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 7233d43d18..580ee9e210 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,10 +4,8 @@ # ################################################################################ -POCO_VERSION_MAJOR = 1.4.6 -POCO_VERSION = $(POCO_VERSION_MAJOR)p1 -POCO_SOURCE = poco-$(POCO_VERSION)-all.tar.gz -POCO_SITE = http://downloads.sourceforge.net/project/poco/sources/poco-$(POCO_VERSION_MAJOR) +POCO_VERSION = poco-1.6.1-release +POCO_SITE = $(call github,pocoproject,poco,$(POCO_VERSION)) POCO_LICENSE = Boost-v1.0 POCO_LICENSE_FILES = LICENSE POCO_INSTALL_STAGING = YES @@ -41,7 +39,7 @@ endif define POCO_CONFIGURE_CMDS (cd $(@D); ./configure \ - --config=Linux-CrossEnv \ + --config=Linux \ --prefix=/usr \ --omit="$(POCO_OMIT)" \ $(POCO_CONF_OPTS) \ @@ -51,7 +49,7 @@ define POCO_CONFIGURE_CMDS endef define POCO_BUILD_CMDS - $(MAKE1) POCO_TARGET_OSARCH=$(ARCH) CROSSENV=$(TARGET_CROSS) \ + $(MAKE1) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \ MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \ MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql -C $(@D) endef From a01be610b2d2c986cf3b4671ef2066d79e62114a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 31 Jul 2015 09:12:16 -0300 Subject: [PATCH 12/72] stunnel: bump to version 5.22 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/stunnel/stunnel.hash | 4 ++-- package/stunnel/stunnel.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/stunnel/stunnel.hash b/package/stunnel/stunnel.hash index 5e75b2e543..9c2bb14b8d 100644 --- a/package/stunnel/stunnel.hash +++ b/package/stunnel/stunnel.hash @@ -1,2 +1,2 @@ -# From http://www.stunnel.org/pipermail/stunnel-users/2015-July/005180.html -sha256 2aef568b1955f5e233f6a8e17ebce3d30755f1be44c813f5a48e621f785596e3 stunnel-5.21.tar.gz +# From http://www.stunnel.org/pipermail/stunnel-users/2015-July/005183.html +sha256 8ad628a6948153cdb2044283f6988384a30585ea7e14778c2ee616a6678cb83f stunnel-5.22.tar.gz diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index 5e9cd726ec..64c60b127a 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -5,7 +5,7 @@ ################################################################################ STUNNEL_VERSION_MAJOR = 5 -STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).21 +STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).22 STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/$(STUNNEL_VERSION_MAJOR).x STUNNEL_DEPENDENCIES = openssl STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \ From fa50d6c1d33c919e503bed75c504399eb54dfeff Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 3 Aug 2015 11:11:21 -0300 Subject: [PATCH 13/72] libidn: bump to version 1.32 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libidn/libidn.hash | 4 ++-- package/libidn/libidn.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libidn/libidn.hash b/package/libidn/libidn.hash index 6425d55c29..20c844e121 100644 --- a/package/libidn/libidn.hash +++ b/package/libidn/libidn.hash @@ -1,2 +1,2 @@ -# From http://lists.gnu.org/archive/html/help-libidn/2015-07/msg00011.html -sha1 0bb34003a0fe05a91e60d346803401f16c82a1fb libidn-1.31.tar.gz +# From http://lists.nongnu.org/archive/html/help-libidn/2015-08/msg00001.html +sha1 ddd018611b98af7c67d434aa42d15d39f45129f5 libidn-1.32.tar.gz diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk index e10fb6e589..9ac2600b8d 100644 --- a/package/libidn/libidn.mk +++ b/package/libidn/libidn.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIDN_VERSION = 1.31 +LIBIDN_VERSION = 1.32 LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn LIBIDN_INSTALL_STAGING = YES LIBIDN_CONF_ENV = EMACS="no" From 8a33bc3ad9d2c1d516988585113a7751251b8ba4 Mon Sep 17 00:00:00 2001 From: Jonathan Ben Avraham Date: Wed, 5 Aug 2015 07:46:23 +0300 Subject: [PATCH 14/72] rapidxml: new package [Thomas: - Rewrap Config.in help text - Indicate that the SHA256 hash has been locally calculated, and add the MD5 and SHA1 hashes from SourceForge. - Use downloads.sourceforge.net as the download site instead of garr.dl.sourceforge.net, in order to use the SourceForge mirrors properly, and be consistent with all other Buildroot packages downloading stuff from SourceForge. - Change the license from "MIT" to "Boost Software License 1.0 or MIT" as indicated by the license.txt file. - Change the _EXTRACT_CMDS to remove the sub-directory created by the .zip file extraction, and simplify the staging installation step accordingly.] Signed-off-by: Jonathan Ben Avraham Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/rapidxml/Config.in | 11 +++++++++++ package/rapidxml/rapidxml.hash | 6 ++++++ package/rapidxml/rapidxml.mk | 27 +++++++++++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 package/rapidxml/Config.in create mode 100644 package/rapidxml/rapidxml.hash create mode 100644 package/rapidxml/rapidxml.mk diff --git a/package/Config.in b/package/Config.in index 47d14d7d31..3ab87cf461 100644 --- a/package/Config.in +++ b/package/Config.in @@ -918,6 +918,7 @@ menu "JSON/XML" source "package/libyaml/Config.in" source "package/mxml/Config.in" source "package/rapidjson/Config.in" + source "package/rapidxml/Config.in" source "package/tinyxml/Config.in" source "package/tinyxml2/Config.in" source "package/xerces/Config.in" diff --git a/package/rapidxml/Config.in b/package/rapidxml/Config.in new file mode 100644 index 0000000000..76b2248ec2 --- /dev/null +++ b/package/rapidxml/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_RAPIDXML + bool "rapidxml" + help + RapidXml is an attempt to create the fastest XML parser + possible, while retaining useability, portability and + reasonable W3C compatibility. It is an in-situ parser with + parsing speed approaching speed of strlen function executed + on the same data. + + http://sourceforge.net/projects/rapidxml/ + https://en.wikipedia.org/wiki/RapidXml diff --git a/package/rapidxml/rapidxml.hash b/package/rapidxml/rapidxml.hash new file mode 100644 index 0000000000..81919f0373 --- /dev/null +++ b/package/rapidxml/rapidxml.hash @@ -0,0 +1,6 @@ +# From https://sourceforge.net/projects/rapidxml/files/rapidxml/rapidxml%201.13/ +sha1 f5fd4fbc5ad7e96045313697811d65ea8089a950 rapidxml-1.13.zip +md5 7b4b42c9331c90aded23bb55dc725d6a rapidxml-1.13.zip + +# Locally calculated +sha256 c3f0b886374981bb20fabcf323d755db4be6dba42064599481da64a85f5b3571 rapidxml-1.13.zip diff --git a/package/rapidxml/rapidxml.mk b/package/rapidxml/rapidxml.mk new file mode 100644 index 0000000000..4356d8d6c3 --- /dev/null +++ b/package/rapidxml/rapidxml.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# rapidxml +# +################################################################################ + +RAPIDXML_VERSION = 1.13 +RAPIDXML_SOURCE = rapidxml-$(RAPIDXML_VERSION).zip +RAPIDXML_SITE = http://downloads.sourceforge.net/project/rapidxml/rapidxml/rapidxml%20$(RAPIDXML_VERSION)/ +RAPIDXML_LICENSE = Boost Software License 1.0 or MIT +RAPIDXML_LICENSE_FILES = license.txt + +# C++ headers only +RAPIDXML_INSTALL_TARGET = NO +RAPIDXML_INSTALL_STAGING = YES + +define RAPIDXML_EXTRACT_CMDS + $(UNZIP) -d $(@D) $(DL_DIR)/$(RAPIDXML_SOURCE) + mv $(@D)/rapidxml-$(RAPIDXML_VERSION)/* $(@D)/ + rmdir $(@D)/rapidxml-$(RAPIDXML_VERSION) +endef + +define RAPIDXML_INSTALL_STAGING_CMDS + cp -dpfr $(@D)/*hpp $(STAGING_DIR)/usr/include +endef + +$(eval $(generic-package)) From 718cefbb9ee76afd85c3eea0c2d65d46a7f9e8c7 Mon Sep 17 00:00:00 2001 From: Alex Suykov Date: Sat, 15 Aug 2015 20:19:34 +0300 Subject: [PATCH 15/72] package/batctl: bump to version 2015.1 musl fixes have been merged upstream, so the patch is no longer needed. [Thomas: re-add locally calculated sha256 hash.] Signed-off-by: Alex Suykov Signed-off-by: Thomas Petazzoni --- package/batctl/0001-musl-fixes.patch | 192 --------------------------- package/batctl/batctl.hash | 4 +- package/batctl/batctl.mk | 2 +- 3 files changed, 4 insertions(+), 194 deletions(-) delete mode 100644 package/batctl/0001-musl-fixes.patch diff --git a/package/batctl/0001-musl-fixes.patch b/package/batctl/0001-musl-fixes.patch deleted file mode 100644 index 4d64f31811..0000000000 --- a/package/batctl/0001-musl-fixes.patch +++ /dev/null @@ -1,192 +0,0 @@ -musl does not allow including netinet/* and linux/* headers together. -batctl includes netinet/if_ether.h indirectly via net/ethernet.h, -so netinet/if_ether.h must be used instead of linux/if_ether.h. - -__be16 and __be32 are linux-specific typedefs for uint16_t and -uint32_t with __attribute__((bitwise)) that has no effect -outside of the kernel. - -Signed-off-by: Alex Suykov - ---- batctl-2014.4.0/ping.c -+++ batctl-2014.4.0/ping.c -@@ -34,7 +34,7 @@ - #include - #include - #include --#include -+#include - - #include "main.h" - #include "ping.h" ---- batctl-2014.4.0/tcpdump.h -+++ batctl-2014.4.0/tcpdump.h -@@ -23,7 +23,7 @@ - #define _BATCTL_TCPDUMP_H - - #include --#include -+#include - #include - #include - #include "main.h" ---- batctl-2014.4.0/traceroute.c -+++ batctl-2014.4.0/traceroute.c -@@ -28,7 +28,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- batctl-2014.4.0/packet.h -+++ batctl-2014.4.0/packet.h -@@ -196,7 +196,7 @@ - struct batadv_bla_claim_dst { - uint8_t magic[3]; /* FF:43:05 */ - uint8_t type; /* bla_claimframe */ -- __be16 group; /* group id */ -+ uint16_t group; /* group id */ - }; - #pragma pack() - -@@ -213,12 +213,12 @@ - uint8_t version; - uint8_t ttl; - uint8_t flags; -- __be32 seqno; -+ uint32_t seqno; - uint8_t orig[ETH_ALEN]; - uint8_t prev_sender[ETH_ALEN]; - uint8_t reserved; - uint8_t tq; -- __be16 tvlv_len; -+ uint16_t tvlv_len; - /* __packed is not needed as the struct size is divisible by 4, - * and the largest data type in this struct has a size of 4. - */ -@@ -273,7 +273,7 @@ - uint8_t orig[ETH_ALEN]; - uint8_t uid; - uint8_t reserved; -- __be16 seqno; -+ uint16_t seqno; - }; - - #define BATADV_RR_LEN 16 -@@ -300,7 +300,7 @@ - uint8_t orig[ETH_ALEN]; - uint8_t uid; - uint8_t rr_cur; -- __be16 seqno; -+ uint16_t seqno; - uint8_t rr[BATADV_RR_LEN][ETH_ALEN]; - }; - -@@ -380,8 +380,8 @@ - #endif - uint8_t dest[ETH_ALEN]; - uint8_t orig[ETH_ALEN]; -- __be16 seqno; -- __be16 total_size; -+ uint16_t seqno; -+ uint16_t total_size; - }; - - /** -@@ -398,7 +398,7 @@ - uint8_t version; /* batman version field */ - uint8_t ttl; - uint8_t reserved; -- __be32 seqno; -+ uint32_t seqno; - uint8_t orig[ETH_ALEN]; - /* "4 bytes boundary + 2 bytes" long to make the payload after the - * following ethernet header again 4 bytes boundary aligned -@@ -431,14 +431,14 @@ - /* uint8_t first_dest[ETH_ALEN]; - saved in mac header destination */ - uint8_t first_source[ETH_ALEN]; - uint8_t first_orig_dest[ETH_ALEN]; -- __be32 first_crc; -+ uint32_t first_crc; - uint8_t second_ttl; - uint8_t second_ttvn; - uint8_t second_dest[ETH_ALEN]; - uint8_t second_source[ETH_ALEN]; - uint8_t second_orig_dest[ETH_ALEN]; -- __be32 second_crc; -- __be16 coded_len; -+ uint32_t second_crc; -+ uint16_t coded_len; - }; - - #pragma pack() -@@ -461,7 +461,7 @@ - uint8_t reserved; - uint8_t dst[ETH_ALEN]; - uint8_t src[ETH_ALEN]; -- __be16 tvlv_len; -+ uint16_t tvlv_len; - uint16_t align; - }; - -@@ -474,7 +474,7 @@ - struct batadv_tvlv_hdr { - uint8_t type; - uint8_t version; -- __be16 len; -+ uint16_t len; - }; - - /** -@@ -484,8 +484,8 @@ - * @bandwidth_up: advertised uplink upload bandwidth - */ - struct batadv_tvlv_gateway_data { -- __be32 bandwidth_down; -- __be32 bandwidth_up; -+ uint32_t bandwidth_down; -+ uint32_t bandwidth_up; - }; - - /** -@@ -498,7 +498,7 @@ - struct batadv_tvlv_tt_data { - uint8_t flags; - uint8_t ttvn; -- __be16 num_vlan; -+ uint16_t num_vlan; - }; - - /** -@@ -509,8 +509,8 @@ - * @reserved: unused, useful for alignment purposes - */ - struct batadv_tvlv_tt_vlan_data { -- __be32 crc; -- __be16 vid; -+ uint32_t crc; -+ uint16_t vid; - uint16_t reserved; - }; - -@@ -526,7 +526,7 @@ - uint8_t flags; - uint8_t reserved[3]; - uint8_t addr[ETH_ALEN]; -- __be16 vid; -+ uint16_t vid; - }; - - /** -@@ -536,7 +536,7 @@ - */ - struct batadv_tvlv_roam_adv { - uint8_t client[ETH_ALEN]; -- __be16 vid; -+ uint16_t vid; - }; - - /** diff --git a/package/batctl/batctl.hash b/package/batctl/batctl.hash index 663e6021de..1a045f43ed 100644 --- a/package/batctl/batctl.hash +++ b/package/batctl/batctl.hash @@ -1,2 +1,4 @@ +# http://downloads.open-mesh.org/batman/releases/batman-adv-2015.1/batctl-2015.1.tar.gz.sha1 +sha1 ae086f334ff912ab2a8116caedf0a2a1816acf1a batctl-2015.1.tar.gz # Locally calculated -sha256 77509ed70232ebc0b73e2fa9471ae13b12d6547d167dda0a82f7a7fad7252c36 batctl-2014.4.0.tar.gz +sha256 ea67ee22785e6fcd5149472bdf2df4e9f21716968e025e7dd41556a010a8d14a batctl-2015.1.tar.gz diff --git a/package/batctl/batctl.mk b/package/batctl/batctl.mk index c458752148..e91dff99dc 100644 --- a/package/batctl/batctl.mk +++ b/package/batctl/batctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATCTL_VERSION = 2014.4.0 +BATCTL_VERSION = 2015.1 BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION) BATCTL_LICENSE = GPLv2 BATCTL_DEPENDENCIES = libnl host-pkgconf From a984f5aa094e3c966b1f363108861b28034dd1b4 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 12 Aug 2015 23:47:10 +0200 Subject: [PATCH 16/72] evemu: bump version to 2.2.0 See [1] for details. [1] http://lists.freedesktop.org/archives/input-tools/2015-August/001190.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/evemu/evemu.hash | 4 ++-- package/evemu/evemu.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/evemu/evemu.hash b/package/evemu/evemu.hash index 99668b7e59..9d7bb5024c 100644 --- a/package/evemu/evemu.hash +++ b/package/evemu/evemu.hash @@ -1,2 +1,2 @@ -# Hash from http://lists.freedesktop.org/archives/input-tools/2014-November/001125.html -sha256 0c87360882751356e9f977ebf7438c00fe97deb232ac725dd86e5ba78203ee97 evemu-2.1.0.tar.xz +# Hash from http://lists.freedesktop.org/archives/input-tools/2015-August/001190.html +sha256 e0f79808959d1b1f307a3d5add8ee9e5786d926e9aeb0045dadb85c7350d0a3c evemu-2.2.0.tar.xz diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk index b502469ec9..ad56888c14 100644 --- a/package/evemu/evemu.mk +++ b/package/evemu/evemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -EVEMU_VERSION = 2.1.0 +EVEMU_VERSION = 2.2.0 EVEMU_SITE = http://www.freedesktop.org/software/evemu EVEMU_SOURCE = evemu-$(EVEMU_VERSION).tar.xz EVEMU_LICENSE = LGPLv3 (library), GPLv3 (tools) From 76f881532485132e1105755aa8a23e6789baf637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Date: Thu, 13 Aug 2015 16:10:32 +0200 Subject: [PATCH 17/72] linux-headers: bump 3.{2, 10, 12, 14, 18}.x and 4.1.x series MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Benoît Thébaudeau Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index baf098af54..61eca21e9e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -208,18 +208,18 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "3.0.101" if BR2_KERNEL_HEADERS_3_0 - default "3.2.69" if BR2_KERNEL_HEADERS_3_2 + default "3.2.70" if BR2_KERNEL_HEADERS_3_2 default "3.4.108" if BR2_KERNEL_HEADERS_3_4 - default "3.10.85" if BR2_KERNEL_HEADERS_3_10 + default "3.10.86" if BR2_KERNEL_HEADERS_3_10 default "3.11.10" if BR2_KERNEL_HEADERS_3_11 - default "3.12.45" if BR2_KERNEL_HEADERS_3_12 + default "3.12.46" if BR2_KERNEL_HEADERS_3_12 default "3.13.11" if BR2_KERNEL_HEADERS_3_13 - default "3.14.49" if BR2_KERNEL_HEADERS_3_14 + default "3.14.50" if BR2_KERNEL_HEADERS_3_14 default "3.15.10" if BR2_KERNEL_HEADERS_3_15 default "3.16.7" if BR2_KERNEL_HEADERS_3_16 default "3.17.8" if BR2_KERNEL_HEADERS_3_17 - default "3.18.19" if BR2_KERNEL_HEADERS_3_18 + default "3.18.20" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 - default "4.1.4" if BR2_KERNEL_HEADERS_4_1 + default "4.1.5" if BR2_KERNEL_HEADERS_4_1 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 0f2d8eae2e5fc0dade6c8b64c3fe4703fffe1b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Date: Thu, 13 Aug 2015 16:10:33 +0200 Subject: [PATCH 18/72] linux: bump default to version 4.1.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Benoît Thébaudeau Signed-off-by: Thomas Petazzoni --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 806c4950f1..86aeeeb643 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -21,7 +21,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "4.1.4" + bool "4.1.5" config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "Same as toolchain kernel headers" @@ -109,7 +109,7 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH config BR2_LINUX_KERNEL_VERSION string - default "4.1.4" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.1.5" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 9c0da0d7dd73ef376b2173c77a74e6025f1004a1 Mon Sep 17 00:00:00 2001 From: Viallard Anthony Date: Thu, 13 Aug 2015 11:59:36 +0200 Subject: [PATCH 19/72] msmtp: bump to version 1.6.2 Signed-off-by: Anthony Viallard Signed-off-by: Thomas Petazzoni --- package/msmtp/msmtp.hash | 6 +++--- package/msmtp/msmtp.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/msmtp/msmtp.hash b/package/msmtp/msmtp.hash index a522f9dd80..fb03e05a0d 100644 --- a/package/msmtp/msmtp.hash +++ b/package/msmtp/msmtp.hash @@ -1,3 +1,3 @@ -# From http://sourceforge.net/projects/msmtp/files/msmtp/1.6.1/ -md5 6ebba4809bbc665b8a665a018d1a5ee1 msmtp-1.6.1.tar.xz -sha1 ac70151bcb53af5e192cbb147fd2b8139c637089 msmtp-1.6.1.tar.xz +# From http://sourceforge.net/projects/msmtp/files/msmtp/1.6.2/ +md5 3baca93c7e5f1aa9d36a2e5b38739ab9 msmtp-1.6.2.tar.xz +sha1 2d2272d04851b9bc806a77f47344e61840185329 msmtp-1.6.2.tar.xz diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk index aa75dd4883..bff2620314 100644 --- a/package/msmtp/msmtp.mk +++ b/package/msmtp/msmtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSMTP_VERSION = 1.6.1 +MSMTP_VERSION = 1.6.2 MSMTP_SITE = http://downloads.sourceforge.net/project/msmtp/msmtp/$(MSMTP_VERSION) MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz MSMTP_DEPENDENCIES = host-pkgconf From d66d2492971cba4a30b326cc3f2eef5d3cb14b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Date: Thu, 13 Aug 2015 18:22:47 +0200 Subject: [PATCH 20/72] package/rpi-firmware: bump marking script version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes since last version: - add support for lz4-compressed kernels, - add copyright and license banners, - enable warnings and fix a few uses of undefined variables, - update from the rpi-4.0.y kernel. Signed-off-by: Benoît Thébaudeau Signed-off-by: Thomas Petazzoni --- package/rpi-firmware/mkknlimg | 246 ++++++++++++++++++++++------------ 1 file changed, 159 insertions(+), 87 deletions(-) mode change 100755 => 100644 package/rpi-firmware/mkknlimg diff --git a/package/rpi-firmware/mkknlimg b/package/rpi-firmware/mkknlimg old mode 100755 new mode 100644 index f3779473e7..33f81874bf --- a/package/rpi-firmware/mkknlimg +++ b/package/rpi-firmware/mkknlimg @@ -1,25 +1,51 @@ #!/usr/bin/env perl # # Originaly from: https://github.com/raspberrypi/tools/blob/master/mkimage/mkknlimg -# Original cset : 92a2df13b887f4799554bf92c4fc78d53668c868 +# Original cset : f5642106425d430e1f82ee064121a5fd0e05a386 +# +# ---------------------------------------------------------------------- +# mkknlimg by Phil Elwell for Raspberry Pi +# based on extract-ikconfig by Dick Streefland +# +# (c) 2009,2010 Dick Streefland +# (c) 2014,2015 Raspberry Pi (Trading) Limited +# +# Licensed under the terms of the GNU General Public License. +# ---------------------------------------------------------------------- use strict; +use warnings; use integer; +use constant FLAG_PI => 1; +use constant FLAG_DTOK => 2; +use constant FLAG_DDTK => 4; +use constant FLAG_283X => 8; + my $trailer_magic = 'RPTL'; my $tmpfile1 = "/tmp/mkknlimg_$$.1"; my $tmpfile2 = "/tmp/mkknlimg_$$.2"; my $dtok = 0; +my $ddtk = 0; +my $is_283x = 0; -while ($ARGV[0] =~ /^-/) +while (@ARGV && ($ARGV[0] =~ /^-/)) { my $arg = shift(@ARGV); if ($arg eq '--dtok') { $dtok = 1; } + elsif ($arg eq '--ddtk') + { + $ddtk = 1; + } + elsif ($arg eq '--283x') + { + $is_283x = 1; + } else { print ("* Unknown option '$arg'\n"); @@ -32,56 +58,68 @@ usage() if (@ARGV != 2); my $kernel_file = $ARGV[0]; my $out_file = $ARGV[1]; -my @wanted_config_lines = -( - 'CONFIG_BCM2708_DT' -); +if (! -r $kernel_file) +{ + print ("* File '$kernel_file' not found\n"); + usage(); +} -my @wanted_strings = -( - 'bcm2708_fb', - 'brcm,bcm2708-pinctrl', - 'brcm,bcm2835-gpio', - 'of_find_property' -); +my $wanted_configs = +{ + 'CONFIG_BCM2708_DT' => FLAG_PI | FLAG_DTOK, + 'CONFIG_ARCH_BCM2835' => FLAG_PI | FLAG_DTOK | FLAG_283X, +}; + +my $wanted_strings = +{ + 'bcm2708_fb' => FLAG_PI, + 'brcm,bcm2835-mmc' => FLAG_PI, + 'brcm,bcm2835-sdhost' => FLAG_PI, + 'brcm,bcm2708-pinctrl' => FLAG_PI | FLAG_DTOK, + 'brcm,bcm2835-gpio' => FLAG_PI | FLAG_DTOK, + 'brcm,bcm2835-pm-wdt' => FLAG_PI | FLAG_DTOK | FLAG_283X, + 'of_overlay_apply' => FLAG_DTOK | FLAG_DDTK, +}; my $res = try_extract($kernel_file, $tmpfile1); - -$res = try_decompress('\037\213\010', 'xy', 'gunzip', 0, - $kernel_file, $tmpfile1, $tmpfile2) if (!$res); -$res = try_decompress('\3757zXZ\000', 'abcde', 'unxz --single-stream', -1, - $kernel_file, $tmpfile1, $tmpfile2) if (!$res); -$res = try_decompress('BZh', 'xy', 'bunzip2', 0, - $kernel_file, $tmpfile1, $tmpfile2) if (!$res); -$res = try_decompress('\135\0\0\0', 'xxx', 'unlzma', 0, - $kernel_file, $tmpfile1, $tmpfile2) if (!$res); -$res = try_decompress('\211\114\132', 'xy', 'lzop -d', 0, - $kernel_file, $tmpfile1, $tmpfile2) if (!$res); +$res ||= try_decompress('\037\213\010', 'xy', 'gunzip', 0, + $kernel_file, $tmpfile1, $tmpfile2); +$res ||= try_decompress('\3757zXZ\000', 'abcde', 'unxz --single-stream', -1, + $kernel_file, $tmpfile1, $tmpfile2); +$res ||= try_decompress('BZh', 'xy', 'bunzip2', 0, + $kernel_file, $tmpfile1, $tmpfile2); +$res ||= try_decompress('\135\0\0\0', 'xxx', 'unlzma', 0, + $kernel_file, $tmpfile1, $tmpfile2); +$res ||= try_decompress('\211\114\132', 'xy', 'lzop -d', 0, + $kernel_file, $tmpfile1, $tmpfile2); +$res ||= try_decompress('\002\041\114\030', 'xy', 'lz4 -d', 1, + $kernel_file, $tmpfile1, $tmpfile2); my $append_trailer; my $trailer; +my $kver = '?'; + +$append_trailer = $dtok; if ($res) { - print("Version: $res->{''}\n"); + $kver = $res->{'kver'} || '?'; + my $flags = $res->{'flags'}; + print("Version: $kver\n"); - $append_trailer = $dtok; - if (!$dtok) + if ($flags & FLAG_PI) { - if (config_bool($res, 'bcm2708_fb')) - { - $dtok ||= config_bool($res, 'CONFIG_BCM2708_DT'); - $dtok ||= config_bool($res, 'brcm,bcm2708-pinctrl'); - $dtok ||= config_bool($res, 'brcm,bcm2835-gpio'); - $append_trailer = 1; - } - else - { - print ("* This doesn't look like a Raspberry Pi kernel. In pass-through mode.\n"); - } + $append_trailer = 1; + $dtok ||= ($flags & FLAG_DTOK) != 0; + $is_283x ||= ($flags & FLAG_283X) != 0; + $ddtk ||= ($flags & FLAG_DDTK) != 0; + } + else + { + print ("* This doesn't look like a Raspberry Pi kernel. In pass-through mode.\n"); } } -else +elsif (!$dtok) { print ("* Is this a valid kernel? In pass-through mode.\n"); } @@ -89,12 +127,16 @@ else if ($append_trailer) { printf("DT: %s\n", $dtok ? "y" : "n"); + printf("DDT: %s\n", $ddtk ? "y" : "n"); + printf("283x: %s\n", $is_283x ? "y" : "n"); my @atoms; push @atoms, [ $trailer_magic, pack('V', 0) ]; - push @atoms, [ 'KVer', $res->{''} ]; + push @atoms, [ 'KVer', $kver ]; push @atoms, [ 'DTOK', pack('V', $dtok) ]; + push @atoms, [ 'DDTK', pack('V', $ddtk) ]; + push @atoms, [ '283x', pack('V', $is_283x) ]; $trailer = pack_trailer(\@atoms); $atoms[0]->[1] = pack('V', length($trailer)); @@ -102,17 +144,31 @@ if ($append_trailer) $trailer = pack_trailer(\@atoms); } -die "* Failed to open '$kernel_file'\n" if (!open(my $ifh, '<', $kernel_file)); -die "* Failed to create '$out_file'\n" if (!open(my $ofh, '>', $out_file)); - -my $copybuf; +my $ofh; my $total_len = 0; -while (1) + +if ($out_file eq $kernel_file) { + die "* Failed to open '$out_file' for append\n" + if (!open($ofh, '>>', $out_file)); + $total_len = tell($ofh); +} +else +{ + die "* Failed to open '$kernel_file'\n" + if (!open(my $ifh, '<', $kernel_file)); + die "* Failed to create '$out_file'\n" + if (!open($ofh, '>', $out_file)); + + my $copybuf; + while (1) + { my $bytes = sysread($ifh, $copybuf, 64*1024); last if (!$bytes); syswrite($ofh, $copybuf, $bytes); $total_len += $bytes; + } + close($ifh); } if ($trailer) @@ -122,7 +178,6 @@ if ($trailer) syswrite($ofh, $trailer); } -close($ifh); close($ofh); exit($trailer ? 0 : 1); @@ -135,7 +190,7 @@ END { sub usage { - print ("Usage: mkknlimg [--dtok] \n"); + print ("Usage: mkknlimg [--dtok] [--283x] \n"); exit(1); } @@ -149,40 +204,9 @@ sub try_extract chomp($ver); - my $res = { ''=>$ver }; - my $string_pattern = '^('.join('|', @wanted_strings).')$'; - - my @matches = `strings \"$knl\" | grep -E \"$string_pattern\"`; - foreach my $match (@matches) - { - chomp($match); - $res->{$match} = 1; - } - - my $config_pattern = '^('.join('|', @wanted_config_lines).')=(.*)$'; - my $cf1 = 'IKCFG_ST\037\213\010'; - my $cf2 = '0123456789'; - - my $pos = `tr "$cf1\n$cf2" "\n$cf2=" < "$knl" | grep -abo "^$cf2"`; - if ($pos) - { - $pos =~ s/:.*[\r\n]*$//s; - $pos += 8; - my $err = (system("tail -c+$pos \"$knl\" | zcat > $tmp 2> /dev/null") >> 8); - if (($err == 0) || ($err == 2)) - { - if (open(my $fh, '<', $tmp)) - { - while (my $line = <$fh>) - { - chomp($line); - $res->{$1} = $2 if ($line =~ /$config_pattern/); - } - - close($fh); - } - } - } + my $res = { 'kver'=>$ver }; + $res->{'flags'} = strings_to_flags($knl, $wanted_strings) | + configs_to_flags($knl, $tmp, $wanted_configs); return $res; } @@ -197,6 +221,7 @@ sub try_decompress { chomp($pos); $pos = (split(/[\r\n]+/, $pos))[$idx]; + return undef if (!defined($pos)); $pos =~ s/:.*[\r\n]*$//s; my $cmd = "tail -c+$pos \"$knl\" | $zcat > $tmp2 2> /dev/null"; my $err = (system($cmd) >> 8); @@ -208,6 +233,59 @@ sub try_decompress return undef; } + +sub strings_to_flags +{ + my ($knl, $strings) = @_; + my $string_pattern = '^('.join('|', keys(%$strings)).')$'; + my $flags = 0; + + my @matches = `strings \"$knl\" | grep -E \"$string_pattern\"`; + foreach my $match (@matches) + { + chomp($match); + $flags |= $strings->{$match}; + } + + return $flags; +} + +sub configs_to_flags +{ + my ($knl, $tmp, $configs) = @_; + my $config_pattern = '^('.join('|', keys(%$configs)).')=(.*)$'; + my $cf1 = 'IKCFG_ST\037\213\010'; + my $cf2 = '0123456789'; + my $flags = 0; + + my $pos = `tr "$cf1\n$cf2" "\n$cf2=" < "$knl" | grep -abo "^$cf2"`; + if ($pos) + { + $pos =~ s/:.*[\r\n]*$//s; + $pos += 8; + my $err = (system("tail -c+$pos \"$knl\" | zcat > $tmp 2> /dev/null") >> 8); + if (($err == 0) || ($err == 2)) + { + if (open(my $fh, '<', $tmp)) + { + while (my $line = <$fh>) + { + chomp($line); + if (($line =~ /$config_pattern/) && + (($2 eq 'y') || ($2 eq 'm'))) + { + $flags |= $configs->{$1}; + } + } + + close($fh); + } + } + } + + return $flags; +} + sub pack_trailer { my ($atoms) = @_; @@ -219,9 +297,3 @@ sub pack_trailer } return $trailer; } - -sub config_bool -{ - my ($configs, $wanted) = @_; - return (($configs->{$wanted} eq 'y') || ($configs->{$wanted} eq '1')); -} From 81b01ce22308976c241fdad7c39ca237b40e9c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Date: Thu, 13 Aug 2015 18:22:48 +0200 Subject: [PATCH 21/72] package/rpi-firmware: bump version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Misc enhancements and fixes all over the place, most notably: - FW: better overclocking, add Mediatek mt7601u Wi-Fi driver, bump kernel version to 4.1.5... - DT: fix SPI, I²S, gpio-poweroff, add MCP7941X, uart1, Fen Logic VGA666 board, RPi Sense HAT... - video: add early frame sequential 3D support, YUV_UV destination format, qpu deinterlace... Signed-off-by: Benoît Thébaudeau Signed-off-by: Thomas Petazzoni --- package/rpi-firmware/rpi-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 1ef15aa5c1..243637668d 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 856e2e1907a7f7058289c30268515c8cbf3fa5e3 +RPI_FIRMWARE_VERSION = 52f65ac4ad1ef1d2838fa2f921d5bc3ece4c777b RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3c RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom From 556d292754932e6f4d5364c86098122980c78521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Date: Thu, 13 Aug 2015 18:22:49 +0200 Subject: [PATCH 22/72] configs/raspberrypi: bump kernel version to 4.1.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Benoît Thébaudeau Signed-off-by: Thomas Petazzoni --- configs/raspberrypi_defconfig | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 61487a47ce..af702a3d7d 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -3,19 +3,18 @@ BR2_arm1176jzf_s=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" -# Lock to 4.0 headers as the RPi kernel stable tree is -# based off the 4.0 branch +# Lock to 4.1 headers as the RPi kernel stable tree is +# based off the 4.1 branch BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="4.0.6" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_0=y +BR2_DEFAULT_KERNEL_VERSION="4.1.5" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f90f981770e3ac8506dc84c9cd01471faaa0b0c2" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="592503752b6951972f161f04280683c5af38d173" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_ZIMAGE=y From ccc6272e7b06ec3e1bb93ac6add14cc2ed0859ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Date: Thu, 13 Aug 2015 18:22:50 +0200 Subject: [PATCH 23/72] configs/raspberrypi2: bump kernel version to 4.1.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Benoît Thébaudeau Signed-off-by: Thomas Petazzoni --- configs/raspberrypi2_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 02603a22e7..7e49f0c6f6 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -7,16 +7,16 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" -# Lock to 4.0 headers as the RPi kernel stable tree is -# based off the 4.0 branch +# Lock to 4.1 headers as the RPi kernel stable tree is +# based off the 4.1 branch BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="4.0.6" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_0=y +BR2_DEFAULT_KERNEL_VERSION="4.1.5" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f90f981770e3ac8506dc84c9cd01471faaa0b0c2" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="592503752b6951972f161f04280683c5af38d173" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_ZIMAGE=y From e16f5da9d50f8f35b7d85b7313578006df142cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Date: Thu, 13 Aug 2015 18:22:51 +0200 Subject: [PATCH 24/72] package/rpi-userland: bump version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes since last version: - early frame sequential 3D support, - add exposure=off option, - khronos: merge with more recent header file, - vchiq: better error handling. Signed-off-by: Benoît Thébaudeau Signed-off-by: Thomas Petazzoni --- package/rpi-userland/rpi-userland.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 403409d783..f1914a2a59 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_USERLAND_VERSION = b834074d0c0d9d7e64c133ab14ed691999cee990 +RPI_USERLAND_VERSION = b864a841e5a459a66a890c22b3a34127cd226238 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3c RPI_USERLAND_LICENSE_FILES = LICENCE From 8836186ef1eb059e115927c54a638ac558d51ce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 13 Aug 2015 22:22:28 +0200 Subject: [PATCH 25/72] package/libpfm4: bump to version 4.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also use checksum from sourceforge. [Thomas: re-add strong SHA256 locally calculated hash.] Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/libpfm4/libpfm4.hash | 7 +++++-- package/libpfm4/libpfm4.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/libpfm4/libpfm4.hash b/package/libpfm4/libpfm4.hash index bc0ce52101..8bebc493fd 100644 --- a/package/libpfm4/libpfm4.hash +++ b/package/libpfm4/libpfm4.hash @@ -1,2 +1,5 @@ -# Locally computed: -sha256 a23eb9affbff279e13563a39317c0ad71c4de28908d4243c8bc109138430cc3b libpfm-4.3.0.tar.gz +# From http://sourceforge.net/projects/perfmon2/files/libpfm4/: +sha1 2ed06d6e746f7b1cd4b70e9736e621052f60d625 libpfm-4.6.0.tar.gz +md5 5077b9022440e4951d96f2d0e73bd487 libpfm-4.6.0.tar.gz +# Locally calculated +sha256 5ab1e5b0472550f9037a8800834f6bc3b927690070f69fac0b67284b4b05fd5f libpfm-4.6.0.tar.gz diff --git a/package/libpfm4/libpfm4.mk b/package/libpfm4/libpfm4.mk index 11106720aa..982500296c 100644 --- a/package/libpfm4/libpfm4.mk +++ b/package/libpfm4/libpfm4.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPFM4_VERSION = 4.3.0 +LIBPFM4_VERSION = 4.6.0 LIBPFM4_SOURCE = libpfm-$(LIBPFM4_VERSION).tar.gz LIBPFM4_SITE = http://downloads.sourceforge.net/project/perfmon2/libpfm4 LIBPFM4_LICENSE = libpfm4 license From 7eebcd24dc9897feb2233660fafb393521485b6b Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Wed, 12 Aug 2015 22:10:06 +0100 Subject: [PATCH 26/72] package/tzdata: bump version to 2015f Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/tzdata/tzdata.hash | 4 ++-- package/tzdata/tzdata.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index 091f57c8cf..cf89dc2846 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,2 +1,2 @@ -# From 2015e release anouncement. See http://mm.icann.org/pipermail/tz-announce/2015-June/000032.html -sha512 86498190a20c5c67827aa75f7e9c6aa6c19d58a88a70425ce70d5ae7cea42dc7386eb2867fa455fcfcdedc6a105ad70fbbdc7c27c7a58a51bd21d76a135983ce tzdata2015e.tar.gz +# From 2015f release anouncement. See http://mm.icann.org/pipermail/tz-announce/2015-August/000033.html +sha512 d86e6c9e4c6d9cd5de30762723d7a90ac697feeb6dd1f04649f6a35e4e1dc638261c32066db4aeafa767ac339ccd100c38dde044ceadd61e95cb3d39c27f977e tzdata2015f.tar.gz diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index c38d4fe8cd..336d145425 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2015e +TZDATA_VERSION = 2015f TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = ftp://ftp.iana.org/tz/releases TZDATA_STRIP_COMPONENTS = 0 From b38a6d5c027baae025c6eacb9dbd7b273524c417 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Wed, 12 Aug 2015 22:10:07 +0100 Subject: [PATCH 27/72] package/zic: bump version to 2015f Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/zic/zic.hash | 4 ++-- package/zic/zic.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 3ddd6f823a..67a6c6d0bb 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,2 +1,2 @@ -# From 2015e release anouncement. See http://mm.icann.org/pipermail/tz-announce/2015-June/000032.html -sha512 fdc568a68f4876b967b39e21fa53f063dc5756e886e2a273cc046d5a014eb517e9c91eb6e03d18c94a89ce48578868aed710790415c500188fce4e4add0ce7ca tzcode2015e.tar.gz +# From 2015f release anouncement. See http://mm.icann.org/pipermail/tz-announce/2015-August/000033.html +sha512 5cfbebde8a0be57e8388a7b6d35aeba99130a72c1a41f9bbd5d5864511a473aa5e9320ab21055b4383e64b3b9d7682c0d30377ce8407619987be672436014710 tzcode2015f.tar.gz diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 03e023ae4f..e4cc1d33ea 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2015e +ZIC_VERSION = 2015f ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = ftp://ftp.iana.org/tz/releases ZIC_STRIP_COMPONENTS = 0 From 3f95523ab222e30dbfb0f48df561a7b13d98652f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 11 Aug 2015 22:12:08 +0200 Subject: [PATCH 28/72] package/libuv: bump to version 1.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/libuv/libuv.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 505c8d89c0..68979e063e 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUV_VERSION = v1.6.1 +LIBUV_VERSION = v1.7.0 LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES From 81cfbee3410e236a3e6c7a64c9bfbed821706482 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 11 Aug 2015 07:35:33 +0300 Subject: [PATCH 29/72] mtd: drop unconditional non LFS build Buildroot removed non LFS support in the 2015.05 release. We now pass -D_FILE_OFFSET_BITS=64 unconditionally, so the mtd WITHOUT_LARGEFILE make variable has no effect. [Thomas: keep using += for other assigments of MTD_MAKE_OPTS.] Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/mtd/mtd.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index edf6e083ed..42a8c1deb3 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -24,8 +24,6 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) MTD_DEPENDENCIES += busybox endif -MTD_MAKE_OPTS = WITHOUT_LARGEFILE=1 - # If extended attributes are required, the acl package must # also be enabled which will also include the attr package. ifeq ($(BR2_PACKAGE_ACL),y) From 7270f114b0c0480c2411d1b2ae1114fd8396d6e3 Mon Sep 17 00:00:00 2001 From: Jonathan Ben Avraham Date: Mon, 17 Aug 2015 14:07:47 +0300 Subject: [PATCH 30/72] package/eigen: bump from 3.2.0 to 3.2.5 The current version of Eigen in Buildroot is 3.2.0 which was released in 2013. Eigen is an active project with too many important changes to begin to list in a bump commit message. See the project's published changelog for details: http://eigen.tuxfamily.org/index.php?title=ChangeLog#Eigen_3.2.5 Signed-off-by: Jonathan Ben Avraham Signed-off-by: Thomas Petazzoni --- package/eigen/eigen.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk index 1ac570786b..015330360e 100644 --- a/package/eigen/eigen.mk +++ b/package/eigen/eigen.mk @@ -4,8 +4,8 @@ # ################################################################################ -# version 3.2 -EIGEN_VERSION = ffa86ffb5570 +# version 3.2.5 +EIGEN_VERSION = 175a47a35f0c EIGEN_SITE = https://bitbucket.org/eigen/eigen EIGEN_SITE_METHOD = hg EIGEN_LICENSE = MPL2, BSD-3c, LGPLv2.1 From c994d5638310e0a6e5110bd11e51ab0d56188cad Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Tue, 11 Aug 2015 17:35:26 +0200 Subject: [PATCH 31/72] python-pyroute2: new package [Thomas: - fix legal info: * the license is GPLv2+ *or* Apache 2.0 * the license files list separator is space, not comma * README.license.md has been added to the license files, since it contains some useful information about the licensing. - rewrap Config.in help text.] Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-pyroute2/Config.in | 7 +++++++ package/python-pyroute2/python-pyroute2.mk | 21 +++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 package/python-pyroute2/Config.in create mode 100644 package/python-pyroute2/python-pyroute2.mk diff --git a/package/Config.in b/package/Config.in index 3ab87cf461..729df7a38a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -646,6 +646,7 @@ menu "external python modules" source "package/python-pypcap/Config.in" source "package/python-pyqt/Config.in" source "package/python-pyro/Config.in" + source "package/python-pyroute2/Config.in" source "package/python-pysendfile/Config.in" source "package/python-pysnmp/Config.in" source "package/python-pysnmp-apps/Config.in" diff --git a/package/python-pyroute2/Config.in b/package/python-pyroute2/Config.in new file mode 100644 index 0000000000..4f13ab2c7b --- /dev/null +++ b/package/python-pyroute2/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_PYROUTE2 + bool "python-pyroute2" + help + Python netlink library - Linux network / netns / wireless / + ipset configuration. + + https://github.com/svinota/pyroute2 diff --git a/package/python-pyroute2/python-pyroute2.mk b/package/python-pyroute2/python-pyroute2.mk new file mode 100644 index 0000000000..61de1957c7 --- /dev/null +++ b/package/python-pyroute2/python-pyroute2.mk @@ -0,0 +1,21 @@ +############################################################# +# +# python-pyroute2 +# +############################################################# + +PYTHON_PYROUTE2_VERSION = 16a8aced82c65b94eb9e15a7d773a3256763d155 +PYTHON_PYROUTE2_SITE = $(call github,svinota,pyroute2,$(PYTHON_PYROUTE2_VERSION)) +PYTHON_PYROUTE2_LICENSE = Apache-2.0 or GPLv2+ +PYTHON_PYROUTE2_LICENSE_FILES = LICENSE.Apache.v2 LICENSE.GPL.v2 README.license.md +PYTHON_PYROUTE2_SETUP_TYPE = distutils +PYTHON_PYROUTE2_DEPENDENCIES = host-gawk + +# this hook is needed to create setup.py from setup.py.in +define PYTHON_PYROUTE2_CREATE_SETUP_PY + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) update-version +endef + +PYTHON_PYROUTE2_PRE_CONFIGURE_HOOKS += PYTHON_PYROUTE2_CREATE_SETUP_PY + +$(eval $(python-package)) From f9280fd9e9f9a4bb108327362559cccac6186b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 11 Aug 2015 09:46:46 +0200 Subject: [PATCH 32/72] package/jsoncpp: bump to version 1.6.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove patch 0001-Revert-Use-std-namespace-for-snprintf.patch: This patch was initially intented to remove upstream commit 1c58876185d2a4ed87dac4a54b82f607e74f55fd to disable std::snprintf() for all compilers. However, the patch actually reverts upstream commit 240ddb6a1b7aae7c6528e328995812ee695a73af which only uses std namespace if the compiler defines __cplusplus >= 201103L, thus is a recent C++11 compiler. Furthermore, upstream commit fac87108a49fb1b2640eff5d8e4cc7a12723a510 adds the `-std=c++11` compiler flag to gcc, so jsoncpp now requires a C++11 compiler either way. With jsoncpp requiring a recent C++11 compiler we need at least gcc 4.7. Backport patch from upstream [1] to remove `-Werror` from the compiler flags to allow building with CS ARM toolchains. [1] https://github.com/open-source-parsers/jsoncpp/commit/d7b84f69c5e92178e110552cce27f900744e1779 Cc: Baruch Siach Cc: Bernd Kuhls Signed-off-by: Jörg Krause Reviewed-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/jsoncpp/0001-Remove-Werror.patch | 39 +++++++++++++++++++ ...evert-Use-std-namespace-for-snprintf.patch | 39 ------------------- package/jsoncpp/Config.in | 5 ++- package/jsoncpp/jsoncpp.mk | 2 +- 4 files changed, 43 insertions(+), 42 deletions(-) create mode 100644 package/jsoncpp/0001-Remove-Werror.patch delete mode 100644 package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch diff --git a/package/jsoncpp/0001-Remove-Werror.patch b/package/jsoncpp/0001-Remove-Werror.patch new file mode 100644 index 0000000000..178cbbf78f --- /dev/null +++ b/package/jsoncpp/0001-Remove-Werror.patch @@ -0,0 +1,39 @@ +From d7b84f69c5e92178e110552cce27f900744e1779 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Thu, 30 Jul 2015 23:47:05 +0200 +Subject: [PATCH 1/1] Remove Werror +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +-Werror shouldn't be used in released code since it can cause random build +failures on moderate warnings. It also depends on the used toolchain since +different toolchains may or may not print the same warnings. + +Backported from: d7b84f69c5e92178e110552cce27f900744e1779 + +Signed-off-by: Jörg Krause +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cab0de8..62bf203 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -97,10 +97,10 @@ endif( MSVC ) + + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + # using regular Clang or AppleClang +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -Wconversion -Wshadow -Wno-sign-conversion") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wconversion -Wshadow -Wno-sign-conversion") + elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + # using GCC +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -Wconversion -Wshadow -Wextra -pedantic") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wconversion -Wshadow -Wextra -pedantic") + # not yet ready for -Wsign-conversion + endif() + +-- +2.5.0 + diff --git a/package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch b/package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch deleted file mode 100644 index 7935849214..0000000000 --- a/package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 29bfb6ac06b7304d326e3b70fc0209a702b89d83 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Subject: [PATCH] Revert "Use std namespace for snprintf." - -This reverts commit 1c58876185d2a4ed87dac4a54b82f607e74f55fd. - -std::snprintf() is only available in C++11, which is not provided by -all compilers. Since the C library snprintf() can easily be used as a -replacement on Linux systems, this patch changes jsoncpp to use the C -library snprintf() instead of C++11 std::snprintf(), fixing the build error -below: - -src/lib_json/json_writer.cpp:33:18: error: 'snprintf' is not a member of 'std' - -Upstream status: sent upstream -package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch - -Signed-off-by: Baruch Siach ---- - - src/lib_json/json_writer.cpp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp -index 83102fd2bb86..f7ad1e21bbc0 100644 ---- a/src/lib_json/json_writer.cpp -+++ b/src/lib_json/json_writer.cpp -@@ -29,8 +29,6 @@ - - #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below - #define snprintf _snprintf --#elif __cplusplus >= 201103L --#define snprintf std::snprintf - #endif - - #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0 --- -2.1.4 - diff --git a/package/jsoncpp/Config.in b/package/jsoncpp/Config.in index 2c96f13266..83118c400c 100644 --- a/package/jsoncpp/Config.in +++ b/package/jsoncpp/Config.in @@ -1,4 +1,5 @@ config BR2_PACKAGE_JSONCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 depends on BR2_INSTALL_LIBSTDCPP bool "jsoncpp" help @@ -10,5 +11,5 @@ config BR2_PACKAGE_JSONCPP https://github.com/open-source-parsers/jsoncpp -comment "jsoncpp needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "jsoncpp needs a toolchain w/ C++, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk index 63b18e62a1..132e264f4d 100644 --- a/package/jsoncpp/jsoncpp.mk +++ b/package/jsoncpp/jsoncpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSONCPP_VERSION = 1.6.1 +JSONCPP_VERSION = 1.6.5 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE From b309d194286c3e8e5aa2e6652ed5351c0d879dec Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 20 Aug 2015 10:37:02 +0200 Subject: [PATCH 33/72] mosquitto: bump version Signed-off-by: Peter Korsgaard --- package/mosquitto/mosquitto.hash | 2 +- package/mosquitto/mosquitto.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index 90133d7952..2ca1d17d14 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 5ebc3800a0018bfbec62dcc3748fb29f628df068acd39c62c4ef651d9276647e mosquitto-1.4.2.tar.gz +sha256 773d7436f729b5a6088035708c9277a9c6ba5651e127b63c8f29fe39e152479c mosquitto-1.4.3.tar.gz diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index 281833c41f..d9703fbb7d 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 1.4.2 +MOSQUITTO_VERSION = 1.4.3 MOSQUITTO_SITE = http://mosquitto.org/files/source MOSQUITTO_LICENSE = EPLv1.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 From 49334f20c228e539b0e3fe3fa8bfb38358dcd0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 31 Jul 2015 21:54:16 +0200 Subject: [PATCH 34/72] package/upmpdcli: bump to version 0.11.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also: * remove patch #1 -> merged upstream Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- ...-Add-conditional-check-for-__linux__.patch | 32 ------------------- package/upmpdcli/upmpdcli.hash | 4 +-- package/upmpdcli/upmpdcli.mk | 2 +- 3 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 package/upmpdcli/0001-Add-conditional-check-for-__linux__.patch diff --git a/package/upmpdcli/0001-Add-conditional-check-for-__linux__.patch b/package/upmpdcli/0001-Add-conditional-check-for-__linux__.patch deleted file mode 100644 index 910ee3c7e5..0000000000 --- a/package/upmpdcli/0001-Add-conditional-check-for-__linux__.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 69740cf6fe35413edc4b6adc502ba70ce8de8557 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Sun, 19 Jul 2015 08:48:13 +0200 -Subject: [PATCH 1/1] Add conditional check for __linux__ -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When building upmpdcli with certain toolchains using the compiler flag --std=c++0x let gcc not define "linux" or "__linux", but "__linux__". - -Signed-off-by: Jörg Krause ---- - src/closefrom.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/closefrom.cpp b/src/closefrom.cpp -index 4429b20..0cd7957 100644 ---- a/src/closefrom.cpp -+++ b/src/closefrom.cpp -@@ -111,7 +111,7 @@ int libclf_closefrom(int fd0) - } - - /*************************************************************************/ --#elif (defined(linux) || defined(__linux)) -+#elif (defined(linux) || defined(__linux) || defined(__linux__)) - - /* Use /proc/self/fd directory */ - #include --- -2.4.6 - diff --git a/package/upmpdcli/upmpdcli.hash b/package/upmpdcli/upmpdcli.hash index 549945ee17..762b0af585 100644 --- a/package/upmpdcli/upmpdcli.hash +++ b/package/upmpdcli/upmpdcli.hash @@ -1,2 +1,2 @@ -# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-0.11.0.tar.gz.sha256 -sha256 0f064b7fe498ee56879e606f48b7bafa42381d25fda6b91ef2cb3677effc85b9 upmpdcli-0.11.0.tar.gz +# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-0.11.2.tar.gz.sha256 +sha256 595865c306b0076baaff7eb4f76f779119bd8952f53a4e6662157dc83ab70d89 upmpdcli-0.11.2.tar.gz diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index 8dde87dc72..c69e01c520 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPMPDCLI_VERSION = 0.11.0 +UPMPDCLI_VERSION = 0.11.2 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = GPLv2+ UPMPDCLI_LICENSE_FILES = COPYING From 4136ea9278bc41f7c0b6afa8f7582b58f510b65a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 4 Aug 2015 10:12:13 -0300 Subject: [PATCH 35/72] configs/mpc8315erdb: bump to the latest and greatest versions Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- board/freescale/mpc8315erdb/linux-3.18.config | 92 ------------------- board/freescale/mpc8315erdb/linux-4.1.config | 48 ++++++++++ configs/freescale_mpc8315erdb_defconfig | 8 +- 3 files changed, 52 insertions(+), 96 deletions(-) delete mode 100644 board/freescale/mpc8315erdb/linux-3.18.config create mode 100644 board/freescale/mpc8315erdb/linux-4.1.config diff --git a/board/freescale/mpc8315erdb/linux-3.18.config b/board/freescale/mpc8315erdb/linux-3.18.config deleted file mode 100644 index a994706fc6..0000000000 --- a/board/freescale/mpc8315erdb/linux-3.18.config +++ /dev/null @@ -1,92 +0,0 @@ -CONFIG_SYSVIPC=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -# CONFIG_KALLSYMS is not set -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_PARTITION_ADVANCED=y -# CONFIG_PPC_CHRP is not set -# CONFIG_PPC_PMAC is not set -CONFIG_PPC_83xx=y -CONFIG_MPC831x_RDB=y -CONFIG_PCI=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_SYN_COOKIES=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_FW_LOADER is not set -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP_OF=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_FSL_ELBC=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=32768 -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_SPI_ATTRS=y -CONFIG_ATA=y -CONFIG_SATA_FSL=y -CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -CONFIG_MD_LINEAR=y -CONFIG_MD_RAID0=y -CONFIG_MD_RAID1=y -CONFIG_NETDEVICES=y -CONFIG_GIANFAR=y -CONFIG_E100=y -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MPC=y -CONFIG_SPI=y -CONFIG_SPI_BITBANG=y -CONFIG_WATCHDOG=y -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_MON=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_FSL=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PPC_OF_BE=y -CONFIG_USB_UHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_RTC_CLASS=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y -CONFIG_RTC_DRV_DS1307=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_PROC_KCORE=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_CRYPTO_PCBC=m -# CONFIG_CRYPTO_ANSI_CPRNG is not set diff --git a/board/freescale/mpc8315erdb/linux-4.1.config b/board/freescale/mpc8315erdb/linux-4.1.config new file mode 100644 index 0000000000..c9f17b73f3 --- /dev/null +++ b/board/freescale/mpc8315erdb/linux-4.1.config @@ -0,0 +1,48 @@ +CONFIG_SYSVIPC=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_EXPERT=y +CONFIG_MODULES=y +# CONFIG_PPC_CHRP is not set +# CONFIG_PPC_PMAC is not set +CONFIG_PPC_83xx=y +CONFIG_MPC831x_RDB=y +CONFIG_PCI=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_FSL_ELBC=y +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_LINEAR=y +CONFIG_MD_RAID0=y +CONFIG_MD_RAID1=y +CONFIG_NETDEVICES=y +CONFIG_GIANFAR=y +CONFIG_E100=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MPC=y +CONFIG_SPI=y +CONFIG_SPI_BITBANG=y +CONFIG_WATCHDOG=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_FSL=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_DS1307=y +CONFIG_TMPFS=y +CONFIG_JFFS2_FS=y +CONFIG_CRYPTO_DEV_TALITOS=y diff --git a/configs/freescale_mpc8315erdb_defconfig b/configs/freescale_mpc8315erdb_defconfig index 85417e5e26..4910ebef3c 100644 --- a/configs/freescale_mpc8315erdb_defconfig +++ b/configs/freescale_mpc8315erdb_defconfig @@ -12,15 +12,15 @@ BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y # Lock headers version to match and avoid breakage BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.18.1" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y +BR2_DEFAULT_KERNEL_VERSION="4.1.4" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.1.4" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-3.18.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-4.1.config" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="mpc8315erdb" From 20bcb278ebd5e41230e9b128e657b9b5d0547aa0 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 4 Aug 2015 10:12:14 -0300 Subject: [PATCH 36/72] configs/p1010rdb: bump to the latest and greatest versions Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- .../{linux-3.18.config => linux-4.1.config} | 59 ------------------- configs/freescale_p1010rdb_pa_defconfig | 8 +-- 2 files changed, 4 insertions(+), 63 deletions(-) rename board/freescale/p1010rdb/{linux-3.18.config => linux-4.1.config} (51%) diff --git a/board/freescale/p1010rdb/linux-3.18.config b/board/freescale/p1010rdb/linux-4.1.config similarity index 51% rename from board/freescale/p1010rdb/linux-3.18.config rename to board/freescale/p1010rdb/linux-4.1.config index c48c4fb5d9..2de430cbee 100644 --- a/board/freescale/p1010rdb/linux-3.18.config +++ b/board/freescale/p1010rdb/linux-4.1.config @@ -1,23 +1,11 @@ CONFIG_PPC_85xx=y CONFIG_PHYS_64BIT=y CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_AUDIT=y -CONFIG_IRQ_DOMAIN_DEBUG=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y CONFIG_EXPERT=y -CONFIG_KALLSYMS_ALL=y CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set CONFIG_P1010_RDB=y CONFIG_HIGHMEM=y CONFIG_SWIOTLB=y @@ -28,26 +16,7 @@ CONFIG_RAPIDIO=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_NET_IPIP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_INET_ESP=y -# CONFIG_INET_XFRM_MODE_BEET is not set -CONFIG_IPV6=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y @@ -60,20 +29,11 @@ CONFIG_MTD_PHYSMAP_OF=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_FSL_ELBC=y CONFIG_MTD_NAND_FSL_IFC=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=131072 -CONFIG_EEPROM_LEGACY=y CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=y -CONFIG_BLK_DEV_SR=y CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_LOGGING=y CONFIG_ATA=y CONFIG_SATA_FSL=y CONFIG_NETDEVICES=y -CONFIG_DUMMY=y CONFIG_GIANFAR=y CONFIG_VITESSE_PHY=y CONFIG_FIXED_PHY=y @@ -91,9 +51,7 @@ CONFIG_I2C_MPC=y CONFIG_SPI=y CONFIG_SPI_FSL_SPI=y CONFIG_SPI_FSL_ESPI=y -# CONFIG_HWMON is not set CONFIG_USB=y -CONFIG_USB_MON=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_FSL=y CONFIG_USB_STORAGE=y @@ -101,29 +59,12 @@ CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF_ESDHC=y -CONFIG_EDAC=y -CONFIG_EDAC_MM_EDAC=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_CMOS=y CONFIG_DMADEVICES=y CONFIG_FSL_DMA=y CONFIG_EXT4_FS=y -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=y -CONFIG_PROC_KCORE=y CONFIG_TMPFS=y CONFIG_JFFS2_FS=y CONFIG_SQUASHFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=y -CONFIG_CRC_T10DIF=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_FS=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_FSL_CAAM=y diff --git a/configs/freescale_p1010rdb_pa_defconfig b/configs/freescale_p1010rdb_pa_defconfig index ff5ee06d41..699df2d30a 100644 --- a/configs/freescale_p1010rdb_pa_defconfig +++ b/configs/freescale_p1010rdb_pa_defconfig @@ -11,15 +11,15 @@ BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x20000 # Lock headers version to match and avoid breakage BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.18.1" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y +BR2_DEFAULT_KERNEL_VERSION="4.1.4" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.1.4" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.18.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-4.1.config" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb-pa" From 84a78f4f0b67814a64a834ce8f157ee342fef678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 31 Jul 2015 00:23:24 +0200 Subject: [PATCH 37/72] package/libserial: bump to version 0.6.0rc2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also: * Update patch #1 * Remove patch #2, fixed upstream * add new dependency to boost * use hashes from sourceforge [Thomas: - add locally calculated sha256 hash - show the Config.in comment about toolchain dependencies only when BR2_PACKAGE_BOOST_ARCH_SUPPORTS is set.] Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- .../0001-disable-python-bindings.patch | 21 ++++++++++--------- .../0002-add-missing-header-include.patch | 15 ------------- package/libserial/Config.in | 9 ++++++-- package/libserial/libserial.hash | 7 +++++-- package/libserial/libserial.mk | 3 ++- 5 files changed, 25 insertions(+), 30 deletions(-) delete mode 100644 package/libserial/0002-add-missing-header-include.patch diff --git a/package/libserial/0001-disable-python-bindings.patch b/package/libserial/0001-disable-python-bindings.patch index 54b5cb6cf1..1f2f5ed7df 100644 --- a/package/libserial/0001-disable-python-bindings.patch +++ b/package/libserial/0001-disable-python-bindings.patch @@ -1,25 +1,26 @@ Disable build of Python bindings, which requires the sipconfig module. Signed-off-by: Simon Dawson +Signed-off-by: Jörg Krause -diff -Nurp a/Makefile.am b/Makefile.am ---- a/Makefile.am 2008-11-12 01:27:31.000000000 +0000 -+++ b/Makefile.am 2013-04-16 09:41:13.476002178 +0100 +diff -purN libserial-0.6.0rc2.orig/Makefile.am libserial-0.6.0rc2/Makefile.am +--- libserial-0.6.0rc2.orig/Makefile.am 2014-06-05 18:37:25.000000000 +0200 ++++ libserial-0.6.0rc2/Makefile.am 2015-07-30 20:59:28.828429011 +0200 @@ -1,4 +1,4 @@ -SUBDIRS=src doc examples sip +SUBDIRS=src doc examples + ACLOCAL_AMFLAGS=-I m4 EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc - -diff -Nurp a/Makefile.in b/Makefile.in ---- a/Makefile.in 2008-11-12 01:28:14.000000000 +0000 -+++ b/Makefile.in 2013-04-16 09:41:05.628013626 +0100 -@@ -197,7 +197,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +diff -purN libserial-0.6.0rc2.orig/Makefile.in libserial-0.6.0rc2/Makefile.in +--- libserial-0.6.0rc2.orig/Makefile.in 2014-06-05 18:40:09.000000000 +0200 ++++ libserial-0.6.0rc2/Makefile.in 2015-07-30 21:00:09.215188376 +0200 +@@ -348,7 +348,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = src doc examples sip +SUBDIRS = src doc examples + ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libserial.pc diff --git a/package/libserial/0002-add-missing-header-include.patch b/package/libserial/0002-add-missing-header-include.patch deleted file mode 100644 index a0226372b9..0000000000 --- a/package/libserial/0002-add-missing-header-include.patch +++ /dev/null @@ -1,15 +0,0 @@ -Add a missing header include, to fix a build error. - -Signed-off-by: Simon Dawson - -diff -Nurp a/src/SerialPort.cpp b/src/SerialPort.cpp ---- a/src/SerialPort.cpp 2008-11-12 01:27:30.000000000 +0000 -+++ b/src/SerialPort.cpp 2013-04-23 15:43:41.537495852 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/package/libserial/Config.in b/package/libserial/Config.in index 22adb7265a..df5d1b5432 100644 --- a/package/libserial/Config.in +++ b/package/libserial/Config.in @@ -1,11 +1,16 @@ config BR2_PACKAGE_LIBSERIAL bool "libserial" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS # boost + depends on BR2_TOOLCHAIN_HAS_THREADS # boost + depends on BR2_USE_WCHAR # boost + select BR2_PACKAGE_BOOST help Simplified serial port programming in C++ under POSIX operating systems. http://libserial.sourceforge.net/ -comment "libserial needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "libserial needs a toolchain w/ C++, threads, wchar" + depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package/libserial/libserial.hash b/package/libserial/libserial.hash index 26f65e5686..bca647ae3f 100644 --- a/package/libserial/libserial.hash +++ b/package/libserial/libserial.hash @@ -1,2 +1,5 @@ -# Locally computed: -sha256 60d8aebf5f262c12baf94ce61d61198fc9b79da2432c735c200decd08ead1fb4 libserial-0.6.0rc1.tar.gz +# From http://sourceforge.net/projects/libserial/files/libserial/0.6.0rc2/ +sha1 e09113be3ba595135e95e853003ff96feea0da63 libserial-0.6.0rc2.tar.gz +md5 7787679b22901e4810bc53ecccdf8266 libserial-0.6.0rc2.tar.gz +# Locally calculated +sha256 35ee29eb1369d52ffb8658237577692f991eb508320d0abbb71c53e6494a1c23 libserial-0.6.0rc2.tar.gz diff --git a/package/libserial/libserial.mk b/package/libserial/libserial.mk index d2c928bb3e..11f187484e 100644 --- a/package/libserial/libserial.mk +++ b/package/libserial/libserial.mk @@ -4,11 +4,12 @@ # ################################################################################ -LIBSERIAL_VERSION = 0.6.0rc1 +LIBSERIAL_VERSION = 0.6.0rc2 LIBSERIAL_SITE = http://downloads.sourceforge.net/libserial LIBSERIAL_INSTALL_STAGING = YES LIBSERIAL_LICENSE = GPLv2+ LIBSERIAL_LICENSE_FILES = COPYING +LIBSERIAL_DEPENDENCIES = boost LIBSERIAL_CONF_ENV = ac_cv_prog_DOCBOOK2PDF=no From e90e781d61b250876290f9f08b5b1d26f11737ac Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Mon, 24 Aug 2015 12:49:53 +0200 Subject: [PATCH 38/72] package/libcgroup: allow to build cgroup-tools Add a new config option that allows to build cgroup-tools - a set of command-line utils for managing cgroups. [Thomas: slightly change the prompt of the new Config.in option.] Signed-off-by: Bartosz Golaszewski Reviewed-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/libcgroup/Config.in | 9 +++++++++ package/libcgroup/libcgroup.mk | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in index b7a84e06e0..d02c2829ad 100644 --- a/package/libcgroup/Config.in +++ b/package/libcgroup/Config.in @@ -9,5 +9,14 @@ config BR2_PACKAGE_LIBCGROUP http://libcg.sourceforge.net/ +if BR2_PACKAGE_LIBCGROUP + +config BR2_PACKAGE_LIBCGROUP_TOOLS + bool "install tools" + help + Include a set of command-line tools for managing cgroups. + +endif + comment "libcgroup needs an (e)glibc toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk index ace2744699..a4c3084c6c 100644 --- a/package/libcgroup/libcgroup.mk +++ b/package/libcgroup/libcgroup.mk @@ -20,10 +20,15 @@ LIBCGROUP_CONF_ENV = \ CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" LIBCGROUP_CONF_OPTS = \ - --disable-tools \ --disable-daemon \ --disable-initscript-install +ifeq ($(BR2_PACKAGE_LIBCGROUP_TOOLS),y) +LIBCGROUP_CONF_OPTS += --enable-tools +else +LIBCGROUP_CONF_OPTS += --disable-tools +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) LIBCGROUP_DEPENDENCIES += linux-pam LIBCGROUP_CONF_OPTS += --enable-pam From 90251cda02acbcda49ba5c267d045e6d09bff066 Mon Sep 17 00:00:00 2001 From: Giovanni Zantedeschi Date: Wed, 19 Aug 2015 17:46:48 -0300 Subject: [PATCH 39/72] libpam-radius-auth: new package [Thomas: - make libpam-radius-auth depend on linux-pam (since it's a linux-pam plugin, it needs some header files from linux-pam) by adding a "if BR2_PACKAGE_LINUX_PAM...endif" block in package/Config.in. This way, we will be grouping all the Linux PAM plugins together. - Fix the indententation in the Config.in file. - Use a better Config.in help text, copy/pasted from the website. - Use a tarball instead of github. This allows to remove AUTORECONF=YES. - Add linux-pam as a dependency. - Use $(TARGET_CONFIGURE_OPTS) instead of passing just CC/LD, but pass it in the environment rather than as options so that the CFLAGS/LDFLAGS added by the package Makefile are still taken into account. - Use mkdir -p + cp -dpfr instead of $(INSTALL) -D since we are copying multiple files. - Add a hash file.] Signed-off-by: Giovanni Zantedeschi Signed-off-by: Thomas Petazzoni --- package/Config.in | 4 +++ package/libpam-radius-auth/Config.in | 9 ++++++ .../libpam-radius-auth.hash | 2 ++ .../libpam-radius-auth/libpam-radius-auth.mk | 28 +++++++++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 package/libpam-radius-auth/Config.in create mode 100644 package/libpam-radius-auth/libpam-radius-auth.hash create mode 100644 package/libpam-radius-auth/libpam-radius-auth.mk diff --git a/package/Config.in b/package/Config.in index 729df7a38a..b92dc05534 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1093,6 +1093,10 @@ menu "Other" source "package/libuv/Config.in" source "package/lightning/Config.in" source "package/linux-pam/Config.in" +if BR2_PACKAGE_LINUX_PAM +comment "linux-pam plugins" + source "package/libpam-radius-auth/Config.in" +endif source "package/lttng-libust/Config.in" source "package/mpc/Config.in" source "package/mpdecimal/Config.in" diff --git a/package/libpam-radius-auth/Config.in b/package/libpam-radius-auth/Config.in new file mode 100644 index 0000000000..a0dec148d7 --- /dev/null +++ b/package/libpam-radius-auth/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBPAM_RADIUS_AUTH + bool "libpam-radius-auth" + help + This is the PAM to RADIUS authentication module. It allows + any PAM-capable machine to become a RADIUS client for + authentication and accounting requests. You will need a + RADIUS server to perform the actual authentication. + + http://freeradius.org/pam_radius_auth/ diff --git a/package/libpam-radius-auth/libpam-radius-auth.hash b/package/libpam-radius-auth/libpam-radius-auth.hash new file mode 100644 index 0000000000..ffd7404df3 --- /dev/null +++ b/package/libpam-radius-auth/libpam-radius-auth.hash @@ -0,0 +1,2 @@ +# Locally calculated after checking PGP signature +sha256 742d79fc39824726c098e746bd3dc3484f983f5ee082c621c1e848b2c3725305 pam_radius-1.4.0.tar.gz diff --git a/package/libpam-radius-auth/libpam-radius-auth.mk b/package/libpam-radius-auth/libpam-radius-auth.mk new file mode 100644 index 0000000000..42acffdd5d --- /dev/null +++ b/package/libpam-radius-auth/libpam-radius-auth.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# libpam-radius-auth +# +################################################################################ + +LIBPAM_RADIUS_AUTH_VERSION = 1.4.0 +LIBPAM_RADIUS_AUTH_SITE = ftp://ftp.freeradius.org/pub/radius/ +LIBPAM_RADIUS_AUTH_SOURCE = pam_radius-$(LIBPAM_RADIUS_AUTH_VERSION).tar.gz +LIBPAM_RADIUS_AUTH_DEPENDENCIES = linux-pam +LIBPAM_RADIUS_AUTH_INSTALL_STAGING = YES +LIBPAM_RADIUS_AUTH_LICENSE = GPLv2+ +LIBPAM_RADIUS_AUTH_LICENSE_FILES = LICENSE +# While autoconf is used for configuration, the Makefile is +# hand-written, so we need to pass CC, LD, CFLAGS at build time. +LIBPAM_RADIUS_AUTH_MAKE_ENV = $(TARGET_CONFIGURE_OPTS) + +define LIBPAM_RADIUS_AUTH_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/lib/security/ + cp -dpfr $(@D)/pam_radius_auth.so* $(STAGING_DIR)/lib/security/ +endef + +define LIBPAM_RADIUS_AUTH_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/lib/security/ + cp -dpfr $(@D)/pam_radius_auth.so* $(TARGET_DIR)/lib/security/ +endef + +$(eval $(autotools-package)) From 8b2990217e22cea11bfc72d6913e3bc6615c5650 Mon Sep 17 00:00:00 2001 From: Giovanni Zantedeschi Date: Thu, 20 Aug 2015 13:16:26 -0300 Subject: [PATCH 40/72] libpam-tacplus: new package [Thomas: - change the inclusion location in package/Config.in to be with the other linux-pam plugins. - fix indentation of the Config.in file. - fix build of the package when a toolchain without SSP support is used. - fix installation location of the PAM module: it was installed in /usr/lib/security, while all other PAM modules are in /lib/security. - adjust the ordering of the variables in the .mk file to be a bit more logical. - remove passing of $(TARGET_CONFIGURE_OPTS) in _CONF_ENV as it is not needed: it is already done by the autotools-package infrastructure.] Signed-off-by: Giovanni Zantedeschi Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/libpam-tacplus/Config.in | 9 +++++++++ package/libpam-tacplus/libpam-tacplus.mk | 21 +++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 package/libpam-tacplus/Config.in create mode 100644 package/libpam-tacplus/libpam-tacplus.mk diff --git a/package/Config.in b/package/Config.in index b92dc05534..1bc31fac78 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1096,6 +1096,7 @@ menu "Other" if BR2_PACKAGE_LINUX_PAM comment "linux-pam plugins" source "package/libpam-radius-auth/Config.in" + source "package/libpam-tacplus/Config.in" endif source "package/lttng-libust/Config.in" source "package/mpc/Config.in" diff --git a/package/libpam-tacplus/Config.in b/package/libpam-tacplus/Config.in new file mode 100644 index 0000000000..2d80809d3b --- /dev/null +++ b/package/libpam-tacplus/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBPAM_TACPLUS + bool "libpam-tacplus" + help + TACACS+ protocol client library and PAM module in C. This + PAM module support authentication, authorization (account + management) and accounting (session management)performed + using TACACS+ protocol designed by Cisco. + + https://github.com/jeroennijhof/pam_tacplus diff --git a/package/libpam-tacplus/libpam-tacplus.mk b/package/libpam-tacplus/libpam-tacplus.mk new file mode 100644 index 0000000000..6696d89887 --- /dev/null +++ b/package/libpam-tacplus/libpam-tacplus.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# libpam-tacplus +# +################################################################################ + +LIBPAM_TACPLUS_VERSION = 1.3.9 +LIBPAM_TACPLUS_SITE = $(call github,jeroennijhof,pam_tacplus,$(LIBPAM_TACPLUS_VERSION)) +LIBPAM_TACPLUS_LICENSE = GPLv2+ +LIBPAM_TACPLUS_LICENSE_FILES = COPYING +LIBPAM_TACPLUS_DEPENDENCIES = linux-pam +# Fetching from github, we need to generate the configure script +LIBPAM_TACPLUS_AUTORECONF = YES +LIBPAM_TACPLUS_AUTORECONF_OPTS = -I m4 +LIBPAM_TACPLUS_INSTALL_STAGING = YES +LIBPAM_TACPLUS_CONF_ENV = \ + ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) +LIBPAM_TACPLUS_CONF_OPTS = \ + --enable-pamdir=/lib/security + +$(eval $(autotools-package)) From afb8c5d80955b14bfb1713d5ad5cdf4d1e8ae6d4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 20 Aug 2015 20:02:45 +0200 Subject: [PATCH 41/72] package/{mesa3d, mesa3d-headers}: bump version to 10.6.4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 4 ++-- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 77c69296c5..85666cc864 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 10.6.3 +MESA3D_HEADERS_VERSION = 10.6.4 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_HEADERS_VERSION) MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 459b7d6f9f..453ee419f9 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,2 +1,2 @@ -# From http://lists.freedesktop.org/archives/mesa-announce/2015-July/000165.html -sha256 58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d mesa-10.6.3.tar.xz +# From http://lists.freedesktop.org/archives/mesa-announce/2015-August/000166.html +sha256 8f5ac103f0f503de2f7a985b0df349bd4ecdfe7f51c714be146fa5a9a3c07b77 mesa-10.6.4.tar.xz diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 67408a3aac..f2a1ffdf41 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 10.6.3 +MESA3D_VERSION = 10.6.4 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos From c7be6b532032d6728ee912839b1ebd048b0e28ff Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 20 Aug 2015 20:02:46 +0200 Subject: [PATCH 42/72] package/libdrm: bump to version 2.4.64 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libdrm/libdrm.hash | 4 ++-- package/libdrm/libdrm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index 05944c56c3..c67b2e5b9b 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,2 +1,2 @@ -# From http://lists.freedesktop.org/archives/dri-devel/2015-June/085375.html -sha256 906c294bdbe1c94c3ca084305d61a6e5a8367f3b4986e6cc13b1e9b3f75931dc libdrm-2.4.62.tar.bz2 +# From http://lists.freedesktop.org/archives/dri-devel/2015-August/088677.html +sha256 b60786fe7d6e42adb3966ce1a658f63fec528d537396381cbda93bcc99a934b6 libdrm-2.4.64.tar.bz2 diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 1768214a49..b11d6864e9 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.62 +LIBDRM_VERSION = 2.4.64 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2 LIBDRM_SITE = http://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From 9c155f7619679250e9680d51712fc74c1d51b5c8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 20 Aug 2015 20:02:47 +0200 Subject: [PATCH 43/72] package/kodi: bump to version 15.1-Isengard Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi/kodi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 6399ff1d92..d91073f3d6 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VERSION = 15.0-Isengard +KODI_VERSION = 15.1-Isengard KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) KODI_LICENSE = GPLv2 KODI_LICENSE_FILES = LICENSE.GPL From 52269572124c36054fa397dc47420b4177a71938 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 20 Aug 2015 20:02:48 +0200 Subject: [PATCH 44/72] package/kodi-visualisation-waveforhue: bump version Also remove patch applied upstream: https://github.com/notspiff/visualization.waveforhue/commit/8824f4fa384693da0dfb3df5c30992bfe0fee9a4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...001-Adapt-xbmc_vis_dll.h-header-path.patch | 26 ------------------- .../kodi-visualisation-waveforhue.mk | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 package/kodi-visualisation-waveforhue/0001-Adapt-xbmc_vis_dll.h-header-path.patch diff --git a/package/kodi-visualisation-waveforhue/0001-Adapt-xbmc_vis_dll.h-header-path.patch b/package/kodi-visualisation-waveforhue/0001-Adapt-xbmc_vis_dll.h-header-path.patch deleted file mode 100644 index baa69b4c71..0000000000 --- a/package/kodi-visualisation-waveforhue/0001-Adapt-xbmc_vis_dll.h-header-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d80b2dfeab475b066004d831c0d28c0dab064ca6 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 30 Jul 2015 10:24:53 +0200 -Subject: [PATCH] Adapt xbmc_vis_dll.h header path - -Signed-off-by: Thomas Petazzoni ---- - src/Main_gles.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Main_gles.cpp b/src/Main_gles.cpp -index 3c22bf8..f5666e9 100644 ---- a/src/Main_gles.cpp -+++ b/src/Main_gles.cpp -@@ -38,7 +38,7 @@ - #include - #endif - --#include "addons/include/xbmc_vis_dll.h" -+#include "kodi/xbmc_vis_dll.h" - #include "VisGUIShader.h" - - //th --- -2.5.0 - diff --git a/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk b/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk index 5599065cfa..28eeb4d881 100644 --- a/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk +++ b/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VISUALISATION_WAVEFORHUE_VERSION = 330b5d0432a976993d8ea3e13f01ec9bd3d8b02e +KODI_VISUALISATION_WAVEFORHUE_VERSION = e87d5c7d7e7504036b80af8bc89f4cf6489085fe KODI_VISUALISATION_WAVEFORHUE_SITE = $(call github,notspiff,visualization.waveforhue,$(KODI_VISUALISATION_WAVEFORHUE_VERSION)) KODI_VISUALISATION_WAVEFORHUE_LICENSE = GPLv2+ KODI_VISUALISATION_WAVEFORHUE_LICENSE_FILES = COPYING From 84face61cf1dfefe864d6d47976932a32bbde9f2 Mon Sep 17 00:00:00 2001 From: Parnell Springmeyer Date: Sat, 8 Aug 2015 11:51:42 -0500 Subject: [PATCH 45/72] scrypt: new package [Thomas: - move from "Libraries -> Crypto" to "System tools", since it only installs one binary, scrypt, and no library. - bump from 1.1.6 to 1.2.0 - add comment in the .hash file explaining where the hash is coming from. - add missing dependency on OpenSSL - use BSD-2c as the license code, instead of BSD2 - use 'main.c' as the license file.] Signed-off-by: Parnell Springmeyer Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/scrypt/Config.in | 8 ++++++++ package/scrypt/scrypt.hash | 1 + package/scrypt/scrypt.mk | 13 +++++++++++++ 4 files changed, 23 insertions(+) create mode 100644 package/scrypt/Config.in create mode 100644 package/scrypt/scrypt.hash create mode 100644 package/scrypt/scrypt.mk diff --git a/package/Config.in b/package/Config.in index 1bc31fac78..5b8084d5d5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -754,6 +754,7 @@ menu "Crypto" source "package/nettle/Config.in" source "package/openssl/Config.in" source "package/polarssl/Config.in" + source "package/scrypt/Config.in" endmenu menu "Database" diff --git a/package/scrypt/Config.in b/package/scrypt/Config.in new file mode 100644 index 0000000000..8be7f5410f --- /dev/null +++ b/package/scrypt/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SCRYPT + bool "scrypt" + help + A password-based key derivation function specifically designed + to make it costly to perform large-scale custom hardware attacks + by requiring large amounts of memory. + + http://www.tarsnap.com/scrypt.html diff --git a/package/scrypt/scrypt.hash b/package/scrypt/scrypt.hash new file mode 100644 index 0000000000..e6b690e240 --- /dev/null +++ b/package/scrypt/scrypt.hash @@ -0,0 +1 @@ +sha256 dfd0d1a544439265bbb9b58043ad3c8ce50a3987b44a61b1d39fd7a3ed5b7fb8 scrypt-1.1.6.tgz diff --git a/package/scrypt/scrypt.mk b/package/scrypt/scrypt.mk new file mode 100644 index 0000000000..2db6e2e891 --- /dev/null +++ b/package/scrypt/scrypt.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# scrypt +# +################################################################################ + +SCRYPT_VERSION = 1.1.6 +SCRYPT_SOURCE = scrypt-$(SCRYPT_VERSION).tgz +SCRYPT_SITE = http://www.tarsnap.com/scrypt +SCRYPT_LICENSE = BSD2 +SCRYPT_INSTALL_STAGING = YES + +$(eval $(autotools-package)) From 0d83de383224c65ec250a005130b1d3cc6fd6d76 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 28 Aug 2015 14:59:51 +0200 Subject: [PATCH 46/72] scrypt: commit packaging improvements The changes brought by this commit should have been part of the previous commit, but were not due to a mistake. This commit implements the following changes to the scrypt package: - move from "Libraries -> Crypto" to "System tools", since it only installs one binary, scrypt, and no library. - bump from 1.1.6 to 1.2.0 - add comment in the .hash file explaining where the hash is coming from. - add missing dependency on OpenSSL - use BSD-2c as the license code, instead of BSD2 - use 'main.c' as the license file. Signed-off-by: Thomas Petazzoni --- package/Config.in | 2 +- package/scrypt/Config.in | 7 ++++--- package/scrypt/scrypt.hash | 3 ++- package/scrypt/scrypt.mk | 6 ++++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/package/Config.in b/package/Config.in index 5b8084d5d5..60cda7178a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -754,7 +754,6 @@ menu "Crypto" source "package/nettle/Config.in" source "package/openssl/Config.in" source "package/polarssl/Config.in" - source "package/scrypt/Config.in" endmenu menu "Database" @@ -1468,6 +1467,7 @@ endif if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/rsyslog/Config.in" endif + source "package/scrypt/Config.in" source "package/smack/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/start-stop-daemon/Config.in" diff --git a/package/scrypt/Config.in b/package/scrypt/Config.in index 8be7f5410f..e6d1ac1a65 100644 --- a/package/scrypt/Config.in +++ b/package/scrypt/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_SCRYPT bool "scrypt" + select BR2_PACKAGE_OPENSSL help - A password-based key derivation function specifically designed - to make it costly to perform large-scale custom hardware attacks - by requiring large amounts of memory. + A password-based key derivation function specifically + designed to make it costly to perform large-scale custom + hardware attacks by requiring large amounts of memory. http://www.tarsnap.com/scrypt.html diff --git a/package/scrypt/scrypt.hash b/package/scrypt/scrypt.hash index e6b690e240..6694456763 100644 --- a/package/scrypt/scrypt.hash +++ b/package/scrypt/scrypt.hash @@ -1 +1,2 @@ -sha256 dfd0d1a544439265bbb9b58043ad3c8ce50a3987b44a61b1d39fd7a3ed5b7fb8 scrypt-1.1.6.tgz +# From http://www.tarsnap.com/scrypt/scrypt-sigs-1.2.0.asc +sha256 1754bc89405277c8ac14220377a4c240ddc34b1ce70882aa92cd01bfdc8569d4 scrypt-1.2.0.tgz diff --git a/package/scrypt/scrypt.mk b/package/scrypt/scrypt.mk index 2db6e2e891..7ffa7ccf3f 100644 --- a/package/scrypt/scrypt.mk +++ b/package/scrypt/scrypt.mk @@ -4,10 +4,12 @@ # ################################################################################ -SCRYPT_VERSION = 1.1.6 +SCRYPT_VERSION = 1.2.0 SCRYPT_SOURCE = scrypt-$(SCRYPT_VERSION).tgz SCRYPT_SITE = http://www.tarsnap.com/scrypt -SCRYPT_LICENSE = BSD2 +SCRYPT_LICENSE = BSD-2c +SCRYPT_LICENSE_FILES = main.c +SCRYPT_DEPENDENCIES = openssl SCRYPT_INSTALL_STAGING = YES $(eval $(autotools-package)) From ba1b3a5f39cb3507d548269f58770b66d441a545 Mon Sep 17 00:00:00 2001 From: Renaud AUBIN Date: Thu, 27 Aug 2015 22:54:56 +0200 Subject: [PATCH 47/72] package/libhttpparser: New package http-parser provides a simple C API to parse HTTP responses and requests. This packaging uses the official Joyent repository. [Thomas: - since we're always building the shared library, depend on !BR2_STATIC_LIBS in Config.in. We could build only the static library, but then we would have to do all the lib installation manually. - indent using tabs in Config.in - use 'make install' instead of handcoding the library installation. - use $(TARGET_CONFIGURE_OPTS) instead of just CC= and LD=. - use tabs for indentation in commands instead of spaces - add patch to fix reinstallation.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + ...tion-when-calling-ln-at-install-time.patch | 34 +++++++++++++++++++ package/libhttpparser/Config.in | 17 ++++++++++ package/libhttpparser/libhttpparser.mk | 26 ++++++++++++++ 4 files changed, 78 insertions(+) create mode 100644 package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch create mode 100644 package/libhttpparser/Config.in create mode 100644 package/libhttpparser/libhttpparser.mk diff --git a/package/Config.in b/package/Config.in index 60cda7178a..69abc78b22 100644 --- a/package/Config.in +++ b/package/Config.in @@ -979,6 +979,7 @@ menu "Networking" source "package/libeXosip2/Config.in" source "package/libfcgi/Config.in" source "package/libgsasl/Config.in" + source "package/libhttpparser/Config.in" source "package/libidn/Config.in" source "package/libiscsi/Config.in" source "package/libmbus/Config.in" diff --git a/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch b/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch new file mode 100644 index 0000000000..29fe04defd --- /dev/null +++ b/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch @@ -0,0 +1,34 @@ +From d9dfeca8736318eaad5cd4554cbae059469decde Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 28 Aug 2015 19:02:11 +0200 +Subject: [PATCH] Use -f option when calling ln at install time + +This allows "make install; make install" to work properly. + +Signed-off-by: Thomas Petazzoni +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 373709c..6206b09 100644 +--- a/Makefile ++++ b/Makefile +@@ -113,12 +113,12 @@ tags: http_parser.c http_parser.h test.c + install: library + $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h + $(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME) +- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so ++ ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so + + install-strip: library + $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h + $(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME) +- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so ++ ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so + + uninstall: + rm $(INCLUDEDIR)/http_parser.h +-- +2.5.0 + diff --git a/package/libhttpparser/Config.in b/package/libhttpparser/Config.in new file mode 100644 index 0000000000..31b8b9b376 --- /dev/null +++ b/package/libhttpparser/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_LIBHTTPPARSER + bool "libhttpparser" + depends on !BR2_STATIC_LIBS + help + This is a parser for HTTP messages written in C. It + parses both requests and responses. The parser is + designed to be used in performance HTTP applications. + It does not make any syscalls nor allocations, it does + not buffer data, it can be interrupted at anytime. + Depending on your architecture, it only requires about + 40 bytes of data per message stream (in a web server + that is per connection). + + https://github.com/joyent/http-parser + +comment "libhttpparser needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/libhttpparser/libhttpparser.mk b/package/libhttpparser/libhttpparser.mk new file mode 100644 index 0000000000..d6ec236650 --- /dev/null +++ b/package/libhttpparser/libhttpparser.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# libhttpparser +# +################################################################################ + +LIBHTTPPARSER_VERSION = v2.5.0 +LIBHTTPPARSER_SITE = $(call github,joyent,http-parser,$(LIBHTTPPARSER_VERSION)) +LIBHTTPPARSER_INSTALL_STAGING = YES +LIBHTTPPARSER_LICENSE = MIT +LIBHTTPPARSER_LICENSE_FILES = LICENSE-MIT + +define LIBHTTPPARSER_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) library package +endef + +define LIBHTTPPARSER_INSTALL_STAGING_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=$(STAGING_DIR)/usr install + $(INSTALL) -D -m 0644 $(@D)/libhttp_parser.a $(STAGING_DIR)/usr/lib/libhttp_parser.a +endef + +define LIBHTTPPARSER_INSTALL_TARGET_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=$(TARGET_DIR)/usr install +endef + +$(eval $(generic-package)) From 68847ad739e881e603e0473e34ed27ccade55ef9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 4 Aug 2015 08:19:38 -0300 Subject: [PATCH 48/72] mtd: add mtdpart option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As pointed by Jörg Krause one of the novelties of the 1.5.2 release is the new mtdpart tool, so add an option for it. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/mtd/Config.in | 3 +++ package/mtd/mtd.mk | 1 + 2 files changed, 4 insertions(+) diff --git a/package/mtd/Config.in b/package/mtd/Config.in index 6653464f16..6e4346f298 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -71,6 +71,9 @@ config BR2_PACKAGE_MTD_MTD_DEBUG bool "mtd_debug" default y +config BR2_PACKAGE_MTD_MTDPART + bool "mtdpart" + config BR2_PACKAGE_MTD_NANDDUMP bool "nanddump" default y diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 42a8c1deb3..0fb9fc2c1a 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -63,6 +63,7 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2 MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug +MTD_TARGETS_$(BR2_PACKAGE_MTD_MTDPART) += mtdpart MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDTEST) += nandtest MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite From ebf3a6117c58422ee9e7af99a37b671b1e301c68 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 11 Aug 2015 20:16:47 +0200 Subject: [PATCH 49/72] package/libyuv: new package [Thomas: fix license, it's BSD-3c, not BSD-4c.] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/libyuv/0001-i386-sse2.patch | 16 ++++++++++++++++ package/libyuv/Config.in | 12 ++++++++++++ package/libyuv/libyuv.mk | 18 ++++++++++++++++++ 4 files changed, 47 insertions(+) create mode 100644 package/libyuv/0001-i386-sse2.patch create mode 100644 package/libyuv/Config.in create mode 100644 package/libyuv/libyuv.mk diff --git a/package/Config.in b/package/Config.in index 69abc78b22..810f4aeea0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -955,6 +955,7 @@ menu "Multimedia" source "package/libplayer/Config.in" source "package/libtheora/Config.in" source "package/live555/Config.in" + source "package/libyuv/Config.in" source "package/mediastreamer/Config.in" source "package/x264/Config.in" endmenu diff --git a/package/libyuv/0001-i386-sse2.patch b/package/libyuv/0001-i386-sse2.patch new file mode 100644 index 0000000000..b8ecb34d0f --- /dev/null +++ b/package/libyuv/0001-i386-sse2.patch @@ -0,0 +1,16 @@ +Fix compilation on non-sse2 platforms + +Signed-off-by: Bernd Kuhls + +diff -uNr libyuv-1411.org/include/libyuv/scale_row.h libyuv-1411/include/libyuv/scale_row.h +--- libyuv-1411.org/include/libyuv/scale_row.h 2015-05-22 23:39:21.000000000 +0200 ++++ libyuv-1411/include/libyuv/scale_row.h 2015-05-25 12:35:17.000000000 +0200 +@@ -33,7 +33,7 @@ + + // The following are available on all x86 platforms: + #if !defined(LIBYUV_DISABLE_X86) && \ +- (defined(_M_IX86) || defined(__x86_64__) || defined(__i386__)) ++ (defined(_M_IX86) || defined(__x86_64__) || (defined(__i386__) && defined(__SSE2__))) + #define HAS_FIXEDDIV1_X86 + #define HAS_FIXEDDIV_X86 + #define HAS_SCALEADDROWS_SSE2 diff --git a/package/libyuv/Config.in b/package/libyuv/Config.in new file mode 100644 index 0000000000..29dcaa44ed --- /dev/null +++ b/package/libyuv/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_LIBYUV + bool "libyuv" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + help + libyuv is an open source project that includes YUV scaling + and conversion functionality. + + https://code.google.com/p/libyuv + +comment "libyuv needs a toolchain w/ C++, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS diff --git a/package/libyuv/libyuv.mk b/package/libyuv/libyuv.mk new file mode 100644 index 0000000000..c00bc05c0a --- /dev/null +++ b/package/libyuv/libyuv.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# libyuv +# +################################################################################ + +LIBYUV_VERSION = 1ebf86795cb213a37f06eb1ef3713cff080568ea +# we use the FreeSwitch fork because there is currently no alternative +# for https://chromium.googlesource.com/libyuv/libyuv which will be +# deactivated in 2015. +LIBYUV_SITE = https://freeswitch.org/stash/scm/sd/libyuv.git +LIBYUV_SITE_METHOD = git +LIBYUV_LICENSE = BSD-3c +LIBYUV_LICENSE_FILES = LICENSE +LIBYUV_INSTALL_STAGING = YES +LIBYUV_DEPENDENCIES = $(if $(BR2_PACKAGE_JPEG),jpeg) + +$(eval $(cmake-package)) From 19ff3f764628a151e08d8c504b8acf240091b1f2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 11 Aug 2015 20:16:48 +0200 Subject: [PATCH 50/72] package/libsilk: new package [Thomas: fix license, it's BSD-3c.] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/libsilk/Config.in | 6 ++++++ package/libsilk/libsilk.mk | 16 ++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 package/libsilk/Config.in create mode 100644 package/libsilk/libsilk.mk diff --git a/package/Config.in b/package/Config.in index 810f4aeea0..59125631e0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -707,6 +707,7 @@ menu "Audio/Sound" source "package/libreplaygain/Config.in" source "package/libsamplerate/Config.in" source "package/libsidplay2/Config.in" + source "package/libsilk/Config.in" source "package/libsndfile/Config.in" source "package/libsoxr/Config.in" source "package/libvorbis/Config.in" diff --git a/package/libsilk/Config.in b/package/libsilk/Config.in new file mode 100644 index 0000000000..10fe03ad32 --- /dev/null +++ b/package/libsilk/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LIBSILK + bool "libsilk" + help + SILK is an audio compression format and audio codec. + + http://tools.ietf.org/html/draft-vos-silk-01 diff --git a/package/libsilk/libsilk.mk b/package/libsilk/libsilk.mk new file mode 100644 index 0000000000..eefdf8fd07 --- /dev/null +++ b/package/libsilk/libsilk.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libsilk +# +################################################################################ + +LIBSILK_VERSION = 4268a02240c35c6055b0f237c46b09b2dcf79e45 +# we use the FreeSwitch fork because it contains pkgconf support +LIBSILK_SITE = https://freeswitch.org/stash/scm/sd/libsilk.git +LIBSILK_SITE_METHOD = git +LIBSILK_LICENSE = BSD-3c +LIBSILK_LICENSE_FILES = COPYING +LIBSILK_AUTORECONF = YES +LIBSILK_INSTALL_STAGING = YES + +$(eval $(autotools-package)) From 697e2b7d948a8a12fd4c08e0beeb9264774ea5fd Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 18 Aug 2015 23:35:04 +0200 Subject: [PATCH 51/72] support/download: fix the Hg backend for tags When the version of a package is a Mercurial tag, the download fails, with: abort: unknown revision 'X.Y.Z'! This is because, in Mercurial, tags are commits like the others, and when we clone, we actively request a tag. But then, the server "dereferences" that tag and sends us the revision pointed to by that tag. Of course, since the tag is a commit after the revision we got, we do not have the revision adding the tag. So, we just have to download the full repository to be sure we have the tags in our local clone. Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- support/download/hg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/hg b/support/download/hg index d6654a1fb6..ac1e9b93b1 100755 --- a/support/download/hg +++ b/support/download/hg @@ -25,7 +25,7 @@ repo="${2}" cset="${3}" basename="${4}" -${HG} clone ${verbose} --noupdate --rev "${cset}" "${repo}" "${basename}" +${HG} clone ${verbose} --noupdate "${repo}" "${basename}" ${HG} archive ${verbose} --repository "${basename}" --type tgz \ --prefix "${basename}" --rev "${cset}" \ From 14fc30a8a163ae41a4d8d502a188ef3fad3182a1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 29 Aug 2015 11:40:39 +0200 Subject: [PATCH 52/72] eigen: use mercurial tag Now that our Mercurial download mechanism has been fixed to also support tags, let's use this possibility in the eigen package. Signed-off-by: Thomas Petazzoni --- package/eigen/eigen.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk index 015330360e..dd88fde45f 100644 --- a/package/eigen/eigen.mk +++ b/package/eigen/eigen.mk @@ -4,8 +4,7 @@ # ################################################################################ -# version 3.2.5 -EIGEN_VERSION = 175a47a35f0c +EIGEN_VERSION = 3.2.5 EIGEN_SITE = https://bitbucket.org/eigen/eigen EIGEN_SITE_METHOD = hg EIGEN_LICENSE = MPL2, BSD-3c, LGPLv2.1 From eb4cb5e0da8574e16bb1f87f75509b566dbfbf52 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 11 Aug 2015 20:16:49 +0200 Subject: [PATCH 53/72] package/libbroadvoice: new package Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/libbroadvoice/Config.in | 7 +++++++ package/libbroadvoice/libbroadvoice.mk | 19 +++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 package/libbroadvoice/Config.in create mode 100644 package/libbroadvoice/libbroadvoice.mk diff --git a/package/Config.in b/package/Config.in index 59125631e0..a1eb3739f0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -694,6 +694,7 @@ menu "Audio/Sound" source "package/celt051/Config.in" source "package/fdk-aac/Config.in" source "package/libao/Config.in" + source "package/libbroadvoice/Config.in" source "package/libcdaudio/Config.in" source "package/libcdio/Config.in" source "package/libcue/Config.in" diff --git a/package/libbroadvoice/Config.in b/package/libbroadvoice/Config.in new file mode 100644 index 0000000000..d695df0c0b --- /dev/null +++ b/package/libbroadvoice/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBBROADVOICE + bool "libbroadvoice" + help + broadvoice - a library for the BroadVoice 16 and 32 speech + codecs + + https://www.broadcom.com/support/broadvoice diff --git a/package/libbroadvoice/libbroadvoice.mk b/package/libbroadvoice/libbroadvoice.mk new file mode 100644 index 0000000000..c18d3d292b --- /dev/null +++ b/package/libbroadvoice/libbroadvoice.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# libbroadvoice +# +################################################################################ + +LIBBROADVOICE_VERSION = f65b0f50c8c767229fbf1758370880abc0d78564 +# we use the FreeSwitch fork because (quoting README): +# "This library is based on the Broadcom reference code, but has been +# heavily modified so that it builds into a proper library, with a clean +# usable interface, on a range of platforms." +LIBBROADVOICE_SITE = https://freeswitch.org/stash/scm/sd/libbroadvoice.git +LIBBROADVOICE_SITE_METHOD = git +LIBBROADVOICE_LICENSE = LGPLv2.1 +LIBBROADVOICE_LICENSE_FILES = COPYING +LIBBROADVOICE_AUTORECONF = YES +LIBBROADVOICE_INSTALL_STAGING = YES + +$(eval $(autotools-package)) From 67027b6f4bfb3fdeed8bce5bd389fbcbe385678a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 11 Aug 2015 20:16:50 +0200 Subject: [PATCH 54/72] package/libcodec2: new package [Thomas: - replace patches from Bernd by patches that are Git formatted and have a chance of being upstream. - remove the no longer necessary post configure hook to build generate_cookbook for the host - pass --disable-unittests to disable unit tests.] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + ...-compiler-to-build-generate_cookbook.patch | 153 ++++++++++++++++++ ...002-Add-option-to-disable-unit-tests.patch | 50 ++++++ package/libcodec2/Config.in | 7 + package/libcodec2/libcodec2.mk | 16 ++ 5 files changed, 227 insertions(+) create mode 100644 package/libcodec2/0001-Use-the-native-compiler-to-build-generate_cookbook.patch create mode 100644 package/libcodec2/0002-Add-option-to-disable-unit-tests.patch create mode 100644 package/libcodec2/Config.in create mode 100644 package/libcodec2/libcodec2.mk diff --git a/package/Config.in b/package/Config.in index a1eb3739f0..61b181c42b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -697,6 +697,7 @@ menu "Audio/Sound" source "package/libbroadvoice/Config.in" source "package/libcdaudio/Config.in" source "package/libcdio/Config.in" + source "package/libcodec2/Config.in" source "package/libcue/Config.in" source "package/libcuefile/Config.in" source "package/libid3tag/Config.in" diff --git a/package/libcodec2/0001-Use-the-native-compiler-to-build-generate_cookbook.patch b/package/libcodec2/0001-Use-the-native-compiler-to-build-generate_cookbook.patch new file mode 100644 index 0000000000..ede31dbc2a --- /dev/null +++ b/package/libcodec2/0001-Use-the-native-compiler-to-build-generate_cookbook.patch @@ -0,0 +1,153 @@ +From c7c769990bca3049bc389dcbd9985adaec134946 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 29 Aug 2015 11:59:18 +0200 +Subject: [PATCH] Use the native compiler to build generate_cookbook + +The generate_cookbook binary needs to be executed at build time. When +cross-compiling, this means that it should be built with the native +compiler rather than the cross-compiler. + +To achieve this, this commit imports the AX_CC_FOR_BUILD autoconf +macro from the GNU Autoconf Archive project, and adjusts +src/Makefile.am to use CC_FOR_BUILD to build generate_cookbook. + +Based on initial work by Bernd Kuhls. + +Signed-off-by: Thomas Petazzoni +--- + Makefile.am | 1 + + configure.ac | 2 ++ + m4/ax_cc_for_build.m4 | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/Makefile.am | 3 ++ + 4 files changed, 83 insertions(+) + create mode 100644 m4/ax_cc_for_build.m4 + +diff --git a/Makefile.am b/Makefile.am +index 4468bca..bd3ce01 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,6 +2,7 @@ AM_CFLAGS = -Isrc -fPIC -Wall -O3 -lm + AUTOMAKE_OPTIONS = gnu + NAME = codec2 + AM_CPPFLAGS = $(AM_CFLAGS) ++ACLOCAL_AMFLAGS = -I m4 + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = codec2.pc +diff --git a/configure.ac b/configure.ac +index 493c517..7520af6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4,10 +4,12 @@ + AC_PREREQ([2.59]) + AC_INIT(codec2, 0.2, david@rowetel.com) + AM_INIT_AUTOMAKE ++AC_CONFIG_MACRO_DIR([m4]) + + # Checks for programs. + AC_PROG_CC + AC_PROG_LIBTOOL ++AX_CC_FOR_BUILD + + # Checks for libraries. + # FIXME: Replace `main' with a function in `-lm': +diff --git a/m4/ax_cc_for_build.m4 b/m4/ax_cc_for_build.m4 +new file mode 100644 +index 0000000..c880fd0 +--- /dev/null ++++ b/m4/ax_cc_for_build.m4 +@@ -0,0 +1,77 @@ ++# =========================================================================== ++# http://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_CC_FOR_BUILD ++# ++# DESCRIPTION ++# ++# Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD. ++# ++# LICENSE ++# ++# Copyright (c) 2010 Reuben Thomas ++# Copyright (c) 1999 Richard Henderson ++# ++# This program is free software: you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by the ++# Free Software Foundation, either version 3 of the License, or (at your ++# option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General ++# Public License for more details. ++# ++# You should have received a copy of the GNU General Public License along ++# with this program. If not, see . ++# ++# As a special exception, the respective Autoconf Macro's copyright owner ++# gives unlimited permission to copy, distribute and modify the configure ++# scripts that are the output of Autoconf when processing the Macro. You ++# need not follow the terms of the GNU General Public License when using ++# or distributing such scripts, even though portions of the text of the ++# Macro appear in them. The GNU General Public License (GPL) does govern ++# all other use of the material that constitutes the Autoconf Macro. ++# ++# This special exception to the GPL applies to versions of the Autoconf ++# Macro released by the Autoconf Archive. When you make and distribute a ++# modified version of the Autoconf Macro, you may extend this special ++# exception to the GPL to apply to your modified version as well. ++ ++#serial 2 ++ ++dnl Get a default for CC_FOR_BUILD to put into Makefile. ++AC_DEFUN([AX_CC_FOR_BUILD], ++[# Put a plausible default for CC_FOR_BUILD in Makefile. ++if test -z "$CC_FOR_BUILD"; then ++ if test "x$cross_compiling" = "xno"; then ++ CC_FOR_BUILD='$(CC)' ++ else ++ CC_FOR_BUILD=gcc ++ fi ++fi ++AC_SUBST(CC_FOR_BUILD) ++# Also set EXEEXT_FOR_BUILD. ++if test "x$cross_compiling" = "xno"; then ++ EXEEXT_FOR_BUILD='$(EXEEXT)' ++else ++ AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext, ++ [rm -f conftest* ++ echo 'int main () { return 0; }' > conftest.c ++ bfd_cv_build_exeext= ++ ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5 ++ for file in conftest.*; do ++ case $file in ++ *.c | *.o | *.obj | *.ilk | *.pdb) ;; ++ *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;; ++ esac ++ done ++ rm -f conftest* ++ test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no]) ++ EXEEXT_FOR_BUILD="" ++ test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext} ++fi ++AC_SUBST(EXEEXT_FOR_BUILD)])dnl +diff --git a/src/Makefile.am b/src/Makefile.am +index 1153b3c..719088d 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -77,6 +77,9 @@ CODEBOOKSGE= \ + + noinst_PROGRAMS = generate_codebook genlspdtcb + ++generate_codebook$(EXEEXT_FOR_BUILD): generate_codebook.c ++ $(CC_FOR_BUILD) -o $@ generate_codebook.c -lm ++ + codebook.$(OBJEXT): codebook.c + codebookd.$(OBJEXT): codebookd.c + codebookdt.$(OBJEXT): codebookdt.c +-- +2.5.0 + diff --git a/package/libcodec2/0002-Add-option-to-disable-unit-tests.patch b/package/libcodec2/0002-Add-option-to-disable-unit-tests.patch new file mode 100644 index 0000000000..7822702092 --- /dev/null +++ b/package/libcodec2/0002-Add-option-to-disable-unit-tests.patch @@ -0,0 +1,50 @@ +From 19db6244200b870317382294f14b7d561d55a64e Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 29 Aug 2015 12:05:53 +0200 +Subject: [PATCH] Add option to disable unit tests + +The unittests require C++, while the rest of the library does not, so +this commit implements a --{enable,disable}-unittests option to +selectively enable the build of the unit tests. When not provided, the +option defaults to yes so that the existing behavior is preserved. + +Based on initial work by Bernd Kuhls. + +Signed-off-by: Thomas Petazzoni +--- + Makefile.am | 6 +++++- + configure.ac | 5 +++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index bd3ce01..1da250b 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -95,4 +95,8 @@ src/codebook/lsp8.txt \ + src/codebook/lsp9.txt \ + src/codebook/lsp10.txt + +-SUBDIRS = src unittest ++SUBDIRS = src ++ ++if UNITTESTS ++SUBDIRS += unittest ++endif +diff --git a/configure.ac b/configure.ac +index 7520af6..55b7215 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,5 +24,10 @@ AC_CHECK_HEADERS([stdlib.h string.h]) + AC_FUNC_MALLOC + AC_CHECK_FUNCS([floor pow sqrt]) + ++AC_ARG_ENABLE([unittests], ++ AS_HELP_STRING([--disable-unittests], [Disable unittests]), ++ [], [enable_unittests=yes]) ++AM_CONDITIONAL([UNITTESTS], [test "${enable_unittests}" = "yes"]) ++ + AC_CONFIG_FILES([Makefile src/Makefile unittest/Makefile codec2.pc]) + AC_OUTPUT +-- +2.5.0 + diff --git a/package/libcodec2/Config.in b/package/libcodec2/Config.in new file mode 100644 index 0000000000..b27aab1c70 --- /dev/null +++ b/package/libcodec2/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBCODEC2 + bool "libcodec2" + help + Codec2 is an open source low bit rate speech codec designed + for communications quality speech between 1200 and 3200 bit/s. + + http://rowetel.com/codec2.html diff --git a/package/libcodec2/libcodec2.mk b/package/libcodec2/libcodec2.mk new file mode 100644 index 0000000000..73f98ca2fe --- /dev/null +++ b/package/libcodec2/libcodec2.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libcodec2 +# +################################################################################ + +LIBCODEC2_VERSION = 392a55b4f3f8ad30d845ac6ae35e8b27343bb944 +LIBCODEC2_SITE = https://freeswitch.org/stash/scm/sd/libcodec2.git +LIBCODEC2_SITE_METHOD = git +LIBCODEC2_LICENSE = LGPLv2.1 +LIBCODEC2_LICENSE_FILES = COPYING +LIBCODEC2_AUTORECONF = YES +LIBCODEC2_INSTALL_STAGING = YES +LIBCODEC2_CONF_OPTS = --disable-unittests + +$(eval $(autotools-package)) From 2657024167e86b9694573e9518c5ef801c978e3d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 11 Aug 2015 20:16:51 +0200 Subject: [PATCH 55/72] package/libg7221: new package Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/libg7221/Config.in | 7 +++++++ package/libg7221/libg7221.mk | 16 ++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 package/libg7221/Config.in create mode 100644 package/libg7221/libg7221.mk diff --git a/package/Config.in b/package/Config.in index 61b181c42b..eb4215d990 100644 --- a/package/Config.in +++ b/package/Config.in @@ -700,6 +700,7 @@ menu "Audio/Sound" source "package/libcodec2/Config.in" source "package/libcue/Config.in" source "package/libcuefile/Config.in" + source "package/libg7221/Config.in" source "package/libid3tag/Config.in" source "package/liblo/Config.in" source "package/libmad/Config.in" diff --git a/package/libg7221/Config.in b/package/libg7221/Config.in new file mode 100644 index 0000000000..e057d289fb --- /dev/null +++ b/package/libg7221/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBG7221 + bool "libg7221" + help + libg722_1 is a library for the ITU G.722.1 and Annex C + wideband speech codecs. + + http://www.soft-switch.org diff --git a/package/libg7221/libg7221.mk b/package/libg7221/libg7221.mk new file mode 100644 index 0000000000..813af11cee --- /dev/null +++ b/package/libg7221/libg7221.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libg7221 +# +################################################################################ + +LIBG7221_VERSION = dbfc29d4806ecdace50379a2f4d68a992a6fec34 +# we use the FreeSwitch fork because it contains pkgconf support +LIBG7221_SITE = https://freeswitch.org/stash/scm/sd/libg7221.git +LIBG7221_SITE_METHOD = git +LIBG7221_LICENSE = Polycom +LIBG7221_LICENSE_FILES = COPYING +LIBG7221_AUTORECONF = YES +LIBG7221_INSTALL_STAGING = YES + +$(eval $(autotools-package)) From 838af7ac04d60c5deb4c91401a6c69fa1165c6e8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 11 Aug 2015 20:16:52 +0200 Subject: [PATCH 56/72] package/libilbc: new package Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/libilbc/Config.in | 7 +++++++ package/libilbc/libilbc.mk | 15 +++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 package/libilbc/Config.in create mode 100644 package/libilbc/libilbc.mk diff --git a/package/Config.in b/package/Config.in index eb4215d990..d9dfb34c16 100644 --- a/package/Config.in +++ b/package/Config.in @@ -702,6 +702,7 @@ menu "Audio/Sound" source "package/libcuefile/Config.in" source "package/libg7221/Config.in" source "package/libid3tag/Config.in" + source "package/libilbc/Config.in" source "package/liblo/Config.in" source "package/libmad/Config.in" source "package/libmodplug/Config.in" diff --git a/package/libilbc/Config.in b/package/libilbc/Config.in new file mode 100644 index 0000000000..89d5db2fd6 --- /dev/null +++ b/package/libilbc/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBILBC + bool "libilbc" + help + iLBC (internet Low Bitrate Codec) is a FREE speech codec + suitable for robust voice communication over IP. + + http://www.webrtc.org/license-rights/ilbc-freeware diff --git a/package/libilbc/libilbc.mk b/package/libilbc/libilbc.mk new file mode 100644 index 0000000000..06d94eb36d --- /dev/null +++ b/package/libilbc/libilbc.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# libilbc +# +################################################################################ + +LIBILBC_VERSION = 829b08c7902ceb87a261279fabb36b6d523c6e07 +LIBILBC_SITE = https://freeswitch.org/stash/scm/sd/libilbc.git +LIBILBC_SITE_METHOD = git +LIBILBC_LICENSE = Global IP Sound iLBC Public License v2.0 +LIBILBC_LICENSE_FILES = gips_iLBClicense.pdf +LIBILBC_AUTORECONF = YES +LIBILBC_INSTALL_STAGING = YES + +$(eval $(autotools-package)) From 082a3dd28613d18260772b689961ce7843447af7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 11 Aug 2015 20:16:53 +0200 Subject: [PATCH 57/72] package/libopenh264: new package [Thomas: - make the license info more specific: it's BSD-2c, not just BSD. - use a single conditional block to test the architecture, instead of multiple separate conditions. - add missing arm/armeb handling in the architecture condition. - make the host-nasm dependency only used on x86/x86-64, since it's not used for other architectures - group the ARCH= and ENABLE64BIT= make variable definitions in a LIBOPENH264_MAKE_OPTS variable, and use them at install time (in addition to build time) to avoid build issues. - wrap too long lines in the .mk file.] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/libopenh264/Config.in | 22 +++++++++++++ package/libopenh264/libopenh264.mk | 52 ++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 package/libopenh264/Config.in create mode 100644 package/libopenh264/libopenh264.mk diff --git a/package/Config.in b/package/Config.in index d9dfb34c16..958b3ed124 100644 --- a/package/Config.in +++ b/package/Config.in @@ -957,6 +957,7 @@ menu "Multimedia" source "package/libmms/Config.in" source "package/libmpeg2/Config.in" source "package/libogg/Config.in" + source "package/libopenh264/Config.in" source "package/libplayer/Config.in" source "package/libtheora/Config.in" source "package/live555/Config.in" diff --git a/package/libopenh264/Config.in b/package/libopenh264/Config.in new file mode 100644 index 0000000000..2b77578a83 --- /dev/null +++ b/package/libopenh264/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS + bool + default y if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || \ + BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ + BR2_x86_64 + +config BR2_PACKAGE_LIBOPENH264 + bool "libopenh264" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS + help + OpenH264 is a codec library which supports H.264 encoding and + decoding. + + http://www.openh264.org + +comment "libopenh264 needs a toolchain w/ C++, dynamic library, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS + depends on BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk new file mode 100644 index 0000000000..cbe30bcc8e --- /dev/null +++ b/package/libopenh264/libopenh264.mk @@ -0,0 +1,52 @@ +################################################################################ +# +# libopenh264 +# +################################################################################ + +LIBOPENH264_VERSION = v1.4.0 +LIBOPENH264_SITE = $(call github,cisco,openh264,$(LIBOPENH264_VERSION)) +LIBOPENH264_LICENSE = BSD-2c +LIBOPENH264_LICENSE_FILES = LICENSE +LIBOPENH264_INSTALL_STAGING = YES + +ifeq ($(BR2_aarch64),y) +LIBOPENH264_ARCH = aarch64 +else ifeq ($(BR2_arm)$(BR2_armeb),y) +LIBOPENH264_ARCH = arm +else ifeq ($(BR2_i386),y) +LIBOPENH264_ARCH = x86 +LIBOPENH264_DEPENDENCIES += host-nasm +else ifeq ($(BR2_mips)$(BR2_mipsel),y) +LIBOPENH264_ARCH = mips +else ifeq ($(BR2_mips64)$(BR2_mips64el),y) +LIBOPENH264_ARCH = mips64 +else ifeq ($(BR2_x86_64),y) +LIBOPENH264_ARCH = x86_64 +LIBOPENH264_DEPENDENCIES += host-nasm +endif + +# ENABLE64BIT is really only used for x86-64, other 64 bits +# architecture don't need it. +LIBOPENH264_MAKE_OPTS = \ + ARCH=$(LIBOPENH264_ARCH) \ + ENABLE64BIT=$(if $(BR2_x86_64),Yes,No) + +define LIBOPENH264_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(LIBOPENH264_MAKE_OPTS) +endef + +define LIBOPENH264_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(LIBOPENH264_MAKE_OPTS) \ + DESTDIR=$(STAGING_DIR) PREFIX=/usr install +endef + +define LIBOPENH264_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(LIBOPENH264_MAKE_OPTS) \ + DESTDIR=$(TARGET_DIR) PREFIX=/usr install +endef + +$(eval $(generic-package)) From 5dc0167525bdbbd14e554a60a52ac9fe78d00ce9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 11 Aug 2015 20:16:54 +0200 Subject: [PATCH 58/72] package/libsoundtouch: new package Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/libsoundtouch/Config.in | 8 ++++++++ package/libsoundtouch/libsoundtouch.mk | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 package/libsoundtouch/Config.in create mode 100644 package/libsoundtouch/libsoundtouch.mk diff --git a/package/Config.in b/package/Config.in index 958b3ed124..72fcbc92b5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -713,6 +713,7 @@ menu "Audio/Sound" source "package/libsidplay2/Config.in" source "package/libsilk/Config.in" source "package/libsndfile/Config.in" + source "package/libsoundtouch/Config.in" source "package/libsoxr/Config.in" source "package/libvorbis/Config.in" source "package/mp4v2/Config.in" diff --git a/package/libsoundtouch/Config.in b/package/libsoundtouch/Config.in new file mode 100644 index 0000000000..396036fad5 --- /dev/null +++ b/package/libsoundtouch/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBSOUNDTOUCH + bool "libsoundtouch" + help + SoundTouch is an open-source audio processing library for + changing the Tempo, Pitch and Playback Rates of audio streams + or audio files. + + http://www.surina.net/soundtouch diff --git a/package/libsoundtouch/libsoundtouch.mk b/package/libsoundtouch/libsoundtouch.mk new file mode 100644 index 0000000000..cdfec20d2b --- /dev/null +++ b/package/libsoundtouch/libsoundtouch.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# libsoundtouch +# +################################################################################ + +LIBSOUNDTOUCH_VERSION = 010a91a59071c7fefd316fca62c0d980ec85b4b1 +LIBSOUNDTOUCH_SITE = https://freeswitch.org/stash/scm/sd/libsoundtouch.git +LIBSOUNDTOUCH_SITE_METHOD = git +LIBSOUNDTOUCH_LICENSE = LGPLv2.1+ +LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT +LIBSOUNDTOUCH_AUTORECONF = YES +LIBSOUNDTOUCH_INSTALL_STAGING = YES + +define LIBSOUNDTOUCH_CREATE_CONFIG_M4 + mkdir -p $(@D)/config/m4 +endef +LIBSOUNDTOUCH_POST_PATCH_HOOKS += LIBSOUNDTOUCH_CREATE_CONFIG_M4 + +$(eval $(autotools-package)) From 721c78c9e05a49a3291364283225b552debb879e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Aug 2015 12:53:38 +0200 Subject: [PATCH 59/72] package/libldns: new package Needed by freeswitch. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + ...le-free-for-answers-bigger-than-4096.patch | 25 +++++++++++ ...fix-whitespace-bug-in-ldns-read-zone.patch | 45 +++++++++++++++++++ package/libldns/Config.in | 9 ++++ package/libldns/libldns.hash | 4 ++ package/libldns/libldns.mk | 36 +++++++++++++++ 6 files changed, 120 insertions(+) create mode 100644 package/libldns/0001-fix-double-free-for-answers-bigger-than-4096.patch create mode 100644 package/libldns/0002-fix-whitespace-bug-in-ldns-read-zone.patch create mode 100644 package/libldns/Config.in create mode 100644 package/libldns/libldns.hash create mode 100644 package/libldns/libldns.mk diff --git a/package/Config.in b/package/Config.in index 72fcbc92b5..68b3aa8f15 100644 --- a/package/Config.in +++ b/package/Config.in @@ -990,6 +990,7 @@ menu "Networking" source "package/libhttpparser/Config.in" source "package/libidn/Config.in" source "package/libiscsi/Config.in" + source "package/libldns/Config.in" source "package/libmbus/Config.in" source "package/libmemcached/Config.in" source "package/libmicrohttpd/Config.in" diff --git a/package/libldns/0001-fix-double-free-for-answers-bigger-than-4096.patch b/package/libldns/0001-fix-double-free-for-answers-bigger-than-4096.patch new file mode 100644 index 0000000000..36bc8753c5 --- /dev/null +++ b/package/libldns/0001-fix-double-free-for-answers-bigger-than-4096.patch @@ -0,0 +1,25 @@ +Downloaded from +http://anonscm.debian.org/cgit/pkg-nlnetlabs/ldns.git/plain/debian/patches/fix-double-free-for-answers-bigger-than-4096.patch + +which is a backport from upstream +http://git.nlnetlabs.nl/ldns/commit/?h=develop&id=2853eb352b4461e98f2926ace4ea3810cedf4167 + +Signed-off-by: Bernd Kuhls + +From 2853eb352b4461e98f2926ace4ea3810cedf4167 Mon Sep 17 00:00:00 2001 +From: Willem Toorop +Date: Tue, 28 Jan 2014 11:06:38 +0100 +Subject: bugfix #548: Double free for answers > 4096 + +in ldns_resolver_send_pkt. Thank you sunthought@gmail.com +--- +--- ldns.orig/resolver.c ++++ ldns/resolver.c +@@ -1117,6 +1117,7 @@ ldns_resolver_send_pkt(ldns_pkt **answer + ldns_pkt_set_edns_udp_size(query_pkt + , 4096); + ldns_pkt_free(answer_pkt); ++ answer_pkt = NULL; + /* Nameservers should not become + * unreachable because fragments are + * dropped (network error). We might diff --git a/package/libldns/0002-fix-whitespace-bug-in-ldns-read-zone.patch b/package/libldns/0002-fix-whitespace-bug-in-ldns-read-zone.patch new file mode 100644 index 0000000000..4d8908eb40 --- /dev/null +++ b/package/libldns/0002-fix-whitespace-bug-in-ldns-read-zone.patch @@ -0,0 +1,45 @@ +Dwonloaded from +http://anonscm.debian.org/cgit/pkg-nlnetlabs/ldns.git/tree/debian/patches/fix-whitespace-bug-in-ldns-read-zone.patch + +which is a backport from +http://git.nlnetlabs.nl/ldns/commit/?h=develop&id=d6037a22fbedb8ef3a22de4107e4eaa36840865b + +Signed-off-by: Bernd Kuhls + +From d6037a22fbedb8ef3a22de4107e4eaa36840865b Mon Sep 17 00:00:00 2001 +From: Matthijs Mekking +Date: Wed, 18 Jun 2014 09:55:17 +0200 +Subject: whitespace bug in ldns-read-zone + +--- +--- ldns.orig/rr.c ++++ ldns/rr.c +@@ -670,6 +670,18 @@ ldns_rr_new_question_frm_str(ldns_rr **n + true); + } + ++static int ++ldns_rr_is_whitespace_line(char* line, int line_len) ++{ ++ int i; ++ for (i = 0; i < line_len; i++) { ++ if (!isspace((int)line[i])) { ++ return 0; ++ } ++ } ++ return 1; ++} ++ + ldns_status + ldns_rr_new_frm_fp(ldns_rr **newrr, FILE *fp, uint32_t *ttl, ldns_rdf **origin, ldns_rdf **prev) + { +@@ -745,6 +757,9 @@ ldns_rr_new_frm_fp_l(ldns_rr **newrr, FI + s = LDNS_STATUS_SYNTAX_TTL; + } else if (strncmp(line, "$INCLUDE", 8) == 0) { + s = LDNS_STATUS_SYNTAX_INCLUDE; ++ } else if (ldns_rr_is_whitespace_line(line, size)) { ++ LDNS_FREE(line); ++ return LDNS_STATUS_SYNTAX_EMPTY; + } else { + if (origin && *origin) { + s = ldns_rr_new_frm_str(&rr, (const char*) line, ttl, *origin, prev); diff --git a/package/libldns/Config.in b/package/libldns/Config.in new file mode 100644 index 0000000000..12065ae2f1 --- /dev/null +++ b/package/libldns/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBLDNS + bool "libldns" + help + The goal of ldns is to simplify DNS programming, it supports + recent RFCs like the DNSSEC documents, and allows developers + to easily create software conforming to current RFCs, and + experimental software for current Internet Drafts. + + http://www.nlnetlabs.nl/projects/ldns diff --git a/package/libldns/libldns.hash b/package/libldns/libldns.hash new file mode 100644 index 0000000000..3565c5830a --- /dev/null +++ b/package/libldns/libldns.hash @@ -0,0 +1,4 @@ +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.17.tar.gz.sha1 +sha1 4218897b3c002aadfc7280b3f40cda829e05c9a4 ldns-1.6.17.tar.gz +# Locally calculated +sha256 8b88e059452118e8949a2752a55ce59bc71fa5bc414103e17f5b6b06f9bcc8cd ldns-1.6.17.tar.gz diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk new file mode 100644 index 0000000000..9a284040ea --- /dev/null +++ b/package/libldns/libldns.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# libldns +# +################################################################################ + +LIBLDNS_VERSION = 1.6.17 +LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz +LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns +LIBLDNS_LICENSE = BSD-3c +LIBLDNS_LICENSE_FILES = LICENSE +LIBLDNS_INSTALL_STAGING = YES +LIBLDNS_CONF_OPTS = \ + --without-examples \ + --without-p5-dns-ldns \ + --without-pyldns \ + --without-pyldnsx + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBLDNS_DEPENDENCIES += host-pkgconf openssl +LIBLDNS_CONF_OPTS += \ + --with-ssl=$(STAGING_DIR)/usr \ + --enable-dane \ + --enable-ecdsa \ + --enable-gost \ + --enable-sha2 +else +LIBLDNS_CONF_OPTS += \ + --without-ssl \ + --disable-dane \ + --disable-ecdsa \ + --disable-gost \ + --disable-sha2 +endif + +$(eval $(autotools-package)) From d45e6bf09d0413742457b371762b09e69cf22829 Mon Sep 17 00:00:00 2001 From: Tom Sparks Date: Sat, 8 Aug 2015 22:42:14 +1000 Subject: [PATCH 60/72] ibrcommon: new package [Thomas: - add package in package/Config.in, to make it visible in menuconfig - make the openssl, libnl and libxml2 dependencies optional, since they are definitely not mandatory - add README to the license files, since it contains useful licensing related information. - remove custom INSTALL_STAGING_OPTS and INSTALL_TARGET_OPTS since the package uses automake. - add missing final newline in Config.in and .mk file.] Signed-off-by: Tom Sparks Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/ibrcommon/Config.in | 14 ++++++++++++++ package/ibrcommon/ibrcommon.mk | 35 ++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 package/ibrcommon/Config.in create mode 100644 package/ibrcommon/ibrcommon.mk diff --git a/package/Config.in b/package/Config.in index 68b3aa8f15..36f8f1c8c7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -980,6 +980,7 @@ menu "Networking" source "package/fmlib/Config.in" source "package/geoip/Config.in" source "package/glib-networking/Config.in" + source "package/ibrcommon/Config.in" source "package/libcgi/Config.in" source "package/libcgicc/Config.in" source "package/libcurl/Config.in" diff --git a/package/ibrcommon/Config.in b/package/ibrcommon/Config.in new file mode 100644 index 0000000000..5aa51a45ff --- /dev/null +++ b/package/ibrcommon/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_IBRCOMMON + bool "ibrcommon" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + help + IBR-DTN is a small dtn application that supports: + Bundle Protocol RFC 5050 + Bundle Security Protocol RFC 6257 + + http://trac.ibr.cs.tu-bs.de/project-cm-2012-ibrdtn + +comment "ibrcommon needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ibrcommon/ibrcommon.mk b/package/ibrcommon/ibrcommon.mk new file mode 100644 index 0000000000..282bfb0e59 --- /dev/null +++ b/package/ibrcommon/ibrcommon.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# ibrcommon +# +################################################################################ + +IBRCOMMON_VERSION = 1.0.1 +IBRCOMMON_SOURCE = ibrcommon-$(IBRCOMMON_VERSION).tar.gz +IBRCOMMON_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/ +IBRCOMMON_INSTALL_STAGING = YES +IBRCOMMON_LICENSE = Apache-2.0 +IBRCOMMON_LICENSE_FILES = COPYING README + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +IBRCOMMON_DEPENDENCIES += openssl +IBRCOMMON_CONF_OPTS += --with-openssl +else +IBRCOMMON_CONF_OPTS += --without-openssl +endif + +ifeq ($(BR2_PACKAGE_LIBNL),y) +IBRCOMMON_DEPENDENCIES += libnl +IBRCOMMON_CONF_OPTS += --with-lowpan +else +IBRCOMMON_CONF_OPTS += --without-lowpan +endif + +ifeq ($(BR2_PACKAGE_LIBXML2),y) +IBRCOMMON_DEPENDENCIES += libxml2 +IBRCOMMON_CONF_OPTS += --with-xml +else +IBRCOMMON_CONF_OPTS += --without-xml +endif + +$(eval $(autotools-package)) From 807f642672a9d527741fd5ec3d37f3a11d7e2e29 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 29 Aug 2015 15:21:25 +0200 Subject: [PATCH 61/72] gdb: add support for gdb 7.10 This commit adds support for gdb 7.10. gdb 7.9.1 carries the following patches: - 0001-gdbserver-fix-uClibc-whithout-MMU.patch merged as 6282837972a5c7b89968319caf821fcbd2a166bb, and part of 7.10 - 0002-gdbserver-xtensa-drop-xtensa_usrregs_info.patch merged as deb44829ecc1dd38275af0fcf91acd319e227a89, and part of 7.10 - 0003-gdbserver-xtensa-fix-typo-in-XCHAL_HAVE_LOOPS.patch merged as a2d5a9d76f2366ed93095fc5a63eafa06b22f808, and part of 7.10 Consequently, none of the three patches we have for 7.9.1 are useful for 7.10. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/gdb/Config.in.host | 4 ++++ package/gdb/gdb.hash | 1 + 2 files changed, 5 insertions(+) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 3207794299..7b05796285 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -41,6 +41,9 @@ choice config BR2_GDB_VERSION_7_9 bool "gdb 7.9.x" + config BR2_GDB_VERSION_7_10 + bool "gdb 7.10.x" + endchoice endif @@ -54,3 +57,4 @@ config BR2_GDB_VERSION default "7.7.1" if BR2_GDB_VERSION_7_7 default "7.8.2" if BR2_GDB_VERSION_7_8 || !BR2_PACKAGE_HOST_GDB default "7.9.1" if BR2_GDB_VERSION_7_9 + default "7.10" if BR2_GDB_VERSION_7_10 diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index a970f0a68f..2646a32d3f 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -2,6 +2,7 @@ sha512 887b9b726dae8f6e3e5e41574460a67e4f9002b0d47bc985dcf63bdf3518397a90b6a208cb5b19e5ed2341715ad75cfeed4df4fb423f39f74218e36bc87f1cab gdb-7.7.1.tar.bz2 sha512 face5bf1b4ce144fc8604fc84620beed956177a11fd632b4e41906fc7f632910b2b43a50e6cfdfd6cbd876ee527c813bddab8df29dc560a6c36694cdb8edc4e4 gdb-7.8.2.tar.xz sha512 eebdf88b24e52e792b8a4b89ea85790de72b462a7810b44975fdf4232c068f353b15506071f450102a9d4bcecdde8e93dc3748a10699b7f73f3e04fb2d9d8414 gdb-7.9.1.tar.xz +sha512 4d9d7b536ad46f881689fca9f3f0b60268ff413c7900115fed5030d81d1d794793cc51d51510584ea1a63fe5891d006a9867ba36981b86b50806d469b717457d gdb-7.10.tar.xz # No hash for the ARC & microblaze variants, comes from the github-helper: none xxx gdb-arc-2015.06-gdb.tar.gz none xxx gdb-6be65fb56ea6694a9260733a536a023a1e2d4d57.tar.gz From 863ec57d809e572641d90e6ac4ee57b6115c6114 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 29 Aug 2015 15:21:26 +0200 Subject: [PATCH 62/72] gdb: use 7.9 by default Now that we have added 7.10, let's switch to 7.9 as the default gdb version. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/gdb/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 7b05796285..b66e74290d 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -27,7 +27,7 @@ choice prompt "GDB debugger Version" depends on !BR2_arc depends on !BR2_microblaze - default BR2_GDB_VERSION_7_8 + default BR2_GDB_VERSION_7_9 help Select the version of gdb you wish to use. @@ -55,6 +55,6 @@ config BR2_GDB_VERSION default "arc-2015.06-gdb" if BR2_arc default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze default "7.7.1" if BR2_GDB_VERSION_7_7 - default "7.8.2" if BR2_GDB_VERSION_7_8 || !BR2_PACKAGE_HOST_GDB - default "7.9.1" if BR2_GDB_VERSION_7_9 + default "7.8.2" if BR2_GDB_VERSION_7_8 + default "7.9.1" if BR2_GDB_VERSION_7_9 || !BR2_PACKAGE_HOST_GDB default "7.10" if BR2_GDB_VERSION_7_10 From 8bb79ac97d152a4e611357564eebf370e947a57e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 29 Aug 2015 18:07:42 +0200 Subject: [PATCH 63/72] ibrcommon: fix dependencies of comment in Config.in We want the comment to be displayed either if C++ is not supported *or* if threads is not supported. Also, fix the indentation to use a tab. Signed-off-by: Thomas Petazzoni --- package/ibrcommon/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/ibrcommon/Config.in b/package/ibrcommon/Config.in index 5aa51a45ff..36ccfbc383 100644 --- a/package/ibrcommon/Config.in +++ b/package/ibrcommon/Config.in @@ -10,5 +10,4 @@ config BR2_PACKAGE_IBRCOMMON http://trac.ibr.cs.tu-bs.de/project-cm-2012-ibrdtn comment "ibrcommon needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS From f1e2419753990744eb9d5d06e8661c9713d9a629 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 29 Aug 2015 18:12:57 +0200 Subject: [PATCH 64/72] ibrcommon: add hash file Signed-off-by: Thomas Petazzoni --- package/ibrcommon/ibrcommon.hash | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package/ibrcommon/ibrcommon.hash diff --git a/package/ibrcommon/ibrcommon.hash b/package/ibrcommon/ibrcommon.hash new file mode 100644 index 0000000000..21a0ec6f19 --- /dev/null +++ b/package/ibrcommon/ibrcommon.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 9c457c1ebc01e6216524636628c647bef34ab11bd96f0e0788be8749374fdc20 ibrcommon-1.0.1.tar.gz From 1c964e320f2676f1bc36cbebeba102c440815d7b Mon Sep 17 00:00:00 2001 From: Tom Sparks Date: Sat, 8 Aug 2015 22:49:05 +1000 Subject: [PATCH 65/72] ibrdtn: new package [Thomas: - Add missing include in package/Config.in to make the package appear in menuconfig. - Fix the comment dependencies: the comment should be shown either if C++ is not available *or* if threads are not supported. - Add a hash file. - Add missing dependency on host-pkgconf, since pkg-config is used to detect the availability of ibrcommon. - Remove the custom INSTALL_STAGING_OPTS and INSTALL_TARGET_OPTS: they are not needed since automake is used. - Make --with-compression conditional on whether zlib is available. - Add optional dependency on libglib2. - Add missing final newlines in .mk and Config.in files.] Signed-off-by: Tom Sparks Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/ibrdtn/Config.in | 16 ++++++++++++++++ package/ibrdtn/ibrdtn.hash | 2 ++ package/ibrdtn/ibrdtn.mk | 30 ++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+) create mode 100644 package/ibrdtn/Config.in create mode 100644 package/ibrdtn/ibrdtn.hash create mode 100644 package/ibrdtn/ibrdtn.mk diff --git a/package/Config.in b/package/Config.in index 36f8f1c8c7..3da201a41b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -981,6 +981,7 @@ menu "Networking" source "package/geoip/Config.in" source "package/glib-networking/Config.in" source "package/ibrcommon/Config.in" + source "package/ibrdtn/Config.in" source "package/libcgi/Config.in" source "package/libcgicc/Config.in" source "package/libcurl/Config.in" diff --git a/package/ibrdtn/Config.in b/package/ibrdtn/Config.in new file mode 100644 index 0000000000..569831596d --- /dev/null +++ b/package/ibrdtn/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_IBRDTN + bool "ibrdtn" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_IBRCOMMON + help + IBR-DTN is a small dtn application that supports: + Bundle Protocol RFC 5050 + Bundle Security Protocol RFC 6257 + + This package contains the ibrdtn library. + + http://trac.ibr.cs.tu-bs.de/project-cm-2012-ibrdtn + +comment "ibrdtn needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ibrdtn/ibrdtn.hash b/package/ibrdtn/ibrdtn.hash new file mode 100644 index 0000000000..5f233277c1 --- /dev/null +++ b/package/ibrdtn/ibrdtn.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 288b14ccbaefb5e3234065c2778c247797ccb3c7afbb6746bb37dc12c620d360 ibrdtn-1.0.1.tar.gz diff --git a/package/ibrdtn/ibrdtn.mk b/package/ibrdtn/ibrdtn.mk new file mode 100644 index 0000000000..aab27a8acc --- /dev/null +++ b/package/ibrdtn/ibrdtn.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# ibrdtn +# +################################################################################ + +IBRDTN_VERSION = 1.0.1 +IBRDTN_SOURCE = ibrdtn-$(IBRDTN_VERSION).tar.gz +IBRDTN_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/ +IBRDTN_INSTALL_STAGING = YES +IBRDTN_LICENSE = Apache-2.0 +IBRDTN_LICENSE_FILES = COPYING +IBRDTN_DEPENDENCIES = ibrcommon host-pkgconf + +ifeq ($(BR2_PACKAGE_ZLIB),y) +IBRDTN_CONF_OPTS += --with-compression +IBRDTN_DEPENDENCIES += zlib +else +IBRDTN_CONF_OPTS += --without-compression +IBRDTN_DEPENDENCIES += zlib +endif + +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +IBRDTN_CONF_OPTS += --with-glib +IBRDTN_DEPENDENCIES += libglib2 +else +IBRDTN_CONF_OPTS += --without-glib +endif + +$(eval $(autotools-package)) From e4f6046f7a2932aa746c705d2b3d3d4745f5b061 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 29 Aug 2015 20:40:54 +0200 Subject: [PATCH 66/72] ibrcommon: add missing dependency on host-pkgconf pkg-config is used by ibrcommon to detect the availability of openssl, libnl and libxml2, so we must depend on host-pkgconf. Signed-off-by: Thomas Petazzoni --- package/ibrcommon/ibrcommon.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ibrcommon/ibrcommon.mk b/package/ibrcommon/ibrcommon.mk index 282bfb0e59..97eced3377 100644 --- a/package/ibrcommon/ibrcommon.mk +++ b/package/ibrcommon/ibrcommon.mk @@ -10,6 +10,7 @@ IBRCOMMON_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/ IBRCOMMON_INSTALL_STAGING = YES IBRCOMMON_LICENSE = Apache-2.0 IBRCOMMON_LICENSE_FILES = COPYING README +IBRCOMMON_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_OPENSSL),y) IBRCOMMON_DEPENDENCIES += openssl From f56de721c4d98e5c064be584e0efbb14f84b0b71 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 29 Aug 2015 20:41:37 +0200 Subject: [PATCH 67/72] ibrdtn: fix bogus dependency on zlib Due to a copy/paste mistake, zlib was being added to _DEPENDENCIES even when not enabled in the configuration. This commit fixes that. Signed-off-by: Thomas Petazzoni --- package/ibrdtn/ibrdtn.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/ibrdtn/ibrdtn.mk b/package/ibrdtn/ibrdtn.mk index aab27a8acc..f899843396 100644 --- a/package/ibrdtn/ibrdtn.mk +++ b/package/ibrdtn/ibrdtn.mk @@ -17,7 +17,6 @@ IBRDTN_CONF_OPTS += --with-compression IBRDTN_DEPENDENCIES += zlib else IBRDTN_CONF_OPTS += --without-compression -IBRDTN_DEPENDENCIES += zlib endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) From c6551d8199b8ee17035636832e2d816152ee697e Mon Sep 17 00:00:00 2001 From: Tom Sparks Date: Sat, 8 Aug 2015 23:07:41 +1000 Subject: [PATCH 68/72] ibrdtnd: new package [Thomas: - add package to package/Config.in - remove "select" on libdaemon, libcurl, sqlite and openssl from Config.in, since those are optional dependency. - add "select" on ibrcommon, since it is a mandatory dependency. - remove bogus includes of package/ibrcommon/Config.in and package/ibrdtn/Config.in, those are directly from package/Config.in. - fix Config.in comment dependency and indentation. - remove INSTALL_STAGING = YES, since ibrdtnd does not install a library. - remove libdaemon, libcurl, sqlite and openssl as mandatory dependencies, and handle them as optional dependencies. - add ibrcommon in the dependencies (even if ibrdtn already depends on it) - remove custom INSTALL_STAGING_OPTS and INSTALL_TARGET_OPTS, they are not needed, since the Makefiles are properly generated by automake. - explicitly disable features for which Buildroot doesn't have the necessary dependencies (dtndht, wifip2p, vmime) - add hash file.] Signed-off-by: Tom Sparks Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/ibrdtnd/Config.in | 15 +++++++++++ package/ibrdtnd/ibrdtnd.hash | 2 ++ package/ibrdtnd/ibrdtnd.mk | 49 ++++++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+) create mode 100644 package/ibrdtnd/Config.in create mode 100644 package/ibrdtnd/ibrdtnd.hash create mode 100644 package/ibrdtnd/ibrdtnd.mk diff --git a/package/Config.in b/package/Config.in index 3da201a41b..7412ba663a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1240,6 +1240,7 @@ endif source "package/hostapd/Config.in" source "package/hplip/Config.in" source "package/httping/Config.in" + source "package/ibrdtnd/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/ifplugd/Config.in" endif diff --git a/package/ibrdtnd/Config.in b/package/ibrdtnd/Config.in new file mode 100644 index 0000000000..f7f371edfd --- /dev/null +++ b/package/ibrdtnd/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_IBRDTND + bool "ibrdtnd" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_IBRDTN + select BR2_PACKAGE_IBRCOMMON + help + IBR-DTN is a small dtn application that supports: + Bundle Protocol RFC 5050 + Bundle Security Protocol RFC 6257 + + http://trac.ibr.cs.tu-bs.de/project-cm-2012-ibrdtn + +comment "ibrdtnd needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ibrdtnd/ibrdtnd.hash b/package/ibrdtnd/ibrdtnd.hash new file mode 100644 index 0000000000..4b7dd7c3d8 --- /dev/null +++ b/package/ibrdtnd/ibrdtnd.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 9bd79636154093ab6bf4fd10d6c62d67c6db45141460847b19def327c93771ed ibrdtnd-1.0.1.tar.gz diff --git a/package/ibrdtnd/ibrdtnd.mk b/package/ibrdtnd/ibrdtnd.mk new file mode 100644 index 0000000000..8a37fa335c --- /dev/null +++ b/package/ibrdtnd/ibrdtnd.mk @@ -0,0 +1,49 @@ +################################################################################ +# +# ibrdtnd +# +################################################################################ + +IBRDTND_VERSION = 1.0.1 +IBRDTND_SOURCE = ibrdtnd-$(IBRDTND_VERSION).tar.gz +IBRDTND_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/ +IBRDTND_LICENSE = Apache-2.0 +IBRDTND_LICENSE_FILES = COPYING +IBRDTND_DEPENDENCIES = ibrdtn ibrcommon + +# Disable features that don't have the necessary dependencies in +# Buildroot +IBRDTND_CONF_OPTS = \ + --disable-dtndht \ + --without-wifip2p \ + --without-vmime + +ifeq ($(BR2_PACKAGE_LIBDAEMON),y) +IBRDTND_CONF_OPTS += --enable-libdaemon +IBRDTND_DEPENDENCIES += libdaemon +else +IBRDTND_CONF_OPTS += --disable-libdaemon +endif + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +IBRDTND_CONF_OPTS += --with-curl +IBRDTND_DEPENDENCIES += libcurl +else +IBRDTND_CONF_OPTS += --without-curl +endif + +ifeq ($(BR2_PACKAGE_SQLITE),y) +IBRDTND_CONF_OPTS += --with-sqlite +IBRDTND_DEPENDENCIES += sqlite +else +IBRDTND_CONF_OPTS += --without-sqlite +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +IBRDTND_CONF_OPTS += --with-tls +IBRDTND_DEPENDENCIES += openssl +else +IBRDTND_CONF_OPTS += --without-tls +endif + +$(eval $(autotools-package)) From 0b22622fecfc35737a7dd3933a7116f7c06cbf8c Mon Sep 17 00:00:00 2001 From: Tom Sparks Date: Sun, 9 Aug 2015 10:00:19 +1000 Subject: [PATCH 69/72] ibrdtn-tools: new package [Thomas: - include package/ibrdtn-tools/Config.in from package/Config.in - fix the Config.in option name: we don't use - in option names, it should be replaced by _. Also do the same change in the .mk file. - from Config.in, don't select BR2_PACKAGE_IBRDTND (it's not a dependency of ibrdtn-tools), but instead select BR2_PACKAGE_IBRCOMMON and BR2_PACKAGE_IBRDTN. - in the Config.in file, fix the comment dependency logic (we want the comment to be shown when either thread support *or* C++ support is missing) - add hash file. - do not install to staging, since the package does not install any library - remove IBRDTN_TOOLS_SOURCE variable, since it's equal to the default value - add ibrcommon, ibrdtn and host-pkgconf as mandatory dependencies, and handle libdaemon and libarchive as optional dependencies. - remove custom INSTALL_STAGING_OPTS and INSTALL_TARGET_OPTS: automake is used, so there's no need for any hack.] Signed-off-by: Tom Sparks Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/ibrdtn-tools/Config.in | 15 ++++++++++++++ package/ibrdtn-tools/ibrdtn-tools.hash | 2 ++ package/ibrdtn-tools/ibrdtn-tools.mk | 27 ++++++++++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 package/ibrdtn-tools/Config.in create mode 100644 package/ibrdtn-tools/ibrdtn-tools.hash create mode 100644 package/ibrdtn-tools/ibrdtn-tools.mk diff --git a/package/Config.in b/package/Config.in index 7412ba663a..ed0eb9845e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1240,6 +1240,7 @@ endif source "package/hostapd/Config.in" source "package/hplip/Config.in" source "package/httping/Config.in" + source "package/ibrdtn-tools/Config.in" source "package/ibrdtnd/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/ifplugd/Config.in" diff --git a/package/ibrdtn-tools/Config.in b/package/ibrdtn-tools/Config.in new file mode 100644 index 0000000000..91419d6769 --- /dev/null +++ b/package/ibrdtn-tools/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_IBRDTN_TOOLS + bool "ibrdtn-tools" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_IBRCOMMON + select BR2_PACKAGE_IBRDTN + help + IBR-DTN is a small dtn application that supports: + Bundle Protocol RFC 5050 + Bundle Security Protocol RFC 6257 + + http://trac.ibr.cs.tu-bs.de/project-cm-2012-ibrdtn + +comment "ibrdtn-tools needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ibrdtn-tools/ibrdtn-tools.hash b/package/ibrdtn-tools/ibrdtn-tools.hash new file mode 100644 index 0000000000..fb77207526 --- /dev/null +++ b/package/ibrdtn-tools/ibrdtn-tools.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 eab066cf15f9c322d769c6c9c58adfb474cba7d446fd12e8de5ff6344376795b ibrdtn-tools-1.0.1.tar.gz diff --git a/package/ibrdtn-tools/ibrdtn-tools.mk b/package/ibrdtn-tools/ibrdtn-tools.mk new file mode 100644 index 0000000000..c9a585d928 --- /dev/null +++ b/package/ibrdtn-tools/ibrdtn-tools.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# ibrdtn-tools +# +################################################################################ + +IBRDTN_TOOLS_VERSION = 1.0.1 +IBRDTN_TOOLS_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/ +IBRDTN_TOOLS_LICENSE = Apache-2.0 +IBRDTN_TOOLS_LICENSE_FILES = COPYING +IBRDTN_TOOLS_DEPENDENCIES = ibrcommon ibrdtn host-pkgconf + +ifeq ($(BR2_PACKAGE_LIBDAEMON),y) +IBRDTN_TOOLS_CONF_OPTS += --with-libdaemon +IBRDTN_TOOLS_DEPENDENCIES += libdaemon +else +IBRDTN_TOOLS_CONF_OPTS += --without-libdaemon +endif + +ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) +IBRDTN_TOOLS_CONF_OPTS += --with-libarchive +IBRDTN_TOOLS_DEPENDENCIES += libarchive +else +IBRDTN_TOOLS_CONF_OPTS += --without-libarchive +endif + +$(eval $(autotools-package)) From 22212f15e43e5f274c8c0ad33957a346ccb99cf1 Mon Sep 17 00:00:00 2001 From: Doug Kehn Date: Tue, 18 Aug 2015 16:17:52 -0500 Subject: [PATCH 70/72] package/sp-oops-extract: new package A tool for extracting OOPS/panic logs from MTD. Tested using arm-buildroot-linux-gnueabihf toolchain. [Thomas: - use sp-oops-extract instead of sp_oops_extract as the Config.in prompt and in the .mk file comment - remove @ in front of the build and install commands. - use $(TARGET_CONFIGURE_OPTS) instead of manually passing CC, AR, LD, CFLAGS and LDFLAGS.] Signed-off-by: Doug Kehn Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + ...akefile-more-cross-compiler-friendly.patch | 22 +++++++++++++++++++ package/sp-oops-extract/Config.in | 6 +++++ package/sp-oops-extract/sp-oops-extract.hash | 2 ++ package/sp-oops-extract/sp-oops-extract.mk | 22 +++++++++++++++++++ 5 files changed, 53 insertions(+) create mode 100644 package/sp-oops-extract/0001-Make-the-Makefile-more-cross-compiler-friendly.patch create mode 100644 package/sp-oops-extract/Config.in create mode 100644 package/sp-oops-extract/sp-oops-extract.hash create mode 100644 package/sp-oops-extract/sp-oops-extract.mk diff --git a/package/Config.in b/package/Config.in index ed0eb9845e..c6244b74ba 100644 --- a/package/Config.in +++ b/package/Config.in @@ -173,6 +173,7 @@ menu "Filesystem and flash utilities" source "package/ntfs-3g/Config.in" source "package/simicsfs/Config.in" source "package/squashfs/Config.in" + source "package/sp-oops-extract/Config.in" source "package/sshfs/Config.in" source "package/sunxi-tools/Config.in" source "package/unionfs/Config.in" diff --git a/package/sp-oops-extract/0001-Make-the-Makefile-more-cross-compiler-friendly.patch b/package/sp-oops-extract/0001-Make-the-Makefile-more-cross-compiler-friendly.patch new file mode 100644 index 0000000000..67153c27bc --- /dev/null +++ b/package/sp-oops-extract/0001-Make-the-Makefile-more-cross-compiler-friendly.patch @@ -0,0 +1,22 @@ +Fetch from: https://github.com/Schischu/ptxdist_sh/tree/master/patches/sp-oops-extract-0.0.7 + +From: Bernhard Walle +Date: Wed, 21 Mar 2012 15:55:06 +0100 +Subject: [PATCH] Make the Makefile more cross-compiler friendly + +Signed-off-by: Bernhard Walle +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index cf5b550..e05eb1f 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -9,4 +9,4 @@ distclean: clean + $(RM) $(TARGETS) + + sp-oops-extract: oopslog.c +- gcc -Wall -s -o $@ $^ ++ $(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -Wall -o $@ $^ + diff --git a/package/sp-oops-extract/Config.in b/package/sp-oops-extract/Config.in new file mode 100644 index 0000000000..d4e0252c89 --- /dev/null +++ b/package/sp-oops-extract/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_SP_OOPS_EXTRACT + bool "sp-oops-extract" + help + A tool for extracting OOPS/panic logs from MTD. + + http://maemo.org/packages/view/sp-oops-extract/ diff --git a/package/sp-oops-extract/sp-oops-extract.hash b/package/sp-oops-extract/sp-oops-extract.hash new file mode 100644 index 0000000000..835bfe8915 --- /dev/null +++ b/package/sp-oops-extract/sp-oops-extract.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 85601a569af1f4584db75fad21d3a70e377ce12d1bccad7dbe1112abd3b43d93 sp-oops-extract_0.0.7-1.tar.gz diff --git a/package/sp-oops-extract/sp-oops-extract.mk b/package/sp-oops-extract/sp-oops-extract.mk new file mode 100644 index 0000000000..588243105d --- /dev/null +++ b/package/sp-oops-extract/sp-oops-extract.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# sp-oops-extract +# +################################################################################ + +SP_OOPS_EXTRACT_VERSION = 0.0.7-1 +SP_OOPS_EXTRACT_SITE = http://repository.maemo.org/pool/maemo5.0/free/s/sp-oops-extract/ +SP_OOPS_EXTRACT_SOURCE = sp-oops-extract_$(SP_OOPS_EXTRACT_VERSION).tar.gz +SP_OOPS_EXTRACT_LICENSE = GPLv2 +SP_OOPS_EXTRACT_LICENSE_FILES = COPYING + +define SP_OOPS_EXTRACT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) +endef + +define SP_OOPS_EXTRACT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install \ + DESTDIR=$(TARGET_DIR) +endef + +$(eval $(generic-package)) From a754bb8758ab9b5c314adda687014da9ddf17287 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 30 Aug 2015 07:06:16 +0300 Subject: [PATCH 71/72] package/Config.in: fix alphabetic order Commit ebf3a6117c58 (package/libyuv: new package, 2015-08-11) added a reference to the libyuv Config.in file at the wrong place. Fix that. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Config.in b/package/Config.in index c6244b74ba..cb548bb820 100644 --- a/package/Config.in +++ b/package/Config.in @@ -962,8 +962,8 @@ menu "Multimedia" source "package/libopenh264/Config.in" source "package/libplayer/Config.in" source "package/libtheora/Config.in" - source "package/live555/Config.in" source "package/libyuv/Config.in" + source "package/live555/Config.in" source "package/mediastreamer/Config.in" source "package/x264/Config.in" endmenu From aa016797444017d4379a139e39697e38ed2e2357 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Mon, 31 Aug 2015 00:05:10 +0800 Subject: [PATCH 72/72] libssh: new package libssh2 and libssh both implement SSH and provide a library API for apps. Both support SSH, SFTP, auth, channels etc. Both are 25K-30K lines of code. [libssh2 vs libssh - A comparison] http://www.libssh2.org/libssh2-vs-libssh.html [Peter: add sha256 hash, fix typo in help text] Signed-off-by: Scott Fan Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/libssh/Config.in | 11 +++++++++++ package/libssh/libssh.hash | 4 ++++ package/libssh/libssh.mk | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+) create mode 100644 package/libssh/Config.in create mode 100644 package/libssh/libssh.hash create mode 100644 package/libssh/libssh.mk diff --git a/package/Config.in b/package/Config.in index cb548bb820..914b83833d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -757,6 +757,7 @@ menu "Crypto" source "package/libsecret/Config.in" source "package/libsha1/Config.in" source "package/libsodium/Config.in" + source "package/libssh/Config.in" source "package/libssh2/Config.in" source "package/nettle/Config.in" source "package/openssl/Config.in" diff --git a/package/libssh/Config.in b/package/libssh/Config.in new file mode 100644 index 0000000000..080ad18e70 --- /dev/null +++ b/package/libssh/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBSSH + bool "libssh" + # Either OpenSSL or libgcrypt are mandatory + select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL + help + libssh is a multiplatform C library implementing the SSHv2 + and SSHv1 protocol on client and server side. With libssh, + you can remotely execute programs, transfer files, use a + secure and transparent tunnel for your remote applications. + + http://www.libssh.org/ diff --git a/package/libssh/libssh.hash b/package/libssh/libssh.hash new file mode 100644 index 0000000000..473ced36c7 --- /dev/null +++ b/package/libssh/libssh.hash @@ -0,0 +1,4 @@ +# from https://red.libssh.org/projects/libssh/files/ +md5 bffc9dc548c3bae3a3afc5ac1654b272 libssh-0.7.1.tar.xz +# Locally calculated +sha256 2fc7ccf96d3263cbd8ab520118cb94d9a2e11714c61e22b3f761fc5352fd046d libssh-0.7.1.tar.xz diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk new file mode 100644 index 0000000000..39cff50073 --- /dev/null +++ b/package/libssh/libssh.mk @@ -0,0 +1,36 @@ +################################################################################ +# +## libssh +# +################################################################################# + +LIBSSH_VERSION = 0.7.1 +LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz +LIBSSH_SITE = https://red.libssh.org/attachments/download/154 +LIBSSH_LICENSE = LGPLv2.1 +LIBSSH_LICENSE_FILES = COPYING +LIBSSH_INSTALL_STAGING = YES +LIBSSH_SUPPORTS_IN_SOURCE_BUILD = NO +LIBSSH_CONF_OPTS = \ + -DWITH_STACK_PROTECTOR=OFF \ + -DWITH_SERVER=OFF \ + -DWITH_EXAMPLES=OFF + +ifeq ($(BR2_PACKAGE_ZLIB),y) +LIBSSH_CONF_OPTS += -DWITH_ZLIB=ON +LIBSSH_DEPENDENCIES += zlib +else +LIBSSH_CONF_OPTS += -DWITH_ZLIB=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +LIBSSH_CONF_OPTS += -DWITH_GCRYPT=ON +LIBSSH_DEPENDENCIES += libgcrypt +else +LIBSSH_CONF_OPTS += -DWITH_GCRYPT=OFF +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBSSH_DEPENDENCIES += openssl +endif +endif + +$(eval $(cmake-package))