From 38ecaf88ae0891dd2d7f2bdd9a7acdcd45835724 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 4 Dec 2024 02:07:22 +0000
Subject: gentoo auto-resync : 04:12:2024 - 02:07:22
---
app-misc/Manifest.gz | Bin 50703 -> 50706 bytes
app-misc/jq/Manifest | 4 +-
app-misc/jq/files/jq-1.7-runpath.patch | 17 -------
app-misc/jq/files/jq-1.7.1-runpath.patch | 38 ++++++++++++++
app-misc/jq/jq-1.7.1-r1.ebuild | 83 +++++++++++++++++++++++++++++++
app-misc/jq/jq-1.7.1.ebuild | 83 -------------------------------
6 files changed, 123 insertions(+), 102 deletions(-)
delete mode 100644 app-misc/jq/files/jq-1.7-runpath.patch
create mode 100644 app-misc/jq/files/jq-1.7.1-runpath.patch
create mode 100644 app-misc/jq/jq-1.7.1-r1.ebuild
delete mode 100644 app-misc/jq/jq-1.7.1.ebuild
(limited to 'app-misc')
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 149de179b595..5e67ef5e8ce4 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index d3e98edf08d2..e60cd6c04452 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,5 +1,5 @@
AUX jq-1.6-r3-never-bundle-oniguruma.patch 867 BLAKE2B 7afe5d3390071a4ccd14ae376c27db07f3d189a32973d82d77b3bd0b8826cf3ed6c032e31e0b7ffdf3834050aeb367316f8930dbb0a1a66218f86ab94cbd36ff SHA512 27b38e765e0850cb97c51015f36ebc447bd23066b640269ff4ea838946545dd86cdd975393943bf4257dc9ce8436a16b610e34883ddacc64b8106f895d1c79c3
-AUX jq-1.7-runpath.patch 572 BLAKE2B 31daf5c3062a446c9e745f065b90add1d23fb6738076becbb67cc3412bdff6b062a66502e453900366d0c4feef90925ffe220acd4d8672c96b611895185a3808 SHA512 00958a570efdc54af7105299576cf528d8091fac0a9aa63bb362a9852d0923d7c0d5207e9349eea29dc7d782547b192554c36b9cd1b50dfdcdbf622c46f7d1e0
+AUX jq-1.7.1-runpath.patch 1269 BLAKE2B a639f19da01e09f37cf05def26e8a8e4a1d0da7e6e3ada92fa80b33d976fcef640fa685fcba9f64798e279887a6d02d06e4ec724ae27b527971cda7b69b613c8 SHA512 85a180136b2fec5a40627373652ae227ebd0bad368813f93ef87badf4e465e905105c1950d194c5af65c28ad46964396855b21ac1e6ae0df633b642ce17dbdb5
DIST jq-1.7.1.gh.tar.gz 1323338 BLAKE2B 17e3b68e23f9a7f1aa8749ede6c0b8fe435990899886f0c96da36d130c17d13609ba7f910321316f0c3b35985360f8cb5e6a3b12caea5e9bc7792e128798f137 SHA512 af9c444e5306423182f467a53acdf45bb8aefa058a47f490ce16395f0aebfb7627e3843f65e96f41cd9d4b72b8ad274ab0bdb061abc6990b1158f86d2256d4ec
-EBUILD jq-1.7.1.ebuild 2175 BLAKE2B ed58de711a4bf0d46a8adc682e5264b5cfe1ed812818e656072e3eb1b5486aab3e924cac4adf1dcdd6067281b640b09c52657ac9032e1d5155f95708e05de3ce SHA512 d1bff8ee7c424e431765a593640494aeb3283019aeb996d88555bb5bc700fdefcaa23e149fc65e521de0f35745ce74e68e550ebfa76b9739bae11f07cf0f8da3
+EBUILD jq-1.7.1-r1.ebuild 2192 BLAKE2B 76892b4f9f2a4fc82c6996241974c0f489521e11d800edd716b5e25ca3c9ada07078c0963e112ba60a55469d5e6771ee3a2b2caa46840dc945ccc63b4a560f7a SHA512 835927c40665fb50c58080f03849703f9a221bd6bb518a8263b83f5dfb74a2c489db76262c2457218db50acb247b4897e64d08c112f03f3b345c0d076e5640ac
MISC metadata.xml 619 BLAKE2B 07d8852baec2c77bdef39bd1bb742ce1148dfdde1c76af80727ea7dda9ebfdc61ee24e3992c3f868c312fb258b8f7a2064996b3a609a801eaeabe09b7a10f6a0 SHA512 10824dca3462dcf96b2025d71f47dbddb3b1fa7ba864fcb5d0a7782423213323143c7c224174b1ac9d69e0c1094285286c213809f023d25542a865fc064d1b04
diff --git a/app-misc/jq/files/jq-1.7-runpath.patch b/app-misc/jq/files/jq-1.7-runpath.patch
deleted file mode 100644
index a8f76f7c90e1..000000000000
--- a/app-misc/jq/files/jq-1.7-runpath.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 0441d4a..8f1aa23 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -283,4 +283,11 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"])
- AC_CONFIG_MACRO_DIR([config/m4])
- AC_CONFIG_FILES([Makefile libjq.pc])
- 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.1-runpath.patch b/app-misc/jq/files/jq-1.7.1-runpath.patch
new file mode 100644
index 000000000000..542218ca24c2
--- /dev/null
+++ b/app-misc/jq/files/jq-1.7.1-runpath.patch
@@ -0,0 +1,38 @@
+Fixes: https://github.com/gentoo/gentoo/commit/df24c1f97695d8a64a82577cd785e85ebe7ad4e7
+Upstream-PR: https://github.com/jqlang/jq/pull/3212
+
+From f23a7373d079a4d4fd1f975936e81f35a66dfe84 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 2 Dec 2024 09:46:33 -0800
+Subject: [PATCH] build: fix insecure RUNPATH
+
+In Gentoo -static-libtool-libs causes a QA Notice.
+
+ * QA Notice: The following files contain insecure RUNPATHs
+ * Please file a bug about this at https://bugs.gentoo.org/
+ * with the maintainer of the package.
+ * /var/tmp/portage/app-misc/jq-1.7.1/image/usr/bin/jqn RPATH: /var/tmp/portage/app-misc/jq-1.7.1/work/jq-jq-1.7.1/.libs
+
+Gentoo-Issue: https://bugs.gentoo.org/945698
+Signed-off-by: orbea <orbea@riseup.net>
+---
+ Makefile.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a183477fde..3f36993c0a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -132,11 +132,10 @@ CLEANFILES = src/version.h .remake-version-h src/builtin.inc src/config_opts.inc
+
+ bin_PROGRAMS = jq
+ jq_SOURCES = src/main.c src/version.h
+-jq_LDFLAGS = -static-libtool-libs
+ jq_LDADD = libjq.la -lm
+
+ if ENABLE_ALL_STATIC
+-jq_LDFLAGS += -all-static
++jq_LDFLAGS = -all-static
+ endif
+
+ ### Tests (make check)
diff --git a/app-misc/jq/jq-1.7.1-r1.ebuild b/app-misc/jq/jq-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..e828ea52bd3e
--- /dev/null
+++ b/app-misc/jq/jq-1.7.1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PV="${PV/_/}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A lightweight and flexible command-line JSON processor"
+HOMEPAGE="https://stedolan.github.io/jq/"
+SRC_URI="https://github.com/jqlang/jq/archive/refs/tags/${MY_P}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="+oniguruma static-libs test"
+
+ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.3' # Keep this in sync with bundled modules/oniguruma/
+DEPEND="
+ >=sys-devel/bison-3.0
+ app-alternatives/lex
+ 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.1-runpath.patch
+)
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( oniguruma )"
+
+src_prepare() {
+ sed -e '/^dist_doc_DATA/d; s:-Wextra ::' -i Makefile.am || die
+ printf "#!/bin/sh\\nprintf '%s'\\n\n" "${MY_PV}" > scripts/version || 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
+
+ sed -i "s/\[jq_version\]/[${MY_PV}]/" configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local econfargs=(
+ # don't try to rebuild docs
+ --disable-docs
+ --disable-valgrind
+ --disable-maintainer-mode
+ $(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.md README.md SECURITY.md )
+ default
+
+ use static-libs || { find "${D}" -name '*.la' -delete || die; }
+}
diff --git a/app-misc/jq/jq-1.7.1.ebuild b/app-misc/jq/jq-1.7.1.ebuild
deleted file mode 100644
index 75a18f279527..000000000000
--- a/app-misc/jq/jq-1.7.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_PV="${PV/_/}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A lightweight and flexible command-line JSON processor"
-HOMEPAGE="https://stedolan.github.io/jq/"
-SRC_URI="https://github.com/jqlang/jq/archive/refs/tags/${MY_P}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="+oniguruma static-libs test"
-
-ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.3' # Keep this in sync with bundled modules/oniguruma/
-DEPEND="
- >=sys-devel/bison-3.0
- app-alternatives/lex
- oniguruma? ( ${ONIGURUMA_MINPV}:=[static-libs?] )
-"
-RDEPEND="
- !static-libs? (
- oniguruma? ( ${ONIGURUMA_MINPV}[static-libs?] )
- )
-"
-PATCHES=(
- "${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
-)
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( oniguruma )"
-
-src_prepare() {
- sed -e '/^dist_doc_DATA/d; s:-Wextra ::' -i Makefile.am || die
- printf "#!/bin/sh\\nprintf '%s'\\n\n" "${MY_PV}" > scripts/version || 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
-
- sed -i "s/\[jq_version\]/[${MY_PV}]/" configure.ac || die
-
- 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.md README.md SECURITY.md )
- default
-
- use static-libs || { find "${D}" -name '*.la' -delete || die; }
-}
--
cgit v1.2.3