* [gentoo-commits] repo/gentoo:master commit in: app-misc/jq/files/, app-misc/jq/
@ 2016-04-30 3:55 Tim Harder
0 siblings, 0 replies; 7+ messages in thread
From: Tim Harder @ 2016-04-30 3:55 UTC (permalink / raw
To: gentoo-commits
commit: 251e0d08bf9303fbbd2ccb66b550def65f609db5
Author: Jan Chren <dev.rindeal <AT> gmail <DOT> com>
AuthorDate: Thu Apr 28 13:03:45 2016 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 03:53:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=251e0d08
app-misc/jq: 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
.../jq-1.5-heap_buffer_overflow_in_tokenadd.patch | 34 ++++++++++++
app-misc/jq/jq-1.5-r2.ebuild | 60 ++++++++++++++++++++++
2 files changed, 94 insertions(+)
diff --git a/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch b/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch
new file mode 100644
index 0000000..edb07d8
--- /dev/null
+++ b/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch
@@ -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)
diff --git a/app-misc/jq/jq-1.5-r2.ebuild b/app-misc/jq/jq-1.5-r2.ebuild
new file mode 100644
index 0000000..df58a52
--- /dev/null
+++ b/app-misc/jq/jq-1.5-r2.ebuild
@@ -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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/jq/files/, app-misc/jq/
@ 2016-08-08 15:30 Tim Harder
0 siblings, 0 replies; 7+ messages in thread
From: Tim Harder @ 2016-08-08 15:30 UTC (permalink / raw
To: gentoo-commits
commit: d7319f3a1a111eeec588b0a7b1c4f0847176d2af
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 8 15:29:58 2016 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Aug 8 15:29:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7319f3a
app-misc/jq: remove old
app-misc/jq/Manifest | 1 -
app-misc/jq/files/jq-1.4-dynamic-link.patch | 12 -------
app-misc/jq/jq-1.4-r1.ebuild | 40 ----------------------
app-misc/jq/jq-1.4.ebuild | 32 -----------------
app-misc/jq/jq-1.5-r1.ebuild | 53 -----------------------------
5 files changed, 138 deletions(-)
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index e3acfd5..10a1e83 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,2 +1 @@
-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
diff --git a/app-misc/jq/files/jq-1.4-dynamic-link.patch b/app-misc/jq/files/jq-1.4-dynamic-link.patch
deleted file mode 100644
index b958a15..0000000
--- a/app-misc/jq/files/jq-1.4-dynamic-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-do not statically link libjq since we install it
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -53,7 +53,6 @@
-
- bin_PROGRAMS = jq
- jq_SOURCES = main.c
--jq_LDFLAGS = -static-libtool-libs
- jq_LDADD = libjq.la -lm
-
- ### Tests (make check)
diff --git a/app-misc/jq/jq-1.4-r1.ebuild b/app-misc/jq/jq-1.4-r1.ebuild
deleted file mode 100644
index 4782414..0000000
--- a/app-misc/jq/jq-1.4-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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 ~x86 ~x64-macos"
-IUSE="static-libs test"
-
-DEPEND="sys-devel/bison
- sys-devel/flex
- test? ( dev-util/valgrind )"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
- sed -i '/^dist_doc_DATA/d' Makefile.am || die
- epatch "${FILESDIR}"/${PN}-1.4-dynamic-link.patch
- eautoreconf
-}
-
-src_configure() {
- # don't try to rebuild docs
- econf \
- --disable-docs \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- use static-libs || find "${ED}" -name libjq.la -delete
-}
diff --git a/app-misc/jq/jq-1.4.ebuild b/app-misc/jq/jq-1.4.ebuild
deleted file mode 100644
index 34a2726..0000000
--- a/app-misc/jq/jq-1.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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 x86"
-IUSE="test"
-
-DEPEND="sys-devel/bison
- sys-devel/flex
- test? ( dev-util/valgrind )"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
- sed -i '/^dist_doc_DATA/d' Makefile.am || die
- eautoreconf
-}
-
-src_configure() {
- # don't try to rebuild docs
- econf --disable-docs
-}
diff --git a/app-misc/jq/jq-1.5-r1.ebuild b/app-misc/jq/jq-1.5-r1.ebuild
deleted file mode 100644
index df24e2f..0000000
--- a/app-misc/jq/jq-1.5-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools
-
-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 ~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?] )
- )"
-
-DOCS=( AUTHORS README )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5-dynamic-link.patch
- "${FILESDIR}"/${P}-remove-automagic-dep-on-oniguruma.patch
-)
-
-src_prepare() {
- 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() {
- # don't try to rebuild docs
- econf \
- --disable-docs \
- $(use_enable static-libs static) \
- $(use_with oniguruma)
-}
-
-src_install() {
- default
- use static-libs || find "${ED}" -name libjq.la -delete
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/jq/files/, app-misc/jq/
@ 2018-12-05 21:56 Patrick McLean
0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2018-12-05 21:56 UTC (permalink / raw
To: gentoo-commits
commit: c73313ba294602d3ec781bbfafc4c63b9e518062
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Wed Dec 5 21:56:11 2018 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Dec 5 21:56:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c73313ba
app-misc/jq: Revision bump, segfault fix with -ar params
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
app-misc/jq/files/jq-1.6-segfault-fix.patch | 22 ++++++++++++++++++++++
app-misc/jq/{jq-1.6.ebuild => jq-1.6-r1.ebuild} | 1 +
2 files changed, 23 insertions(+)
diff --git a/app-misc/jq/files/jq-1.6-segfault-fix.patch b/app-misc/jq/files/jq-1.6-segfault-fix.patch
new file mode 100644
index 00000000000..8eb7d456bc6
--- /dev/null
+++ b/app-misc/jq/files/jq-1.6-segfault-fix.patch
@@ -0,0 +1,22 @@
+From a1f1231a73c221155d539a281181ef37f874869d Mon Sep 17 00:00:00 2001
+From: William Langford <wlangfor@gmail.com>
+Date: Tue, 20 Nov 2018 09:58:25 -0500
+Subject: [PATCH] Add missing jv_copy when printing with -ar
+
+---
+ src/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.c b/src/main.c
+index b154689e..61ae43f9 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -168,7 +168,7 @@ static int process(jq_state *jq, jv value, int flags, int dumpopts) {
+ while (jv_is_valid(result = jq_next(jq))) {
+ if ((options & RAW_OUTPUT) && jv_get_kind(result) == JV_KIND_STRING) {
+ if (options & ASCII_OUTPUT) {
+- jv_dumpf(result, stdout, JV_PRINT_ASCII);
++ jv_dumpf(jv_copy(result), stdout, JV_PRINT_ASCII);
+ } else {
+ fwrite(jv_string_value(result), 1, jv_string_length_bytes(jv_copy(result)), stdout);
+ }
diff --git a/app-misc/jq/jq-1.6.ebuild b/app-misc/jq/jq-1.6-r1.ebuild
similarity index 97%
rename from app-misc/jq/jq-1.6.ebuild
rename to app-misc/jq/jq-1.6-r1.ebuild
index 43d94479124..e5e7da47aca 100644
--- a/app-misc/jq/jq-1.6.ebuild
+++ b/app-misc/jq/jq-1.6-r1.ebuild
@@ -29,6 +29,7 @@ src_prepare() {
local PATCHES=(
"${FILESDIR}"/jq-1.6-never-bundle-oniguruma.patch
"${FILESDIR}"/jq-1.6-runpath.patch
+ "${FILESDIR}"/jq-1.6-segfault-fix.patch
)
use oniguruma || { sed -i 's:tests/onigtest::' Makefile.am || die; }
sed -i '/^dist_doc_DATA/d' Makefile.am || die
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/jq/files/, app-misc/jq/
@ 2019-04-12 21:10 Patrick McLean
0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2019-04-12 21:10 UTC (permalink / raw
To: gentoo-commits
commit: 0d6f69a4b08c32aec8e8c65f48cc6d75274830d1
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri Apr 12 21:06:46 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Apr 12 21:07:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6f69a4
app-misc/jq: Revbump, fix oniguruma patch (bug #674680)
Patch by Robin Johnson <robbat2 <AT> gentoo.org>
Closes: https://bugs.gentoo.org/674680
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../jq/files/jq-1.6-never-bundle-oniguruma.patch | 80 ----------------------
.../files/jq-1.6-r3-never-bundle-oniguruma.patch | 27 ++++++++
app-misc/jq/{jq-1.6-r2.ebuild => jq-1.6-r3.ebuild} | 6 +-
3 files changed, 30 insertions(+), 83 deletions(-)
diff --git a/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch b/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch
deleted file mode 100644
index 0b0e9260050..00000000000
--- a/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 6344b4e..5f0c74d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -48,7 +48,7 @@ AM_YFLAGS = --warnings=all -d
- lib_LTLIBRARIES = libjq.la
- libjq_la_SOURCES = ${LIBJQ_SRC}
- libjq_la_LIBADD = -lm
--libjq_la_LDFLAGS = $(onig_LDFLAGS) -export-symbols-regex '^j[qv]_' -version-info 1:4:0
-+libjq_la_LDFLAGS = -export-symbols-regex '^j[qv]_' -version-info 1:4:0
-
- if WIN32
- libjq_la_LIBADD += -lshlwapi
-@@ -137,15 +137,6 @@ jq.1: $(srcdir)/jq.1.prebuilt
- endif
-
-
--### Build oniguruma
--
--if BUILD_ONIGURUMA
--libjq_la_LIBADD += modules/oniguruma/src/.libs/libonig.la
--SUBDIRS = modules/oniguruma
--endif
--
--AM_CFLAGS += $(onig_CFLAGS)
--
- ### Packaging
-
- docs/site.yml: configure.ac
-diff --git a/configure.ac b/configure.ac
-index 280694c..0c5d86f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -236,45 +236,20 @@ AC_ARG_WITH([oniguruma],
- [try this for a non-standard install prefix of the oniguruma library])], ,
- [with_oniguruma=yes])
-
--onig_CFLAGS=
--onig_LDFLAGS=
--build_oniguruma=no
- AS_IF([test "x$with_oniguruma" != xno], [
- save_CFLAGS="$CFLAGS"
- save_LDFLAGS="$LDFLAGS"
-- AS_IF([test "x$with_oniguruma" != xyes], [
-- AS_IF([test "x$with_oniguruma" = xbuiltin], [
-- build_oniguruma=yes
-- ], [
-- onig_CFLAGS="-I${with_oniguruma}/include"
-- onig_LDFLAGS="-L${with_oniguruma}/lib"
-- ])
-- ])
- AS_IF([test "x$build_oniguruma" = xno], [
- # check for ONIGURUMA library, either in /usr or where requested
-- CFLAGS="$CFLAGS $onig_CFLAGS"
-- LDFLAGS="$LDFLAGS $onig_LDFLAGS"
- AC_CHECK_HEADER("oniguruma.h",
- AC_CHECK_LIB([onig],[onig_version]))
- # handle check results
- AS_IF([test "x$ac_cv_lib_onig_onig_version" != "xyes"], [
-- build_oniguruma=yes
-- AC_MSG_NOTICE([Oniguruma was not found. Will use the packaged oniguruma.])
-+ AC_MSG_ERROR(oniguruma.h not found)
- ])
- ])
-- AS_IF([test "x$build_oniguruma" = xyes -a -f "${srcdir}/modules/oniguruma/configure.ac" ], [
-- onig_CFLAGS="-I${srcdir}/modules/oniguruma/src"
-- onig_LDFLAGS="-L${srcdir}/modules/oniguruma/src -Wl,-rpath,${libdir}"
-- AC_CONFIG_SUBDIRS([modules/oniguruma])
-- AC_DEFINE([HAVE_LIBONIG],1,[Define to 1 if the system includes libonig])
-- ])
-- CFLAGS="$save_CFLAGS"
-- LDFLAGS="$save_LDFLAGS"
- ])
--AC_SUBST(onig_CFLAGS)
--AC_SUBST(onig_LDFLAGS)
-
--AM_CONDITIONAL([BUILD_ONIGURUMA], [test "x$build_oniguruma" = xyes])
- AC_SUBST([BUNDLER], ["$bundle_cmd"])
-
- AC_CONFIG_MACRO_DIR([config/m4])
diff --git a/app-misc/jq/files/jq-1.6-r3-never-bundle-oniguruma.patch b/app-misc/jq/files/jq-1.6-r3-never-bundle-oniguruma.patch
new file mode 100644
index 00000000000..75ab111f881
--- /dev/null
+++ b/app-misc/jq/files/jq-1.6-r3-never-bundle-oniguruma.patch
@@ -0,0 +1,27 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6344b4e..86d968e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -47,7 +47,7 @@ AM_YFLAGS = --warnings=all -d
+
+ lib_LTLIBRARIES = libjq.la
+ libjq_la_SOURCES = ${LIBJQ_SRC}
+-libjq_la_LIBADD = -lm
++libjq_la_LIBADD = -lm $(onig_LIBS)
+ libjq_la_LDFLAGS = $(onig_LDFLAGS) -export-symbols-regex '^j[qv]_' -version-info 1:4:0
+
+ if WIN32
+diff --git a/configure.ac b/configure.ac
+index 280694c..d96026e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -249,6 +249,9 @@ AS_IF([test "x$with_oniguruma" != xno], [
+ onig_CFLAGS="-I${with_oniguruma}/include"
+ onig_LDFLAGS="-L${with_oniguruma}/lib"
+ ])
++ ], [
++ # with_oniguruma == yes
++ PKG_CHECK_MODULES([onig], [oniguruma])
+ ])
+ AS_IF([test "x$build_oniguruma" = xno], [
+ # check for ONIGURUMA library, either in /usr or where requested
diff --git a/app-misc/jq/jq-1.6-r2.ebuild b/app-misc/jq/jq-1.6-r3.ebuild
similarity index 90%
rename from app-misc/jq/jq-1.6-r2.ebuild
rename to app-misc/jq/jq-1.6-r3.ebuild
index 9463846be75..2b187f05c7a 100644
--- a/app-misc/jq/jq-1.6-r2.ebuild
+++ b/app-misc/jq/jq-1.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -27,7 +27,7 @@ RDEPEND="
src_prepare() {
local PATCHES=(
- "${FILESDIR}"/jq-1.6-never-bundle-oniguruma.patch
+ "${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
"${FILESDIR}"/jq-1.6-runpath.patch
"${FILESDIR}"/jq-1.6-segfault-fix.patch
)
@@ -48,7 +48,7 @@ src_configure() {
--disable-maintainer-mode
--enable-rpathhack
$(use_enable static-libs static)
- $(use_with oniguruma)
+ $(use_with oniguruma oniguruma yes)
)
econf "${econfargs[@]}"
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/jq/files/, app-misc/jq/
@ 2021-03-25 18:53 Patrick McLean
0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2021-03-25 18:53 UTC (permalink / raw
To: gentoo-commits
commit: 5e850fa723a5ed727bc209b633aa6838e162b129
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Thu Mar 25 18:53:14 2021 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 18:53:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e850fa7
app-misc/jq-1.7_pre20201109: Add patch for git bdep (bug #776385)
Closes: https://bugs.gentoo.org/776385
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch | 13 +++++++++++++
app-misc/jq/jq-1.7_pre20201109.ebuild | 2 ++
2 files changed, 15 insertions(+)
diff --git a/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch b/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch
new file mode 100644
index 00000000000..726624df13d
--- /dev/null
+++ b/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 0441d4a..592ceb9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,8 +1,3 @@
+-m4_define([jq_version],
+- m4_esyscmd_s([(git rev-parse --verify -q jq-1.0 > /dev/null &&
+- (git describe --tags --dirty --match 'jq-*'|sed 's/^jq-//')) ||
+- echo `git rev-parse --abbrev-ref HEAD`-`git describe --always --dirty`])))
+-
+ AC_INIT([jq], [jq_version], [https://github.com/stedolan/jq/issues],
+ [jq], [https://stedolan.github.io/jq])
+
diff --git a/app-misc/jq/jq-1.7_pre20201109.ebuild b/app-misc/jq/jq-1.7_pre20201109.ebuild
index 41e4b14e2af..22f1f4f05b5 100644
--- a/app-misc/jq/jq-1.7_pre20201109.ebuild
+++ b/app-misc/jq/jq-1.7_pre20201109.ebuild
@@ -34,6 +34,8 @@ PATCHES=(
"${FILESDIR}"/jq-1.7-runpath.patch
"${FILESDIR}"/jq-1.7-warnings.patch
"${FILESDIR}"/jq-1.7-visible-null.patch
+ # https://bugs.gentoo.org/776385
+ "${FILESDIR}"/jq-1.7_pre20201109-no-git-bdep.patch
)
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/jq/files/, app-misc/jq/
@ 2023-10-06 16:24 Patrick McLean
0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2023-10-06 16:24 UTC (permalink / raw
To: gentoo-commits
commit: 653c8c89ef66817684380ce0b635e65ff6aa8e89
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 6 16:24:12 2023 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Oct 6 16:24:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=653c8c89
app-misc/jq: drop 1.6-r3
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
app-misc/jq/Manifest | 1 -
app-misc/jq/files/jq-1.6-segfault-fix.patch | 22 --------
app-misc/jq/jq-1.6-r3.ebuild | 78 -----------------------------
3 files changed, 101 deletions(-)
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index eb1d037f5221..09d558b12519 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,3 +1,2 @@
-DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
DIST jq-1.7.gh.tar.gz 1267139 BLAKE2B b6a54f9beaabd7915d7a8f14cda9621573f1796af53fe1645561a7a199787a7e9b2b2df038208f23e63f339dec567851b70696ffb8194986250527333d36d44e SHA512 01676319fe98d5ab1e278430b2c58ec594191cc9485a20312d658c0e199ac7ea5f5e934817ce98da0864ec7e0a018aae9b87525260e8ab6a7bde918db483bd84
DIST jq-1.7_pre20201109.tar.gz 1181867 BLAKE2B 9db187ab927b635c43fbc6191aeffa00451b12253ae023bbabe6fba5fdf8fb393f8450ee2011ef58cb93e2f27994d454fac967984a721439aaac93259c02f7f1 SHA512 f2997d70edb36d0a23b71a7d933a763cedd7c74ffa3129c2a6cb7189aaff1c5095cdc51062b7cd119324ec2c83ebae6ff0b7da3941315303b7a31146b9eb285a
diff --git a/app-misc/jq/files/jq-1.6-segfault-fix.patch b/app-misc/jq/files/jq-1.6-segfault-fix.patch
deleted file mode 100644
index 8eb7d456bc6b..000000000000
--- a/app-misc/jq/files/jq-1.6-segfault-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a1f1231a73c221155d539a281181ef37f874869d Mon Sep 17 00:00:00 2001
-From: William Langford <wlangfor@gmail.com>
-Date: Tue, 20 Nov 2018 09:58:25 -0500
-Subject: [PATCH] Add missing jv_copy when printing with -ar
-
----
- src/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main.c b/src/main.c
-index b154689e..61ae43f9 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -168,7 +168,7 @@ static int process(jq_state *jq, jv value, int flags, int dumpopts) {
- while (jv_is_valid(result = jq_next(jq))) {
- if ((options & RAW_OUTPUT) && jv_get_kind(result) == JV_KIND_STRING) {
- if (options & ASCII_OUTPUT) {
-- jv_dumpf(result, stdout, JV_PRINT_ASCII);
-+ jv_dumpf(jv_copy(result), stdout, JV_PRINT_ASCII);
- } else {
- fwrite(jv_string_value(result), 1, jv_string_length_bytes(jv_copy(result)), stdout);
- }
diff --git a/app-misc/jq/jq-1.6-r3.ebuild b/app-misc/jq/jq-1.6-r3.ebuild
deleted file mode 100644
index f1172ab62ab9..000000000000
--- a/app-misc/jq/jq-1.6-r3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A lightweight and flexible command-line JSON processor"
-HOMEPAGE="https://stedolan.github.io/jq/"
-SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="MIT CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="oniguruma static-libs"
-
-ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/
-DEPEND="
- >=sys-devel/bison-3.0
- sys-devel/flex
- oniguruma? ( ${ONIGURUMA_MINPV}:=[static-libs?] )
-"
-RDEPEND="
- !static-libs? (
- oniguruma? ( ${ONIGURUMA_MINPV}[static-libs?] )
- )
-"
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
- "${FILESDIR}"/jq-1.6-runpath.patch
- "${FILESDIR}"/jq-1.6-segfault-fix.patch
- )
- use oniguruma || { sed -i 's:tests/onigtest::' Makefile.am || die; }
- sed -i '/^dist_doc_DATA/d' Makefile.am || die
- sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
- configure.ac || die
-
- # jq-1.6-r3-never-bundle-oniguruma makes sure we build with the system oniguruma,
- # but the bundled copy of oniguruma still gets eautoreconf'd since it
- # exists; save the cycles by nuking it.
- sed -i -e '/modules\/oniguruma/d' Makefile.am || die
- rm -rf "${S}"/modules/oniguruma || die
-
- default
- eautoreconf
-}
-
-src_configure() {
- local econfargs=(
- # don't try to rebuild docs
- --disable-docs
- --disable-valgrind
- --disable-maintainer-mode
- --enable-rpathhack
- $(use_enable static-libs static)
- $(use_with oniguruma oniguruma yes)
- )
- econf "${econfargs[@]}"
-}
-
-src_test() {
- if ! emake check; then
- if [[ -r test-suite.log ]]; then
- eerror "Tests failed, outputting testsuite log"
- cat test-suite.log
- fi
- die "Tests failed"
- fi
-}
-
-src_install() {
- local DOCS=( AUTHORS README.md )
- default
-
- use static-libs || { find "${D}" -name '*.la' -delete || die; }
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/jq/files/, app-misc/jq/
@ 2023-10-06 17:29 Patrick McLean
0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2023-10-06 17:29 UTC (permalink / raw
To: gentoo-commits
commit: 79d039542c3c53925c72db7a58db0cf06f33faae
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 6 17:29:12 2023 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Oct 6 17:29:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d03954
app-misc/jq: drop 1.7_pre20201109-r1
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
app-misc/jq/Manifest | 1 -
app-misc/jq/files/jq-1.6-runpath.patch | 17 -----
app-misc/jq/files/jq-1.7-visible-null.patch | 41 ----------
app-misc/jq/files/jq-1.7-warnings.patch | 44 -----------
.../jq-1.7_pre20201109-fix-configure-test.patch | 54 -------------
.../jq/files/jq-1.7_pre20201109-no-git-bdep.patch | 13 ----
app-misc/jq/jq-1.7_pre20201109-r1.ebuild | 88 ----------------------
7 files changed, 258 deletions(-)
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 09d558b12519..71d260f19bcd 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,2 +1 @@
DIST jq-1.7.gh.tar.gz 1267139 BLAKE2B b6a54f9beaabd7915d7a8f14cda9621573f1796af53fe1645561a7a199787a7e9b2b2df038208f23e63f339dec567851b70696ffb8194986250527333d36d44e SHA512 01676319fe98d5ab1e278430b2c58ec594191cc9485a20312d658c0e199ac7ea5f5e934817ce98da0864ec7e0a018aae9b87525260e8ab6a7bde918db483bd84
-DIST jq-1.7_pre20201109.tar.gz 1181867 BLAKE2B 9db187ab927b635c43fbc6191aeffa00451b12253ae023bbabe6fba5fdf8fb393f8450ee2011ef58cb93e2f27994d454fac967984a721439aaac93259c02f7f1 SHA512 f2997d70edb36d0a23b71a7d933a763cedd7c74ffa3129c2a6cb7189aaff1c5095cdc51062b7cd119324ec2c83ebae6ff0b7da3941315303b7a31146b9eb285a
diff --git a/app-misc/jq/files/jq-1.6-runpath.patch b/app-misc/jq/files/jq-1.6-runpath.patch
deleted file mode 100644
index 40a2ed02f3db..000000000000
--- a/app-misc/jq/files/jq-1.6-runpath.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 280694c..7227c9d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -280,4 +280,11 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"])
- AC_CONFIG_MACRO_DIR([config/m4])
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
--
-+AC_ARG_ENABLE([rpathhack],
-+ [AC_HELP_STRING([--enable-rpathhack], [patch libtool to remove RPATH])],
-+ [
-+AC_MSG_RESULT([patching libtool to fix rpath])
-+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-+ ],
-+ [])
diff --git a/app-misc/jq/files/jq-1.7-visible-null.patch b/app-misc/jq/files/jq-1.7-visible-null.patch
deleted file mode 100644
index 41e55df72111..000000000000
--- a/app-misc/jq/files/jq-1.7-visible-null.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/src/jv_print.c b/src/jv_print.c
-index 2e781bb..e621b31 100644
---- a/src/jv_print.c
-+++ b/src/jv_print.c
-@@ -32,7 +32,7 @@ static const jv_kind color_kinds[] =
- static char color_bufs[sizeof(color_kinds)/sizeof(color_kinds[0])][16];
- static const char *color_bufps[8];
- static const char* def_colors[] =
-- {COL("1;30"), COL("0;37"), COL("0;37"), COL("0;37"),
-+ {COL("1;90"), COL("0;37"), COL("0;37"), COL("0;37"),
- COL("0;32"), COL("1;37"), COL("1;37")};
- #define FIELD_COLOR COL("34;1")
-
-diff --git a/tests/shtest b/tests/shtest
-index 8ed62b2..2d3f0da 100755
---- a/tests/shtest
-+++ b/tests/shtest
-@@ -280,12 +280,12 @@ fi
-
- # Check $JQ_COLORS
- $JQ -Ccn . > $d/color
--printf '\033[1;30mnull\033[0m\n' > $d/expect
-+printf '\033[1;90mnull\033[0m\n' > $d/expect
- cmp $d/color $d/expect
- JQ_COLORS='4;31' $JQ -Ccn . > $d/color
- printf '\033[4;31mnull\033[0m\n' > $d/expect
- cmp $d/color $d/expect
--JQ_COLORS='1;30:0;31:0;32:0;33:0;34:1;35:1;36' \
-+JQ_COLORS='1;90:0;31:0;32:0;33:0;34:1;35:1;36' \
- $JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color
- (
- printf '\033[1;35m[\033[1;36m{'
-@@ -298,7 +298,7 @@ printf '[0m\033[0;31mfalse\033'
- printf '[0m\033[1;36m\033[1;36'
- printf 'm}\033[0m\033[1;35m,\033['
- printf '0;33m123\033[0m\033[1;'
--printf '35m,\033[1;30mnull\033'
-+printf '35m,\033[1;90mnull\033'
- printf '[0m\033[1;35m\033[1;35'
- printf 'm]\033[0m\n'
- ) > $d/expect
diff --git a/app-misc/jq/files/jq-1.7-warnings.patch b/app-misc/jq/files/jq-1.7-warnings.patch
deleted file mode 100644
index 0047ca391cae..000000000000
--- a/app-misc/jq/files/jq-1.7-warnings.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/src/builtin.c b/src/builtin.c
-index bf80c7b..12db573 100644
---- a/src/builtin.c
-+++ b/src/builtin.c
-@@ -1,5 +1,6 @@
- #define _BSD_SOURCE
- #define _GNU_SOURCE
-+#define _DEFAULT_SOURCE
- #ifndef __sun__
- # define _XOPEN_SOURCE
- # define _XOPEN_SOURCE_EXTENDED 1
-diff --git a/src/jv_dtoa.c b/src/jv_dtoa.c
-index 33feb99..fcbd902 100644
---- a/src/jv_dtoa.c
-+++ b/src/jv_dtoa.c
-@@ -2327,7 +2327,7 @@ retlow1:
- jvp_strtod
- (struct dtoa_context* C, const char *s00, char **se)
- {
-- int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, e, e1, test_scale;
-+ int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, e, e1;
- int esign, i, j, k, nd, nd0, nf, nz, nz0, nz1, sign;
- CONST char *s, *s0, *s1;
- double aadj, aadj1;
-diff --git a/src/jv_dtoa_tsd.c b/src/jv_dtoa_tsd.c
-index 0f95df4..e5209dd 100644
---- a/src/jv_dtoa_tsd.c
-+++ b/src/jv_dtoa_tsd.c
-@@ -24,7 +24,7 @@ static void tsd_dtoa_ctx_fini() {
- }
-
- static void tsd_dtoa_ctx_init() {
-- if (pthread_key_create(&dtoa_ctx_key, tsd_dtoa_ctx_dtor) != 0) {
-+ if (pthread_key_create(&dtoa_ctx_key, (void (*)(void *))tsd_dtoa_ctx_dtor) != 0) {
- fprintf(stderr, "error: cannot create thread specific key");
- abort();
- }
-@@ -43,4 +43,4 @@ inline struct dtoa_context *tsd_dtoa_context_get() {
- }
- }
- return ctx;
--}
-\ No newline at end of file
-+}
diff --git a/app-misc/jq/files/jq-1.7_pre20201109-fix-configure-test.patch b/app-misc/jq/files/jq-1.7_pre20201109-fix-configure-test.patch
deleted file mode 100644
index 8be52042bcc4..000000000000
--- a/app-misc/jq/files/jq-1.7_pre20201109-fix-configure-test.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://github.com/stedolan/jq/pull/2480
-
-From 40bbd419ad8d1bd9cbe8b17063c323f8a40ab327 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 6 Sep 2022 09:59:31 -0700
-Subject: [PATCH 1/2] configure: Pass _XOPEN_SOURCE when checking for strptime
-
-Include sys/time.h for gettimeofday since thats where its in glibc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/configure.ac
-+++ b/configure.ac
-@@ -139,7 +139,10 @@ AC_FUNC_ALLOCA
-
- AC_FIND_FUNC([isatty], [c], [#include <unistd.h>], [0])
- AC_FIND_FUNC([_isatty], [c], [#include <io.h>], [0])
-+OLD_CFLAGS=$CFLAGS
-+CFLAGS="$CFLAGS -D_XOPEN_SOURCE"
- AC_FIND_FUNC([strptime], [c], [#include <time.h>], [0, 0, 0])
-+CFLAGS=$OLD_CFLAGS
- AC_FIND_FUNC([strftime], [c], [#include <time.h>], [0, 0, 0, 0])
- AC_FIND_FUNC([setenv], [c], [#include <stdlib.h>], [0, 0, 0])
- AC_FIND_FUNC([timegm], [c], [#include <time.h>], [0])
-@@ -147,7 +150,7 @@ AC_FIND_FUNC([gmtime_r], [c], [#include <time.h>], [0, 0])
- AC_FIND_FUNC([gmtime], [c], [#include <time.h>], [0])
- AC_FIND_FUNC([localtime_r], [c], [#include <time.h>], [0, 0])
- AC_FIND_FUNC([localtime], [c], [#include <time.h>], [0])
--AC_FIND_FUNC([gettimeofday], [c], [#include <time.h>], [0, 0])
-+AC_FIND_FUNC([gettimeofday], [c], [#include <sys/time.h>], [0, 0])
- AC_CHECK_MEMBER([struct tm.tm_gmtoff], [AC_DEFINE([HAVE_TM_TM_GMT_OFF],1,[Define to 1 if the system has the tm_gmt_off field in struct tm])],
- [], [[#include <time.h>]])
- AC_CHECK_MEMBER([struct tm.__tm_gmtoff], [AC_DEFINE([HAVE_TM___TM_GMT_OFF],1,[Define to 1 if the system has the __tm_gmt_off field in struct tm])],
-
-From cda1734bed3b048c01452c798877d05b8c2f4c15 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 6 Sep 2022 10:00:59 -0700
-Subject: [PATCH 2/2] builtin: Replace _BSD_SOURCE with _DEFAULT_SOURCE
-
-newer glibc has remove _BSD_SOURCE and wants it to be replaced with _DEFAULT_SOURCE
-
-Fixes
-/usr/include/features.h:194:3: warning: "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-W#warnings]
-warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/src/builtin.c
-+++ b/src/builtin.c
-@@ -1,4 +1,4 @@
--#define _BSD_SOURCE
-+#define _DEFAULT_SOURCE
- #define _GNU_SOURCE
- #ifndef __sun__
- # define _XOPEN_SOURCE
-
diff --git a/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch b/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch
deleted file mode 100644
index 726624df13d6..000000000000
--- a/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 0441d4a..592ceb9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,8 +1,3 @@
--m4_define([jq_version],
-- m4_esyscmd_s([(git rev-parse --verify -q jq-1.0 > /dev/null &&
-- (git describe --tags --dirty --match 'jq-*'|sed 's/^jq-//')) ||
-- echo `git rev-parse --abbrev-ref HEAD`-`git describe --always --dirty`])))
--
- AC_INIT([jq], [jq_version], [https://github.com/stedolan/jq/issues],
- [jq], [https://stedolan.github.io/jq])
-
diff --git a/app-misc/jq/jq-1.7_pre20201109-r1.ebuild b/app-misc/jq/jq-1.7_pre20201109-r1.ebuild
deleted file mode 100644
index 6c0d7ed19c9b..000000000000
--- a/app-misc/jq/jq-1.7_pre20201109-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-COMMIT_HASH="a17dd3248a666d01be75f6b16be37e80e20b0954"
-
-DESCRIPTION="A lightweight and flexible command-line JSON processor"
-HOMEPAGE="https://stedolan.github.io/jq/"
-#SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
-SRC_URI="https://github.com/stedolan/jq/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT_HASH}"
-
-LICENSE="MIT CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
-IUSE="+oniguruma static-libs test"
-
-ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/
-DEPEND="
- >=sys-devel/bison-3.0
- sys-devel/flex
- oniguruma? ( ${ONIGURUMA_MINPV}:=[static-libs?] )
-"
-RDEPEND="
- !static-libs? (
- oniguruma? ( ${ONIGURUMA_MINPV}[static-libs?] )
- )
-"
-PATCHES=(
- "${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
- "${FILESDIR}"/jq-1.7-runpath.patch
- "${FILESDIR}"/jq-1.7-warnings.patch
- "${FILESDIR}"/jq-1.7-visible-null.patch
- # https://bugs.gentoo.org/776385
- "${FILESDIR}"/jq-1.7_pre20201109-no-git-bdep.patch
- "${FILESDIR}"/jq-1.7_pre20201109-fix-configure-test.patch
-)
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( oniguruma )"
-
-src_prepare() {
- sed -e '/^dist_doc_DATA/d; s:-Wextra ::' -i Makefile.am || die
- sed -r -e "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
- -i configure.ac || die
-
- # jq-1.6-r3-never-bundle-oniguruma makes sure we build with the system oniguruma,
- # but the bundled copy of oniguruma still gets eautoreconf'd since it
- # exists; save the cycles by nuking it.
- sed -e '/modules\/oniguruma/d' -i Makefile.am || die
- rm -rf "${S}"/modules/oniguruma || die
-
- default
- eautoreconf
-}
-
-src_configure() {
- local econfargs=(
- # don't try to rebuild docs
- --disable-docs
- --disable-valgrind
- --disable-maintainer-mode
- --enable-rpathhack
- $(use_enable static-libs static)
- $(use_with oniguruma oniguruma yes)
- )
- econf "${econfargs[@]}"
-}
-
-src_test() {
- if ! LD_LIBRARY_PATH="${S}/.libs" nonfatal emake check; then
- if [[ -r "${S}/test-suite.log" ]]; then
- eerror "Tests failed, outputting testsuite log"
- cat "${S}/test-suite.log"
- fi
- die "Tests failed"
- fi
-}
-
-src_install() {
- local DOCS=( AUTHORS NEWS README.md )
- default
-
- use static-libs || { find "${D}" -name '*.la' -delete || die; }
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-10-06 17:29 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-08 15:30 [gentoo-commits] repo/gentoo:master commit in: app-misc/jq/files/, app-misc/jq/ Tim Harder
-- strict thread matches above, loose matches on Subject: below --
2023-10-06 17:29 Patrick McLean
2023-10-06 16:24 Patrick McLean
2021-03-25 18:53 Patrick McLean
2019-04-12 21:10 Patrick McLean
2018-12-05 21:56 Patrick McLean
2016-04-30 3:55 Tim Harder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox