| 1 |
commit: 1b392016b38669dfc9fd540380b358e39f90dba4 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 29 13:33:39 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 29 13:33:39 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1b392016 |
| 7 |
|
| 8 |
sys-apps/coreutils: sync with gx86 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.52.2-prefix, Repoman-2.3.12 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/coreutils/Manifest | 25 +--- |
| 14 |
sys-apps/coreutils/coreutils-8.30.ebuild | 228 +++++++++++++++++++++++++++++++ |
| 15 |
sys-apps/coreutils/metadata.xml | 1 + |
| 16 |
3 files changed, 231 insertions(+), 23 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest |
| 19 |
index a2672d3187..fb0c4db2ce 100644 |
| 20 |
--- a/sys-apps/coreutils/Manifest |
| 21 |
+++ b/sys-apps/coreutils/Manifest |
| 22 |
@@ -1,25 +1,4 @@ |
| 23 |
------BEGIN PGP SIGNED MESSAGE----- |
| 24 |
-Hash: SHA256 |
| 25 |
- |
| 26 |
-AUX coreutils-8.22-mint.patch 3894 BLAKE2B 5e057efc95691d601989e8b6b8a8aef30222f207cdd9cfb56a0844902c9346eed13e2ecb8cf4c24dafc139c80074c014b1e980afdf50b58720a1d7242685c23e SHA512 3f779203d6751bdbeec5ac2d4fc9d1b10d52ae97c7c83f9edb7ac783b075e0e312ad4f12e27772cbedfc240dc4bb9f5232dd7f7edc81a492a530e655eb9d2d30 |
| 27 |
-AUX coreutils-8.28-cygwin-8.26-3.patch 36792 BLAKE2B f494be97595ff9532f57ca3d5386d185d813647fb07480dc1b22434fa5eecfa22acb6940b82cc733ae4448757e5f69cf2c7c746a5752409fe4aa11dd47482e63 SHA512 53d05262118a0063a0b3992b80dcda28256516da4d077a691117384ea808e5468488443d9c4b0e38a4d5148e5e721e733dcb0562dcf23a1370d4090251458951 |
| 28 |
DIST coreutils-8.29-patches-1.0.tar.xz 5772 BLAKE2B 8f05185404d527ad524684231f0b8bef3b65e7752527b6bf55371f474035b8a92cdcaa8349a321784d14c6700a0d49e9d10ee2e3a96b78e8f6423ee8c5b9ec02 SHA512 0f7db6744a6a6bad8d582bb2d32e1a0ad0ab5f48a53b54c371d27494967832ddec2570e45dbf7e66c7091496bcecd66aab21644f603d2c8878a87f51a1a9b1a2 |
| 29 |
DIST coreutils-8.29.tar.xz 5286588 BLAKE2B cbb66d9054bdd2db5b9a6010876484b16d178f8f4d935836b1e42830178647fac4e0a75052a6e7e2fbc50e74e4e7ff6f8da43f1137b96d0c2d027c4ebac28a98 SHA512 546bbcd5741beae7a68e7c4ca14d6d634f7c8be87feecdeddd00e226f4865bb89d503437c3a95622ba7bb0cb70addbb5bdf3767fa18d0b7410ab90ee53b29dfd |
| 30 |
-EBUILD coreutils-8.29.ebuild 7189 BLAKE2B fc45ed65d0fb36282943ebda46743cc8b183340e0c00e8c7b32364785540a75b9272e69c59f0df9a8be62db2a574a0e166f722eb18add2d36ead4a229b14e786 SHA512 a6de14a69cedd38391a892007767e4bd8bb3dcac862151f0396daebdfb438b3669e5b2d8eaf738d8f10b269a09bb0bc6e0fc5d207351999b7af81571a8566e10 |
| 31 |
-MISC metadata.xml 869 BLAKE2B 397aa866d67eb1d6ff5f604194cf071be0f75606092d78e1cf7f0ced85cf4474d67677307e7e8566ba402c1f94ae2f3e3906ef5006a50e73d6673edb25d517fa SHA512 19e07c93cbe1cfe087eb7fdc8647aa4c264f1e6a193a0ed4e1ceb302bda92565aa76966b6ef2efa15d7535082ef0e6a1454fee20eca4797466f5de5e37ac4957 |
| 32 |
------BEGIN PGP SIGNATURE----- |
| 33 |
- |
| 34 |
-iQIzBAEBCAAdFiEEqGPdSmYcJzzTeG67KfsOnscZ7iAFAls15f8ACgkQKfsOnscZ |
| 35 |
-7iB0OA/9EauonM1/bg8U5dWvJovssW7TVAKpIkKVQBQwLtf/rxgMucr3UmREa/RX |
| 36 |
-sFKcK7Kb6jEBbv1ng8YlWz5x54oDzQnt5adg9I6g7L4EG8entHzYs1y42iTzM0WQ |
| 37 |
-78LNoPc1Qmq8iRA+KAk/bpfbK93dOtcuotV/Lkg3tgej7XpF5OC/RLs/yQoQueGO |
| 38 |
-geSVp/yeN4LodfqicM8enu6EQIKTsL+59kvoJbIZFRvoHcadUMUjxPLFGBc0TACo |
| 39 |
-FtCB9vF3Z0KfummPl15Kp18+AgNQfWaYe4AdMhR9jwjYUTUG0FdQHQkS9f8GLKFX |
| 40 |
-yDYS/7iMA/6cv6YMKXkG2rRFyJSwTyYMIZ3VPwJcw7aIysQGx5FQYIxgey7vv8x8 |
| 41 |
-xuRFEdC2NWKepr0LIEjUD82/LfKyEBH9mDI7uk52DMaGnYeAtRNWQl+2AnKilEae |
| 42 |
-W/AaF8X+CahK7HiIcH96tAb37o7dKMTQ+q/o+vlE2WR/rqI4kSQrM7Ygs0P7P0L2 |
| 43 |
-SHidWWURSkoNTmelTIGOqiCIY9B307/3cOZxluKa1gReaMJl3ywKWeY6cM8s7JJu |
| 44 |
-JOCG8hDplD2fFw2YSuxP4vWYlGeedD5+5qy2B2KnPy4ynJ111Rfvm0aKvMH6qaEK |
| 45 |
-4R7o4AHFutkSZ5FB7JBBBtUFT7b6bvGjg47SapNjQV5I+7Ri71A= |
| 46 |
-=Lc9g |
| 47 |
------END PGP SIGNATURE----- |
| 48 |
+DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454 |
| 49 |
+DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda |
| 50 |
|
| 51 |
diff --git a/sys-apps/coreutils/coreutils-8.30.ebuild b/sys-apps/coreutils/coreutils-8.30.ebuild |
| 52 |
new file mode 100644 |
| 53 |
index 0000000000..7b19bd0c46 |
| 54 |
--- /dev/null |
| 55 |
+++ b/sys-apps/coreutils/coreutils-8.30.ebuild |
| 56 |
@@ -0,0 +1,228 @@ |
| 57 |
+# Copyright 1999-2018 Gentoo Authors |
| 58 |
+# Distributed under the terms of the GNU General Public License v2 |
| 59 |
+ |
| 60 |
+EAPI="6" |
| 61 |
+ |
| 62 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 63 |
+ |
| 64 |
+inherit eutils flag-o-matic python-any-r1 toolchain-funcs |
| 65 |
+ |
| 66 |
+PATCH_VER="01" |
| 67 |
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" |
| 68 |
+HOMEPAGE="https://www.gnu.org/software/coreutils/" |
| 69 |
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz |
| 70 |
+ mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz |
| 71 |
+ https://dev.gentoo.org/~polynomial-c/dist/${P}-patches-${PATCH_VER}.tar.xz" |
| 72 |
+ |
| 73 |
+LICENSE="GPL-3" |
| 74 |
+SLOT="0" |
| 75 |
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 76 |
+IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr" |
| 77 |
+ |
| 78 |
+LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) |
| 79 |
+ caps? ( sys-libs/libcap ) |
| 80 |
+ gmp? ( dev-libs/gmp:=[static-libs] ) |
| 81 |
+ xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )" |
| 82 |
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) |
| 83 |
+ selinux? ( sys-libs/libselinux ) |
| 84 |
+ nls? ( virtual/libintl )" |
| 85 |
+DEPEND="${RDEPEND} |
| 86 |
+ static? ( ${LIB_DEPEND} ) |
| 87 |
+ app-arch/xz-utils |
| 88 |
+ test? ( |
| 89 |
+ dev-lang/perl |
| 90 |
+ dev-perl/Expect |
| 91 |
+ !userland_BSD? ( |
| 92 |
+ dev-util/strace |
| 93 |
+ ) |
| 94 |
+ ${PYTHON_DEPS} |
| 95 |
+ $(python_gen_any_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]') |
| 96 |
+ )" |
| 97 |
+RDEPEND+=" |
| 98 |
+ hostname? ( !sys-apps/net-tools[hostname] ) |
| 99 |
+ kill? ( |
| 100 |
+ !sys-apps/util-linux[kill] |
| 101 |
+ !sys-process/procps[kill] |
| 102 |
+ ) |
| 103 |
+ !app-misc/realpath |
| 104 |
+ !<sys-apps/util-linux-2.13 |
| 105 |
+ !<sys-apps/sandbox-2.10-r4 |
| 106 |
+ !sys-apps/stat |
| 107 |
+ !net-mail/base64 |
| 108 |
+ !sys-apps/mktemp |
| 109 |
+ !<app-forensics/tct-1.18-r1 |
| 110 |
+ !<net-fs/netatalk-2.0.3-r4" |
| 111 |
+ |
| 112 |
+pkg_setup() { |
| 113 |
+ if use test ; then |
| 114 |
+ python-any-r1_pkg_setup |
| 115 |
+ fi |
| 116 |
+} |
| 117 |
+ |
| 118 |
+src_prepare() { |
| 119 |
+ if ! use vanilla ; then |
| 120 |
+ eapply "${WORKDIR}"/patch/*.patch |
| 121 |
+ fi |
| 122 |
+ |
| 123 |
+ eapply_user |
| 124 |
+ |
| 125 |
+ epatch "${FILESDIR}"/${PN}-8.22-mint.patch |
| 126 |
+ |
| 127 |
+ # fixup libstdbuf non-libtool stuff |
| 128 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 129 |
+ sed -i \ |
| 130 |
+ -e "/src_libstdbuf_so_LDFLAGS = -shared/s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/libexec/coreutils/libstdbuf.dylib:" \ |
| 131 |
+ Makefile.in \ |
| 132 |
+ || die |
| 133 |
+ elif use elibc_Cygwin ; then |
| 134 |
+ epatch "${FILESDIR}"/${PN}-8.28-cygwin-8.26-3.patch |
| 135 |
+ sed -i -e 's|\(libstdbuf\.so\)$(EXEEXT)|\1|g' Makefile.in || die |
| 136 |
+ fi |
| 137 |
+ sed -i \ |
| 138 |
+ -e "s/libstdbuf\\.so/libstdbuf$(get_libname)/" \ |
| 139 |
+ src/stdbuf.c \ |
| 140 |
+ Makefile.in \ |
| 141 |
+ configure \ |
| 142 |
+ || die |
| 143 |
+ |
| 144 |
+ # Since we've patched many .c files, the make process will try to |
| 145 |
+ # re-build the manpages by running `./bin --help`. When doing a |
| 146 |
+ # cross-compile, we can't do that since 'bin' isn't a native bin. |
| 147 |
+ # Also, it's not like we changed the usage on any of these things, |
| 148 |
+ # so let's just update the timestamps and skip the help2man step. |
| 149 |
+ set -- man/*.x |
| 150 |
+ touch ${@/%x/1} |
| 151 |
+ |
| 152 |
+ # Avoid perl dep for compiled in dircolors default #348642 |
| 153 |
+ if ! has_version dev-lang/perl ; then |
| 154 |
+ touch src/dircolors.h |
| 155 |
+ touch ${@/%x/1} |
| 156 |
+ fi |
| 157 |
+} |
| 158 |
+ |
| 159 |
+src_configure() { |
| 160 |
+ local myconf=( |
| 161 |
+ --with-packager="Gentoo" |
| 162 |
+ --with-packager-version="${PVR} (p${PATCH_VER:-0})" |
| 163 |
+ --with-packager-bug-reports="https://bugs.gentoo.org/" |
| 164 |
+ --enable-install-program="arch,$(usev hostname),$(usev kill)" |
| 165 |
+ --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime" |
| 166 |
+ --enable-largefile |
| 167 |
+ $(usex caps '' --disable-libcap) |
| 168 |
+ $(use_enable nls) |
| 169 |
+ $(use_enable acl) |
| 170 |
+ $(use_enable multicall single-binary) |
| 171 |
+ $(use_enable xattr) |
| 172 |
+ $(use_with gmp) |
| 173 |
+ ) |
| 174 |
+ if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then |
| 175 |
+ export fu_cv_sys_stat_statfs2_bsize=yes #311569 |
| 176 |
+ export gl_cv_func_realpath_works=yes #416629 |
| 177 |
+ fi |
| 178 |
+ |
| 179 |
+ export gl_cv_func_mknod_works=yes #409919 |
| 180 |
+ use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821 |
| 181 |
+ use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782 |
| 182 |
+ use userland_BSD && myconf+=( -program-prefix=g --program-transform-name=s/stat/nustat/ ) |
| 183 |
+ # kill/uptime - procps |
| 184 |
+ # groups/su - shadow |
| 185 |
+ # hostname - net-tools |
| 186 |
+ econf "${myconf[@]}" |
| 187 |
+} |
| 188 |
+ |
| 189 |
+src_test() { |
| 190 |
+ # Known to fail with FEATURES=usersandbox (bug #439574): |
| 191 |
+ # - tests/du/long-from-unreadable.sh} (bug #413621) |
| 192 |
+ # - tests/rm/deep-2.sh (bug #413621) |
| 193 |
+ # - tests/dd/no-allocate.sh (bug #629660) |
| 194 |
+ if has usersandbox $FEATURES ; then |
| 195 |
+ ewarn "You are emerging ${P} with 'usersandbox' enabled." \ |
| 196 |
+ "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" |
| 197 |
+ fi |
| 198 |
+ |
| 199 |
+ # Non-root tests will fail if the full path isn't |
| 200 |
+ # accessible to non-root users |
| 201 |
+ chmod -R go-w "${WORKDIR}" |
| 202 |
+ chmod a+rx "${WORKDIR}" |
| 203 |
+ |
| 204 |
+ # coreutils tests like to do `mount` and such with temp dirs |
| 205 |
+ # so make sure /etc/mtab is writable #265725 |
| 206 |
+ # make sure /dev/loop* can be mounted #269758 |
| 207 |
+ mkdir -p "${T}"/mount-wrappers |
| 208 |
+ mkwrap() { |
| 209 |
+ local w ww |
| 210 |
+ for w in "$@" ; do |
| 211 |
+ ww="${T}/mount-wrappers/${w}" |
| 212 |
+ cat <<-EOF > "${ww}" |
| 213 |
+ #!${EPREFIX}/bin/sh |
| 214 |
+ exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@" |
| 215 |
+ EOF |
| 216 |
+ chmod a+rx "${ww}" |
| 217 |
+ done |
| 218 |
+ } |
| 219 |
+ mkwrap mount umount |
| 220 |
+ |
| 221 |
+ addwrite /dev/full |
| 222 |
+ #export RUN_EXPENSIVE_TESTS="yes" |
| 223 |
+ #export FETISH_GROUPS="portage wheel" |
| 224 |
+ env PATH="${T}/mount-wrappers:${PATH}" \ |
| 225 |
+ emake -j1 -k check |
| 226 |
+} |
| 227 |
+ |
| 228 |
+src_install() { |
| 229 |
+ default |
| 230 |
+ |
| 231 |
+ insinto /etc |
| 232 |
+ newins src/dircolors.hin DIR_COLORS |
| 233 |
+ |
| 234 |
+ if [[ ${USERLAND} == "GNU" ]] ; then |
| 235 |
+ cd "${ED%/}"/usr/bin || die |
| 236 |
+ dodir /bin |
| 237 |
+ # move critical binaries into /bin (required by FHS) |
| 238 |
+ local fhs="cat chgrp chmod chown cp date dd df echo false ln ls |
| 239 |
+ mkdir mknod mv pwd rm rmdir stty sync true uname" |
| 240 |
+ mv ${fhs} ../../bin/ || die "could not move fhs bins" |
| 241 |
+ if use hostname; then |
| 242 |
+ mv hostname ../../bin/ || die |
| 243 |
+ fi |
| 244 |
+ if use kill; then |
| 245 |
+ mv kill ../../bin/ || die |
| 246 |
+ fi |
| 247 |
+ if use split-usr ; then |
| 248 |
+ # move critical binaries into /bin (common scripts) |
| 249 |
+ local com="basename chroot cut dir dirname du env expr head mkfifo |
| 250 |
+ mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" |
| 251 |
+ mv ${com} ../../bin/ || die "could not move common bins" |
| 252 |
+ # create a symlink for uname in /usr/bin/ since autotools require it |
| 253 |
+ local x |
| 254 |
+ for x in ${com} uname ; do |
| 255 |
+ dosym ../../bin/${x} /usr/bin/${x} |
| 256 |
+ done |
| 257 |
+ fi |
| 258 |
+ else |
| 259 |
+ # For now, drop the man pages, collides with the ones of the system. |
| 260 |
+ rm -rf "${ED%/}"/usr/share/man |
| 261 |
+ fi |
| 262 |
+ |
| 263 |
+ if use elibc_Cygwin ; then |
| 264 |
+ ! use kill || mv "${ED}"/bin/{,g}kill || die |
| 265 |
+ mv "${ED}"/usr/libexec/${PN}/libstdbuf$(get_libname){.exe,} || die |
| 266 |
+ fi |
| 267 |
+} |
| 268 |
+ |
| 269 |
+pkg_postinst() { |
| 270 |
+ ewarn "Make sure you run 'hash -r' in your active shells." |
| 271 |
+ ewarn "You should also re-source your shell settings for LS_COLORS" |
| 272 |
+ ewarn " changes, such as: source /etc/profile" |
| 273 |
+ |
| 274 |
+ # Help out users using experimental filesystems |
| 275 |
+ if grep -qs btrfs "${EROOT%/}"/etc/fstab /proc/mounts ; then |
| 276 |
+ case $(uname -r) in |
| 277 |
+ 2.6.[12][0-9]|2.6.3[0-7]*) |
| 278 |
+ ewarn "You are running a system with a buggy btrfs driver." |
| 279 |
+ ewarn "Please upgrade your kernel to avoid silent corruption." |
| 280 |
+ ewarn "See: https://bugs.gentoo.org/353907" |
| 281 |
+ ;; |
| 282 |
+ esac |
| 283 |
+ fi |
| 284 |
+} |
| 285 |
|
| 286 |
diff --git a/sys-apps/coreutils/metadata.xml b/sys-apps/coreutils/metadata.xml |
| 287 |
index 9241968a46..4e46af051b 100644 |
| 288 |
--- a/sys-apps/coreutils/metadata.xml |
| 289 |
+++ b/sys-apps/coreutils/metadata.xml |
| 290 |
@@ -12,6 +12,7 @@ |
| 291 |
<flag name="hostname">Build the hostname program</flag> |
| 292 |
<flag name="kill">Build the kill program</flag> |
| 293 |
<flag name="multicall">Build all tools into a single `coreutils` program akin to busybox to save space</flag> |
| 294 |
+ <flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag> |
| 295 |
</use> |
| 296 |
<upstream> |
| 297 |
<remote-id type="cpe">cpe:/a:gnu:coreutils</remote-id> |
Archives