-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'refs/heads/master' into armhf
- Loading branch information
Showing
7 changed files
with
479 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,202 @@ | ||
| From 87041f7cfadb294f85cbf22e68ebdee55b6301d8 Mon Sep 17 00:00:00 2001 | ||
| From: Vicente Olivert Riera <[email protected]> | ||
| Date: Wed, 10 May 2017 12:09:08 +0100 | ||
| Subject: [PATCH] git: bump version to 2.13.0 | ||
|
|
||
| Patches 0001 and 0002 already included in this release: | ||
| https://github.com/git/git/commit/379642bcd8d89db52feba88a651e4e56d6ac5767 | ||
| https://github.com/git/git/commit/2225e1ea20481a7c0da526891470abf9ece623e7 | ||
|
|
||
| Signed-off-by: Vicente Olivert Riera <[email protected]> | ||
| Signed-off-by: Thomas Petazzoni <[email protected]> | ||
| --- | ||
| .../git/0001-grep-set-default-output-method.patch | 59 --------------- | ||
| ...ep-fix-builds-with-with-no-thread-support.patch | 87 ---------------------- | ||
| package/git/git.hash | 2 +- | ||
| package/git/git.mk | 2 +- | ||
| 4 files changed, 2 insertions(+), 148 deletions(-) | ||
| delete mode 100644 package/git/0001-grep-set-default-output-method.patch | ||
| delete mode 100644 package/git/0002-grep-fix-builds-with-with-no-thread-support.patch | ||
|
|
||
| diff --git a/package/git/0001-grep-set-default-output-method.patch b/package/git/0001-grep-set-default-output-method.patch | ||
| deleted file mode 100644 | ||
| index ade35eb021..0000000000 | ||
| --- a/package/git/0001-grep-set-default-output-method.patch | ||
| +++ /dev/null | ||
| @@ -1,59 +0,0 @@ | ||
| -From 379642bcd8d89db52feba88a651e4e56d6ac5767 Mon Sep 17 00:00:00 2001 | ||
| -From: Brandon Williams <[email protected]> | ||
| -Date: Fri, 17 Mar 2017 11:41:54 -0700 | ||
| -Subject: [PATCH] grep: set default output method | ||
| - | ||
| -Signed-off-by: Brandon Williams <[email protected]> | ||
| -Signed-off-by: Junio C Hamano <[email protected]> | ||
| -Signed-off-by: Rahul Bedarkar <[email protected]> | ||
| ---- | ||
| - grep.c | 12 +++++++----- | ||
| - 1 file changed, 7 insertions(+), 5 deletions(-) | ||
| - | ||
| -diff --git a/grep.c b/grep.c | ||
| -index 0dbdc1d..56ef0ec 100644 | ||
| ---- a/grep.c | ||
| -+++ b/grep.c | ||
| -@@ -12,6 +12,11 @@ static int grep_source_is_binary(struct grep_source *gs); | ||
| - | ||
| - static struct grep_opt grep_defaults; | ||
| - | ||
| -+static void std_output(struct grep_opt *opt, const void *buf, size_t size) | ||
| -+{ | ||
| -+ fwrite(buf, size, 1, stdout); | ||
| -+} | ||
| -+ | ||
| - /* | ||
| - * Initialize the grep_defaults template with hardcoded defaults. | ||
| - * We could let the compiler do this, but without C99 initializers | ||
| -@@ -42,6 +47,7 @@ void init_grep_defaults(void) | ||
| - color_set(opt->color_selected, ""); | ||
| - color_set(opt->color_sep, GIT_COLOR_CYAN); | ||
| - opt->color = -1; | ||
| -+ opt->output = std_output; | ||
| - } | ||
| - | ||
| - static int parse_pattern_type_arg(const char *opt, const char *arg) | ||
| -@@ -152,6 +158,7 @@ void grep_init(struct grep_opt *opt, const char *prefix) | ||
| - opt->pathname = def->pathname; | ||
| - opt->regflags = def->regflags; | ||
| - opt->relative = def->relative; | ||
| -+ opt->output = def->output; | ||
| - | ||
| - color_set(opt->color_context, def->color_context); | ||
| - color_set(opt->color_filename, def->color_filename); | ||
| -@@ -1379,11 +1386,6 @@ static int look_ahead(struct grep_opt *opt, | ||
| - return 0; | ||
| - } | ||
| - | ||
| --static void std_output(struct grep_opt *opt, const void *buf, size_t size) | ||
| --{ | ||
| -- fwrite(buf, size, 1, stdout); | ||
| --} | ||
| -- | ||
| - static int fill_textconv_grep(struct userdiff_driver *driver, | ||
| - struct grep_source *gs) | ||
| - { | ||
| --- | ||
| -2.6.2 | ||
| - | ||
| diff --git a/package/git/0002-grep-fix-builds-with-with-no-thread-support.patch b/package/git/0002-grep-fix-builds-with-with-no-thread-support.patch | ||
| deleted file mode 100644 | ||
| index 077b554083..0000000000 | ||
| --- a/package/git/0002-grep-fix-builds-with-with-no-thread-support.patch | ||
| +++ /dev/null | ||
| @@ -1,87 +0,0 @@ | ||
| -From 2225e1ea20481a7c0da526891470abf9ece623e7 Mon Sep 17 00:00:00 2001 | ||
| -From: Brandon Williams <[email protected]> | ||
| -Date: Fri, 17 Mar 2017 11:41:55 -0700 | ||
| -Subject: [PATCH] grep: fix builds with with no thread support | ||
| - | ||
| -Commit 0281e487fd91 ("grep: optionally recurse into submodules") | ||
| -added functions grep_submodule() and grep_submodule_launch() which | ||
| -use "struct work_item" which is defined only when thread support | ||
| -is available. | ||
| - | ||
| -The original implementation of grep_submodule() used the "struct | ||
| -work_item" in order to gain access to a strbuf to store its output which | ||
| -was to be printed at a later point in time. This differs from how both | ||
| -grep_file() and grep_sha1() handle their output. This patch eliminates | ||
| -the reliance on the "struct work_item" and instead opts to use the | ||
| -output function stored in the output field of the "struct grep_opt" | ||
| -object directly, making it behave similarly to both grep_file() and | ||
| -grep_sha1(). | ||
| - | ||
| -Reported-by: Rahul Bedarkar <[email protected]> | ||
| -Signed-off-by: Brandon Williams <[email protected]> | ||
| -Reviewed-by: Jonathan Nieder <[email protected]> | ||
| -Signed-off-by: Junio C Hamano <[email protected]> | ||
| -Signed-off-by: Rahul Bedarkar <[email protected]> | ||
| ---- | ||
| - builtin/grep.c | 21 +++++++++------------ | ||
| - 1 file changed, 9 insertions(+), 12 deletions(-) | ||
| - | ||
| -diff --git a/builtin/grep.c b/builtin/grep.c | ||
| -index 2c727ef..33561f2 100644 | ||
| ---- a/builtin/grep.c | ||
| -+++ b/builtin/grep.c | ||
| -@@ -538,7 +538,7 @@ static int grep_submodule_launch(struct grep_opt *opt, | ||
| - int status, i; | ||
| - const char *end_of_base; | ||
| - const char *name; | ||
| -- struct work_item *w = opt->output_priv; | ||
| -+ struct strbuf child_output = STRBUF_INIT; | ||
| - | ||
| - end_of_base = strchr(gs->name, ':'); | ||
| - if (gs->identifier && end_of_base) | ||
| -@@ -593,14 +593,16 @@ static int grep_submodule_launch(struct grep_opt *opt, | ||
| - * child process. A '0' indicates a hit, a '1' indicates no hit and | ||
| - * anything else is an error. | ||
| - */ | ||
| -- status = capture_command(&cp, &w->out, 0); | ||
| -+ status = capture_command(&cp, &child_output, 0); | ||
| - if (status && (status != 1)) { | ||
| - /* flush the buffer */ | ||
| -- write_or_die(1, w->out.buf, w->out.len); | ||
| -+ write_or_die(1, child_output.buf, child_output.len); | ||
| - die("process for submodule '%s' failed with exit code: %d", | ||
| - gs->name, status); | ||
| - } | ||
| - | ||
| -+ opt->output(opt, child_output.buf, child_output.len); | ||
| -+ strbuf_release(&child_output); | ||
| - /* invert the return code to make a hit equal to 1 */ | ||
| - return !status; | ||
| - } | ||
| -@@ -641,19 +643,14 @@ static int grep_submodule(struct grep_opt *opt, const unsigned char *sha1, | ||
| - } else | ||
| - #endif | ||
| - { | ||
| -- struct work_item w; | ||
| -+ struct grep_source gs; | ||
| - int hit; | ||
| - | ||
| -- grep_source_init(&w.source, GREP_SOURCE_SUBMODULE, | ||
| -+ grep_source_init(&gs, GREP_SOURCE_SUBMODULE, | ||
| - filename, path, sha1); | ||
| -- strbuf_init(&w.out, 0); | ||
| -- opt->output_priv = &w; | ||
| -- hit = grep_submodule_launch(opt, &w.source); | ||
| -+ hit = grep_submodule_launch(opt, &gs); | ||
| - | ||
| -- write_or_die(1, w.out.buf, w.out.len); | ||
| -- | ||
| -- grep_source_clear(&w.source); | ||
| -- strbuf_release(&w.out); | ||
| -+ grep_source_clear(&gs); | ||
| - return hit; | ||
| - } | ||
| - } | ||
| --- | ||
| -2.6.2 | ||
| - | ||
| diff --git a/package/git/git.hash b/package/git/git.hash | ||
| index 4782dcbefb..efe6225621 100644 | ||
| --- a/package/git/git.hash | ||
| +++ b/package/git/git.hash | ||
| @@ -1,2 +1,2 @@ | ||
| # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc | ||
| -sha256 016124c54ce2db7a4c2bd26b0de21fbf8f6bcaee04842aa221c7243141df4e42 git-2.12.3.tar.xz | ||
| +sha256 4bbf2ab6f2341253a38f95306ec7936833eb1c42572da5c1fa61f0abb2191258 git-2.13.0.tar.xz | ||
| diff --git a/package/git/git.mk b/package/git/git.mk | ||
| index 9cea8de6b1..9cc88dd726 100644 | ||
| --- a/package/git/git.mk | ||
| +++ b/package/git/git.mk | ||
| @@ -4,7 +4,7 @@ | ||
| # | ||
| ################################################################################ | ||
|
|
||
| -GIT_VERSION = 2.12.3 | ||
| +GIT_VERSION = 2.13.0 | ||
| GIT_SOURCE = git-$(GIT_VERSION).tar.xz | ||
| GIT_SITE = https://www.kernel.org/pub/software/scm/git | ||
| GIT_LICENSE = GPL-2.0, LGPL-2.1+ | ||
| -- | ||
| 2.14.1 | ||
|
|
27 changes: 27 additions & 0 deletions
27
patches/0009-git-use-BR2_KERNEL_MIRROR-as-download-site.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| From d6d87288082bc4707fae54903709fc2744439bd1 Mon Sep 17 00:00:00 2001 | ||
| From: Baruch Siach <[email protected]> | ||
| Date: Tue, 18 Jul 2017 15:21:18 +0300 | ||
| Subject: [PATCH] git: use BR2_KERNEL_MIRROR as download site | ||
|
|
||
| Signed-off-by: Baruch Siach <[email protected]> | ||
| Signed-off-by: Thomas Petazzoni <[email protected]> | ||
| --- | ||
| package/git/git.mk | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/package/git/git.mk b/package/git/git.mk | ||
| index 9cc88dd726..18f3f17d84 100644 | ||
| --- a/package/git/git.mk | ||
| +++ b/package/git/git.mk | ||
| @@ -6,7 +6,7 @@ | ||
|
|
||
| GIT_VERSION = 2.13.0 | ||
| GIT_SOURCE = git-$(GIT_VERSION).tar.xz | ||
| -GIT_SITE = https://www.kernel.org/pub/software/scm/git | ||
| +GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git | ||
| GIT_LICENSE = GPL-2.0, LGPL-2.1+ | ||
| GIT_LICENSE_FILES = COPYING LGPL-2.1 | ||
| GIT_DEPENDENCIES = zlib host-gettext | ||
| -- | ||
| 2.14.1 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| From 18a6998b6826ca95898517860fa7f6a343a152cd Mon Sep 17 00:00:00 2001 | ||
| From: Baruch Siach <[email protected]> | ||
| Date: Tue, 18 Jul 2017 15:21:19 +0300 | ||
| Subject: [PATCH] git: bump to version 2.13.3 | ||
|
|
||
| Add license files hashes. | ||
|
|
||
| Signed-off-by: Baruch Siach <[email protected]> | ||
| Signed-off-by: Thomas Petazzoni <[email protected]> | ||
| --- | ||
| package/git/git.hash | 4 +++- | ||
| package/git/git.mk | 2 +- | ||
| 2 files changed, 4 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/package/git/git.hash b/package/git/git.hash | ||
| index efe6225621..66bb1367d5 100644 | ||
| --- a/package/git/git.hash | ||
| +++ b/package/git/git.hash | ||
| @@ -1,2 +1,4 @@ | ||
| # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc | ||
| -sha256 4bbf2ab6f2341253a38f95306ec7936833eb1c42572da5c1fa61f0abb2191258 git-2.13.0.tar.xz | ||
| +sha256 91aa23be428f67eb19616f43fa0229d567e9acf4f08fba33eb0b627e4d323e62 git-2.13.3.tar.xz | ||
| +sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING | ||
| +sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 | ||
| diff --git a/package/git/git.mk b/package/git/git.mk | ||
| index 18f3f17d84..b94c86b18f 100644 | ||
| --- a/package/git/git.mk | ||
| +++ b/package/git/git.mk | ||
| @@ -4,7 +4,7 @@ | ||
| # | ||
| ################################################################################ | ||
|
|
||
| -GIT_VERSION = 2.13.0 | ||
| +GIT_VERSION = 2.13.3 | ||
| GIT_SOURCE = git-$(GIT_VERSION).tar.xz | ||
| GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git | ||
| GIT_LICENSE = GPL-2.0, LGPL-2.1+ | ||
| -- | ||
| 2.14.1 | ||
|
|
42 changes: 42 additions & 0 deletions
42
patches/0011-package-git-security-bump-to-version-2.13.5.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| From ea878bf19f37b4a4f29a35534dc823f4a8f1a610 Mon Sep 17 00:00:00 2001 | ||
| From: Bernd Kuhls <[email protected]> | ||
| Date: Fri, 11 Aug 2017 19:17:28 +0200 | ||
| Subject: [PATCH] package/git: security bump to version 2.13.5 | ||
|
|
||
| Fixes CVE-2017-1000117: | ||
| http://www.mail-archive.com/[email protected]/msg1466490.html | ||
|
|
||
| Signed-off-by: Bernd Kuhls <[email protected]> | ||
| Acked-by: "Yann E. MORIN" <[email protected]> | ||
| Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]> | ||
| --- | ||
| package/git/git.hash | 2 +- | ||
| package/git/git.mk | 2 +- | ||
| 2 files changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/package/git/git.hash b/package/git/git.hash | ||
| index 66bb1367d5..8aa0503db1 100644 | ||
| --- a/package/git/git.hash | ||
| +++ b/package/git/git.hash | ||
| @@ -1,4 +1,4 @@ | ||
| # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc | ||
| -sha256 91aa23be428f67eb19616f43fa0229d567e9acf4f08fba33eb0b627e4d323e62 git-2.13.3.tar.xz | ||
| +sha256 21c9e29caac86d244ac7af78bc3422746dabb903cb3952a1ceefd801020ad1a1 git-2.13.5.tar.xz | ||
| sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING | ||
| sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 | ||
| diff --git a/package/git/git.mk b/package/git/git.mk | ||
| index b94c86b18f..b5938b5460 100644 | ||
| --- a/package/git/git.mk | ||
| +++ b/package/git/git.mk | ||
| @@ -4,7 +4,7 @@ | ||
| # | ||
| ################################################################################ | ||
|
|
||
| -GIT_VERSION = 2.13.3 | ||
| +GIT_VERSION = 2.13.5 | ||
| GIT_SOURCE = git-$(GIT_VERSION).tar.xz | ||
| GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git | ||
| GIT_LICENSE = GPL-2.0, LGPL-2.1+ | ||
| -- | ||
| 2.14.1 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| From aaeb3ab18bac34ad8e137f3cc8a5c0ed3b707ecc Mon Sep 17 00:00:00 2001 | ||
| From: Adam Duskett <[email protected]> | ||
| Date: Wed, 21 Jun 2017 16:30:53 -0400 | ||
| Subject: [PATCH] libcurl: bump version to 7.54.1 | ||
|
|
||
| Signed-off-by: Adam Duskett <[email protected]> | ||
| Signed-off-by: Thomas Petazzoni <[email protected]> | ||
| --- | ||
| package/libcurl/libcurl.hash | 2 +- | ||
| package/libcurl/libcurl.mk | 2 +- | ||
| 2 files changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash | ||
| index f8885e0488..1b8d80fc96 100644 | ||
| --- a/package/libcurl/libcurl.hash | ||
| +++ b/package/libcurl/libcurl.hash | ||
| @@ -1,2 +1,2 @@ | ||
| # Locally calculated after checking pgp signature | ||
| -sha256 f50ebaf43c507fa7cc32be4b8108fa8bbd0f5022e90794388f3c7694a302ff06 curl-7.54.0.tar.bz2 | ||
| +sha256 fdfc4df2d001ee0c44ec071186e770046249263c491fcae48df0e1a3ca8f25a0 curl-7.54.1.tar.bz2 | ||
| diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk | ||
| index 355b81fef2..684844919e 100644 | ||
| --- a/package/libcurl/libcurl.mk | ||
| +++ b/package/libcurl/libcurl.mk | ||
| @@ -4,7 +4,7 @@ | ||
| # | ||
| ################################################################################ | ||
|
|
||
| -LIBCURL_VERSION = 7.54.0 | ||
| +LIBCURL_VERSION = 7.54.1 | ||
| LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 | ||
| LIBCURL_SITE = https://curl.haxx.se/download | ||
| LIBCURL_DEPENDENCIES = host-pkgconf \ | ||
| -- | ||
| 2.14.1 | ||
|
|
Oops, something went wrong.