libcap: full switch to /usr.
This commit is contained in:
parent
5b300a2c6f
commit
0c28e5c5b3
4 changed files with 9 additions and 18 deletions
|
@ -1,15 +1,14 @@
|
||||||
# Template file for 'libcap-devel'.
|
# Template file for 'libcap-devel'.
|
||||||
#
|
#
|
||||||
depends="glibc-devel libcap"
|
depends="glibc-devel libcap>=$version"
|
||||||
short_desc="${short_desc} (development files)"
|
short_desc="${short_desc} (development files)"
|
||||||
long_desc="${long_desc}
|
long_desc="${long_desc}
|
||||||
|
|
||||||
This package contains files for development, headers, static libs, etc."
|
This package contains files for development, headers, static libs, etc."
|
||||||
|
|
||||||
|
|
||||||
do_install()
|
do_install() {
|
||||||
{
|
|
||||||
vmove usr/include usr
|
vmove usr/include usr
|
||||||
vmove lib/libcap.a usr/lib
|
vmove usr/lib/libcap.a usr/lib
|
||||||
vmove usr/share/man/man3 usr/share/man
|
vmove usr/share/man/man3 usr/share/man
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,6 @@ long_desc="${long_desc}
|
||||||
This package contains a PAM module provided by the libcap package."
|
This package contains a PAM module provided by the libcap package."
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
vmove lib/security usr/lib
|
vmove usr/lib/security usr/lib
|
||||||
vmove etc
|
vmove etc
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,6 @@ long_desc="${long_desc}
|
||||||
This package contains binary utilities provided by the libcap package."
|
This package contains binary utilities provided by the libcap package."
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
vmove "sbin/*" usr/sbin
|
vmove usr/sbin usr
|
||||||
vmove usr/share usr
|
vmove usr/share usr
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'libcap'
|
# Template file for 'libcap'
|
||||||
pkgname=libcap
|
pkgname=libcap
|
||||||
version=2.22
|
version=2.22
|
||||||
revision=5
|
revision=7
|
||||||
subpackages="$pkgname-devel $pkgname-pam $pkgname-progs"
|
subpackages="$pkgname-devel $pkgname-pam $pkgname-progs"
|
||||||
makedepends="perl pam-devel attr-devel"
|
makedepends="perl pam-devel attr-devel"
|
||||||
short_desc="POSIX.1e capabilities library"
|
short_desc="POSIX.1e capabilities library"
|
||||||
|
@ -16,21 +16,13 @@ long_desc="
|
||||||
draft 15 capabilities."
|
draft 15 capabilities."
|
||||||
|
|
||||||
do_build() {
|
do_build() {
|
||||||
sed -i -e "s|LIBDIR=\$(FAKEROOT)\$(lib_prefix)\/lib|LIBDIR=\$(FAKEROOT)/\$(lib)|g" \
|
|
||||||
Make.Rules
|
|
||||||
make ${makejobs}
|
make ${makejobs}
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
vmkdir lib
|
make DESTDIR=${DESTDIR} MANDIR=${DESTDIR}/usr/share/man \
|
||||||
vmkdir usr/lib
|
SBINDIR=${DESTDIR}/usr/sbin LIBDIR=${DESTDIR}/usr/lib \
|
||||||
if [ "$XBPS_MACHINE" = "x86_64" ]; then
|
RAISE_SETFCAP=no install
|
||||||
ln -sf lib ${DESTDIR}/lib64
|
|
||||||
fi
|
|
||||||
make DESTDIR=${DESTDIR} RAISE_SETFCAP=no install
|
|
||||||
rm -f ${DESTDIR}/lib64
|
|
||||||
|
|
||||||
vinstall pam_cap/capability.conf 644 etc/security
|
vinstall pam_cap/capability.conf 644 etc/security
|
||||||
vmove "lib/*.so*" usr/lib
|
|
||||||
chmod 755 ${DESTDIR}/usr/lib/libcap.so.*
|
chmod 755 ${DESTDIR}/usr/lib/libcap.so.*
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue