diff --git a/system/base/libcap/actions.py b/system/base/libcap/actions.py index 11e26e4e..3a01948a 100644 --- a/system/base/libcap/actions.py +++ b/system/base/libcap/actions.py @@ -9,26 +9,39 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools + + +pam = "no" if get.buildTYPE() == "emul32" else "yes" + +cc = "'gcc -m32'" if get.buildTYPE() == "emul32" else "'gcc'" + pisitools.cflags.add("-D_LARGEFILE64_SOURCE", "-D_FILE_OFFSET_BITS=64") def setup(): # fix linkage pisitools.dosed("pam_cap/Makefile", "(.*<\s\$\(LDLIBS\))", r"\1 -lpam") # no static libs - pisitools.dosed("libcap/Makefile", "install.*STALIBNAME", deleteLine=True) + #pisitools.dosed("libcap/Makefile", "install.*STALIBNAME", deleteLine=True) + shelltools.system("sed -i '/install -m.*STA/d' libcap/Makefile") # change shared libs mode - pisitools.dosed("libcap/Makefile", "(.*?install -m) 0644 (.*?MINLIBNAME.*)", r"\1 0755 \2") + #pisitools.dosed("libcap/Makefile", "(.*?install -m) 0644 (.*?MINLIBNAME.*)", r"\1 0755 \2") # use pisilinux flags - pisitools.dosed("Make.Rules", "^(CC|CFLAGS|LD)\s:=.*", deleteLine=True) + #pisitools.dosed("Make.Rules", "^(CC|CFLAGS|LD)\s:=.*", deleteLine=True) pisitools.dosed("Make.Rules", "^(PAM_CAP\s:=).*", r"\1 %s" % ("no" if get.buildTYPE() == "emul32" else "yes")) + + def build(): - autotools.make("lib_prefix=/usr lib=lib%s" % ("32" if get.buildTYPE() == "emul32" else "")) + autotools.make("prefix=/usr lib=lib%s PAM_CAP=%s CC=%s" % ("32" if get.buildTYPE() == "emul32" else "", pam, cc)) + +#def check(): + #autotools.make("test -k CC=%s PAM_CAP=%s" % (cc, pam)) def install(): if get.buildTYPE() == "emul32": - autotools.rawInstall("prefix=/emul32 lib=../usr/lib32 DESTDIR=%s RAISE_SETFCAP=no" % get.installDIR()) + autotools.rawInstall("DESTDIR=%s prefix=/usr lib=lib32 SBINDIR=/_emul32 MANDIR=/_emul32 RAISE_SETFCAP=no PAM_CAP=no" % get.installDIR()) + pisitools.removeDir("/_emul32") return autotools.rawInstall("prefix=/usr DESTDIR=%s SBINDIR=/sbin RAISE_SETFCAP=no" % (get.installDIR())) diff --git a/system/base/libcap/pspec.xml b/system/base/libcap/pspec.xml index fc704e49..3edf32be 100644 --- a/system/base/libcap/pspec.xml +++ b/system/base/libcap/pspec.xml @@ -13,7 +13,7 @@ library POSIX 1003.1e capabilities library libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities. - https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.27.tar.xz + https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.65.tar.xz attr-devel pam-devel @@ -67,6 +67,13 @@ + + 2022-08-02 + 2.65 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-06-16 2.27