Revert "apparmor: update to 4.0.2."

this is a development release, not stable, according to upstream.

fixes #52655

This reverts commit 4cb0ee7666.
This commit is contained in:
classabbyamp 2024-10-16 14:28:47 -04:00
parent b97b92b09f
commit ceb659ced8
No known key found for this signature in database
GPG Key ID: 6BE0755918A4C7F5
3 changed files with 4 additions and 48 deletions

View File

@ -1,8 +0,0 @@
*** 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 <string.h>
+ #include <limits.h>
#include <dirent.h>

View File

@ -1,36 +0,0 @@
*** 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;

View File

@ -1,7 +1,7 @@
# Template file for 'apparmor' # Template file for 'apparmor'
pkgname=apparmor pkgname=apparmor
version=4.0.2 version=3.1.7
revision=1 revision=2
build_wrksrc=libraries/libapparmor build_wrksrc=libraries/libapparmor
build_style=gnu-configure build_style=gnu-configure
conf_files="/etc/apparmor.d/local/* /etc/apparmor/*" conf_files="/etc/apparmor.d/local/* /etc/apparmor/*"
@ -19,7 +19,7 @@ license="GPL-2.0-only"
homepage="https://gitlab.com/apparmor/apparmor" homepage="https://gitlab.com/apparmor/apparmor"
changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_${version}" changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_${version}"
distfiles="https://launchpad.net/apparmor/${version%.*}/${version}/+download/apparmor-${version}.tar.gz" distfiles="https://launchpad.net/apparmor/${version%.*}/${version}/+download/apparmor-${version}.tar.gz"
checksum=7b4de5a34913a8bcc85f0dad22ac1607717566adcf99906da0ec2d0106cd493e checksum=c6c161d6dbd99c2f10758ff347cbc6848223c7381f311de62522f22b0a16de64
replaces="apparmor-vim>=0" replaces="apparmor-vim>=0"
# /usr/lib/perl5/core_perl/CORE/perl.h:3360:22: error: unknown type name 'off64_t'; # /usr/lib/perl5/core_perl/CORE/perl.h:3360:22: error: unknown type name 'off64_t';
@ -72,7 +72,7 @@ post_install() {
fi fi
# we installed a custom conflicting profile # we installed a custom conflicting profile
rm ${DESTDIR}/etc/apparmor.d/php-fpm rm ${DESTDIR}/etc/apparmor.d/{,local/}php-fpm
vinstall utils/aa-notify.desktop 644 usr/share/applications vinstall utils/aa-notify.desktop 644 usr/share/applications
vdoc "${FILESDIR}/README.voidlinux" vdoc "${FILESDIR}/README.voidlinux"