diff options
author | Vincent Grande | 2021-01-12 04:41:54 -0500 |
---|---|---|
committer | Vincent Grande | 2021-01-12 04:41:54 -0500 |
commit | fc30e704dd30e698cc82cd5b62d4e5c63bb5b58c (patch) | |
tree | 7360401dc81d63ce98c99689826cd67dd210f286 | |
parent | c0858d482e541b36b5b0ede63ba0d028bb1a7cd8 (diff) | |
download | aur-fc30e704dd30e698cc82cd5b62d4e5c63bb5b58c.tar.gz |
big fix
-rw-r--r-- | .SRCINFO | 17 | ||||
-rw-r--r-- | PKGBUILD | 51 | ||||
-rw-r--r-- | libcap-2.45-makefile.patch | 21 |
3 files changed, 62 insertions, 27 deletions
@@ -1,20 +1,21 @@ -# Generated by mksrcinfo v8 -# Tue Sep 5 20:30:18 UTC 2017 pkgbase = libcap-git pkgdesc = POSIX 1003.1e capabilities - pkgver = 2.25 + pkgver = 2.46 pkgrel = 1 - url = http://sites.google.com/site/fullycapable/ - arch = i686 + url = https://sites.google.com/site/fullycapable/ arch = x86_64 license = GPL2 makedepends = linux-api-headers depends = glibc - depends = attr + depends = pam + provides = libcap.so + provides = libpsx.so provides = libcap conflicts = libcap - source = libcap::git://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git - md5sums = SKIP + source = git+https://git.kernel.org/pub/scm/libs/libcap/libcap.git + source = libcap-2.45-makefile.patch + sha512sums = SKIP + sha512sums = 4f613f83198dfccb8b79e1b2c8764657a85300cb166d633d86b87f46567d51fa9395387caf33e82a8718f19e9a1fc65c11e7b6f63c3c4cde1b2a27f70671ec07 pkgname = libcap-git @@ -1,36 +1,49 @@ -#$Id$ -# Maintainer: Yegor Alexeyev +# Maintainer: Vincent Grande <shoober420@gmail.com> +# Contributor: David Runge <dvzrv@archlinux.org> +# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libcap-git -_gitname=libcap -pkgver=2.25 +pkgver=2.46 pkgrel=1 pkgdesc='POSIX 1003.1e capabilities' -arch=('i686' 'x86_64') -url='http://sites.google.com/site/fullycapable/' +arch=('x86_64') +url="https://sites.google.com/site/fullycapable/" license=('GPL2') -depends=('glibc' 'attr') -provides=('libcap') +depends=('glibc' 'pam') makedepends=('linux-api-headers') -source=("$_gitname::git://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git") -md5sums=('SKIP') -conflicts=('libcap') +provides=('libcap.so' 'libpsx.so' 'libcap') +conflicts=(libcap) +source=("git+https://git.kernel.org/pub/scm/libs/libcap/libcap.git" + "libcap-2.45-makefile.patch" +) +sha512sums=('SKIP' + '4f613f83198dfccb8b79e1b2c8764657a85300cb166d633d86b87f46567d51fa9395387caf33e82a8718f19e9a1fc65c11e7b6f63c3c4cde1b2a27f70671ec07') +#validpgpkeys=(38A644698C69787344E954CE29EE848AE2CCF3F4) # Andrew G. Morgan <morgan@kernel.org> prepare() { - cd "$srcdir/$_gitname" - sed -i "/SBINDIR/s#sbin#bin#" Make.Rules + cd libcap + # SBINDIR is hardcoded to sbin. set to bin + # add CPPFLAGS + patch -Np1 -i ../"libcap-2.45-makefile.patch" } build() { - make -C $srcdir/$_gitname KERNEL_HEADERS=/usr/include + cd libcap + make KERNEL_HEADERS='/usr/include' lib='lib' prefix='/usr' } -package() { - cd "$srcdir/$_gitname" - make prefix=/usr lib=/lib DESTDIR="$pkgdir" RAISE_SETFCAP=no install +#check() { +# cd libcap +# make test +#} - install -Dm644 pam_cap/capability.conf \ - "$pkgdir"/usr/share/doc/$pkgname/capability.conf.example +package() { + cd libcap + make DESTDIR="$pkgdir" RAISE_SETFCAP='no' lib='lib' prefix='/usr' install + # docs + install -vDm 644 {CHANGELOG,README} -t "${pkgdir}/usr/share/doc/libcap/" + install -vDm 644 pam_cap/capability.conf \ + -t "$pkgdir/usr/share/doc/libcap/examples/" } diff --git a/libcap-2.45-makefile.patch b/libcap-2.45-makefile.patch new file mode 100644 index 000000000000..3d09d1555e86 --- /dev/null +++ b/libcap-2.45-makefile.patch @@ -0,0 +1,21 @@ +diff -ruN a/Make.Rules b/Make.Rules +--- a/Make.Rules 2020-11-03 02:38:59.000000000 +0100 ++++ b/Make.Rules 2020-11-06 16:55:10.149893784 +0100 +@@ -37,7 +37,7 @@ + # Target directories + + MANDIR=$(man_prefix)/man +-SBINDIR=$(exec_prefix)/sbin ++SBINDIR=$(exec_prefix)/bin + INCDIR=$(inc_prefix)/include + LIBDIR=$(lib_prefix)/$(lib) + PKGCONFIGDIR=$(LIBDIR)/pkgconfig +@@ -79,7 +79,7 @@ + SYSTEM_HEADERS = /usr/include + INCS=$(topdir)/libcap/include/sys/capability.h + LDFLAGS += -L$(topdir)/libcap +-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) ++CFLAGS += $(CPPFLAGS) -Dlinux $(WARNINGS) $(DEBUG) + INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) + + # SHARED tracks whether or not the SHARED libraries (libcap.so, |