From 74298f87a68cdd131f9269cbcf606567f081fd5a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 20 Feb 2013 11:52:56 +0100 Subject: [PATCH] util-linux: install kill(1) and conflict with old coreutils. --- srcpkgs/util-linux/template | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index 43b35bbad7f..ea43d010a11 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -1,12 +1,7 @@ # Template file for 'util-linux' pkgname=util-linux version=2.22.2 -revision=6 -conflicts="chroot-util-linux>=0" -depends="coreutils shadow>=4.1.5.1_3" -makedepends="pkg-config zlib-devel ncurses-devel pam-devel" -replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5.1_3" -provides="eject-${version}" +revision=7 subpackages="libmount libmount-devel libblkid libblkid-devel libuuid libuuid-devel" short_desc="Miscellaneous linux utilities" maintainer="Juan RP " @@ -15,6 +10,12 @@ license="GPL-2" distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.22/${pkgname}-${version}.tar.xz" checksum=929b517fa39b16a61ec536514e08940a381b92befc629d0348e3097920dd2f12 +conflicts="chroot-util-linux>=0 coreutils<8.21_3" +depends="coreutils shadow>=4.1.5.1_3" +makedepends="pkg-config zlib-devel ncurses-devel pam-devel" +replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5.1_3" +provides="eject-${version}" + # Create uuidd system account for uuidd. system_accounts="uuidd" uuidd_homedir="/run/uuidd" @@ -45,7 +46,7 @@ do_configure() { --enable-fs-paths-extra=/usr/sbin:/usr/bin \ --enable-vipw --enable-newgrp --enable-chfn-chsh \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --without-udev --enable-write --disable-kill \ + --without-udev --enable-write \ --enable-socket-activation --disable-static ${_confargs} \ SUID_CFLAGS="-fPIE" SUID_LDFLAGS="-pie" }