diff --git a/srcpkgs/libcap/patches/pkgconfig.patch b/srcpkgs/libcap/patches/pkgconfig.patch deleted file mode 100644 index 74ba0e9d1c..0000000000 --- a/srcpkgs/libcap/patches/pkgconfig.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git libcap/Makefile libcap/Makefile -index 949cfad..314a857 100644 ---- libcap/Makefile -+++ libcap/Makefile -@@ -22,7 +22,7 @@ MAJLIBNAME=$(LIBNAME).$(VERSION) - MINLIBNAME=$(MAJLIBNAME).$(MINOR) - GPERF_OUTPUT = _caps_output.gperf - --all: $(MINLIBNAME) $(STACAPLIBNAME) libcap.pc $(STAPSXLIBNAME) -+all: $(MINLIBNAME) $(STACAPLIBNAME) libcap.pc libpsx.pc $(STAPSXLIBNAME) - - ifeq ($(BUILD_GPERF),yes) - USE_GPERF_OUTPUT = $(GPERF_OUTPUT) -@@ -38,6 +38,15 @@ libcap.pc: libcap.pc.in - -e 's,@deps@,$(DEPS),' \ - $< >$@ - -+libpsx.pc: libpsx.pc.in -+ sed -e 's,@prefix@,$(prefix),' \ -+ -e 's,@exec_prefix@,$(exec_prefix),' \ -+ -e 's,@libdir@,$(LIBDIR),' \ -+ -e 's,@includedir@,$(inc_prefix)/include,' \ -+ -e 's,@VERSION@,$(VERSION).$(MINOR),' \ -+ -e 's,@deps@,$(DEPS),' \ -+ $< >$@ -+ - _makenames: _makenames.c cap_names.list.h - $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ - -@@ -86,6 +95,7 @@ ifeq ($(FAKEROOT),) - endif - mkdir -p -m 0755 $(FAKEROOT)$(PKGCONFIGDIR) - install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc -+ install -m 0644 libpsx.pc $(FAKEROOT)$(PKGCONFIGDIR)/libpsx.pc - ifeq ($(GOLANG),yes) - mkdir -p -m 0755 $(FAKEROOT)$(GOPKGDIR)/libcap/cap - install -m 0644 src/libcap/cap/* $(FAKEROOT)$(GOPKGDIR)/libcap/cap/ -@@ -96,6 +106,7 @@ endif - clean: - $(LOCALCLEAN) - rm -f $(CAPOBJS) $(LIBNAME)* $(STACAPLIBNAME) libcap.pc -+ rm -f $(CAPOBJS) $(LIBNAME)* $(STACAPLIBNAME) libpsx.pc - rm -f $(PSXOBJS) $(STAPSXLIBNAME) - rm -f cap_names.h cap_names.list.h _makenames $(GPERF_OUTPUT) - cd include/sys && $(LOCALCLEAN) -diff --git libcap/libcap.pc.in libcap/libcap.pc.in -index 3d6b273..69cd231 100644 ---- libcap/libcap.pc.in -+++ libcap/libcap.pc.in -@@ -9,10 +9,3 @@ Version: @VERSION@ - Libs: -L${libdir} -lcap - Libs.private: @deps@ - Cflags: -I${includedir} -- --Name: libpsx --Description: libpsx - linux posix syscall API for pthreads --Version: @VERSION@ --Libs: -L${libdir} -lpsx -lpthread -Wl,-wrap,pthread_create --Libs.private: @deps@ --Cflags: -I${includedir} - libcap/libpsx.pc.in | 11 +++++++++++ - 1 file changed, 11 insertions(+) - create mode 100644 libcap/libpsx.pc.in - -diff --git a/libcap/libpsx.pc.in b/libcap/libpsx.pc.in -new file mode 100644 -index 0000000..d032b9f ---- /dev/null -+++ libcap/libpsx.pc.in -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: libpsx -+Description: libpsx - linux posix syscall API for pthreads -+Version: @VERSION@ -+Libs: -L${libdir} -lpsx -lpthread -Wl,-wrap,pthread_create -+Libs.private: @deps@ -+Cflags: -I${includedir} --- -2.24.1 - diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template index 4683623bf4..30b5615e81 100644 --- a/srcpkgs/libcap/template +++ b/srcpkgs/libcap/template @@ -1,7 +1,7 @@ # Template file for 'libcap' pkgname=libcap -version=2.29 -revision=2 +version=2.30 +revision=1 bootstrap=yes build_style=gnu-makefile make_install_args="SBINDIR=/usr/bin exec_prefix=/usr @@ -13,7 +13,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="http://sites.google.com/site/fullycapable/" distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz" -checksum=6c83352c316c40d1d4c8ad704e13dc36840ff05eccc36050aa18e42e7f2aa7f8 +checksum=a287bae0b0d95e5230a1c4177b835c70774511b631f87c7bd29e91a03e027f11 if [ "$CHROOT_READY" ]; then hostmakedepends="perl"