util-linux: update to 2.25.

This commit is contained in:
Juan RP 2014-07-22 15:50:19 +02:00
parent 50b193e3d0
commit 1ad8dcfbd9
4 changed files with 33 additions and 15 deletions

View file

@ -1678,3 +1678,4 @@ libgeis.so.1 geis-2.2.16_1
libndp.so.0 libndp-1.3_1 libndp.so.0 libndp-1.3_1
libepoxy.so.0 libepoxy-1.2_1 libepoxy.so.0 libepoxy-1.2_1
libfakekey.so.0 libfakekey-0.1_1 libfakekey.so.0 libfakekey-0.1_1
libsmartcols.so.1 libsmartcols-2.25_1

1
srcpkgs/libsmartcols Symbolic link
View file

@ -0,0 +1 @@
util-linux

1
srcpkgs/libsmartcols-devel Symbolic link
View file

@ -0,0 +1 @@
util-linux

View file

@ -1,15 +1,15 @@
# Template file for 'util-linux' # Template file for 'util-linux'
pkgname=util-linux pkgname=util-linux
version=2.24.2 version=2.25
revision=3 revision=1
short_desc="Miscellaneous linux utilities" short_desc="Miscellaneous linux utilities"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://userweb.kernel.org/~kzak/util-linux-ng" homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
license="GPL-2" license="GPL-2"
distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.24/${pkgname}-${version}.tar.xz" distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version}/${pkgname}-${version}.tar.xz"
checksum=1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0 checksum=47ba5a8bd8cdd55262699078a5612a95db17966c7f20c43e3fe492c90ce7980a
hostmakedepends="pkg-config" hostmakedepends="libtool pkg-config"
makedepends="zlib-devel ncurses-devel pam-devel>=1.1.8_4 libcap-ng-devel" makedepends="zlib-devel ncurses-devel pam-devel>=1.1.8_4 libcap-ng-devel"
# Create uuidd system account for uuidd. # Create uuidd system account for uuidd.
system_accounts="uuidd" system_accounts="uuidd"
@ -25,12 +25,9 @@ conflicts="chroot-util-linux>=0 coreutils<8.21_3 shadow<4.1.5.1_14"
replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5.1_3" replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5.1_3"
provides="eject-${version}_1" provides="eject-${version}_1"
if [ "$CROSS_BUILD" ]; then pre_configure() {
hostmakedepends+=" automake gettext-devel libtool" libtoolize -f
pre_configure() { }
NOCONFIGURE=1 ./autogen.sh
}
fi
do_configure() { do_configure() {
./configure ${configure_args} \ ./configure ${configure_args} \
@ -41,8 +38,7 @@ do_configure() {
--enable-fs-paths-extra=/usr/sbin:/usr/bin \ --enable-fs-paths-extra=/usr/sbin:/usr/bin \
--disable-vipw --enable-newgrp --enable-chfn-chsh \ --disable-vipw --enable-newgrp --enable-chfn-chsh \
--with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-systemdsystemunitdir=/usr/lib/systemd/system \
--without-udev --enable-write \ --without-udev --enable-write --localstatedir=/run \
--enable-socket-activation --localstatedir=/run \
SUID_CFLAGS="-fPIE" SUID_LDFLAGS="-pie" SUID_CFLAGS="-fPIE" SUID_LDFLAGS="-pie"
} }
do_build() { do_build() {
@ -116,7 +112,26 @@ libuuid-devel_package() {
vmove usr/lib/libuuid.a vmove usr/lib/libuuid.a
vmove usr/lib/libuuid.so vmove usr/lib/libuuid.so
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
vmove usr/include vmove usr/include/uuid
vmove usr/share/man/man3 vmove usr/share/man/man3/uuid*
} }
} }
libsmartcols-devel_package() {
depends="libsmartcols>=${version}_${revision}"
short_desc="Table or Tree library from util-linux - development files"
pkg_install() {
vmove usr/lib/libsmartcols.a
vmove usr/lib/libsmartcols.so
vmove usr/include/libsmartcols
vmove usr/lib/pkgconfig/smartcols*
}
}
libsmartcols_package() {
short_desc="Table or Tree library from util-linux"
pkg_install() {
vmove usr/lib/libsmartcols.so.*
}
}