commit: c620646b17bdd28c990b50b8c79063cd473b00c1 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Wed Jul 15 15:35:11 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Wed Jul 15 15:35:11 2015 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c620646b
sys-apps/util-linux: cleanup. sys-apps/util-linux/Manifest | 12 +- .../util-linux/files/util-linux-2.23.1-musl.patch | 110 ------------- .../files/util-linux-2.24-last-tests.patch | 86 ---------- .../files/util-linux-2.24-skip-last-tests.patch | 41 ----- .../util-linux/files/util-linux-2.24.1-musl.patch | 30 ---- .../files/util-linux-2.24.2-hexdump.patch | 40 ----- .../files/util-linux-2.25-lscpu-pic.patch | 81 ---------- sys-apps/util-linux/util-linux-2.24.1-r99.ebuild | 147 ----------------- sys-apps/util-linux/util-linux-2.25-r99.ebuild | 176 --------------------- sys-apps/util-linux/util-linux-2.25.2-r99.ebuild | 2 +- 10 files changed, 2 insertions(+), 723 deletions(-) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 6989c25..87e1075 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,18 +1,8 @@ AUX crypto-loop.confd 412 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600 SHA512 fdcb4e3a267afd1bbc836e368918da7edc709fc8a61e45b53ec3694a79722ebfda0f3bcbeb053c665a6552241c5a915b76f142bff07757a7c018446000dd7bd0 WHIRLPOOL 7e0c95f46bc7c5474f950a0da93d9eefda7962385e1f425f2ae3dd931f7119fb5efa5ca0a470706bdbde661a001bb3797cf6e5f2735f346efb69aed5d66146e7 AUX crypto-loop.initd 1729 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810 SHA512 89983743c2277c2c88e7f77cd38ce0e2cc56255f7f314dcce74c5cbffe607323f888d00ef115a660ec6c52802b347d8e0d8cc0a411644f20118d776c88f9725b WHIRLPOOL 3f3256788ba61e2ce147b38144b739c4f7d0ed7bc1b8936b1bf4f33d4a0bce4cd17a49d81a573009601a597fff081170845b5cdf400dc8b7160022943538c7d9 AUX ttydefaults.h 964 SHA256 ad3983370bad941522ebb481c2ca087a405b16870ac094301aa9a3afc2b24441 SHA512 151d19dee177c0851200c247b598aad2a2879b4721f87af7a81a5f709100f0a06d942f8473789973c61e075bc295d8728bb9711c2fe217ea24c553bea69ad289 WHIRLPOOL 03bc2f196386d3f7823ca51da88671b5f752fb4bba645af649072bd723817297b98a7453f23f8828cebbf8b6551b8a7990c5a21561ade10f5e97bc650ac402d9 -AUX util-linux-2.23.1-musl.patch 3946 SHA256 b36f16f7ccad9bb7177df149767dccbae03d948e10299d2f14a91bc2a919425e SHA512 16a529026bf590e51038cbc1101a126477194b79297f49629a0ce36afefce227c96ee5ef6f9442ec19c449a589b2bfb099f60f60d8c851ba0eea99ab5ab81382 WHIRLPOOL 92259307a9375c20593b75b7acfa87b5aaef7024f405eb8b54d225773f313b16935a7955ccfeec4adf581d2ab0705991f36d25cad2f3d7cfd18cd3c0d52b808f -AUX util-linux-2.24-last-tests.patch 4513 SHA256 61be31970f0aced6a8423e1f0ab35751f0dcd9e24265eb3221a8e0e14cae731f SHA512 f9be688b0a074ca3e93139fcd78c4a28b892b9cafedc70d92b08f695131631349044d1eb42b4534db9c09f656e503d400dc59b220234668cba206888ad43cd1a WHIRLPOOL fa1057d0b9d99a92f53975c468e7488d47b2a801d42141233c88b01a9bde66ae489cf862505f3eadfb6c7e99172d202e37ec4bc5cd7d97e2fdc6e043df3335f9 -AUX util-linux-2.24-skip-last-tests.patch 1003 SHA256 5ccbab17e26cc9b592b534b9b3e72b6a23dbdd04718f6360cb7d8886221ffa4d SHA512 9d89530f203c8a50e1def8164669b93ce1c1509d4da112c9db56cea9e29288c32964978e06ababa8e6c00222813d7a99bc35e0a7cfc17d8cd63804b629c9165c WHIRLPOOL 0e7c1cd6a4bdc94fdad3582f1855992d375238438d165627d60cddda8d1314c759b6e34171c5d00890956acdf9641ad5bf955f980fd142545b1ef468caa90be6 -AUX util-linux-2.24.1-musl.patch 977 SHA256 027890f21ad6ae870e519d6da6498cade79f42d0a8c95a3afa30a6af41b25aea SHA512 b01a915da3e288e19e7f1c404d982bb296ab33b2d1a068decea04f35bc69aad2b33b78215054911682db855a61e0446c11ce0a37af6bc7f2be05537c97557fc3 WHIRLPOOL 20f4f6a503e5645bd9e0360f84529bd9a878d7815940447e7a9db93b71bb3c24ad59ee9b5e0cb5ae83c4b3881c1121744332a5a5b82ead525bf17640068dfec9 -AUX util-linux-2.24.2-hexdump.patch 838 SHA256 3b225036f09ff2979c5c181b129231169d10b95a8bf3d37308ccb44fc9e164d8 SHA512 bc94e4c6ba5620c8e21a642052e91f74b4b1552af65fc5dea8f4c6fb0f976dd83c7b2ecc62956936a70561af0eeb5894f5dcca29283bff458d7d7696eed81c2f WHIRLPOOL 184f89870273a48d87fc7869128cc099851702dceb9342fb06dc5f2f155558e1df6f55aab2c745d73eeb1a4ba4d44befdc37d49b41917bb26635e66593512b0a -AUX util-linux-2.25-lscpu-pic.patch 2529 SHA256 5ca73497accd0a53084e756c150b32c6f7a7fa2524acceb17182bf866e03b13a SHA512 186bbc40330f118ca5cde88db113b0dbc2111de2aab7a3001b369fc01a2b7e05ae4cc9b6d164a5ed6b4d48bd19558d2ac4a18c5df60da5d5c02228fada2d7a2b WHIRLPOOL a4777871b7cc14b0c63153c7dd6e1a3a45eee0b1a06eee19f20a02796ac3bd18bbc17774cb45c51bec074dde21a2b93dd11167349ea285bfd73eda98bb27b0e8 AUX util-linux-2.25-remove__SWORD_TYPE.patch 663 SHA256 29eb73d4a14352176bcc81bbb82518ebd8b8f57aecde0314465ffa5568407cf9 SHA512 80679400b61bd87aef8c8e0f448e83b8d14e15b4a0edda4e6866e15fc2d3d2968e23345b0d47edf6fc31d2e89707e0aa68d3def8bd0f3bb194cb1a08c9638b6e WHIRLPOOL a86a121b0496f7aeaa29c9b5c57449903e9364cc10e48c5b62c9a64e5db1bef4c45a14cadc5e9ae737cbdcb47d47333b21e594c95eb02aa4c7844b8d2168bcfa AUX util-linux-2.25.2-runuser-bash-completion.patch 1372 SHA256 a3eebac8c53b3bf6e29e15e161ba460fdafed840647f49de93cf8e20856f10ed SHA512 d7a90f709480065eceddc9c0ca2186a12b941c08130d3bee69286e1cd13ef228bff6991373ce30eacbb29f4ddad8a1afdf6551652d5ca21063e0ab7211aa44da WHIRLPOOL ef5446ecee7ae1d932fe62a0a321cab55df0ed24d7ab98abf2d8cba9fbd47bd2524fac22c0a0d4ebdcacb642ece273ce97e76f763ed816eaa3df95a76579caba -DIST util-linux-2.24.1.tar.xz 3543692 SHA256 835eb6232cfab0118ef2e4fd649de0ba9f5bd1b8cbf9a7d4d84594541dec8410 SHA512 5636e1c57bd57954518e90ff0f079810cc2927f52bb925dde556ce2744a088577f8adbc19c19b2bd079efd253406767faa44d1de5f557e024762522e647f044b WHIRLPOOL 25862a85788eb1c275c7e06f3d2be8e6a9605811665e06a4b21d1e274fc4a5e19dd03e5c52061ee5d98ce8c86ba757a7f8076683edb603ad0c43c05ab5e52a51 DIST util-linux-2.25.2.tar.xz 3703644 SHA256 e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6 SHA512 cf8c5bde78f844425150c2a81bdecb87aa57bcd5cebd177a78160835627f58037fa2cfe4db26fd8f35eedb3beb499a91492a297a27d065465e2ea0c6218dc387 WHIRLPOOL dd1685f2e694bf3de95acc3ba3170d231426c18c3395a867c815bbd3ab5ee0f07567b49d0ae083ce669c89db711e39fd2b990bc7321985ec2279d78816ec5258 -DIST util-linux-2.25.tar.xz 3681308 SHA256 47ba5a8bd8cdd55262699078a5612a95db17966c7f20c43e3fe492c90ce7980a SHA512 9306bcf8ef4b25c09a56e2e96c885d47a43bc389c3bba6123ff11b146eddfec0d04da817ff599bf7f2aa330b1044a051f69e8d90b6f2c4b125d2842f852be690 WHIRLPOOL e787d474c64b0a4ef944d5ec205afc3de6ff5b8789448a9d00232179813ee8fdf6564b433409012fed27a1fdfbb79c8ff504fde904b5f3433da95b79825900bd -EBUILD util-linux-2.24.1-r99.ebuild 4037 SHA256 4b191a882c5b099ea3ee7b96d2391eaae4fdad98371476b290c53f72b564c792 SHA512 912c9e32ee3c704435537ab4c7c8add494673d8ec2266ce3a6b2095a872622379861b8f5869145bee029f362650bd1f3d956b0de79d1165a0cee1277630c0549 WHIRLPOOL 5ceddd10cb246ca8190e6316b0de0a85a5adf426a4e6fe0520d2ac25cdc79bbcc0549af94bb37831cba8a8141d8544d6a59f4fdb5aa029f15ae7416fb0c94925 -EBUILD util-linux-2.25-r99.ebuild 5195 SHA256 5615d0cde4c97893100b9c80f48c6c6b71bd434db580ad466fbf0a8063c4aada SHA512 fd72e236e89790310058391d24a3748a083fed638e3b5c83ff13059c0f4a61ea921d324ffcf7e774ad469b096707d00aefa702a47ab99addd7ff789d0fb8a858 WHIRLPOOL 19fac70b043702b79462ce954a461a19785c0aeff7536745019f8c4a12c5f21fbf2ba09c0f053fc08b5ccf7b5f6be9a0a60bf1fe2ef9100b110d914aa6427aa2 -EBUILD util-linux-2.25.2-r99.ebuild 5156 SHA256 20af508111b44fa8b53821f5f9ce93e3097d75cac40f206c55f35c9f5ed71dbd SHA512 772c617b54bf4e9ee74a72a8c79a711398095eb7140f2ee85bb534f57f2cf31eac995e9761baa6976ec4df12a373fabfaa254251cb44a216de994c97e5c730a1 WHIRLPOOL c8436040b3aa55908b96d101868bb7b5e5a518803a67d41a577669a625fad73cd44c0cb2c280047d1ab3390966561662b52a73cb752aed3bd90df2ae9ea4cf3e +EBUILD util-linux-2.25.2-r99.ebuild 5154 SHA256 de6c07cae77e538e565283397df35afe5bfb12b6f27cc729a2b0b3501facc3d4 SHA512 21cd38ea994c4bac604cf3b9c39acb05ddcb12a1cf3bd2dae2abaca9a40faef9bfc6689b9cbb9ff16d2153dc78efb06ab179749bc507f5fcbd21b2f71ea1cc75 WHIRLPOOL 85931f239429777eb8125d1bddec507df0746176a15fc0864a0122f3c36244d13985e9e40689a61936ac1e78928436c45a9c77f641e14b5674b0ff347c15b44b MISC metadata.xml 846 SHA256 7fef382903a74be1395de2940640987cb09f84b4925bb9e19cbd803cad7041dc SHA512 47cbc59784221810ee0815e8078bb1c89147e6c69c9efa7ca3dddc66265225f98c698ca58d2a0406141aa3a069d68079c6dffae7f18cf1bc2a0b94ecf54ca6ef WHIRLPOOL 653bc6ee4435225a16ce7d662793af9bbe389185b831feeb43094b334a4662a593b5c92089ed71ed8108f6fc8768c46182f3a7f6210cfc6de14238b3c3088862 diff --git a/sys-apps/util-linux/files/util-linux-2.23.1-musl.patch b/sys-apps/util-linux/files/util-linux-2.23.1-musl.patch deleted file mode 100644 index 7868998..0000000 --- a/sys-apps/util-linux/files/util-linux-2.23.1-musl.patch +++ /dev/null @@ -1,110 +0,0 @@ -patch taken from sabotage linux -- https://github.com/rofl0r/sabotage -diff -aur util-linux-2.23.1.org/fdisks/cfdisk.c util-linux-2.23.1/fdisks/cfdisk.c ---- util-linux-2.23.1.org/fdisks/cfdisk.c 2013-07-01 21:37:58.508000002 +0000 -+++ util-linux-2.23.1/fdisks/cfdisk.c 2013-07-01 22:00:23.042000002 +0000 -@@ -325,7 +325,7 @@ - int logical = 0; - long long logical_sectors[MAXIMUM_PARTS]; - --__sighandler_t old_SIGINT, old_SIGTERM; -+sighandler_t old_SIGINT, old_SIGTERM; - - int arrow_cursor = FALSE; - int display_units = MEGABYTES; -diff -aur util-linux-2.23.1.org/fdisks/fdisksunlabel.c util-linux-2.23.1/fdisks/fdisksunlabel.c ---- util-linux-2.23.1.org/fdisks/fdisksunlabel.c 2013-07-01 21:37:58.508000002 +0000 -+++ util-linux-2.23.1/fdisks/fdisksunlabel.c 2013-07-01 21:59:43.721000002 +0000 -@@ -383,9 +383,11 @@ - } - } - --static int verify_sun_cmp(int *a, int *b, void *data) -+static void* cmp_data; -+static int verify_sun_cmp(const void *pa, const void *pb) - { -- unsigned int *verify_sun_starts = (unsigned int *) data; -+ const int *a = pa, *b = pb; -+ unsigned int *verify_sun_starts = (unsigned int *) cmp_data; - - if (*a == -1) - return 1; -@@ -449,9 +451,8 @@ - else - array[i] = -1; - } -- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), -- (int (*)(const void *,const void *,void *)) verify_sun_cmp, -- verify_sun_starts); -+ cmp_data = verify_sun_starts; -+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]), verify_sun_cmp); - - if (array[0] == -1) { - fdisk_info(cxt, _("No partitions defined")); -diff -aur util-linux-2.23.1.org/include/ttyutils.h util-linux-2.23.1/include/ttyutils.h ---- util-linux-2.23.1.org/include/ttyutils.h 2013-07-01 21:37:58.433000002 +0000 -+++ util-linux-2.23.1/include/ttyutils.h 2013-07-01 21:48:42.328000002 +0000 -@@ -10,6 +10,7 @@ - #include <stdlib.h> - #include <termios.h> - #include <limits.h> -+#include "ttydefaults.h" - #ifdef HAVE_SYS_IOCTL_H - #include <sys/ioctl.h> - #endif -diff -aur util-linux-2.23.1.org/term-utils/setterm.c util-linux-2.23.1/term-utils/setterm.c ---- util-linux-2.23.1.org/term-utils/setterm.c 2013-07-01 21:37:58.442000002 +0000 -+++ util-linux-2.23.1/term-utils/setterm.c 2013-07-01 22:02:54.244000002 +0000 -@@ -123,7 +123,7 @@ - #include "nls.h" - #include "closestream.h" - --#if __GNU_LIBRARY__ < 5 -+#if defined(__GLIBC__) && __GNU_LIBRARY__ < 5 - #ifndef __alpha__ - # include <linux/unistd.h> - #define __NR_klogctl __NR_syslog -diff -aur util-linux-2.23.1.org/term-utils/ttymsg.c util-linux-2.23.1/term-utils/ttymsg.c ---- util-linux-2.23.1.org/term-utils/ttymsg.c 2013-07-01 21:37:58.442000002 +0000 -+++ util-linux-2.23.1/term-utils/ttymsg.c 2013-07-01 22:07:02.788000002 +0000 -@@ -41,6 +41,7 @@ - */ - - #include <sys/types.h> -+#include <sys/param.h> - #include <sys/uio.h> - #include <signal.h> - #include <fcntl.h> -diff -aur util-linux-2.23.1.org/text-utils/hexdump.h util-linux-2.23.1/text-utils/hexdump.h ---- util-linux-2.23.1.org/text-utils/hexdump.h 2013-07-01 21:37:58.437000002 +0000 -+++ util-linux-2.23.1/text-utils/hexdump.h 2013-07-01 22:01:27.005000002 +0000 -@@ -32,7 +32,7 @@ - * - * @(#)hexdump.h 5.4 (Berkeley) 6/1/90 - */ -- -+#include <sys/types.h> - typedef struct _pr { - struct _pr *nextpr; /* next print unit */ - #define F_ADDRESS 0x001 /* print offset */ -diff -aur util-linux-2.23.1.org/text-utils/pg.c util-linux-2.23.1/text-utils/pg.c ---- util-linux-2.23.1.org/text-utils/pg.c 2013-07-01 21:37:58.437000002 +0000 -+++ util-linux-2.23.1/text-utils/pg.c 2013-07-01 22:01:55.831000002 +0000 -@@ -37,7 +37,7 @@ - #ifndef TIOCGWINSZ - # include <sys/ioctl.h> - #endif --#include <sys/termios.h> -+#include <termios.h> - #include <fcntl.h> - #include <regex.h> - #include <stdio.h> ---- util-linux-2.23.1.orig/sys-utils/eject.c -+++ util-linux-2.23.1/sys-utils/eject.c -@@ -40,7 +40,6 @@ - #include <sys/mount.h> - #include <scsi/scsi.h> - #include <scsi/sg.h> --#include <scsi/scsi_ioctl.h> - #include <sys/time.h> - - #include <libmount.h> diff --git a/sys-apps/util-linux/files/util-linux-2.24-last-tests.patch b/sys-apps/util-linux/files/util-linux-2.24-last-tests.patch deleted file mode 100644 index 77cf478..0000000 --- a/sys-apps/util-linux/files/util-linux-2.24-last-tests.patch +++ /dev/null @@ -1,86 +0,0 @@ -https://bugs.gentoo.org/501408 - -From 3c76515abd2e80dc1da03041eb868b8c1e596fb1 Mon Sep 17 00:00:00 2001 -From: Sami Kerola <[email protected]> -Date: Sun, 16 Feb 2014 23:54:18 +0000 -Subject: [PATCH] tests: align last.1 with recent phantom detection - -None existing account is not still-logged-in but gone mysteriously, -assuming wtmp logout markup is missing. - -Signed-off-by: Sami Kerola <[email protected]> ---- - tests/expected/last/last | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/tests/expected/last/last b/tests/expected/last/last -index 2ff5cc1..dfb140b 100644 ---- a/tests/expected/last/last -+++ b/tests/expected/last/last -@@ -1,6 +1,6 @@ - ~~~ basic output ~~~ - rick long never-gonna-logo Thu Jan 1 00:00 - 03:14 (24855+03:14) --torvalds linux hobby Mon Aug 26 00:57 still logged in -+torvalds linux hobby Mon Aug 26 00:57 gone - no logout - reboot system boot system-name Wed Aug 28 18:00 still running - reboot system boot system-name Wed Aug 28 16:00 - 17:00 (01:00) - IPv4 root dns-server Wed Aug 28 13:00 - 14:00 (01:00) -@@ -17,7 +17,7 @@ accounti foo nine Wed Aug 28 03:00 - 04:00 (01:00) - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ include system ~~~ - rick long never-gonna-logo Thu Jan 1 00:00 - 03:14 (24855+03:14) --torvalds linux hobby Mon Aug 26 00:57 still logged in -+torvalds linux hobby Mon Aug 26 00:57 gone - no logout - reboot system boot system-name Wed Aug 28 18:00 still running - shutdown system down system-name Wed Aug 28 17:00 - 18:00 (01:00) - reboot system boot system-name Wed Aug 28 16:00 - 17:00 (01:00) -@@ -47,16 +47,16 @@ IPv4 root Wed Aug 28 13:00 - 14:00 (01:00) a.root-servers.net - - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ show ip ~~~ --torvalds linux 128.214.205.14 Mon Aug 26 00:57 still logged in -+torvalds linux 128.214.205.14 Mon Aug 26 00:57 gone - no logout - - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ no host ~~~ --torvalds linux Mon Aug 26 00:57 still logged in -+torvalds linux Mon Aug 26 00:57 gone - no logout - - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ full times ~~~ - rick long never-gonna-logo Thu Jan 1 00:00:00 1970 - Tue Jan 19 03:14:07 2038 (24855+03:14) --torvalds linux hobby Mon Aug 26 00:57:08 1991 still logged in -+torvalds linux hobby Mon Aug 26 00:57:08 1991 gone - no logout - reboot system boot system-name Wed Aug 28 18:00:00 2013 still running - reboot system boot system-name Wed Aug 28 16:00:00 2013 - Wed Aug 28 17:00:00 2013 (01:00) - IPv4 root dns-server Wed Aug 28 13:00:00 2013 - Wed Aug 28 14:00:00 2013 (01:00) -@@ -73,7 +73,7 @@ accounti foo nine Wed Aug 28 03:00:00 2013 - Wed Aug 28 04: - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ no time ~~~ - rick long never-gonna-logo (24855+03:14) --torvalds linux hobby logged in -+torvalds linux hobby - no logout - reboot system boot system-name running - reboot system boot system-name (01:00) - IPv4 root dns-server (01:00) -@@ -90,7 +90,7 @@ accounti foo nine (01:00) - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ iso-8601 time ~~~ - rick long never-gonna-logout 1970-01-01T00:00:00+0000 - 2038-01-19T03:14:07+0000 (24855+03:14) --torvalds linux hobby 1991-08-26T00:57:08+0000 still logged in -+torvalds linux hobby 1991-08-26T00:57:08+0000 gone - no logout - reboot system boot system-name 2013-08-28T18:00:00+0000 still running - reboot system boot system-name 2013-08-28T16:00:00+0000 - 2013-08-28T17:00:00+0000 (01:00) - IPv4 root dns-server 2013-08-28T13:00:00+0000 - 2013-08-28T14:00:00+0000 (01:00) -@@ -115,7 +115,7 @@ accounti foo nine Wed Aug 28 03:00 - 04:00 (01:00) - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ present ~~~ - rick long never-gonna-logo Thu Jan 1 00:00 - 03:14 (24855+03:14) --torvalds linux hobby Mon Aug 26 00:57 still logged in -+torvalds linux hobby Mon Aug 26 00:57 gone - no logout - runlevel foo one Wed Aug 28 11:00 - 12:00 (01:00) - - wtmp begins Wed Aug 28 03:00:00 2013 --- -1.8.5.5 - diff --git a/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch b/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch deleted file mode 100644 index 5148053..0000000 --- a/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6b55612b9ad1193a042f3c3a1d9216e63b0d2907 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Sun, 22 Dec 2013 18:17:15 -0500 -Subject: [PATCH] tests: last: skip when last is not enabled - -References: https://bugs.gentoo.org/489794 -Signed-off-by: Mike Frysinger <[email protected]> ---- - tests/ts/last/ipv6 | 2 ++ - tests/ts/last/last | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/tests/ts/last/ipv6 b/tests/ts/last/ipv6 -index 8e2b01e..60b72bd 100755 ---- a/tests/ts/last/ipv6 -+++ b/tests/ts/last/ipv6 -@@ -18,6 +18,8 @@ TS_DESC="last ipv6" - . $TS_TOPDIR/functions.sh - ts_init "$*" - -+[ -x $TS_CMD_LAST ] || ts_skip "last not enabled" -+ - export LANG=C - export TZ=GMT - -diff --git a/tests/ts/last/last b/tests/ts/last/last -index 4ad38cb..83b7f8d 100755 ---- a/tests/ts/last/last -+++ b/tests/ts/last/last -@@ -18,6 +18,8 @@ TS_DESC="last" - . $TS_TOPDIR/functions.sh - ts_init "$*" - -+[ -x $TS_CMD_LAST ] || ts_skip "last not enabled" -+ - export LANG=C - export TZ=GMT - --- -1.8.4.3 - diff --git a/sys-apps/util-linux/files/util-linux-2.24.1-musl.patch b/sys-apps/util-linux/files/util-linux-2.24.1-musl.patch deleted file mode 100644 index 3d9efcf..0000000 --- a/sys-apps/util-linux/files/util-linux-2.24.1-musl.patch +++ /dev/null @@ -1,30 +0,0 @@ -adapted from a patch from sabotage linux -diff -ru a/util-linux-2.24.1/libfdisk/src/sun.c b/util-linux-2.24.1/libfdisk/src/sun.c ---- a/util-linux-2.24.1/libfdisk/src/sun.c -+++ b/util-linux-2.24.1/libfdisk/src/sun.c -@@ -361,9 +361,11 @@ - } - } - --static int verify_sun_cmp(int *a, int *b, void *data) -+static void* cmp_data; -+static int verify_sun_cmp(const void *pa, const void *pb) - { -- unsigned int *verify_sun_starts = (unsigned int *) data; -+ const int *a = pa, *b = pb; -+ unsigned int *verify_sun_starts = (unsigned int *) cmp_data; - - if (*a == -1) - return 1; -@@ -427,9 +429,8 @@ - else - array[i] = -1; - } -- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), -- (int (*)(const void *,const void *,void *)) verify_sun_cmp, -- verify_sun_starts); -+ cmp_data = verify_sun_starts; -+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]), verify_sun_cmp); - - if (array[0] == -1) { - fdisk_info(cxt, _("No partitions defined.")); diff --git a/sys-apps/util-linux/files/util-linux-2.24.2-hexdump.patch b/sys-apps/util-linux/files/util-linux-2.24.2-hexdump.patch deleted file mode 100644 index 716ea53..0000000 --- a/sys-apps/util-linux/files/util-linux-2.24.2-hexdump.patch +++ /dev/null @@ -1,40 +0,0 @@ -from alpine linux ---- ./text-utils/parse.c.orig -+++ ./text-utils/parse.c -@@ -208,7 +208,7 @@ - PR *pr, **nextpr; - FU *fu; - char *p1, *p2; -- char savech, *fmtp, cs[3]; -+ char savech, *fmtp, cs[4]; - int nconv, prec; - - nextpr = NULL; -@@ -282,9 +282,10 @@ - goto isint; - case 'o': case 'u': case 'x': case 'X': - pr->flags = F_UINT; --isint: cs[2] = '\0'; -- cs[1] = cs[0]; -- cs[0] = 'q'; -+isint: cs[3] = '\0'; -+ cs[2] = cs[0]; -+ cs[1] = 'l'; -+ cs[0] = 'l'; - switch(fu->bcnt) { - case 0: case 4: - pr->bcnt = 4; -@@ -342,9 +343,10 @@ - ++p2; - switch(p1[2]) { - case 'd': case 'o': case'x': -- cs[0] = 'q'; -- cs[1] = p1[2]; -- cs[2] = '\0'; -+ cs[0] = 'l'; -+ cs[1] = 'l'; -+ cs[2] = p1[2]; -+ cs[3] = '\0'; - break; - default: - p1[3] = '\0'; diff --git a/sys-apps/util-linux/files/util-linux-2.25-lscpu-pic.patch b/sys-apps/util-linux/files/util-linux-2.25-lscpu-pic.patch deleted file mode 100644 index f66ffa7..0000000 --- a/sys-apps/util-linux/files/util-linux-2.25-lscpu-pic.patch +++ /dev/null @@ -1,81 +0,0 @@ -From f86d649d5f2522c61b791366a96e9f00cd255668 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Tue, 5 Aug 2014 18:58:52 -0400 -Subject: [PATCH] lscpu: clean up vmware inline asm - -This code is not PIC clean which means it fails to build on hardened -32bit x86 systems (i.e. building as PIE). - -While here, optimize the existing cpuid logic slightly. - -URL: https://bugs.gentoo.org/518936 -Signed-off-by: Mike Frysinger <[email protected]> ---- - sys-utils/lscpu.c | 36 ++++++++++++++++++++++++++---------- - 1 file changed, 26 insertions(+), 10 deletions(-) - -diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c -index 062dff5..9965eeb 100644 ---- a/sys-utils/lscpu.c -+++ b/sys-utils/lscpu.c -@@ -546,10 +546,9 @@ cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx, - __asm__( - #if defined(__PIC__) && defined(__i386__) - /* x86 PIC cannot clobber ebx -- gcc bitches */ -- "pushl %%ebx;" -+ "xchg %%ebx, %%esi;" - "cpuid;" -- "movl %%ebx, %%esi;" -- "popl %%ebx;" -+ "xchg %%esi, %%ebx;" - : "=S" (*ebx), - #else - "cpuid;" -@@ -656,12 +655,29 @@ read_hypervisor_powerpc(struct lscpu_desc *desc) - #define VMWARE_BDOOR_PORT 0x5658 - #define VMWARE_BDOOR_CMD_GETVERSION 10 - --#define VMWARE_BDOOR(eax, ebx, ecx, edx) \ -- __asm__("inl (%%dx), %%eax" : \ -- "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : \ -- "0"(VMWARE_BDOOR_MAGIC), "1"(VMWARE_BDOOR_CMD_GETVERSION), \ -- "2"(VMWARE_BDOOR_PORT), "3"(0) : \ -- "memory"); -+static inline -+void vmware_bdoor(uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) -+{ -+ __asm__( -+#if defined(__PIC__) && defined(__i386__) -+ /* x86 PIC cannot clobber ebx -- gcc bitches */ -+ "xchg %%ebx, %%esi;" -+ "inl (%%dx), %%eax;" -+ "xchg %%esi, %%ebx;" -+ : "=S" (*ebx), -+#else -+ "inl (%%dx), %%eax;" -+ : "=b" (*ebx), -+#endif -+ "=a" (*eax), -+ "=c" (*ecx), -+ "=d" (*edx) -+ : "0" (VMWARE_BDOOR_MAGIC), -+ "1" (VMWARE_BDOOR_CMD_GETVERSION), -+ "2" (VMWARE_BDOOR_PORT), -+ "3" (0) -+ : "memory"); -+} - - static jmp_buf segv_handler_env; - -@@ -697,7 +713,7 @@ is_vmware_platform(void) - if (sigaction(SIGSEGV, &act, &oact)) - err(EXIT_FAILURE, _("error: can not set signal handler")); - -- VMWARE_BDOOR(eax, ebx, ecx, edx); -+ vmware_bdoor(&eax, &ebx, &ecx, &edx); - - if (sigaction(SIGSEGV, &oact, NULL)) - err(EXIT_FAILURE, _("error: can not restore signal handler")); --- -2.0.0 - diff --git a/sys-apps/util-linux/util-linux-2.24.1-r99.ebuild b/sys-apps/util-linux/util-linux-2.24.1-r99.ebuild deleted file mode 100644 index bb150bc..0000000 --- a/sys-apps/util-linux/util-linux-2.24.1-r99.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.24.1-r2.ebuild,v 1.8 2014/05/14 18:13:29 ssuominen Exp $ - -EAPI="4" - -PYTHON_COMPAT=( python2_7 python3_{2,3,4} ) - -inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 python-single-r1 - -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} - -if [[ ${PV} == 9999 ]] ; then - inherit git-2 autotools - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" -else - KEYWORDS="amd64 arm ~mips ppc x86" - SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" -fi - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"; - -LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="bash-completion caps +cramfs cytune fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode" - -RDEPEND="!sys-process/schedutils - !sys-apps/setarch - !<sys-apps/sysvinit-2.88-r7 - !sys-block/eject - !<sys-libs/e2fsprogs-libs-1.41.8 - !<sys-fs/e2fsprogs-1.41.8 - !<app-shells/bash-completion-1.3-r2 - caps? ( sys-libs/libcap-ng ) - cramfs? ( sys-libs/zlib ) - ncurses? ( >=sys-libs/ncurses-5.2-r2 ) - pam? ( sys-libs/pam ) - python? ( ${PYTHON_DEPS} ) - selinux? ( sys-libs/libselinux ) - slang? ( sys-libs/slang ) - udev? ( virtual/udev )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) - virtual/os-headers" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles - eautoreconf - fi - epatch "${FILESDIR}"/${PN}-2.24-skip-last-tests.patch #491742 - epatch "${FILESDIR}"/${PN}-2.24-last-tests.patch #501408 - epatch "${FILESDIR}"/${PN}-2.24.1-musl.patch #for musl - epatch "${FILESDIR}"/${PN}-2.24.2-hexdump.patch #for musl - find tests/ -name bigyear -delete #489794 - elibtoolize -} - -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS #300307 - cat <<-EOF > "${T}"/fallocate.c - #define _GNU_SOURCE - #include <fcntl.h> - main() { return fallocate(0, 0, 0, 0); } - EOF - append-lfs-flags - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.c -} - -src_configure() { - lfs_fallocate_test - export ac_cv_header_security_pam_misc_h=$(usex pam) #485486 - econf \ - --docdir="/usr/share/doc/${PF}" \ - --enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \ - $(use_enable nls) \ - --enable-agetty \ - --with-bashcompletiondir="$(get_bashcompdir)" \ - $(use_enable bash-completion) \ - $(use_enable caps setpriv) \ - $(use_enable cramfs) \ - $(use_enable cytune) \ - $(use_enable fdformat) \ - --with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \ - --disable-kill \ - --disable-login \ - $(use_enable tty-helpers mesg) \ - --disable-nologin \ - --enable-partx \ - $(use_with python) \ - --enable-raw \ - --enable-rename \ - --disable-reset \ - --enable-schedutils \ - --disable-su \ - $(use_enable tty-helpers wall) \ - $(use_enable tty-helpers write) \ - $(use_enable suid makeinstall-chown) \ - $(use_enable suid makeinstall-setuid) \ - $(use_with selinux) \ - $(use_with slang) \ - $(use_enable static-libs static) \ - $(use_with udev) \ - $(tc-has-tls || echo --disable-tls) -} - -src_test() { - emake check -} - -src_install() { - default - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - - use python && python_optimize - - # need the libs in / - gen_usr_ldscript -a blkid mount uuid - - # e2fsprogs-libs didnt install .la files, and .pc work fine - prune_libtool_files -} - -pkg_postinst() { - if ! use tty-helpers; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -} diff --git a/sys-apps/util-linux/util-linux-2.25-r99.ebuild b/sys-apps/util-linux/util-linux-2.25-r99.ebuild deleted file mode 100644 index 2e10960..0000000 --- a/sys-apps/util-linux/util-linux-2.25-r99.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.25.ebuild,v 1.5 2014/08/05 23:04:39 vapier Exp $ - -EAPI="4" - -PYTHON_COMPAT=( python2_7 python3_{2,3,4} ) - -inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - python-single-r1 multilib-minimal - -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} - -if [[ ${PV} == 9999 ]] ; then - inherit git-2 autotools - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" -else - #KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" - KEYWORDS="" - SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" -fi - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"; - -LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="bash-completion caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode" - -RDEPEND="!sys-process/schedutils - !sys-apps/setarch - !<sys-apps/sysvinit-2.88-r7 - !sys-block/eject - !<sys-libs/e2fsprogs-libs-1.41.8 - !<sys-fs/e2fsprogs-1.41.8 - !<app-shells/bash-completion-1.3-r2 - caps? ( sys-libs/libcap-ng ) - cramfs? ( sys-libs/zlib ) - ncurses? ( >=sys-libs/ncurses-5.2-r2 ) - pam? ( sys-libs/pam ) - python? ( ${PYTHON_DEPS} ) - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) - slang? ( sys-libs/slang ) - udev? ( virtual/udev ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) - virtual/os-headers" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles - eautoreconf - fi - epatch "${FILESDIR}"/${P}-lscpu-pic.patch #518936 - epatch "${FILESDIR}"/${PN}-2.25-remove__SWORD_TYPE.patch - elibtoolize -} - -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS #300307 - cat <<-EOF > "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include <fcntl.h> - main() { return fallocate(0, 0, 0, 0); } - EOF - append-lfs-flags - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.${ABI}.c -} - -multilib_src_configure() { - lfs_fallocate_test - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 - # We manually set --libdir to the default since on prefix, econf will set it to - # a value which the configure script does not recognize. This makes it set the - # usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25 - ECONF_SOURCE=${S} \ - econf \ - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \ - --libdir='${prefix}/'"$(get_libdir)" \ - $(multilib_native_use_enable nls) \ - --enable-agetty \ - --with-bashcompletiondir="$(get_bashcompdir)" \ - $(multilib_native_use_enable bash-completion) \ - $(multilib_native_use_enable caps setpriv) \ - --disable-chfn-chsh \ - $(multilib_native_use_enable cramfs) \ - $(multilib_native_use_enable fdformat) \ - --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \ - --disable-kill \ - --disable-login \ - $(multilib_native_use_enable tty-helpers mesg) \ - --disable-nologin \ - --enable-partx \ - $(multilib_native_use_with python) \ - --enable-raw \ - --enable-rename \ - --disable-reset \ - --enable-schedutils \ - --disable-su \ - $(multilib_native_use_enable tty-helpers wall) \ - $(multilib_native_use_enable tty-helpers write) \ - $(multilib_native_use_enable suid makeinstall-chown) \ - $(multilib_native_use_enable suid makeinstall-setuid) \ - $(use_with selinux) \ - $(multilib_native_use_with slang) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with udev) \ - $(tc-has-tls || echo --disable-tls) -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - # build libraries only - emake -f Makefile -f - mylibs \ - <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && emake check -} - -multilib_src_install() { - if multilib_is_native_abi; then - default - else - emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ - install-pkgconfigDATA install-uuidincHEADERS \ - install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ - install-nodist_smartcolsincHEADERS - fi - - if multilib_is_native_abi; then - # need the libs in / - gen_usr_ldscript -a blkid mount smartcols uuid - - use python && python_optimize - fi -} - -multilib_src_install_all() { - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - - # e2fsprogs-libs didnt install .la files, and .pc work fine - prune_libtool_files -} - -pkg_postinst() { - if ! use tty-helpers; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -} diff --git a/sys-apps/util-linux/util-linux-2.25.2-r99.ebuild b/sys-apps/util-linux/util-linux-2.25.2-r99.ebuild index 17f7738..404bb98 100644 --- a/sys-apps/util-linux/util-linux-2.25.2-r99.ebuild +++ b/sys-apps/util-linux/util-linux-2.25.2-r99.ebuild @@ -4,7 +4,7 @@ EAPI="4" -PYTHON_COMPAT=( python2_7 python3_{2,3,4} ) +PYTHON_COMPAT=( python2_7 python3_{3,4} ) inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \ python-single-r1 multilib-minimal
