diff --git a/srcpkgs/firejail/patches/musl.patch b/srcpkgs/firejail/patches/musl.patch index e0f1c284907..ad1a71e918d 100644 --- a/srcpkgs/firejail/patches/musl.patch +++ b/srcpkgs/firejail/patches/musl.patch @@ -41,7 +41,7 @@ --- a/config.mk.in +++ b/config.mk.in @@ -22,6 +22,8 @@ - mandir=@mandir@ + localstatedir=@localstatedir@ sysconfdir=@sysconfdir@ +HAVE_STAT64=@HAVE_STAT64@ @@ -51,10 +51,10 @@ HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@ @@ -99,7 +101,7 @@ -fstack-protector-all \ - -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' \ + -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/$(TARNAME)"' \ -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' \ -- -DVARDIR='"/var/lib/firejail"' -+ -DVARDIR='"/var/lib/firejail"' $(HAVE_STAT64) +- -DVARDIR='"$(localstatedir)/lib/$(TARNAME)"' ++ -DVARDIR='"$(localstatedir)/lib/$(TARNAME)"' $(HAVE_STAT64) PROG_CFLAGS = \ $(COMMON_CFLAGS) \ diff --git a/srcpkgs/firejail/patches/profiles-fix-xkeyboard-config.patch b/srcpkgs/firejail/patches/profiles-fix-xkeyboard-config.patch deleted file mode 100644 index a336cc03600..00000000000 --- a/srcpkgs/firejail/patches/profiles-fix-xkeyboard-config.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/etc/inc/whitelist-usr-share-common.inc b/etc/inc/whitelist-usr-share-common.inc -index 03653cc1673..ed5367208e0 100644 ---- a/etc/inc/whitelist-usr-share-common.inc -+++ b/etc/inc/whitelist-usr-share-common.inc -@@ -70,6 +70,7 @@ whitelist /usr/share/thumbnail.so - whitelist /usr/share/uim - whitelist /usr/share/vulkan - whitelist /usr/share/X11 -+whitelist /usr/share/xkeyboard-config-2 - whitelist /usr/share/xml - whitelist /usr/share/zenity - whitelist /usr/share/zoneinfo diff --git a/srcpkgs/firejail/template b/srcpkgs/firejail/template index 406489f6982..376a92e4e21 100644 --- a/srcpkgs/firejail/template +++ b/srcpkgs/firejail/template @@ -1,7 +1,7 @@ # Template file for 'firejail' pkgname=firejail -version=0.9.74 -revision=2 +version=0.9.76 +revision=1 build_style=gnu-configure configure_args="--enable-apparmor" hostmakedepends="pkg-config autoconf automake" @@ -12,7 +12,7 @@ license="GPL-2.0-or-later" homepage="https://firejail.wordpress.com" changelog="https://github.com/netblue30/firejail/raw/master/RELNOTES" distfiles="https://github.com/netblue30/firejail/archive/${version}.tar.gz" -checksum=fa54d64d1a6c9d45d72c37d1b8135c50f6e9468e75db7b2dd5ee66983f5a23dd +checksum=d8dac051fcb7d555cd20579a90ab4a8f123a3f4b803c0b09dca5310abacb7c68 conf_files="/etc/firejail/* /etc/apparmor.d/local/firejail-default" nocross=yes