1 |
commit: 867ecd5fb3b1d6e2900627a23ae37e0209da19ca |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 31 01:17:03 2021 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 31 01:18:29 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=867ecd5f |
7 |
|
8 |
sys-process/psmisc: treeclean |
9 |
|
10 |
::gentoo version works, ppc64 ptregs patches no longer needed |
11 |
|
12 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
13 |
|
14 |
sys-process/psmisc/Manifest | 2 - |
15 |
sys-process/psmisc/files/include_limits.patch | 45 ---------------- |
16 |
sys-process/psmisc/files/musl_ptregs.patch | 19 ------- |
17 |
.../psmisc-23.4-fuser_regression_revert.patch | 45 ---------------- |
18 |
sys-process/psmisc/metadata.xml | 11 ---- |
19 |
sys-process/psmisc/psmisc-23.3-r1.ebuild | 56 ------------------- |
20 |
sys-process/psmisc/psmisc-23.4-r1.ebuild | 62 ---------------------- |
21 |
7 files changed, 240 deletions(-) |
22 |
|
23 |
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest |
24 |
deleted file mode 100644 |
25 |
index 972c7e9..0000000 |
26 |
--- a/sys-process/psmisc/Manifest |
27 |
+++ /dev/null |
28 |
@@ -1,2 +0,0 @@ |
29 |
-DIST psmisc-23.3.tar.xz 311896 BLAKE2B f38360dfb037a758633a8ff25af1de70be83ae5b2f2afe856ce237ade7bd2720f7c270c5af884313177022aa70f408dfce0c39e5d847057a6fdba98e3363561c SHA512 791ffef78d87b092d653da98710b338017466a9e1e1935968b9f0194ccef8da941317aa0c39d821d46b20d95d6539ccf78e5ebb71ad1032ae62337a397180d58 |
30 |
-DIST psmisc-23.4.tar.xz 370000 BLAKE2B e762171c4d3252421a49b352fadb3e892f66862f003a313a0cc692f973364b06d2652a51d331314462784d94ad55189e74c4d7a023d5d7c917c5e5c05009f46b SHA512 b05781fdb283a6f132bd385d64437f8080e6bc0e11cd2e3e02227678682bb67b3c89edec34a6d067d77312811d072dc60b47ebb32b168c4c69bbc36df643a471 |
31 |
|
32 |
diff --git a/sys-process/psmisc/files/include_limits.patch b/sys-process/psmisc/files/include_limits.patch |
33 |
deleted file mode 100644 |
34 |
index 1b474bc..0000000 |
35 |
--- a/sys-process/psmisc/files/include_limits.patch |
36 |
+++ /dev/null |
37 |
@@ -1,45 +0,0 @@ |
38 |
-Author: Breno Leitao <brenohl@××××××.com> |
39 |
-Date: Thu Apr 6 13:59:57 2017 -0300 |
40 |
- |
41 |
- peekfd: Include headers for ppc64 |
42 |
- |
43 |
- Currently peekfd fails to build on ppc64le architecture with musl |
44 |
- because it does not find reference for __WORDSIZE. |
45 |
- |
46 |
- This patch just includes reference for this macro if it was not |
47 |
- previously defined. |
48 |
- |
49 |
-Index: psmisc-22.21/src/peekfd.c |
50 |
-=================================================================== |
51 |
---- psmisc-22.21.orig/src/peekfd.c |
52 |
-+++ psmisc-22.21/src/peekfd.c |
53 |
-@@ -37,6 +37,14 @@ |
54 |
- |
55 |
- #include "i18n.h" |
56 |
- |
57 |
-+#if !defined(PATH_MAX) |
58 |
-+#include <limits.h> |
59 |
-+#endif |
60 |
-+ |
61 |
-+#if !defined(__WORDSIZE) |
62 |
-+#include <bits/reg.h> |
63 |
-+#endif |
64 |
-+ |
65 |
- #ifdef I386 |
66 |
- #define REG_ORIG_ACCUM orig_eax |
67 |
- #define REG_ACCUM eax |
68 |
-Index: psmisc-22.21/src/pstree.c |
69 |
-=================================================================== |
70 |
---- psmisc-22.21.orig/src/pstree.c |
71 |
-+++ psmisc-22.21/src/pstree.c |
72 |
-@@ -45,6 +45,10 @@ |
73 |
- #include "i18n.h" |
74 |
- #include "comm.h" |
75 |
- |
76 |
-+#if !defined(PATH_MAX) |
77 |
-+#include <limits.h> |
78 |
-+#endif |
79 |
-+ |
80 |
- #ifdef WITH_SELINUX |
81 |
- #include <selinux/selinux.h> |
82 |
- #else |
83 |
|
84 |
diff --git a/sys-process/psmisc/files/musl_ptregs.patch b/sys-process/psmisc/files/musl_ptregs.patch |
85 |
deleted file mode 100644 |
86 |
index e8d4387..0000000 |
87 |
--- a/sys-process/psmisc/files/musl_ptregs.patch |
88 |
+++ /dev/null |
89 |
@@ -1,19 +0,0 @@ |
90 |
-Author: Breno Leitao <brenohl@××××××.com> |
91 |
-Date: Thu Apr 6 14:03:00 2017 -0300 |
92 |
- |
93 |
- peekfd: Avoid pt_regs clash |
94 |
- |
95 |
-Index: psmisc-22.21/src/peekfd.c |
96 |
-=================================================================== |
97 |
---- a/src/peekfd.c.old |
98 |
-+++ b/src/peekfd.c |
99 |
-@@ -27,7 +27,9 @@ |
100 |
- #include <sys/types.h> |
101 |
- #include <sys/wait.h> |
102 |
- #include <sys/syscall.h> |
103 |
-+#define pt_regs uapi_pt_regs |
104 |
- #include <asm/ptrace.h> |
105 |
-+#undef pt_regs |
106 |
- #include <byteswap.h> |
107 |
- #include <endian.h> |
108 |
- #include <sys/user.h> |
109 |
|
110 |
diff --git a/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch b/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch |
111 |
deleted file mode 100644 |
112 |
index 59b2bfc..0000000 |
113 |
--- a/sys-process/psmisc/files/psmisc-23.4-fuser_regression_revert.patch |
114 |
+++ /dev/null |
115 |
@@ -1,45 +0,0 @@ |
116 |
-https://gitlab.com/psmisc/psmisc/-/issues/35 |
117 |
- |
118 |
-diff --git a/ChangeLog b/ChangeLog |
119 |
-index df45ae3..be20ca0 100644 |
120 |
---- a/ChangeLog |
121 |
-+++ b/ChangeLog |
122 |
-@@ -5,8 +5,6 @@ Changes in 23.4 |
123 |
- * pstree: fix layout when using -C !24 |
124 |
- * pstree: add time namespace !25 |
125 |
- * pstree: Dynamically link to selinux and use attr |
126 |
-- * fuser: Get less confused about duplicate dev_id !10 |
127 |
-- * fuser: Only check pathname on non-block devices !31 |
128 |
- |
129 |
- Changes in 23.3 |
130 |
- =============== |
131 |
-diff --git a/src/fuser.c b/src/fuser.c |
132 |
-index 03e6237..f9d78db 100644 |
133 |
---- a/src/fuser.c |
134 |
-+++ b/src/fuser.c |
135 |
-@@ -1566,7 +1566,6 @@ check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head, |
136 |
- struct stat st, lst; |
137 |
- char *dirpath; |
138 |
- char filepath[PATH_MAX]; |
139 |
-- char real_filepath[PATH_MAX]; |
140 |
- |
141 |
- if (asprintf(&dirpath, "/proc/%d/%s", pid, dirname) < 0) |
142 |
- return; |
143 |
-@@ -1605,17 +1604,6 @@ check_dir(const pid_t pid, const char *dirname, struct device_list *dev_head, |
144 |
- dev_tmp = dev_tmp->next) { |
145 |
- if (thedev != dev_tmp->device) |
146 |
- continue; |
147 |
-- |
148 |
-- /* check the paths match if it is not a block device */ |
149 |
-- if (! S_ISBLK(dev_tmp->name->st.st_mode)) { |
150 |
-- if (readlink(filepath, real_filepath, PATH_MAX-1) < 0) { |
151 |
-- if (strncmp(dev_tmp->name->filename, filepath, strlen(dev_tmp->name->filename)) != 0) |
152 |
-- continue; |
153 |
-- } else { |
154 |
-- if (strncmp(dev_tmp->name->filename, real_filepath, strlen(dev_tmp->name->filename)) != 0) |
155 |
-- continue; |
156 |
-- } |
157 |
-- } |
158 |
- if (access == ACCESS_FILE |
159 |
- && (lstat(filepath, &lst) == 0) |
160 |
- && (lst.st_mode & S_IWUSR)) { |
161 |
|
162 |
diff --git a/sys-process/psmisc/metadata.xml b/sys-process/psmisc/metadata.xml |
163 |
deleted file mode 100644 |
164 |
index df39eb8..0000000 |
165 |
--- a/sys-process/psmisc/metadata.xml |
166 |
+++ /dev/null |
167 |
@@ -1,11 +0,0 @@ |
168 |
-<?xml version="1.0" encoding="UTF-8"?> |
169 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
170 |
-<pkgmetadata> |
171 |
-<maintainer type="project"> |
172 |
- <email>base-system@g.o</email> |
173 |
- <name>Gentoo Base System</name> |
174 |
-</maintainer> |
175 |
-<upstream> |
176 |
- <remote-id type="sourceforge">psmisc</remote-id> |
177 |
-</upstream> |
178 |
-</pkgmetadata> |
179 |
|
180 |
diff --git a/sys-process/psmisc/psmisc-23.3-r1.ebuild b/sys-process/psmisc/psmisc-23.3-r1.ebuild |
181 |
deleted file mode 100644 |
182 |
index edc88ce..0000000 |
183 |
--- a/sys-process/psmisc/psmisc-23.3-r1.ebuild |
184 |
+++ /dev/null |
185 |
@@ -1,56 +0,0 @@ |
186 |
-# Copyright 1999-2021 Gentoo Authors |
187 |
-# Distributed under the terms of the GNU General Public License v2 |
188 |
- |
189 |
-EAPI=7 |
190 |
- |
191 |
-DESCRIPTION="A set of tools that use the proc filesystem" |
192 |
-HOMEPAGE="http://psmisc.sourceforge.net/" |
193 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" |
194 |
- |
195 |
-LICENSE="GPL-2" |
196 |
-SLOT="0" |
197 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" |
198 |
-IUSE="ipv6 nls selinux X" |
199 |
- |
200 |
-RDEPEND=">=sys-libs/ncurses-5.7-r7:0= |
201 |
- nls? ( virtual/libintl ) |
202 |
- selinux? ( sys-libs/libselinux )" |
203 |
-DEPEND="${RDEPEND}" |
204 |
-BDEPEND=">=sys-devel/libtool-2.2.6b |
205 |
- nls? ( sys-devel/gettext )" |
206 |
- |
207 |
-DOCS=( AUTHORS ChangeLog NEWS README ) |
208 |
- |
209 |
-src_prepare() { |
210 |
- default |
211 |
- |
212 |
- if use elibc_musl ; then |
213 |
- eapply "${FILESDIR}"/include_limits.patch |
214 |
- eapply "${FILESDIR}"/musl_ptregs.patch |
215 |
- fi |
216 |
- |
217 |
- eapply_user |
218 |
-} |
219 |
- |
220 |
-src_configure() { |
221 |
- local myeconfargs=( |
222 |
- --disable-harden-flags |
223 |
- $(use_enable ipv6) |
224 |
- $(use_enable nls) |
225 |
- $(use_enable selinux) |
226 |
- ) |
227 |
- econf "${myeconfargs[@]}" |
228 |
-} |
229 |
- |
230 |
-src_install() { |
231 |
- default |
232 |
- |
233 |
- use X || rm -f "${ED}"/usr/bin/pstree.x11 |
234 |
- |
235 |
- [[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd |
236 |
- [[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1 |
237 |
- |
238 |
- # fuser is needed by init.d scripts; use * wildcard for #458250 |
239 |
- dodir /bin |
240 |
- mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die |
241 |
-} |
242 |
|
243 |
diff --git a/sys-process/psmisc/psmisc-23.4-r1.ebuild b/sys-process/psmisc/psmisc-23.4-r1.ebuild |
244 |
deleted file mode 100644 |
245 |
index 311f4ee..0000000 |
246 |
--- a/sys-process/psmisc/psmisc-23.4-r1.ebuild |
247 |
+++ /dev/null |
248 |
@@ -1,62 +0,0 @@ |
249 |
-# Copyright 1999-2021 Gentoo Authors |
250 |
-# Distributed under the terms of the GNU General Public License v2 |
251 |
- |
252 |
-EAPI=7 |
253 |
- |
254 |
-DESCRIPTION="A set of tools that use the proc filesystem" |
255 |
-HOMEPAGE="http://psmisc.sourceforge.net/" |
256 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" |
257 |
- |
258 |
-LICENSE="GPL-2" |
259 |
-SLOT="0" |
260 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
261 |
-IUSE="ipv6 nls selinux X" |
262 |
- |
263 |
-RDEPEND="!=app-i18n/man-pages-l10n-4.0.0-r0 |
264 |
- >=sys-libs/ncurses-5.7-r7:0= |
265 |
- nls? ( virtual/libintl ) |
266 |
- selinux? ( sys-libs/libselinux )" |
267 |
-DEPEND="${RDEPEND}" |
268 |
-BDEPEND=">=sys-devel/libtool-2.2.6b |
269 |
- nls? ( sys-devel/gettext )" |
270 |
- |
271 |
-DOCS=( AUTHORS ChangeLog NEWS README ) |
272 |
- |
273 |
-PATCHES=( |
274 |
- # https://gitlab.com/psmisc/psmisc/-/issues/35 |
275 |
- "${FILESDIR}/${PN}-23.4-fuser_regression_revert.patch" |
276 |
-) |
277 |
- |
278 |
-src_prepare() { |
279 |
- default |
280 |
- |
281 |
- if use elibc_musl ; then |
282 |
- eapply "${FILESDIR}"/include_limits.patch |
283 |
- eapply "${FILESDIR}"/musl_ptregs.patch |
284 |
- fi |
285 |
- |
286 |
- eapply_user |
287 |
-} |
288 |
- |
289 |
-src_configure() { |
290 |
- local myeconfargs=( |
291 |
- --disable-harden-flags |
292 |
- $(use_enable ipv6) |
293 |
- $(use_enable nls) |
294 |
- $(use_enable selinux) |
295 |
- ) |
296 |
- econf "${myeconfargs[@]}" |
297 |
-} |
298 |
- |
299 |
-src_install() { |
300 |
- default |
301 |
- |
302 |
- use X || rm -f "${ED}"/usr/bin/pstree.x11 |
303 |
- |
304 |
- [[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd |
305 |
- [[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1 |
306 |
- |
307 |
- # fuser is needed by init.d scripts; use * wildcard for #458250 |
308 |
- dodir /bin |
309 |
- mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die |
310 |
-} |