* [gentoo-commits] repo/gentoo:master commit in: app-portage/genlop/, app-portage/genlop/files/
@ 2019-05-12 4:39 Zac Medico
0 siblings, 0 replies; 2+ messages in thread
From: Zac Medico @ 2019-05-12 4:39 UTC (permalink / raw
To: gentoo-commits
commit: 3c64f10f130eca58f5171e9d8b915272638af1ba
Author: Gabriel Linder <linder.gabriel <AT> gmail <DOT> com>
AuthorDate: Sat May 11 23:50:57 2019 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun May 12 04:39:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c64f10f
app-portage/genlop: Correctly filter sandboxes.
Embed the patch provided by Joe Breuer to fix `genlop -c`.
The underlying cause seems to be that genlop looks for running emerges
by filtering over sandbox processes. A change to portage (or something)
introduced the pid-ns-init process to the call tree, which is also
selected by genlop looking for sandbox processes. This is what causes
each emerge to show up twice - once matched on the pid-ns-init process,
once on the sandbox process itself.
See https://bugs.gentoo.org/677890#c7 for more details.
Closes: https://github.com/gentoo/gentoo/pull/11975
Bug: https://bugs.gentoo.org/677890
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Gabriel Linder <linder.gabriel <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
.../genlop/files/genlop-0.30.10-sandbox.patch | 29 +++++++++++++++++++
app-portage/genlop/genlop-0.30.10-r2.ebuild | 33 ++++++++++++++++++++++
2 files changed, 62 insertions(+)
diff --git a/app-portage/genlop/files/genlop-0.30.10-sandbox.patch b/app-portage/genlop/files/genlop-0.30.10-sandbox.patch
new file mode 100644
index 00000000000..1b4efdb9768
--- /dev/null
+++ b/app-portage/genlop/files/genlop-0.30.10-sandbox.patch
@@ -0,0 +1,29 @@
+From af0fccf158a0a5d0c300be2eae167eace93cc1d3 Mon Sep 17 00:00:00 2001
+From: Joe Breuer <gentoo@jmbreuer.net>
+Date: Sat, 11 May 2019 21:08:21 -0700
+Subject: [PATCH] genlop -c: filter pid-ns-init duplicates (bug 677890)
+
+The latest stable version of portage introduces a pid-ns-init
+process which must be filtered in order to avoid duplicates.
+
+Bug: https://bugs.gentoo.org/677890
+Signed-off-by: Zac Medico <zmedico@gentoo.org>
+---
+ genlop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/genlop b/genlop
+index b28c9d6..c154aa4 100755
+--- a/genlop
++++ b/genlop
+@@ -706,7 +706,7 @@ sub current()
+ # not check for sanity and have users check their FEATURES instead.
+ my @targets = ();
+ my @sandbox_pids = ();
+- my @sandbox_procs = qx{ps ax -o pid,args | tail -n +2 | sed -e's/^ *//' | grep ' sandbox ' | grep -v ' grep '};
++ my @sandbox_procs = qx{ps ax -o pid,args | tail -n +2 | sed -e's/^ *//' | grep ' sandbox ' | grep -v -e ' grep ' -e 'pid-ns-init '};
+ my ($e_curmerge, $e_lastmerge);
+ foreach (@sandbox_procs)
+ {
+--
+2.21.0
diff --git a/app-portage/genlop/genlop-0.30.10-r2.ebuild b/app-portage/genlop/genlop-0.30.10-r2.ebuild
new file mode 100644
index 00000000000..36cc50c5a1c
--- /dev/null
+++ b/app-portage/genlop/genlop-0.30.10-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base bash-completion-r1
+
+DESCRIPTION="A nice emerge.log parser"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl"
+SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/perl
+ dev-perl/Date-Manip
+ dev-perl/libwww-perl"
+RDEPEND="${DEPEND}"
+
+# Populate the patches array for any patches for -rX releases
+PATCHES=(
+ "${FILESDIR}"/${P}-sync.patch
+ "${FILESDIR}"/${P}-sandbox.patch
+)
+
+src_install() {
+ dobin genlop
+ dodoc README Changelog
+ doman genlop.1
+ newbashcomp genlop.bash-completion genlop
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-portage/genlop/, app-portage/genlop/files/
@ 2021-03-21 17:56 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2021-03-21 17:56 UTC (permalink / raw
To: gentoo-commits
commit: 6b0c930e14ec7034214da728f52555244476a403
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 21 17:56:19 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Mar 21 17:56:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b0c930e
app-portage/genlop: Remove old 0.30.9-r1, 0.30.10-r1
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-portage/genlop/Manifest | 1 -
.../genlop/files/genlop-0.30.9-display.patch | 26 -------------------
app-portage/genlop/genlop-0.30.10-r1.ebuild | 30 ----------------------
app-portage/genlop/genlop-0.30.9-r1.ebuild | 30 ----------------------
4 files changed, 87 deletions(-)
diff --git a/app-portage/genlop/Manifest b/app-portage/genlop/Manifest
index 86fbbdd02a3..78315f8b102 100644
--- a/app-portage/genlop/Manifest
+++ b/app-portage/genlop/Manifest
@@ -1,2 +1 @@
DIST genlop-0.30.10.tar.gz 20872 BLAKE2B e06088678598464c67b78cf10a7472d7bf7b22d69c85fc072064b7a90fe57e2015fddba30edaa85574381cd59367b81c7bf514c269d5dc186fbcc367bba0cca4 SHA512 eab59d7dc012fbbdbe7de509deba66e6c7d0c5a37064e79c25a37c64becc259ee5206194615b60b3363022fa59e458356547edca307ceb4e19eeeaf4b146c593
-DIST genlop-0.30.9.tar.gz 21160 BLAKE2B 4d8fd34c8ea1e49498ebb887782c02b2dd20bd20bd1559b469dc93ccaa9873b27681c8c50ca85d3a96ca687f28f77750d79d9d93ac50e10c3d0fac2a593dd1ea SHA512 659c85bb1d75a90e37449a194fca2c610b2684dab3eb722d566aa929626d958aa1584d12a623f31518d982543be9392786291886ea66a5511e61de1beb3a6936
diff --git a/app-portage/genlop/files/genlop-0.30.9-display.patch b/app-portage/genlop/files/genlop-0.30.9-display.patch
deleted file mode 100644
index cd9919ee3a2..00000000000
--- a/app-portage/genlop/files/genlop-0.30.9-display.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 76cb98e439c65b5ec8d32d809100a67c653e5635 Mon Sep 17 00:00:00 2001
-From: Paul Varner <fuzzyray@gentoo.org>
-Date: Mon, 21 Jan 2013 15:37:19 -0600
-Subject: [PATCH] Fix issue where genlop <pkg name> no longer displays merge
- information (Bug 453382).
-
----
- genlop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/genlop b/genlop
-index 52af5ed..d5020eb 100755
---- a/genlop
-+++ b/genlop
-@@ -1127,7 +1127,7 @@ foreach my $ebuild_arg (@targets)
- }
- }
- }
-- if ($list_found or $ebuild_found or $time_found)
-+ if ($list_found or $ebuild_found or $time_found or !$info_found)
- {
- my $eb = $2;
- my $extra = $3 || "";
---
-1.8.1.1
-
diff --git a/app-portage/genlop/genlop-0.30.10-r1.ebuild b/app-portage/genlop/genlop-0.30.10-r1.ebuild
deleted file mode 100644
index 6f1e8c5d203..00000000000
--- a/app-portage/genlop/genlop-0.30.10-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit base bash-completion-r1
-
-DESCRIPTION="A nice emerge.log parser"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
- dev-perl/Date-Manip
- dev-perl/libwww-perl"
-RDEPEND="${DEPEND}"
-
-# Populate the patches array for any patches for -rX releases
-PATCHES=( "${FILESDIR}"/${P}-sync.patch )
-
-src_install() {
- dobin genlop
- dodoc README Changelog
- doman genlop.1
- newbashcomp genlop.bash-completion genlop
-}
diff --git a/app-portage/genlop/genlop-0.30.9-r1.ebuild b/app-portage/genlop/genlop-0.30.9-r1.ebuild
deleted file mode 100644
index 681c0468ab1..00000000000
--- a/app-portage/genlop/genlop-0.30.9-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit base bash-completion-r1
-
-DESCRIPTION="A nice emerge.log parser"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Perl"
-SRC_URI="mirror://gentoo//${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
- dev-perl/Date-Manip
- dev-perl/libwww-perl"
-RDEPEND="${DEPEND}"
-
-# Populate the patches array for any patches for -rX releases
-PATCHES=( "${FILESDIR}"/${P}-display.patch )
-
-src_install() {
- dobin genlop
- dodoc README Changelog
- doman genlop.1
- newbashcomp genlop.bash-completion genlop
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-21 17:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-12 4:39 [gentoo-commits] repo/gentoo:master commit in: app-portage/genlop/, app-portage/genlop/files/ Zac Medico
-- strict thread matches above, loose matches on Subject: below --
2021-03-21 17:56 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox