1 |
commit: 7a82eb0bdbddb98f6a9256feac82664682765624 |
2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
3 |
AuthorDate: Sun Jan 27 21:10:27 2019 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 28 13:41:21 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7a82eb0b |
7 |
|
8 |
sys-process/psmisc: resync ebuild with ebuild from tree |
9 |
|
10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
11 |
|
12 |
sys-process/psmisc/Manifest | 2 +- |
13 |
.../psmisc/files/psmisc-22.21-add-limits_h.patch | 11 ---- |
14 |
.../psmisc/files/psmisc-22.21-fuser_typo_fix.patch | 44 ---------------- |
15 |
.../psmisc/files/psmisc-22.21-sysmacros.patch | 26 --------- |
16 |
sys-process/psmisc/psmisc-22.21-r3.ebuild | 61 ---------------------- |
17 |
sys-process/psmisc/psmisc-23.1-r1.ebuild | 51 ++++++++++++++++++ |
18 |
6 files changed, 52 insertions(+), 143 deletions(-) |
19 |
|
20 |
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest |
21 |
index e25cc4f..c193226 100644 |
22 |
--- a/sys-process/psmisc/Manifest |
23 |
+++ b/sys-process/psmisc/Manifest |
24 |
@@ -1 +1 @@ |
25 |
-DIST psmisc-22.21.tar.gz 457702 SHA256 97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a SHA512 766aeb45687090b88b17176c5117a603e83fe92a13c013aea72c8ee80048adf02e18c7daa52ddfb8b2135f7c9a1bcae38896cdfb8d0158728d85a446c5e0d5ae WHIRLPOOL cbd4af3e54ce01f43558184b57a24e44dfb6e05d8438bd11e2308ee62535bb93dc417b08e66603966cc5912d7fa88c29df1529995a42e2a8b7c3da663b01681f |
26 |
+DIST psmisc-23.1.tar.xz 296136 BLAKE2B e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be SHA512 f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95 |
27 |
|
28 |
diff --git a/sys-process/psmisc/files/psmisc-22.21-add-limits_h.patch b/sys-process/psmisc/files/psmisc-22.21-add-limits_h.patch |
29 |
deleted file mode 100644 |
30 |
index 6ebb34a..0000000 |
31 |
--- a/sys-process/psmisc/files/psmisc-22.21-add-limits_h.patch |
32 |
+++ /dev/null |
33 |
@@ -1,11 +0,0 @@ |
34 |
-diff -Naur psmisc-22.21.orig/src/pstree.c psmisc-22.21/src/pstree.c |
35 |
---- psmisc-22.21.orig/src/pstree.c 2013-09-29 05:11:56.000000000 +0000 |
36 |
-+++ psmisc-22.21/src/pstree.c 2014-03-26 13:30:36.000000000 +0000 |
37 |
-@@ -41,6 +41,7 @@ |
38 |
- #include <sys/types.h> |
39 |
- #include <sys/stat.h> |
40 |
- #include <sys/ioctl.h> |
41 |
-+#include <limits.h> |
42 |
- |
43 |
- #include "i18n.h" |
44 |
- #include "comm.h" |
45 |
|
46 |
diff --git a/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch b/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch |
47 |
deleted file mode 100644 |
48 |
index 5c5fd99..0000000 |
49 |
--- a/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch |
50 |
+++ /dev/null |
51 |
@@ -1,44 +0,0 @@ |
52 |
-From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001 |
53 |
-From: Brad Jorsch <anomie@×××××××××××××××××.net> |
54 |
-Date: Fri, 28 Feb 2014 21:55:02 +1100 |
55 |
-Subject: [PATCH] Typo in fuser makes -M on all the time |
56 |
- |
57 |
-Brad found that fuser had the -M option on all the time. |
58 |
-A simple but significant typo caused this, thanks the the patch. |
59 |
- |
60 |
-Bug-Debian: http://bugs.debian.org/740275 |
61 |
- |
62 |
-Signed-off-by: Craig Small <csmall@×××××××.au> |
63 |
---- |
64 |
- ChangeLog | 4 ++++ |
65 |
- src/fuser.c | 2 +- |
66 |
- 2 files changed, 5 insertions(+), 1 deletion(-) |
67 |
- |
68 |
-diff --git a/ChangeLog b/ChangeLog |
69 |
-index fd1cccf..e5f784c 100644 |
70 |
---- a/ChangeLog |
71 |
-+++ b/ChangeLog |
72 |
-@@ -1,3 +1,7 @@ |
73 |
-+Changes in 22.22 |
74 |
-+================ |
75 |
-+ * Fixed typo in fuser which has -M on Debian #740275 |
76 |
-+ |
77 |
- Changes in 22.21 |
78 |
- ================ |
79 |
- * Missing comma in fuser(1) added Debian #702391 |
80 |
-diff --git a/src/fuser.c b/src/fuser.c |
81 |
-index b485f65..389b302 100644 |
82 |
---- a/src/fuser.c |
83 |
-+++ b/src/fuser.c |
84 |
-@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[]) |
85 |
- usage(_("No process specification given")); |
86 |
- |
87 |
- /* Check if -M flag was used and if so check mounts */ |
88 |
-- if (opts * OPT_ISMOUNTPOINT) { |
89 |
-+ if (opts & OPT_ISMOUNTPOINT) { |
90 |
- check_mountpoints(&mounts, &names_head, &names_tail); |
91 |
- } |
92 |
- |
93 |
--- |
94 |
-2.2.2 |
95 |
- |
96 |
|
97 |
diff --git a/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch b/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch |
98 |
deleted file mode 100644 |
99 |
index 440c5e6..0000000 |
100 |
--- a/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch |
101 |
+++ /dev/null |
102 |
@@ -1,26 +0,0 @@ |
103 |
-From 367886e1c49238d1a02721f849564d77a163465b Mon Sep 17 00:00:00 2001 |
104 |
-From: Mike Frysinger <vapier@g.o> |
105 |
-Date: Mon, 7 Mar 2016 14:52:22 -0500 |
106 |
-Subject: [PATCH] fuser: include sysmacros.h for makedev |
107 |
- |
108 |
-BSD/Linux define makedev in the sysmacros.h header. Include it directly |
109 |
-instead of relying on types.h pulling it in for us. |
110 |
---- |
111 |
- src/fuser.c | 1 + |
112 |
- 1 file changed, 1 insertion(+) |
113 |
- |
114 |
-diff --git a/src/fuser.c b/src/fuser.c |
115 |
-index da94d22..380046f 100644 |
116 |
---- a/src/fuser.c |
117 |
-+++ b/src/fuser.c |
118 |
-@@ -36,6 +36,7 @@ |
119 |
- #include <sys/types.h> |
120 |
- #include <sys/stat.h> |
121 |
- #include <sys/socket.h> |
122 |
-+#include <sys/sysmacros.h> |
123 |
- #include <sys/wait.h> |
124 |
- #include <arpa/inet.h> |
125 |
- #include <netinet/in.h> |
126 |
--- |
127 |
-2.6.2 |
128 |
- |
129 |
|
130 |
diff --git a/sys-process/psmisc/psmisc-22.21-r3.ebuild b/sys-process/psmisc/psmisc-22.21-r3.ebuild |
131 |
deleted file mode 100644 |
132 |
index b1eae76..0000000 |
133 |
--- a/sys-process/psmisc/psmisc-22.21-r3.ebuild |
134 |
+++ /dev/null |
135 |
@@ -1,61 +0,0 @@ |
136 |
-# Copyright 1999-2017 Gentoo Foundation |
137 |
-# Distributed under the terms of the GNU General Public License v2 |
138 |
- |
139 |
-EAPI=5 |
140 |
- |
141 |
-inherit eutils |
142 |
- |
143 |
-DESCRIPTION="A set of tools that use the proc filesystem" |
144 |
-HOMEPAGE="http://psmisc.sourceforge.net/" |
145 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
146 |
- |
147 |
-LICENSE="GPL-2" |
148 |
-SLOT="0" |
149 |
-KEYWORDS="amd64 arm arm64 ia64 ~mips ppc sh sparc x86" |
150 |
-IUSE="ipv6 nls selinux X" |
151 |
- |
152 |
-RDEPEND=">=sys-libs/ncurses-5.7-r7:0= |
153 |
- nls? ( virtual/libintl ) |
154 |
- selinux? ( sys-libs/libselinux )" |
155 |
-DEPEND="${RDEPEND} |
156 |
- >=sys-devel/libtool-2.2.6b |
157 |
- nls? ( sys-devel/gettext )" |
158 |
- |
159 |
-DOCS="AUTHORS ChangeLog NEWS README" |
160 |
- |
161 |
-PATCHES=( |
162 |
- "${FILESDIR}/${P}-fuser_typo_fix.patch" |
163 |
- "${FILESDIR}/${P}-sysmacros.patch" |
164 |
- "${FILESDIR}/${P}-add-limits_h.patch" |
165 |
-) |
166 |
- |
167 |
-src_prepare() { |
168 |
- epatch "${PATCHES[@]}" |
169 |
-} |
170 |
- |
171 |
-src_configure() { |
172 |
- econf \ |
173 |
- $(use_enable selinux) \ |
174 |
- --disable-harden-flags \ |
175 |
- $(use_enable ipv6) \ |
176 |
- $(use_enable nls) |
177 |
-} |
178 |
- |
179 |
-src_compile() { |
180 |
- # peekfd is a fragile crap hack #330631 |
181 |
- nonfatal emake -C src peekfd || touch src/peekfd{.o,} |
182 |
- emake |
183 |
-} |
184 |
- |
185 |
-src_install() { |
186 |
- default |
187 |
- |
188 |
- use X || rm -f "${ED}"/usr/bin/pstree.x11 |
189 |
- |
190 |
- [[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd |
191 |
- [[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1 |
192 |
- |
193 |
- # fuser is needed by init.d scripts; use * wildcard for #458250 |
194 |
- dodir /bin |
195 |
- mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die |
196 |
-} |
197 |
|
198 |
diff --git a/sys-process/psmisc/psmisc-23.1-r1.ebuild b/sys-process/psmisc/psmisc-23.1-r1.ebuild |
199 |
new file mode 100644 |
200 |
index 0000000..bad4699 |
201 |
--- /dev/null |
202 |
+++ b/sys-process/psmisc/psmisc-23.1-r1.ebuild |
203 |
@@ -0,0 +1,51 @@ |
204 |
+# Copyright 1999-2018 Gentoo Foundation |
205 |
+# Distributed under the terms of the GNU General Public License v2 |
206 |
+ |
207 |
+EAPI=6 |
208 |
+ |
209 |
+DESCRIPTION="A set of tools that use the proc filesystem" |
210 |
+HOMEPAGE="http://psmisc.sourceforge.net/" |
211 |
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" |
212 |
+ |
213 |
+LICENSE="GPL-2" |
214 |
+SLOT="0" |
215 |
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" |
216 |
+IUSE="ipv6 nls selinux X" |
217 |
+ |
218 |
+RDEPEND=">=sys-libs/ncurses-5.7-r7:0= |
219 |
+ nls? ( virtual/libintl ) |
220 |
+ selinux? ( sys-libs/libselinux )" |
221 |
+DEPEND="${RDEPEND} |
222 |
+ >=sys-devel/libtool-2.2.6b |
223 |
+ nls? ( sys-devel/gettext )" |
224 |
+ |
225 |
+DOCS=( AUTHORS ChangeLog NEWS README ) |
226 |
+ |
227 |
+src_configure() { |
228 |
+ local myeconfargs=( |
229 |
+ $(use_enable selinux) |
230 |
+ --disable-harden-flags |
231 |
+ $(use_enable ipv6) |
232 |
+ $(use_enable nls) |
233 |
+ ) |
234 |
+ econf "${myeconfargs[@]}" |
235 |
+} |
236 |
+ |
237 |
+src_compile() { |
238 |
+ # peekfd is a fragile crap hack #330631 |
239 |
+ nonfatal emake -C src peekfd || touch src/peekfd{.o,} |
240 |
+ emake |
241 |
+} |
242 |
+ |
243 |
+src_install() { |
244 |
+ default |
245 |
+ |
246 |
+ use X || rm -f "${ED%/}"/usr/bin/pstree.x11 |
247 |
+ |
248 |
+ [[ -s ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/bin/peekfd |
249 |
+ [[ -e ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/share/man/man1/peekfd.1 |
250 |
+ |
251 |
+ # fuser is needed by init.d scripts; use * wildcard for #458250 |
252 |
+ dodir /bin |
253 |
+ mv "${ED%/}"/usr/bin/*fuser "${ED%/}"/bin || die |
254 |
+} |