packages/libcap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcap 2.71-1

Browse Source
This commit is contained in:
xhaa123 2024-11-05 19:36:44 +08:00
parent 91674bd72e
commit 68bbab5dc0
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PKGBUILD
View File

@ -5,7 +5,7 @@
# Maintainer: Future Linux Team <future_linux@163.com> # Maintainer: Future Linux Team <future_linux@163.com>
pkgname=libcap pkgname=libcap
pkgver=2.70 pkgver=2.71
pkgrel=1 pkgrel=1
pkgdesc="POSIX 1003.1e capabilities" pkgdesc="POSIX 1003.1e capabilities"
arch=('x86_64') arch=('x86_64')
@ -15,9 +15,9 @@ depends=('glibc' 'gcc-libs' 'linux-pam')
makedepends=('linux-api-headers' 'go') makedepends=('linux-api-headers' 'go')
options=('!lto') options=('!lto')
source=(https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.xz source=(https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.xz
libcap-2.69-cgo_flags.patch) libcap-2.71-cgo-flags.patch)
sha256sums=(23a6ef8aadaf1e3e875f633bb2d116cfef8952dba7bc7c569b13458e1952b30f sha256sums=(b7006c9af5168315f35fc734bf1a8d2aa70766bd8b8c4340962e05b19c35b900
f7c0e863879c76a1fd20654932e8b13af64405ce969c5cae52a75731b6ea8a2e) 436594bed416dfa1a3a3a9df17350555c1f995d480d0ebbb739d7a29656ccc5a)
# NOTE: with CGO_ENABLED we need all relevant make options in build(), check() and package() otherwise the package is not reproducible # NOTE: with CGO_ENABLED we need all relevant make options in build(), check() and package() otherwise the package is not reproducible
_common_make_options=( _common_make_options=(
@ -34,7 +34,7 @@ prepare() {
cd ${pkgname}-${pkgver} cd ${pkgname}-${pkgver}
# ensure to use CGO_ENABLED all the way (so that we can have full RELRO) # ensure to use CGO_ENABLED all the way (so that we can have full RELRO)
patch -Np1 -i ${srcdir}/libcap-2.69-cgo_flags.patch patch -Np1 -i ${srcdir}/libcap-2.71-cgo-flags.patch
} }

13
libcap-2.69-cgo_flags.patch → libcap-2.71-cgo-flags.patch
View File

@ -1,7 +1,8 @@
diff -ruN a/go/Makefile b/go/Makefile diff --git i/go/Makefile w/go/Makefile
--- a/go/Makefile 2022-10-10 01:01:27.000000000 +0200 index d0b081d..ba3a357 100644
+++ b/go/Makefile 2024-03-19 12:33:19.217467384 +0100 --- i/go/Makefile
@@ -68,19 +68,19 @@ +++ w/go/Makefile
@@ -68,19 +68,19 @@ ifeq ($(RAISE_GO_FILECAP),yes)
endif endif
setid: ../goapps/setid/setid.go CAPGOPACKAGE PSXGOPACKAGE setid: ../goapps/setid/setid.go CAPGOPACKAGE PSXGOPACKAGE
@ -21,8 +22,8 @@ diff -ruN a/go/Makefile b/go/Makefile
+ CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) CGO_CFLAGS="$(CGO_CFLAGS)" CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build $(GO_BUILD_FLAGS) $(GOFLAGS) -mod=vendor -o $@ $< + CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) CGO_CFLAGS="$(CGO_CFLAGS)" CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build $(GO_BUILD_FLAGS) $(GOFLAGS) -mod=vendor -o $@ $<
ok: ok.go vendor/modules.txt ok: ok.go vendor/modules.txt
- CC="$(CC)" CGO_ENABLED="0" $(GO) build $(GO_BUILD_FLAGS) -mod=vendor $< - CC="$(CC)" CGO_ENABLED="0" $(GO) build $(GO_BUILD_FLAGS) -mod=vendor $<
+ CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(GO) build $(GO_BUILD_FLAGS) -mod=vendor $< + CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(GO) build $(GO_BUILD_FLAGS) $(GOFLAGS) -mod=vendor $<
try-launching: try-launching.go CAPGOPACKAGE ok try-launching: try-launching.go CAPGOPACKAGE ok
CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) $(GO) build $(GO_BUILD_FLAGS) -mod=vendor $< CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) $(GO) build $(GO_BUILD_FLAGS) -mod=vendor $<