commit: 01a9b57bd677a8ad402f858984ce15d0f08ea37c
Author: layman <layman <AT> localhost>
AuthorDate: Sun Mar 13 23:34:20 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 01:39:16 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=01a9b57b
sys-apps/util-linux: in tree versions 2.26.2 works
sys-apps/util-linux/Manifest | 8 -
sys-apps/util-linux/files/crypto-loop.confd | 9 --
sys-apps/util-linux/files/crypto-loop.initd | 70 ---------
sys-apps/util-linux/files/ttydefaults.h | 38 -----
.../files/util-linux-2.25-remove__SWORD_TYPE.patch | 14 --
...util-linux-2.25.2-runuser-bash-completion.patch | 33 ----
sys-apps/util-linux/metadata.xml | 24 ---
sys-apps/util-linux/util-linux-2.25.2-r99.ebuild | 175 ---------------------
8 files changed, 371 deletions(-)
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
deleted file mode 100644
index 13d7286..0000000
--- a/sys-apps/util-linux/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-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.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.25.2.tar.xz 3703644 SHA256
e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6 SHA512
cf8c5bde78f844425150c2a81bdecb87aa57bcd5cebd177a78160835627f58037fa2cfe4db26fd8f35eedb3beb499a91492a297a27d065465e2ea0c6218dc387
WHIRLPOOL
dd1685f2e694bf3de95acc3ba3170d231426c18c3395a867c815bbd3ab5ee0f07567b49d0ae083ce669c89db711e39fd2b990bc7321985ec2279d78816ec5258
-EBUILD util-linux-2.25.2-r99.ebuild 5154 SHA256
de6c07cae77e538e565283397df35afe5bfb12b6f27cc729a2b0b3501facc3d4 SHA512
21cd38ea994c4bac604cf3b9c39acb05ddcb12a1cf3bd2dae2abaca9a40faef9bfc6689b9cbb9ff16d2153dc78efb06ab179749bc507f5fcbd21b2f71ea1cc75
WHIRLPOOL
85931f239429777eb8125d1bddec507df0746176a15fc0864a0122f3c36244d13985e9e40689a61936ac1e78928436c45a9c77f641e14b5674b0ff347c15b44b
-MISC metadata.xml 1026 SHA256
fc6ac08a869c4555266d169487375ce91c49ff85fdb1a2bdf6ad5cb2676bdb79 SHA512
190010c1b4a7e2ea7c1825eb9226dc071582e042b43380473b2c5a163bf1cea41c55da9e96314ee0769636af91906ca6c86c17dc4754769256c9e6e525eea5c7
WHIRLPOOL
1700705274ea217a4e7353989f8e3dc0ae900fe87893fefb3cd1d357d1ae83f55c476de338b6bdae573767578740501b8ec9bdd45a603226594ff3f478c7d180
diff --git a/sys-apps/util-linux/files/crypto-loop.confd
b/sys-apps/util-linux/files/crypto-loop.confd
deleted file mode 100644
index 6a88434..0000000
--- a/sys-apps/util-linux/files/crypto-loop.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/conf.d/crypto-loop: Configuration file for /etc/init.d/crypto-loop
-
-# More info can be found in the init.d script
-
-# Specify loopback configurations here. The format of this file is
-# shown in the following commented-out example. One line per loopback
-# configuration. For possible hash values, see `man hashalot`.
-
-# loop=/dev/loop0 hash='' cipher=serpent keysize=256 device=/dev/system/test
other=''
diff --git a/sys-apps/util-linux/files/crypto-loop.initd
b/sys-apps/util-linux/files/crypto-loop.initd
deleted file mode 100755
index 853bae2..0000000
--- a/sys-apps/util-linux/files/crypto-loop.initd
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sys-apps/util-linux/files/crypto-loop.initd,v 1.4
2008/10/26 03:16:48 vapier Exp $
-
-depend() {
- if [ -x /etc/init.d/root ]; then
- need root
- else
- need checkroot
- fi
- need modules
- before localmount
-}
-
-start() {
- local status="0"
-
- ebegin "Starting crypto loop devices"
-
- if [ -e /etc/conf.d/crypto-loop ] ; then
- egrep "^loop" /etc/conf.d/crypto-loop | \
- while read loopline ; do
- eval ${loopline}
-
- local configured=$(awk -v MOUNT="${device}" \
- '($2 == MOUNT) { print "yes" }' /proc/mounts)
-
- if [ "${configured}" != "yes" ] ; then
- einfo " Loop ${loop} on device ${device}
(cipher ${cipher}, key size ${keysize}): "
-
- if [ -n "${hash}" ] ; then
- /usr/sbin/hashalot -n ${keysize}
${hash} </dev/tty|\
- /sbin/losetup -p 0 -e
${cipher}-${keysize} ${loop} ${device} ${other}
- else
- /sbin/losetup -e ${cipher}-${keysize}
${loop} ${device} ${other}
- fi
-
- if [ $? -ne 0 ] ; then
- ewarn "Failure configuring ${loop}.
Skipping."
- status=1
- fi
- else
- ewarn " Loop ${loop} on device ${device} are
already configured"
- fi
- done
- fi
- ewend ${status} "Failed to start some loop devices."
-
- # We do not fail if some loop devices did not start ...
- return 0
-}
-
-stop() {
- local status="0"
- for loop in $(ls /dev/loop[0-9] 2>/dev/null) ; do
- losetup ${loop} > /dev/null 2>&1
- if [ $? -eq 0 ] ; then
- ( umount ${loop} || swapoff "${loop}" ) >/dev/null 2>&1
- if ! /sbin/losetup -d ${loop} > /dev/null 2>&1; then
- ewarn "Failure deconfiguring ${loop}."
- status=1
- fi
- fi
- done
- ewend ${status}
-}
-
-
-# vim:ts=4
diff --git a/sys-apps/util-linux/files/ttydefaults.h
b/sys-apps/util-linux/files/ttydefaults.h
deleted file mode 100644
index af692ac..0000000
--- a/sys-apps/util-linux/files/ttydefaults.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef _SYS_TTYDEFAULTS_H_
-#define _SYS_TTYDEFAULTS_H_
-#define TTYDEF_IFLAG (BRKINT | ISTRIP | ICRNL | IMAXBEL | IXON | IXANY)
-#define TTYDEF_OFLAG (OPOST | ONLCR | XTABS)
-#define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL)
-#define TTYDEF_CFLAG (CREAD | CS7 | PARENB | HUPCL)
-#define TTYDEF_SPEED (B9600)
-#define CTRL(x) (x&037)
-#define CEOF CTRL('d')
-#ifdef _POSIX_VDISABLE
-# define CEOL _POSIX_VDISABLE
-#else
-# define CEOL '\0'
-#endif
-#define CERASE 0177
-#define CINTR CTRL('c')
-#ifdef _POSIX_VDISABLE
-# define CSTATUS _POSIX_VDISABLE
-#else
-# define CSTATUS '\0'
-#endif
-#define CKILL CTRL('u')
-#define CMIN 1
-#define CQUIT 034
-#define CSUSP CTRL('z')
-#define CTIME 0
-#define CDSUSP CTRL('y')
-#define CSTART CTRL('q')
-#define CSTOP CTRL('s')
-#define CLNEXT CTRL('v')
-#define CDISCARD CTRL('o')
-#define CWERASE CTRL('w')
-#define CREPRINT CTRL('r')
-#define CEOT CEOF
-#define CBRK CEOL
-#define CRPRNT CREPRINT
-#define CFLUSH CDISCARD
-#endif
diff --git a/sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch
b/sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch
deleted file mode 100644
index 86edab4..0000000
--- a/sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur util-linux-2.25.orig/sys-utils/switch_root.c
util-linux-2.25/sys-utils/switch_root.c
---- util-linux-2.25.orig/sys-utils/switch_root.c 2014-08-13
15:08:15.632801343 +0000
-+++ util-linux-2.25/sys-utils/switch_root.c 2014-08-13 15:09:19.617801087
+0000
-@@ -181,8 +181,8 @@
- if (pid <= 0) {
- struct statfs stfs;
- if (fstatfs(cfd, &stfs) == 0 &&
-- (stfs.f_type == (__SWORD_TYPE)STATFS_RAMFS_MAGIC ||
-- stfs.f_type == (__SWORD_TYPE)STATFS_TMPFS_MAGIC))
-+ (stfs.f_type == STATFS_RAMFS_MAGIC ||
-+ stfs.f_type == STATFS_TMPFS_MAGIC))
- recursiveRemove(cfd);
- else
- warn(_("old root filesystem is not an
initramfs"));
diff --git
a/sys-apps/util-linux/files/util-linux-2.25.2-runuser-bash-completion.patch
b/sys-apps/util-linux/files/util-linux-2.25.2-runuser-bash-completion.patch
deleted file mode 100644
index 85c4811..0000000
--- a/sys-apps/util-linux/files/util-linux-2.25.2-runuser-bash-completion.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/522288
-
-From a95987423c4d7781a14ffda34f082086cd51f4f7 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <[email protected]>
-Date: Fri, 24 Oct 2014 12:08:22 -0400
-Subject: [PATCH] bash-completion: fix runuser install
-
-The runuser symlink used to depend on su being enabled, but a refactoring
-broke that. So if you build with runuser enabled but not su, you end up
-with a broken symlink. Rework the logic so it works in both cases.
-
-Signed-off-by: Mike Frysinger <[email protected]>
----
- bash-completion/Makemodule.am | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am
-index 271a6db..045c2d5 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -11071,7 +10823,8 @@
- @BUILD_MOUNT_TRUE@@MAKEINSTALL_DO_SETUID_TRUE@ chmod 4755
$(DESTDIR)$(bindir)/umount
-
-
@BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@install-data-hook-bashcomp-runuser::
--@BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@ ln -sf su
$(DESTDIR)$(bashcompletiondir)/runuser
-+@BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@@BUILD_SU_TRUE@ ln -sf
su $(DESTDIR)$(bashcompletiondir)/runuser
-+@BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@@BUILD_SU_FALSE@ cp
$(top_srcdir)/bash-completion/su $(DESTDIR)$(bashcompletiondir)/runuser
-
- clean-local-tests:
- rm -rf $(top_builddir)/tests/output $(top_builddir)/tests/diff
---
-2.1.2
-
diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
deleted file mode 100644
index c2ad0f9..0000000
--- a/sys-apps/util-linux/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer type="project">
- <email>[email protected]</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<use>
- <flag name="caps">build setpriv helper (run programs with diff
capabilities)</flag>
- <flag name="cramfs">build mkfs/fsck helpers for cramfs
filesystems</flag>
- <flag name="cytune">build cytune for Cyclades-Z multiport serial
cards</flag>
- <flag name="fdformat">build fdformat (floppy disk format)</flag>
- <flag name="kill">build the kill program</flag>
- <flag name="pam">build runuser helper</flag>
- <flag name="suid">
- install mount/umount as setuid so non-root users may
mount/umount devices,
- and wall/write as setgid so non-root users can notify other
users
- </flag>
- <flag name="tty-helpers">install the mesg/wall/write tools for talking
to local users</flag>
-</use>
-<upstream>
- <remote-id type="cpe">cpe:/a:andries_brouwer:util-linux</remote-id>
-</upstream>
-</pkgmetadata>
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
deleted file mode 100644
index 404bb98..0000000
--- a/sys-apps/util-linux/util-linux-2.25.2-r99.ebuild
+++ /dev/null
@@ -1,175 +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.2.ebuild,v 1.1
2014/10/24 16:27:07 vapier Exp $
-
-EAPI="4"
-
-PYTHON_COMPAT=( python2_7 python3_{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"
-
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="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() {
- epatch "${FILESDIR}"/${P}-runuser-bash-completion.patch #522288
- epatch "${FILESDIR}"/${PN}-2.25-remove__SWORD_TYPE.patch
- if [[ ${PV} == 9999 ]] ; then
- po/update-potfiles
- eautoreconf
- fi
- 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)" \
- --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
-}
