mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-18 21:11:08 +02:00
bump(app-misc/jq): sync with upstream
This commit is contained in:
parent
66e516084c
commit
38be3cf62c
@ -116,3 +116,17 @@
|
||||
|
||||
Package-Manager: portage-2.2.27
|
||||
|
||||
*jq-1.5-r2 (30 Apr 2016)
|
||||
|
||||
30 Apr 2016; Tim Harder <radhermit@gentoo.org>
|
||||
+files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch, +jq-1.5-r2.ebuild:
|
||||
fix buffer overflow (bug #580606) and other updates
|
||||
|
||||
- add upstream metadata
|
||||
- add arm architecture
|
||||
- refactor econf args to an array
|
||||
- move DOCS and PATCHES to their appropriate functions
|
||||
- replace custom find with prune_libtool_files()
|
||||
|
||||
Gentoo-Bug: 580606
|
||||
|
||||
|
@ -1,11 +1,13 @@
|
||||
AUX jq-1.4-dynamic-link.patch 232 SHA256 dbc4f3a9f0e509e805a7a6966a37b53aaa00d0e0f06cc58d0a392b27a79e1a2b SHA512 d4c16d04a74ae9f119d6c513b4f401f90dbe88af0d03b0060ac29a57849c05a139eafc3ebfb7d815212858d8bfec981556874151351c0c56830cd0380679fc4f WHIRLPOOL fa7f215b94fa22010f55259379f069d68f2012d73477325ad2ceebe89b3ff81c19772aa5c248c2ecf3946d9200321deaf7fc43976355a9e4137a25e681527200
|
||||
AUX jq-1.5-dynamic-link.patch 292 SHA256 c4000f13ea2e0fe85e4d89470af17b7528cb87b2ca921fb990815bf6abcfad6d SHA512 1573ab7bdb9bd28db1ef7cbf834aada998b9651ffc1a9c67941faf23490ac3b145b6af6f1e41212b2c8c990d738b24bc7912a591db386f922c0b829a59e465ee WHIRLPOOL 29f3e6011c4f27d9339a0692685285ecee057aff58ba289146f6e36a31289c3146b1bc760948a1e55bdd5f6283338f2abbd3f5cbdab6e67479c5986c49e0f11a
|
||||
AUX jq-1.5-heap_buffer_overflow_in_tokenadd.patch 1241 SHA256 5069a8e81ece30279e8d525b4a590f5757dfb3d05f8c0a9bf212f37e75905fcc SHA512 7c0e7268a8715f9354322b81e82971fd6e6810206024fb59f55fdf319c1053fdd17ab4d2a78c8edc9ed1638339671419f4ea92cbb0f8ffbb34e5b521efb35718 WHIRLPOOL 16d961d05c95d17c3d87543fc60b6166b968356b25568a8b1d2a5b2cb43bfed37435342ff7a3b530527222835da88ba6c4ccfbc60e542c22eb93431db0473ebd
|
||||
AUX jq-1.5-remove-automagic-dep-on-oniguruma.patch 1879 SHA256 d5b55b63332899e9eff705fbb32fb1d790e2c637ff3be2659c47ecf8b17bc6c2 SHA512 3c7efccf85beda5f80c66432f6950b2d885c4587e6ed3cdc66447f60440dc0287da834cc5744ddd7af8ad36677254ebae6969bc498d36e457dfac69ca0da3f6d WHIRLPOOL 903ce507584d94ac49eaaa33c414e9fdca1a7f9ebbf185038ccb232b78ac6c04d7782458b97db0e983037ff4ab63e3e1cdd8d164191b7b22c020930d25baf913
|
||||
DIST jq-1.4.tar.gz 578317 SHA256 998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d SHA512 02e601b713a3249bcfe5373153dff38a63bf504895181ca3f691dbf033b407373a9c5880001bbd1954123cdf89f4fe75e2a5168e7a7cf13b3f7355dc18f92458 WHIRLPOOL 93c85a40d8aaf36d1f846ee9050aebe32a3a135e89a64647688b447af8733d210a4716d4ee62271a7d33f2e498e8aee7b2e88ed5373d0ec07e810215c1d288ab
|
||||
DIST jq-1.5.tar.gz 739309 SHA256 c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe9f493c SHA512 4a0bb069ae875f47731d7d84ae6b82240703dc7a694cfb0aee4c7e9639defe7ba9af575d17dc32bda4426b80c186cc8dcd4505f3a6bcbe16b39e9b13097da238 WHIRLPOOL ca45763fb43ba0bc4a97f1a6d34e3c5af0f25f2548d04646f76ac18e95792445eaa42869ce4a7a736b7d6bc09440225e277df79abacf23ef3c8f1b41170e2907
|
||||
EBUILD jq-1.4-r1.ebuild 852 SHA256 2cd732ef8eb9e415cfd72665f9e12184f2dcf2972a10154d25190ec44a382b2e SHA512 45a066036354a0ef24a7956537a59c5f4c0139a709228939e2fe966326dba5eb23309a18c2cb52e0edbec4b065de01f588d23ba5980ecea1ad3b45af1d681c15 WHIRLPOOL 670bdb2dfb974ce1882ae1802a5053427a7ce2c5bc09877399ca3991d610887e4cbb27643081e462362defd93c41defa30c78a8be3f597c4c7013f0aee44cd62
|
||||
EBUILD jq-1.4.ebuild 651 SHA256 43181180141fa4db04987979f289c505b73700e3e168c688ae1176902c1ab066 SHA512 4876194bc95a00060ad7d782ded2706c8e663f326a1189b81cf8f18d9f84921a233b3bf08b8ca1c17aa732a2a54d9358ca783a164050e617fc1a673d51b04184 WHIRLPOOL 239bafe801745cc496347025db5cec6950e73d6340433f93669fce2178a5e15e6a00d7887595b1e07984efb6374230a59af5a16596a78cf2c8effe54dbf5452a
|
||||
EBUILD jq-1.5-r1.ebuild 1179 SHA256 b06ed59e186353dd2abf5d8b42d25ac412e50cf37b584ee3cdc16b27d8761713 SHA512 bb769a67a11413286d90e6ba36538d9e981b32e339b6af8a3c632cdc2ce5a0808180aeb5accde3e5057f9481b6a79e08e50d1daa679e661ba3e70b0ec71df5fd WHIRLPOOL 9fa21b8b5b09264b6bac82ccecbd34e2216617176f601c946581ae87959e2197b20db34a8acd841496fd775795886ee7f32b06c34457051ad768cb6d21d8d878
|
||||
MISC ChangeLog 3946 SHA256 38b4b7b3aacc2f101fe05924fe44dded900dbee0578d584b6e439393155b7487 SHA512 f66abeb56cce4030ee6243b7baf63b4bc2b72829cefd1576d5f25b60cfa63d03838090355c7476b611b1066e367a6fc61c76492e468cd3e52096b558c462d067 WHIRLPOOL 6d3ca998b2e2a8adcfc92d99efc3865afafded3199d5b344b565360d48e45a20e3e87279f2106dc64bee249b109c8d53ca6b57cd7c941f55d04813cedd706129
|
||||
EBUILD jq-1.5-r2.ebuild 1303 SHA256 92a68cac012346e195f58da19f26340449b9928f1da8122a294d0942658e5b82 SHA512 326323e3adf59bd9767010bfde22a9ead50e901a805b703e961651f15985dd8e1b1e4362c36540e00327e3cdc8866a1aaf80414f566c5d1e8ded5bf940e53406 WHIRLPOOL 6feba9512f13b6448c5976f3c8ead7ab8eca4d44a18ea45784afccd8f518633e873f3851aa242e5aa8fc0c1549c7e571e66767cdc3e017ed5d7415810b400cd9
|
||||
MISC ChangeLog 4369 SHA256 deec1974e3dcdfde4bde44455f9de1dafd176cbc46c352de75c3be4ff1812d6a SHA512 1b9a501fddc7ba3400fea9a09eecce8961a7ceb3e8b4eca33f9765f10d0b0f4a1c00643295435c7bb538532ac86add0c64cb8774264ee1e6ca9608553c622eb5 WHIRLPOOL a36a29d921ce4fd2c25fc02a725cd3014e58473b2a7ea2b731fd35c402c2653997146f6937f1c9bece0ee102e7c05813ddabcdde2571a3522f51c869ea7709d0
|
||||
MISC ChangeLog-2015 2176 SHA256 2e4f02d2f3bd0d54f9eb8e19deebb0bc43a8a7bd523dd65a0391817de5d9afeb SHA512 b407b35544a94c67504a90635083d816147c27791c8ee745e8252dcb0da67950fdf248eb791a25b3275a259ad70ef7a475a8b24d14711cdfb6e943da34493769 WHIRLPOOL ffef34e807b2ad4af67959abd78088316d73db4f520ceb062b0c2cd5c3149bbc31acbf251ab0dfbef2d74305702ad2d995bb92cb12a13c4e0820162c0e298e08
|
||||
MISC metadata.xml 347 SHA256 9ee404d621988a6d22c3726d75f9af3552a7e1d4675a78911e23b9910fa7696b SHA512 82b1311616fcfd74119bfe3e926bda3ac5f81cbbf5b6e81b277fc49edbf9e007cd625fa79d99dbd8e1ea31edadc5b5ccb80bcac9376730b37c0836c71d689e86 WHIRLPOOL 1ac47bc7ffd1f8c30a71ad364f0a7f4bb6dfd448526a876fba072e8cb6d213d1ec71b82d4a8955fa1f7f43334efceba07810255cc166bfe414b679b1300bda16
|
||||
|
@ -0,0 +1,34 @@
|
||||
From 8eb1367ca44e772963e704a700ef72ae2e12babd Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Williams <nico@cryptonector.com>
|
||||
Date: Sat, 24 Oct 2015 17:24:57 -0500
|
||||
Subject: [PATCH] Heap buffer overflow in tokenadd() (fix #105)
|
||||
|
||||
This was an off-by one: the NUL terminator byte was not allocated on
|
||||
resize. This was triggered by JSON-encoded numbers longer than 256
|
||||
bytes.
|
||||
---
|
||||
src/jv_parse.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/jv_parse.c b/src/jv_parse.c
|
||||
index 3102ed4..84245b8 100644
|
||||
--- a/jv_parse.c
|
||||
+++ b/jv_parse.c
|
||||
@@ -383,7 +383,7 @@ static pfunc stream_token(struct jv_parser* p, char ch) {
|
||||
|
||||
static void tokenadd(struct jv_parser* p, char c) {
|
||||
assert(p->tokenpos <= p->tokenlen);
|
||||
- if (p->tokenpos == p->tokenlen) {
|
||||
+ if (p->tokenpos >= (p->tokenlen - 1)) {
|
||||
p->tokenlen = p->tokenlen*2 + 256;
|
||||
p->tokenbuf = jv_mem_realloc(p->tokenbuf, p->tokenlen);
|
||||
}
|
||||
@@ -485,7 +485,7 @@ static pfunc check_literal(struct jv_parser* p) {
|
||||
TRY(value(p, v));
|
||||
} else {
|
||||
// FIXME: better parser
|
||||
- p->tokenbuf[p->tokenpos] = 0; // FIXME: invalid
|
||||
+ p->tokenbuf[p->tokenpos] = 0;
|
||||
char* end = 0;
|
||||
double d = jvp_strtod(&p->dtoa, p->tokenbuf, &end);
|
||||
if (end == 0 || *end != 0)
|
60
sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.5-r2.ebuild
vendored
Normal file
60
sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.5-r2.ebuild
vendored
Normal file
@ -0,0 +1,60 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools eutils
|
||||
|
||||
DESCRIPTION="A lightweight and flexible command-line JSON processor"
|
||||
HOMEPAGE="https://stedolan.github.com/jq/"
|
||||
SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT CC-BY-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
|
||||
IUSE="oniguruma static-libs test"
|
||||
|
||||
DEPEND="
|
||||
>=sys-devel/bison-3.0
|
||||
sys-devel/flex
|
||||
oniguruma? ( dev-libs/oniguruma[static-libs?] )
|
||||
test? ( dev-util/valgrind )
|
||||
"
|
||||
RDEPEND="
|
||||
!static-libs? (
|
||||
oniguruma? ( dev-libs/oniguruma[static-libs?] )
|
||||
)
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
local PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.5-dynamic-link.patch
|
||||
"${FILESDIR}"/${PN}-1.5-remove-automagic-dep-on-oniguruma.patch
|
||||
"${FILESDIR}"/${PN}-1.5-heap_buffer_overflow_in_tokenadd.patch
|
||||
)
|
||||
|
||||
sed -i '/^dist_doc_DATA/d' Makefile.am || die
|
||||
sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
|
||||
configure.ac || die
|
||||
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local econfargs=(
|
||||
# don't try to rebuild docs
|
||||
--disable-docs
|
||||
$(use_enable static-libs static)
|
||||
$(use_with oniguruma)
|
||||
)
|
||||
econf "${econfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local DOCS=( AUTHORS README )
|
||||
default
|
||||
|
||||
use static-libs || prune_libtool_files
|
||||
}
|
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.5-r2
vendored
Normal file
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.5-r2
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=configure install prepare
|
||||
DEPEND=>=sys-devel/bison-3.0 sys-devel/flex oniguruma? ( dev-libs/oniguruma[static-libs?] ) test? ( dev-util/valgrind ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=A lightweight and flexible command-line JSON processor
|
||||
EAPI=6
|
||||
HOMEPAGE=https://stedolan.github.com/jq/
|
||||
IUSE=oniguruma static-libs test
|
||||
KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
|
||||
LICENSE=MIT CC-BY-3.0
|
||||
RDEPEND=!static-libs? ( oniguruma? ( dev-libs/oniguruma[static-libs?] ) )
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz
|
||||
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 9d81603248f2ba3ec59124320d123e5e libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||
_md5_=238b14d596853d923d5ab32105de6270
|
Loading…
x
Reference in New Issue
Block a user