diff --git a/srcpkgs/apparmor/patches/fix_path_max.patch b/srcpkgs/apparmor/patches/fix_path_max.patch new file mode 100644 index 00000000000..c377c3c4e97 --- /dev/null +++ b/srcpkgs/apparmor/patches/fix_path_max.patch @@ -0,0 +1,8 @@ +*** a/binutils/aa_load.c 2024-07-23 19:02:50.000000000 -0400 +--- b/binutils/aa_load.c 2024-10-06 20:23:30.065439516 -0300 +*************** +*** 18,19 **** +--- 18,20 ---- + #include ++ #include + #include diff --git a/srcpkgs/apparmor/patches/fix_uint_from_musl.patch b/srcpkgs/apparmor/patches/fix_uint_from_musl.patch new file mode 100644 index 00000000000..fc74e976274 --- /dev/null +++ b/srcpkgs/apparmor/patches/fix_uint_from_musl.patch @@ -0,0 +1,36 @@ +*** a/parser/rule.h 2024-07-23 19:02:50.000000000 -0400 +--- b/parser/rule.h 2024-10-10 23:11:40.923677300 -0300 +*************** public: +*** 210,218 **** + int cmp(prefixes const &rhs) const { +! if ((uint) audit < (uint) rhs.audit) + return -1; +! if ((uint) audit > (uint) rhs.audit) + return 1; +! if ((uint) rule_mode < (uint) rhs.rule_mode) + return -1; +! if ((uint) rule_mode > (uint) rhs.rule_mode) + return 1; +--- 210,218 ---- + int cmp(prefixes const &rhs) const { +! if ((unsigned int) audit < (unsigned int) rhs.audit) + return -1; +! if ((unsigned int) audit > (unsigned int) rhs.audit) + return 1; +! if ((unsigned int) rule_mode < (unsigned int) rhs.rule_mode) + return -1; +! if ((unsigned int) rule_mode > (unsigned int) rhs.rule_mode) + return 1; +*************** public: +*** 226,230 **** + bool operator<(prefixes const &rhs) const { +! if ((uint) audit < (uint) rhs.audit) + return true; +! if ((uint) rule_mode < (uint) rhs.rule_mode) + return true; +--- 226,230 ---- + bool operator<(prefixes const &rhs) const { +! if ((unsigned int) audit < (unsigned int) rhs.audit) + return true; +! if ((unsigned int) rule_mode < (unsigned int) rhs.rule_mode) + return true; diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template index 0afe30b37d1..62ef85bd7c1 100644 --- a/srcpkgs/apparmor/template +++ b/srcpkgs/apparmor/template @@ -1,7 +1,7 @@ # Template file for 'apparmor' pkgname=apparmor -version=3.1.7 -revision=2 +version=4.0.2 +revision=1 build_wrksrc=libraries/libapparmor build_style=gnu-configure conf_files="/etc/apparmor.d/local/* /etc/apparmor/*" @@ -19,7 +19,7 @@ license="GPL-2.0-only" homepage="https://gitlab.com/apparmor/apparmor" changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_${version}" distfiles="https://launchpad.net/apparmor/${version%.*}/${version}/+download/apparmor-${version}.tar.gz" -checksum=c6c161d6dbd99c2f10758ff347cbc6848223c7381f311de62522f22b0a16de64 +checksum=7b4de5a34913a8bcc85f0dad22ac1607717566adcf99906da0ec2d0106cd493e replaces="apparmor-vim>=0" # /usr/lib/perl5/core_perl/CORE/perl.h:3360:22: error: unknown type name 'off64_t'; @@ -72,7 +72,7 @@ post_install() { fi # we installed a custom conflicting profile - rm ${DESTDIR}/etc/apparmor.d/{,local/}php-fpm + rm ${DESTDIR}/etc/apparmor.d/php-fpm vinstall utils/aa-notify.desktop 644 usr/share/applications vdoc "${FILESDIR}/README.voidlinux"