summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-06-22 20:18:32 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-06-22 20:18:32 -0500
commit5f838f9667e0607ce0aabb2988cd4fc1a10729b3 (patch)
treeb84a0c01ae46eff1aa3261178ffdb6d216a73b9f
parent67f2c5e24c27f083667e2934624d939fb3708d40 (diff)
downloadpackages-5f838f9667e0607ce0aabb2988cd4fc1a10729b3.tar.gz
packages-5f838f9667e0607ce0aabb2988cd4fc1a10729b3.tar.bz2
packages-5f838f9667e0607ce0aabb2988cd4fc1a10729b3.tar.xz
packages-5f838f9667e0607ce0aabb2988cd4fc1a10729b3.zip
system/util-linux: [PD] take, un-split, remove buttloads of crap
-rw-r--r--system/util-linux/APKBUILD101
1 files changed, 21 insertions, 80 deletions
diff --git a/system/util-linux/APKBUILD b/system/util-linux/APKBUILD
index e46543d97..a28f0626f 100644
--- a/system/util-linux/APKBUILD
+++ b/system/util-linux/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=util-linux
-pkgver=2.31
+pkgver=2.32
case $pkgver in
*.*.*) _v=${pkgver%.*};;
@@ -10,23 +10,25 @@ case $pkgver in
esac
pkgrel=0
-pkgdesc="Random collection of Linux utilities"
+pkgdesc="Official Linux system management utilities"
url="http://git.kernel.org/cgit/utils/util-linux/util-linux.git"
arch="all"
-license="GPL-2.0 GPL-2.0-or-later LGPL-2.0-or-later BSD Public-Domain"
-depends="findmnt"
+options="!check suid" # multibyte input fails because of musl locale stuff
+license="GPL-2.0-only AND GPL-2.0+ AND LGPL-2.1+ AND Public-Domain"
+depends=""
makedepends_build="autoconf automake libtool"
makedepends_host="zlib-dev ncurses-dev linux-headers libcap-ng-dev"
-options="!check suid"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:bashcomp:noarch
+ libuuid libfdisk $pkgname-lang"
+makedepends="$makedepends_build $makedepends_host"
+replaces="e2fsprogs util-linux-ng sfdisk cfdisk findmnt mcookie blkid setpriv
+ libblkid libsmartcols libmount"
+provides="sfdisk=$pkgver-$pkgrel cfdisk=$pkgver-$pkgrel findmnt=$pkgver-$pkgrel
+ mcookie=$pkgver-$pkgrel blkid=$pkgver-$pkgrel libblkid=$pkgver-$pkgrel
+ libmount=$pkgver-$pkgrel libsmartcols=$pkgver-$pkgrel"
source="http://www.kernel.org/pub/linux/utils/$pkgname/v${_v}/$pkgname-$pkgver.tar.xz
ttydefaults.h
"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:bashcomp:noarch
- libuuid libblkid libmount libsmartcols libfdisk sfdisk cfdisk
- findmnt:_findmnt mcookie blkid setpriv"
-_bootstrap_config="--without-python"
-makedepends="$makedepends_build $makedepends_host"
-replaces="e2fsprogs util-linux-ng"
builddir="$srcdir/$pkgname-$pkgver"
prepare() {
@@ -49,19 +51,19 @@ build() {
--prefix=/usr \
--enable-raw \
--disable-uuidd \
- --disable-nls \
--disable-tls \
--disable-kill \
--disable-login \
--disable-last \
--disable-sulogin \
--disable-su \
- $_bootstrap_config
+ --without-python
make
}
package() {
- make -j1 DESTDIR="$pkgdir" -C "$builddir" install
+ cd "$builddir"
+ make -j1 DESTDIR="$pkgdir" install
# use pkg-config
}
@@ -80,90 +82,29 @@ bashcomp() {
"$subpkgdir"/usr/share/
}
-blkid() {
- pkgdesc="block device identification tool"
- depends=""
- replaces="util-linux-ng"
- mkdir -p "$subpkgdir"/sbin
- mv "$pkgdir"/sbin/blkid "$subpkgdir"/sbin/
-}
-
libuuid() {
pkgdesc="DCE compatible Universally Unique Identifier library"
+ license="BSD-3-Clause"
depends=""
mkdir -p "$subpkgdir"/lib
mv "$pkgdir"/lib/libuuid* "$subpkgdir"/lib/
}
-libblkid() {
- pkgdesc="Block device identification library from util-linux"
- depends=""
- mkdir -p "$subpkgdir"/lib
- mv "$pkgdir"/lib/libblkid* "$subpkgdir"/lib/
-}
-
libmount() {
pkgdesc="Block device identification library from util-linux"
+ license="LGPL-2.1+"
depends=""
mkdir -p "$subpkgdir"/lib
mv "$pkgdir"/lib/libmount.so.* "$subpkgdir"/lib/
}
-libsmartcols() {
- pkgdesc="Formatting library for ls-like programs."
- depends=""
- mkdir -p "$subpkgdir"/lib
- mv "$pkgdir"/lib/libsmartcols.so.* "$subpkgdir"/lib/
-}
-
libfdisk() {
pkgdesc="Partitioning library for fdisk-like programs"
+ license="LGPL.2.1+"
depends=""
mkdir -p "$subpkgdir"/lib
mv "$pkgdir"/lib/libfdisk.so.* "$subpkgdir"/lib/
}
-sfdisk() {
- pkgdesc="Partition table manipulator from util-linux"
- depends=""
- mkdir -p "$subpkgdir"/sbin
- mv "$pkgdir"/sbin/sfdisk "$subpkgdir"/sbin/
-}
-
-cfdisk() {
- pkgdesc="Curses based partition table manipulator from util-linux"
- depends=""
- mkdir -p "$subpkgdir"/sbin
- mv "$pkgdir"/sbin/cfdisk "$subpkgdir"/sbin/
-}
-
-mcookie() {
- pkgdesc="mcookie from util-linux"
- replaces="util-linux-ng"
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/mcookie "$subpkgdir"/usr/bin/
-}
-
-setpriv() {
- pkgdesc="Run a program with different Linux privilege settings"
- replaces="util-linux-ng"
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/setpriv "$subpkgdir"/usr/bin/
-}
-
-_findmnt() {
- pkgdesc="findmnt from util-linux"
- depends=""
- replaces=""
- mkdir -p "$subpkgdir"/bin
- mv "$pkgdir"/bin/findmnt "$subpkgdir"/bin
-}
-
-_py() {
- pkgdesc="python bindings to libmount"
- mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
-}
-
-sha512sums="48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5 util-linux-2.31.tar.xz
+sha512sums="320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482 util-linux-2.32.tar.xz
876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9 ttydefaults.h"