diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-08-06 03:17:13 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-08-06 03:17:13 +0000 |
| commit | 48c8c30252b3742d891bd07eea7a71594c539ce5 (patch) | |
| tree | 8f203590a790baea8b13c635cf350fbc27e35529 | |
| parent | a7ec5ed3bc0c625a89a7af118faaa9e0950e75a0 (diff) | |
| download | packages-48c8c30252b3742d891bd07eea7a71594c539ce5.tar.gz packages-48c8c30252b3742d891bd07eea7a71594c539ce5.tar.bz2 packages-48c8c30252b3742d891bd07eea7a71594c539ce5.tar.xz packages-48c8c30252b3742d891bd07eea7a71594c539ce5.zip | |
system/psmisc: bump to 23.2, disable test suite
| -rw-r--r-- | system/psmisc/APKBUILD | 12 | ||||
| -rw-r--r-- | system/psmisc/dont-underlink-peekfd.patch | 10 | ||||
| -rw-r--r-- | system/psmisc/fix-peekfd-on-ppc.patch | 2 |
3 files changed, 7 insertions, 17 deletions
diff --git a/system/psmisc/APKBUILD b/system/psmisc/APKBUILD index 2ffe67d71..f98d21cf1 100644 --- a/system/psmisc/APKBUILD +++ b/system/psmisc/APKBUILD @@ -1,11 +1,13 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: pkgname=psmisc -pkgver=23.1 -pkgrel=1 +pkgver=23.2 +pkgrel=0 pkgdesc="Miscellaneous utilities that use the proc filesystem" url="https://gitlab.com/psmisc/psmisc" arch="all" +options="!check" # killall(8) is known-broken on musl: + # https://gitlab.com/psmisc/psmisc/issues/18 license="GPL-2.0+" makedepends_build="autoconf>=2.69 automake" makedepends_host="ncurses-dev" @@ -13,7 +15,6 @@ checkdepends="dejagnu" subpackages="$pkgname-doc" [ "$CBUILD" != "$CHOST" ] || subpackages="$subpackages $pkgname-lang" source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/$pkgname/$pkgname/repository/archive.tar.bz2?ref=v$pkgver - dont-underlink-peekfd.patch fix-peekfd-on-ppc.patch musl_ptregs.patch " @@ -54,7 +55,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="636f33b628f07599c7a08d0fe0e084469647e2b03046f9c220f6a24475ab1d5dd07db2501bc1a581ca68c72c212367b5dab8b44edfe477a70bfc8740af2b1365 psmisc-23.1.tar.bz2 -a68c75eb3c66a9df0d4e574a9439eeed0cd2dc97b3cad3fcd8b945619c2ec238b73bf479d1b55ddd4821471cd8934ee1fbc7871c92de7ef72c3d3f989ab62c9f dont-underlink-peekfd.patch -b16139606e1ccaebd94b7b7a14f49f530b180f1fd24338008e4c4d48761b57953458c46e57b0f7ec191353514f68126f79c281875c4cd56ed2f1220ace131ce1 fix-peekfd-on-ppc.patch +sha512sums="210dd327f1ff614587ff5b4ae60cd843426302a020fe7f1c018ddba99dcdff7b7ad0620e2b1f10f6204402c1dc0deebcb4332235bcca082d6be21dcb68043619 psmisc-23.2.tar.bz2 +a910611896368a088503f50a04a1c2af00d57ee20f3613e81c79cd89574805a505dff43e356ed833a464e3b59d7c1e11fd52cf0bbf32fcfece4dbd2380f23b71 fix-peekfd-on-ppc.patch 57e3ebf427bae9d3ef5b40be1cbc29743009720a75369c91d338f7634fea5bf522f20ec54404b99f3a39e2c4c146c40baee2b22f68e5ede76678d488fde00db5 musl_ptregs.patch" diff --git a/system/psmisc/dont-underlink-peekfd.patch b/system/psmisc/dont-underlink-peekfd.patch deleted file mode 100644 index e1623f193..000000000 --- a/system/psmisc/dont-underlink-peekfd.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- psmisc-23.0/Makefile.am.old 2017-06-12 00:29:46.000000000 +0000 -+++ psmisc-23.0/Makefile.am 2017-06-28 10:21:04.148955051 +0000 -@@ -65,6 +65,7 @@ - src_killall_SOURCES = src/killall.c src/comm.h src/signals.c src/signals.h src/i18n.h - src_killall_LDADD = @LIBINTL@ @SELINUX_LIB@ - src_peekfd_SOURCES = src/peekfd.c -+src_peekfd_LDADD = @LIBINTL@ - src_pslog_SOURCES = src/pslog.c - src_pstree_SOURCES = src/pstree.c src/comm.h src/i18n.h - src_pstree_LDADD = @LIBINTL@ @TERMCAP_LIB@ @SELINUX_LIB@ diff --git a/system/psmisc/fix-peekfd-on-ppc.patch b/system/psmisc/fix-peekfd-on-ppc.patch index d9fc1d5f1..b28e17efb 100644 --- a/system/psmisc/fix-peekfd-on-ppc.patch +++ b/system/psmisc/fix-peekfd-on-ppc.patch @@ -1,6 +1,6 @@ --- psmisc-23.0/src/peekfd.c.old 2017-06-12 00:29:46.000000000 +0000 +++ psmisc-23.0/src/peekfd.c 2017-06-28 10:15:18.635344983 +0000 -@@ -233,11 +233,11 @@ +@@ -266,11 +266,11 @@ if (WIFSTOPPED(status)) { #ifdef PPC struct pt_regs regs; |