~alpine/aports

keyutils: fix installation prefix v1 APPLIED

Drew DeVault <sir@cmpwn.com>
5 years ago 
Drew DeVault: 1
 keyutils: fix installation prefix

 1 files changed, 6 insertions(+), 12 deletions(-)
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git: 

curl -s https://lists.alpinelinux.org/~alpine/aports/patches/3194/mbox | git am -3
Learn more about email & git
Reply to thread View this thread in the archives

[PATCH] keyutils: fix installation prefix Export this patch

Drew DeVault <sir@cmpwn.com>
5 years ago 
This was previously installed to / instead of /usr, which breaks many
things on a system which expects the global prefix to be /usr.

Fixes #11090
---
 main/keyutils/APKBUILD | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/main/keyutils/APKBUILD b/main/keyutils/APKBUILD
index 22f35bd10c..68b1e487c2 100644
--- a/main/keyutils/APKBUILD
+++ b/main/keyutils/APKBUILD
@@ -2,21 +2,21 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=keyutils
pkgver=1.6.1
pkgrel=0
pkgrel=1
pkgdesc="Linux Key Management Utilities"
url="http://people.redhat.com/~dhowells/keyutils/"
arch="all"
options="!check"  # Test suite requires RPM.
license="GPL-2.0-or-later LGPL-2.0-or-later"
makedepends="file linux-headers"
subpackages="$pkgname-dev:_dev $pkgname-doc $pkgname-libs"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-$pkgver.tar.gz"

build() {
	cd "$builddir"
	make -j1 \
		NO_ARLIB=1 \
		LIBDIR=/lib \
		LIBDIR=/usr/lib \
		USRLIBDIR=/usr/lib \
		VERSION=$pkgver \
		RELEASE=-r$pkgrel \
@@ -27,21 +27,15 @@ package() {
	cd "$builddir"
	make DESTDIR="$pkgdir" \
		NO_ARLIB=1 \
		LIBDIR=/lib \
		LIBDIR=/usr/lib \
		USRLIBDIR=/usr/lib \
		install
}

libs() {
	pkgdesc="Key utilities library"
	mkdir -p "$subpkgdir"
	mv "$pkgdir"/lib "$subpkgdir"/
}

_dev() {
	# Fix for #10662
	ln -fs ../../lib/libkeyutils.so.1 "$pkgdir"/usr/lib/libkeyutils.so
	default_dev
	mkdir -p "$subpkgdir"/usr/lib
	mv "$pkgdir"/usr/lib/* "$subpkgdir"/usr/lib
}

sha512sums="a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2  keyutils-1.6.1.tar.gz"
-- 
2.24.1