1 |
commit: 0d16cd79f3457c7b113c53859a127e64489e5f7d |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 29 09:55:06 2018 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 29 09:55:32 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d16cd79 |
7 |
|
8 |
sys-process/procps: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
sys-process/procps/Manifest | 2 - |
13 |
.../procps/files/procps-3.3.12-elogind.patch | 265 --------------------- |
14 |
.../files/procps-3.3.12-strtod_nol_err.patch | 110 --------- |
15 |
.../procps/files/procps-3.3.8-kill-neg-pid.patch | 46 ---- |
16 |
sys-process/procps/procps-3.3.12-r1.ebuild | 91 ------- |
17 |
sys-process/procps/procps-3.3.12.ebuild | 78 ------ |
18 |
sys-process/procps/procps-3.3.14.ebuild | 81 ------- |
19 |
7 files changed, 673 deletions(-) |
20 |
|
21 |
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest |
22 |
index 3eeb0d0b057..446d7cbdee9 100644 |
23 |
--- a/sys-process/procps/Manifest |
24 |
+++ b/sys-process/procps/Manifest |
25 |
@@ -1,3 +1 @@ |
26 |
-DIST procps-ng-3.3.12.tar.xz 845484 BLAKE2B d317935e28de45ca5afa59ce33f85e286820a630c7fe036bddcf7a4418fa347cbc9cab39ef380f482ce13f47555598fd2419c67c3f861d7e4e2e89a9b2f4ae4a SHA512 ea816740ff72cc53d99b5d2e78a511b627ea5b295e0efff67605c56d1ab075abc6b0e2da3df4facbfe903fc9d679e892d351b6884a966d37c6f4bfd9141a924b |
27 |
-DIST procps-ng-3.3.14.tar.xz 926924 BLAKE2B b18f8ec50a1449008b01a52be51a3a509266945b82fbb6964f54b9746d71b90e4a1a37be29b4bf07fedc70d4528fac7f7099d7b245bd9c6ed033e77eb49aae77 SHA512 45617924ae1520765c15d71b76278dc80cac04f5985f83c9b65a8ba379d9a80a2ff0dc14c5a6edee7d6cfa66ce50ec019e8b5203704175ff94547ae6ff2b18c5 |
28 |
DIST procps-ng-3.3.15.tar.xz 904416 BLAKE2B 9fc1384df1d51a13bdf3aaad173160a11c5a7e016a8c397a076b5115e350d2c6fd8ff8d9ad5d83b959020bcd6a1ef9e1bca02e9a63d56881816c5c7d7c9a8bc3 SHA512 bc83ccc1941e7be8266588fdfbba17e2424b30163a215873ee6dee96215d66249f5d5e46fec2278d030b42bd7599861c4878360042dacec4c221ce411453747c |
29 |
|
30 |
diff --git a/sys-process/procps/files/procps-3.3.12-elogind.patch b/sys-process/procps/files/procps-3.3.12-elogind.patch |
31 |
deleted file mode 100644 |
32 |
index 07c165310ce..00000000000 |
33 |
--- a/sys-process/procps/files/procps-3.3.12-elogind.patch |
34 |
+++ /dev/null |
35 |
@@ -1,265 +0,0 @@ |
36 |
---- procps-ng-3.3.12/configure 2016-07-10 07:32:09.862265237 +0200 |
37 |
-+++ procps-ng-3.3.12/configure 2016-07-10 07:32:09.862265237 +0200 |
38 |
-@@ -650,6 +650,10 @@ |
39 |
- BUILD_KILL_TRUE |
40 |
- BUILD_PIDOF_FALSE |
41 |
- BUILD_PIDOF_TRUE |
42 |
-+WITH_ELOGIND_FALSE |
43 |
-+WITH_ELOGIND_TRUE |
44 |
-+ELOGIND_LIBS |
45 |
-+ELOGIND_CFLAGS |
46 |
- WITH_SYSTEMD_FALSE |
47 |
- WITH_SYSTEMD_TRUE |
48 |
- SYSTEMD_LIBS |
49 |
-@@ -815,6 +819,7 @@ |
50 |
- enable_libselinux |
51 |
- with_ncurses |
52 |
- with_systemd |
53 |
-+with_elogind |
54 |
- enable_pidof |
55 |
- enable_kill |
56 |
- enable_skill |
57 |
-@@ -845,7 +850,9 @@ |
58 |
- NCURSESW_CFLAGS |
59 |
- NCURSESW_LIBS |
60 |
- SYSTEMD_CFLAGS |
61 |
--SYSTEMD_LIBS' |
62 |
-+SYSTEMD_LIBS |
63 |
-+ELOGIND_CFLAGS |
64 |
-+ELOGIND_LIBS' |
65 |
- |
66 |
- |
67 |
- # Initialize some variables set by options. |
68 |
-@@ -1521,6 +1528,7 @@ |
69 |
- --without-libintl-prefix don't search for libintl in includedir and libdir |
70 |
- --without-ncurses build only applications not needing ncurses |
71 |
- --with-systemd enable systemd support |
72 |
-+ --with-elogind enable elogind support |
73 |
- |
74 |
- Some influential environment variables: |
75 |
- CC C compiler command |
76 |
-@@ -1550,6 +1558,10 @@ |
77 |
- C compiler flags for SYSTEMD, overriding pkg-config |
78 |
- SYSTEMD_LIBS |
79 |
- linker flags for SYSTEMD, overriding pkg-config |
80 |
-+ ELOGIND_CFLAGS |
81 |
-+ C compiler flags for ELOGIND, overriding pkg-config |
82 |
-+ ELOGIND_LIBS |
83 |
-+ linker flags for ELOGIND, overriding pkg-config |
84 |
- |
85 |
- Use these variables to override the choices made by `configure' or to help |
86 |
- it to find libraries and programs with nonstandard names/locations. |
87 |
-@@ -17295,6 +17307,127 @@ |
88 |
- fi |
89 |
- |
90 |
- |
91 |
-+ |
92 |
-+# Check whether --with-elogind was given. |
93 |
-+if test "${with_elogind+set}" = set; then : |
94 |
-+ withval=$with_elogind; |
95 |
-+else |
96 |
-+ with_elogind=no |
97 |
-+ |
98 |
-+fi |
99 |
-+ |
100 |
-+# Do not allow elogind if systemd is wanted and found |
101 |
-+if test "x$with_systemd" != "xno"; then : |
102 |
-+ with_elogind=no |
103 |
-+fi |
104 |
-+ |
105 |
-+if test "x$with_elogind" != "xno"; then : |
106 |
-+ |
107 |
-+ |
108 |
-+pkg_failed=no |
109 |
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libelogind" >&5 |
110 |
-+$as_echo_n "checking for libelogind... " >&6; } |
111 |
-+ |
112 |
-+if test -n "$ELOGIND_CFLAGS"; then |
113 |
-+ pkg_cv_ELOGIND_CFLAGS="$ELOGIND_CFLAGS" |
114 |
-+ elif test -n "$PKG_CONFIG"; then |
115 |
-+ if test -n "$PKG_CONFIG" && \ |
116 |
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 |
117 |
-+ ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5 |
118 |
-+ ac_status=$? |
119 |
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
120 |
-+ test $ac_status = 0; }; then |
121 |
-+ pkg_cv_ELOGIND_CFLAGS=`$PKG_CONFIG --cflags "libelogind" 2>/dev/null` |
122 |
-+ test "x$?" != "x0" && pkg_failed=yes |
123 |
-+else |
124 |
-+ pkg_failed=yes |
125 |
-+fi |
126 |
-+ else |
127 |
-+ pkg_failed=untried |
128 |
-+fi |
129 |
-+if test -n "$ELOGIND_LIBS"; then |
130 |
-+ pkg_cv_ELOGIND_LIBS="$ELOGIND_LIBS" |
131 |
-+ elif test -n "$PKG_CONFIG"; then |
132 |
-+ if test -n "$PKG_CONFIG" && \ |
133 |
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 |
134 |
-+ ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5 |
135 |
-+ ac_status=$? |
136 |
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
137 |
-+ test $ac_status = 0; }; then |
138 |
-+ pkg_cv_ELOGIND_LIBS=`$PKG_CONFIG --libs "libelogind" 2>/dev/null` |
139 |
-+ test "x$?" != "x0" && pkg_failed=yes |
140 |
-+else |
141 |
-+ pkg_failed=yes |
142 |
-+fi |
143 |
-+ else |
144 |
-+ pkg_failed=untried |
145 |
-+fi |
146 |
-+ |
147 |
-+ |
148 |
-+ |
149 |
-+if test $pkg_failed = yes; then |
150 |
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
151 |
-+$as_echo "no" >&6; } |
152 |
-+ |
153 |
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
154 |
-+ _pkg_short_errors_supported=yes |
155 |
-+else |
156 |
-+ _pkg_short_errors_supported=no |
157 |
-+fi |
158 |
-+ if test $_pkg_short_errors_supported = yes; then |
159 |
-+ ELOGIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libelogind" 2>&1` |
160 |
-+ else |
161 |
-+ ELOGIND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libelogind" 2>&1` |
162 |
-+ fi |
163 |
-+ # Put the nasty error message in config.log where it belongs |
164 |
-+ echo "$ELOGIND_PKG_ERRORS" >&5 |
165 |
-+ |
166 |
-+ as_fn_error $? "Package requirements (libelogind) were not met: |
167 |
-+ |
168 |
-+$ELOGIND_PKG_ERRORS |
169 |
-+ |
170 |
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you |
171 |
-+installed software in a non-standard prefix. |
172 |
-+ |
173 |
-+Alternatively, you may set the environment variables ELOGIND_CFLAGS |
174 |
-+and ELOGIND_LIBS to avoid the need to call pkg-config. |
175 |
-+See the pkg-config man page for more details." "$LINENO" 5 |
176 |
-+elif test $pkg_failed = untried; then |
177 |
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
178 |
-+$as_echo "no" >&6; } |
179 |
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
180 |
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
181 |
-+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it |
182 |
-+is in your PATH or set the PKG_CONFIG environment variable to the full |
183 |
-+path to pkg-config. |
184 |
-+ |
185 |
-+Alternatively, you may set the environment variables ELOGIND_CFLAGS |
186 |
-+and ELOGIND_LIBS to avoid the need to call pkg-config. |
187 |
-+See the pkg-config man page for more details. |
188 |
-+ |
189 |
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>. |
190 |
-+See \`config.log' for more details" "$LINENO" 5; } |
191 |
-+else |
192 |
-+ ELOGIND_CFLAGS=$pkg_cv_ELOGIND_CFLAGS |
193 |
-+ ELOGIND_LIBS=$pkg_cv_ELOGIND_LIBS |
194 |
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
195 |
-+$as_echo "yes" >&6; } |
196 |
-+ |
197 |
-+fi |
198 |
-+ |
199 |
-+$as_echo "#define WITH_ELOGIND 1" >>confdefs.h |
200 |
-+ |
201 |
-+ |
202 |
-+fi |
203 |
-+ if test x$with_elogind != xno; then |
204 |
-+ WITH_ELOGIND_TRUE= |
205 |
-+ WITH_ELOGIND_FALSE='#' |
206 |
-+else |
207 |
-+ WITH_ELOGIND_TRUE='#' |
208 |
-+ WITH_ELOGIND_FALSE= |
209 |
-+fi |
210 |
-+ |
211 |
-+ |
212 |
- # AC_ARG_ENABLEs |
213 |
- # Check whether --enable-pidof was given. |
214 |
- if test "${enable_pidof+set}" = set; then : |
215 |
-@@ -17712,6 +17845,10 @@ |
216 |
- as_fn_error $? "conditional \"WITH_SYSTEMD\" was never defined. |
217 |
- Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
218 |
- fi |
219 |
-+if test -z "${WITH_ELOGIND_TRUE}" && test -z "${WITH_ELOGIND_FALSE}"; then |
220 |
-+ as_fn_error $? "conditional \"WITH_ELOGIND\" was never defined. |
221 |
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
222 |
-+fi |
223 |
- if test -z "${BUILD_PIDOF_TRUE}" && test -z "${BUILD_PIDOF_FALSE}"; then |
224 |
- as_fn_error $? "conditional \"BUILD_PIDOF\" was never defined. |
225 |
- Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
226 |
---- procps-ng-3.3.12/configure.ac 2016-07-09 23:49:25.817307031 +0200 |
227 |
-+++ procps-ng-3.3.12/configure.ac 2016-07-09 23:49:25.817307031 +0200 |
228 |
-@@ -155,6 +155,19 @@ |
229 |
- ]) |
230 |
- AM_CONDITIONAL([WITH_SYSTEMD], [test x$with_systemd != xno]) |
231 |
- |
232 |
-+AC_ARG_WITH([elogind], |
233 |
-+ [AS_HELP_STRING([--with-elogind], [enable elogind support])], |
234 |
-+ [], [with_elogind=no] |
235 |
-+) |
236 |
-+# Do not allow elogind if systemd is wanted and found |
237 |
-+AS_IF([test "x$with_systemd" != "xno"], [with_elogind=no]) |
238 |
-+ |
239 |
-+AS_IF([test "x$with_elogind" != "xno"], [ |
240 |
-+ PKG_CHECK_MODULES([ELOGIND], [libelogind]) |
241 |
-+ AC_DEFINE(WITH_ELOGIND, 1, [enable elogind support]) |
242 |
-+]) |
243 |
-+AM_CONDITIONAL([WITH_ELOGIND], [test x$with_elogind != xno]) |
244 |
-+ |
245 |
- # AC_ARG_ENABLEs |
246 |
- AC_ARG_ENABLE([pidof], |
247 |
- AS_HELP_STRING([--disable-pidof], [do not build pidof]), |
248 |
---- procps-ng-3.3.12/Makefile.am 2016-07-10 00:40:44.235121270 +0200 |
249 |
-+++ procps-ng-3.3.12/Makefile.am 2016-07-10 00:40:44.235121270 +0200 |
250 |
-@@ -155,6 +155,10 @@ |
251 |
- proc_libprocps_la_LIBADD += @SYSTEMD_LIBS@ |
252 |
- endif |
253 |
- |
254 |
-+if WITH_ELOGIND |
255 |
-+proc_libprocps_la_LIBADD += @ELOGIND_LIBS@ |
256 |
-+endif |
257 |
-+ |
258 |
- proc_libprocps_la_LDFLAGS = \ |
259 |
- -version-info $(LIBprocps_CURRENT):$(LIBprocps_REVISION):$(LIBprocps_AGE) \ |
260 |
- -no-undefined \ |
261 |
---- procps-ng-3.3.12/Makefile.in 2016-07-10 07:32:11.170237828 +0200 |
262 |
-+++ procps-ng-3.3.12/Makefile.in 2016-07-10 07:32:11.170237828 +0200 |
263 |
-@@ -126,6 +126,7 @@ |
264 |
- @BUILD_SKILL_FALSE@ snice.1 |
265 |
- |
266 |
- @WITH_SYSTEMD_TRUE@am__append_14 = @SYSTEMD_LIBS@ |
267 |
-+@WITH_ELOGIND_TRUE@am__append_15 = @ELOGIND_LIBS@ |
268 |
- TESTS = lib/test_strtod_nol$(EXEEXT) |
269 |
- check_PROGRAMS = $(am__EXEEXT_5) |
270 |
- noinst_PROGRAMS = lib/test_strutils$(EXEEXT) \ |
271 |
-@@ -688,6 +689,8 @@ |
272 |
- ECHO_N = @ECHO_N@ |
273 |
- ECHO_T = @ECHO_T@ |
274 |
- EGREP = @EGREP@ |
275 |
-+ELOGIND_CFLAGS = @ELOGIND_CFLAGS@ |
276 |
-+ELOGIND_LIBS = @ELOGIND_LIBS@ |
277 |
- EXEEXT = @EXEEXT@ |
278 |
- FGREP = @FGREP@ |
279 |
- GMSGFMT = @GMSGFMT@ |
280 |
---- procps-ng-3.3.12/proc/readproc.c 2016-07-09 23:49:25.825306872 +0200 |
281 |
-+++ procps-ng-3.3.12/proc/readproc.c 2016-07-09 23:49:25.825306872 +0200 |
282 |
-@@ -40,6 +40,9 @@ |
283 |
- #ifdef WITH_SYSTEMD |
284 |
- #include <systemd/sd-login.h> |
285 |
- #endif |
286 |
-+#ifdef WITH_ELOGIND |
287 |
-+#include <elogind/sd-login.h> |
288 |
-+#endif |
289 |
- |
290 |
- // sometimes it's easier to do this manually, w/o gcc helping |
291 |
- #ifdef PROF |
292 |
-@@ -518,7 +521,7 @@ |
293 |
- } |
294 |
- |
295 |
- static void sd2proc(proc_t *restrict p) { |
296 |
--#ifdef WITH_SYSTEMD |
297 |
-+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) |
298 |
- char buf[64]; |
299 |
- uid_t uid; |
300 |
- |
301 |
|
302 |
diff --git a/sys-process/procps/files/procps-3.3.12-strtod_nol_err.patch b/sys-process/procps/files/procps-3.3.12-strtod_nol_err.patch |
303 |
deleted file mode 100644 |
304 |
index 1a298c87f70..00000000000 |
305 |
--- a/sys-process/procps/files/procps-3.3.12-strtod_nol_err.patch |
306 |
+++ /dev/null |
307 |
@@ -1,110 +0,0 @@ |
308 |
-From 4ed44ab58e27a9a09902b9c5b49df484842b6c9a Mon Sep 17 00:00:00 2001 |
309 |
-From: Dr. Werner Fink <werner@××××.de> |
310 |
-Date: Wed, 13 Jul 2016 20:08:51 +1000 |
311 |
-Subject: [PATCH] misc: fix strtod_nol_err tests |
312 |
- |
313 |
-A better way of implementing the string to double |
314 |
-conversion and a better way of testing it. |
315 |
- |
316 |
-Signed-off-by: Craig Small <csmall@×××××××.au> |
317 |
---- |
318 |
-diff --git a/include/strutils.h b/include/strutils.h |
319 |
-index 85a6192..a5a15c9 100644 |
320 |
---- a/include/strutils.h |
321 |
-+++ b/include/strutils.h |
322 |
-@@ -7,6 +7,6 @@ |
323 |
- |
324 |
- extern long strtol_or_err(const char *str, const char *errmesg); |
325 |
- extern double strtod_or_err(const char *str, const char *errmesg); |
326 |
--double strtod_nol_or_err(char *str, const char *errmesg); |
327 |
-+extern double strtod_nol_or_err(char *str, const char *errmesg); |
328 |
- |
329 |
- #endif |
330 |
-diff --git a/lib/strutils.c b/lib/strutils.c |
331 |
-index e5245db..e0632c4 100644 |
332 |
---- a/lib/strutils.c |
333 |
-+++ b/lib/strutils.c |
334 |
-@@ -20,6 +20,8 @@ |
335 |
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
336 |
- */ |
337 |
- |
338 |
-+#include <float.h> |
339 |
-+#include <math.h> |
340 |
- #include <stdlib.h> |
341 |
- #include <ctype.h> |
342 |
- |
343 |
-@@ -71,9 +73,9 @@ double strtod_or_err(const char *str, const char *errmesg) |
344 |
- */ |
345 |
- double strtod_nol_or_err(char *str, const char *errmesg) |
346 |
- { |
347 |
-- double num; |
348 |
-+ long double num; |
349 |
- const char *cp, *radix; |
350 |
-- double mult; |
351 |
-+ long double mult; |
352 |
- int negative = 0; |
353 |
- |
354 |
- if (str != NULL && *str != '\0') { |
355 |
-@@ -95,29 +97,29 @@ double strtod_nol_or_err(char *str, const char *errmesg) |
356 |
- mult=0.1; |
357 |
- while(isdigit(*radix)) { |
358 |
- radix++; |
359 |
-- mult *= 10; |
360 |
-+ mult *= 10.0; |
361 |
- } |
362 |
- while(isdigit(*cp)) { |
363 |
-- num += (*cp - '0') * mult; |
364 |
-- mult /= 10; |
365 |
-+ num += (long double)(*cp - '0') * mult; |
366 |
-+ mult /= 10.0; |
367 |
- cp++; |
368 |
- } |
369 |
- /* got the integers */ |
370 |
- if (*cp == '\0') |
371 |
-- return (negative?-num:num); |
372 |
-+ return (double)(negative?-num:num); |
373 |
- if (*cp != '.' && *cp != ',') |
374 |
- error(EXIT_FAILURE, EINVAL, "%s: '%s'", errmesg, str); |
375 |
- |
376 |
- cp++; |
377 |
- mult = 0.1; |
378 |
- while(isdigit(*cp)) { |
379 |
-- num += (*cp - '0') * mult; |
380 |
-- mult /= 10; |
381 |
-+ num += (long double)(*cp - '0') * mult; |
382 |
-+ mult /= 10.0; |
383 |
- cp++; |
384 |
- } |
385 |
- if (*cp == '\0') |
386 |
-- return (negative?-num:num); |
387 |
-+ return (double)(negative?-num:num); |
388 |
- } |
389 |
- error(EXIT_FAILURE, errno, "%s: '%s'", errmesg, str); |
390 |
-- return 0; |
391 |
-+ return (double)0; |
392 |
- } |
393 |
-diff --git a/lib/test_strtod_nol.c b/lib/test_strtod_nol.c |
394 |
-index 0be798c..736768a 100644 |
395 |
---- a/lib/test_strtod_nol.c |
396 |
-+++ b/lib/test_strtod_nol.c |
397 |
-@@ -1,4 +1,5 @@ |
398 |
-- |
399 |
-+#include <float.h> |
400 |
-+#include <math.h> |
401 |
- #include <stdio.h> |
402 |
- #include <stdlib.h> |
403 |
- #include "strutils.h" |
404 |
-@@ -33,8 +34,8 @@ int main(int argc, char *argv[]) |
405 |
- double val; |
406 |
- |
407 |
- for(i=0; tests[i].string != NULL; i++) { |
408 |
-- if(strtod_nol_or_err(tests[i].string, "Cannot parse number") != |
409 |
-- tests[i].result) { |
410 |
-+ val = strtod_nol_or_err(tests[i].string, "Cannot parse number"); |
411 |
-+ if(fabs(tests[i].result - val) > DBL_EPSILON) { |
412 |
- fprintf(stderr, "FAIL: strtod_nol_or_err(\"%s\") != %f\n", |
413 |
- tests[i].string, tests[i].result); |
414 |
- return EXIT_FAILURE; |
415 |
--- |
416 |
-libgit2 0.24.0 |
417 |
- |
418 |
|
419 |
diff --git a/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch b/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch |
420 |
deleted file mode 100644 |
421 |
index 00397480ca3..00000000000 |
422 |
--- a/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch |
423 |
+++ /dev/null |
424 |
@@ -1,46 +0,0 @@ |
425 |
-From 396cbc4cf36166217d877e2ff7e0a290758b0bc2 Mon Sep 17 00:00:00 2001 |
426 |
-From: Mike Frysinger <vapier@g.o> |
427 |
-Date: Thu, 27 Jun 2013 18:37:17 -0400 |
428 |
-Subject: [PATCH] kill: fix -PID handling |
429 |
- |
430 |
-Commit 19b6f48990b02aeca211b480625b95b2033c1017 tried to fix -PID |
431 |
-handling, but the new logic ends up skipping over the arg. This is |
432 |
-because getopt increments optind after it processed the -PID (even |
433 |
-though it was an unknown option). We need to decrement it by one |
434 |
-so the loop at the end of the code will process it for us. |
435 |
- |
436 |
-I also fixed some whitespace errors in that same commit. |
437 |
- |
438 |
-URL: http://code.google.com/p/chromium/issues/detail?id=255209 |
439 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
440 |
---- |
441 |
- skill.c | 6 ++++-- |
442 |
- 1 file changed, 4 insertions(+), 2 deletions(-) |
443 |
- |
444 |
-diff --git a/skill.c b/skill.c |
445 |
-index fb57305..074c5d7 100644 |
446 |
---- a/skill.c |
447 |
-+++ b/skill.c |
448 |
-@@ -390,7 +390,7 @@ static void __attribute__ ((__noreturn__)) |
449 |
- else |
450 |
- sigopt++; |
451 |
- |
452 |
-- opterr=0; /* suppress errors on -123 */ |
453 |
-+ opterr = 0; /* suppress errors on -123 */ |
454 |
- while (loop == 1 && (i = getopt_long(argc, argv, "l::Ls:hV", longopts, NULL)) != -1) |
455 |
- switch (i) { |
456 |
- case 'l': |
457 |
-@@ -423,7 +423,9 @@ static void __attribute__ ((__noreturn__)) |
458 |
- xwarnx(_("invalid argument %c"), optopt); |
459 |
- kill_usage(stderr); |
460 |
- } |
461 |
-- loop=0; |
462 |
-+ /* We need to back off by one since getopt() ate the -PID */ |
463 |
-+ --optind; |
464 |
-+ loop = 0; |
465 |
- break; |
466 |
- default: |
467 |
- kill_usage(stderr); |
468 |
--- |
469 |
-1.8.2.1 |
470 |
- |
471 |
|
472 |
diff --git a/sys-process/procps/procps-3.3.12-r1.ebuild b/sys-process/procps/procps-3.3.12-r1.ebuild |
473 |
deleted file mode 100644 |
474 |
index 118aed2504b..00000000000 |
475 |
--- a/sys-process/procps/procps-3.3.12-r1.ebuild |
476 |
+++ /dev/null |
477 |
@@ -1,91 +0,0 @@ |
478 |
-# Copyright 1999-2017 Gentoo Foundation |
479 |
-# Distributed under the terms of the GNU General Public License v2 |
480 |
- |
481 |
-EAPI=5 |
482 |
- |
483 |
-inherit epatch toolchain-funcs flag-o-matic |
484 |
- |
485 |
-DESCRIPTION="standard informational utilities and process-handling tools" |
486 |
-HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps" |
487 |
-SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz" |
488 |
- |
489 |
-LICENSE="GPL-2" |
490 |
-SLOT="0/5" # libprocps.so |
491 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" |
492 |
-IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode" |
493 |
- |
494 |
-COMMON_DEPEND=" |
495 |
- elogind? ( sys-auth/elogind ) |
496 |
- ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) |
497 |
- selinux? ( sys-libs/libselinux ) |
498 |
- systemd? ( sys-apps/systemd ) |
499 |
-" |
500 |
-DEPEND="${COMMON_DEPEND} |
501 |
- elogind? ( virtual/pkgconfig ) |
502 |
- ncurses? ( virtual/pkgconfig ) |
503 |
- systemd? ( virtual/pkgconfig ) |
504 |
- test? ( dev-util/dejagnu )" |
505 |
-RDEPEND=" |
506 |
- ${COMMON_DEPEND} |
507 |
- kill? ( |
508 |
- !sys-apps/coreutils[kill] |
509 |
- !sys-apps/util-linux[kill] |
510 |
- ) |
511 |
- !<sys-apps/sysvinit-2.88-r6 |
512 |
-" |
513 |
- |
514 |
-S="${WORKDIR}/${PN}-ng-${PV}" |
515 |
- |
516 |
-PATCHES=( |
517 |
- "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209 |
518 |
- "${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304 |
519 |
- "${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036 |
520 |
- |
521 |
- # Upstream fixes |
522 |
- "${FILESDIR}"/${P}-strtod_nol_err.patch |
523 |
-) |
524 |
- |
525 |
-src_prepare() { |
526 |
- epatch "${PATCHES[@]}" |
527 |
- |
528 |
- # Requires special handling or autoreconf gets triggered which we don't |
529 |
- # want to happen in a base-system package. |
530 |
- EPATCH_OPTS="-Z" \ |
531 |
- epatch "${FILESDIR}"/${PN}-3.3.12-elogind.patch # 599504 |
532 |
- |
533 |
- epatch_user |
534 |
-} |
535 |
- |
536 |
-src_configure() { |
537 |
- # http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support |
538 |
- append-lfs-flags #471102 |
539 |
- econf \ |
540 |
- --docdir='$(datarootdir)'/doc/${PF} \ |
541 |
- $(use_with elogind) \ |
542 |
- $(use_enable kill) \ |
543 |
- $(use_enable modern-top) \ |
544 |
- $(use_with ncurses) \ |
545 |
- $(use_enable nls) \ |
546 |
- $(use_enable selinux libselinux) \ |
547 |
- $(use_enable static-libs static) \ |
548 |
- $(use_with systemd) \ |
549 |
- $(use_enable unicode watch8bit) |
550 |
-} |
551 |
- |
552 |
-src_test() { |
553 |
- emake check </dev/null #461302 |
554 |
-} |
555 |
- |
556 |
-src_install() { |
557 |
- default |
558 |
- #dodoc sysctl.conf |
559 |
- |
560 |
- dodir /bin |
561 |
- mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die |
562 |
- if use kill; then |
563 |
- mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die |
564 |
- fi |
565 |
- |
566 |
- gen_usr_ldscript -a procps |
567 |
- find "${D}" -name '*.la' -delete || die |
568 |
-} |
569 |
|
570 |
diff --git a/sys-process/procps/procps-3.3.12.ebuild b/sys-process/procps/procps-3.3.12.ebuild |
571 |
deleted file mode 100644 |
572 |
index 57528f8ba61..00000000000 |
573 |
--- a/sys-process/procps/procps-3.3.12.ebuild |
574 |
+++ /dev/null |
575 |
@@ -1,78 +0,0 @@ |
576 |
-# Copyright 1999-2017 Gentoo Foundation |
577 |
-# Distributed under the terms of the GNU General Public License v2 |
578 |
- |
579 |
-EAPI=5 |
580 |
- |
581 |
-inherit eutils toolchain-funcs flag-o-matic |
582 |
- |
583 |
-DESCRIPTION="standard informational utilities and process-handling tools" |
584 |
-HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps" |
585 |
-SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz" |
586 |
- |
587 |
-LICENSE="GPL-2" |
588 |
-SLOT="0/5" # libprocps.so |
589 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" |
590 |
-IUSE="+kill +ncurses modern-top nls selinux static-libs systemd test unicode" |
591 |
- |
592 |
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) |
593 |
- selinux? ( sys-libs/libselinux ) |
594 |
- systemd? ( >=sys-apps/systemd-209 )" |
595 |
-DEPEND="${RDEPEND} |
596 |
- ncurses? ( virtual/pkgconfig ) |
597 |
- systemd? ( virtual/pkgconfig ) |
598 |
- test? ( dev-util/dejagnu )" |
599 |
-RDEPEND+=" |
600 |
- kill? ( |
601 |
- !sys-apps/coreutils[kill] |
602 |
- !sys-apps/util-linux[kill] |
603 |
- ) |
604 |
- !<sys-apps/sysvinit-2.88-r6" |
605 |
- |
606 |
-S="${WORKDIR}/${PN}-ng-${PV}" |
607 |
- |
608 |
-PATCHES=( |
609 |
- "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209 |
610 |
- "${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304 |
611 |
- "${FILESDIR}"/${PN}-3.3.12-proc-tests.patch #583036 |
612 |
- |
613 |
- # Upstream fixes |
614 |
- "${FILESDIR}"/${P}-strtod_nol_err.patch |
615 |
-) |
616 |
- |
617 |
-src_prepare() { |
618 |
- epatch "${PATCHES[@]}" |
619 |
- epatch_user |
620 |
-} |
621 |
- |
622 |
-src_configure() { |
623 |
- # http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support |
624 |
- append-lfs-flags #471102 |
625 |
- econf \ |
626 |
- --docdir='$(datarootdir)'/doc/${PF} \ |
627 |
- $(use_enable kill) \ |
628 |
- $(use_enable modern-top) \ |
629 |
- $(use_with ncurses) \ |
630 |
- $(use_enable nls) \ |
631 |
- $(use_enable selinux libselinux) \ |
632 |
- $(use_enable static-libs static) \ |
633 |
- $(use_with systemd) \ |
634 |
- $(use_enable unicode watch8bit) |
635 |
-} |
636 |
- |
637 |
-src_test() { |
638 |
- emake check </dev/null #461302 |
639 |
-} |
640 |
- |
641 |
-src_install() { |
642 |
- default |
643 |
- #dodoc sysctl.conf |
644 |
- |
645 |
- dodir /bin |
646 |
- mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die |
647 |
- if use kill; then |
648 |
- mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die |
649 |
- fi |
650 |
- |
651 |
- gen_usr_ldscript -a procps |
652 |
- prune_libtool_files |
653 |
-} |
654 |
|
655 |
diff --git a/sys-process/procps/procps-3.3.14.ebuild b/sys-process/procps/procps-3.3.14.ebuild |
656 |
deleted file mode 100644 |
657 |
index 5e9a2b13394..00000000000 |
658 |
--- a/sys-process/procps/procps-3.3.14.ebuild |
659 |
+++ /dev/null |
660 |
@@ -1,81 +0,0 @@ |
661 |
-# Copyright 1999-2018 Gentoo Foundation |
662 |
-# Distributed under the terms of the GNU General Public License v2 |
663 |
- |
664 |
-EAPI=6 |
665 |
- |
666 |
-inherit toolchain-funcs flag-o-matic |
667 |
- |
668 |
-DESCRIPTION="standard informational utilities and process-handling tools" |
669 |
-HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps" |
670 |
-SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz" |
671 |
- |
672 |
-LICENSE="GPL-2" |
673 |
-SLOT="0/5" # libprocps.so |
674 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" |
675 |
-IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode" |
676 |
- |
677 |
-COMMON_DEPEND=" |
678 |
- elogind? ( sys-auth/elogind ) |
679 |
- ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) |
680 |
- selinux? ( sys-libs/libselinux ) |
681 |
- systemd? ( sys-apps/systemd ) |
682 |
-" |
683 |
-DEPEND="${COMMON_DEPEND} |
684 |
- elogind? ( virtual/pkgconfig ) |
685 |
- ncurses? ( virtual/pkgconfig ) |
686 |
- systemd? ( virtual/pkgconfig ) |
687 |
- test? ( dev-util/dejagnu )" |
688 |
-RDEPEND=" |
689 |
- ${COMMON_DEPEND} |
690 |
- kill? ( |
691 |
- !sys-apps/coreutils[kill] |
692 |
- !sys-apps/util-linux[kill] |
693 |
- ) |
694 |
- !<sys-apps/sysvinit-2.88-r6 |
695 |
-" |
696 |
- |
697 |
-S="${WORKDIR}/${PN}-ng-${PV}" |
698 |
- |
699 |
-PATCHES=( |
700 |
- "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch # http://crbug.com/255209 |
701 |
- "${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304 |
702 |
- "${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036 |
703 |
- |
704 |
- # Upstream fixes |
705 |
-) |
706 |
- |
707 |
-src_configure() { |
708 |
- # http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support |
709 |
- append-lfs-flags #471102 |
710 |
- local myeconfargs=( |
711 |
- --docdir='$(datarootdir)'/doc/${PF} |
712 |
- $(use_with elogind) |
713 |
- $(use_enable kill) |
714 |
- $(use_enable modern-top) |
715 |
- $(use_with ncurses) |
716 |
- $(use_enable nls) |
717 |
- $(use_enable selinux libselinux) |
718 |
- $(use_enable static-libs static) |
719 |
- $(use_with systemd) |
720 |
- $(use_enable unicode watch8bit) |
721 |
- ) |
722 |
- econf "${myeconfargs[@]}" |
723 |
-} |
724 |
- |
725 |
-src_test() { |
726 |
- emake check </dev/null #461302 |
727 |
-} |
728 |
- |
729 |
-src_install() { |
730 |
- default |
731 |
- #dodoc sysctl.conf |
732 |
- |
733 |
- dodir /bin |
734 |
- mv "${ED%/}"/usr/bin/ps "${ED%/}"/bin/ || die |
735 |
- if use kill; then |
736 |
- mv "${ED%/}"/usr/bin/kill "${ED}"/bin/ || die |
737 |
- fi |
738 |
- |
739 |
- gen_usr_ldscript -a procps |
740 |
- find "${D}" -name '*.la' -delete || die |
741 |
-} |