From: piekay <piekay@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] apparmor: update to 3.1.7.
Date: Wed, 12 Jun 2024 13:10:18 +0200 [thread overview]
Message-ID: <20240612111018.282D9285DE@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-50757@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1109 bytes --]
There is an updated pull request by piekay against master on the void-packages repository
https://github.com/piekay/void-packages apparmor-update
https://github.com/void-linux/void-packages/pull/50757
apparmor: update to 3.1.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/50757.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apparmor-update-50757.patch --]
[-- Type: text/x-diff, Size: 2110 bytes --]
From 681797e7e0cdd092d3d4855eb155e7f29d916436 Mon Sep 17 00:00:00 2001
From: Piekay <github@piekay.de>
Date: Mon, 10 Jun 2024 01:53:14 +0200
Subject: [PATCH] apparmor: update to 3.1.7.
---
.../patches/libapparmor-basename.patch | 20 +++++++++++++++++++
srcpkgs/apparmor/template | 6 +++---
2 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/apparmor/patches/libapparmor-basename.patch
diff --git a/srcpkgs/apparmor/patches/libapparmor-basename.patch b/srcpkgs/apparmor/patches/libapparmor-basename.patch
new file mode 100644
index 00000000000000..7977d2c2f85fc9
--- /dev/null
+++ b/srcpkgs/apparmor/patches/libapparmor-basename.patch
@@ -0,0 +1,20 @@
+--- a/libraries/libapparmor/testsuite/test_multi.c
++++ b/libraries/libapparmor/testsuite/test_multi.c
+@@ -1,5 +1,3 @@
+-#define _GNU_SOURCE /* for glibc's basename version */
+-
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -7,6 +5,11 @@
+
+ #include <aalogparse.h>
+
++static const char *basename(const char *path)
++{
++ return strrchr(path, '/') ? strrchr(path, '/')+1 : path;
++}
++
+ int print_results(aa_log_record *record);
+
+ int main(int argc, char **argv)
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index d3f4d35c393447..13586d0976f979 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
# Template file for 'apparmor'
pkgname=apparmor
-version=3.1.6
-revision=2
+version=3.1.7
+revision=1
build_wrksrc=libraries/libapparmor
build_style=gnu-configure
conf_files="/etc/apparmor.d/local/* /etc/apparmor/*"
@@ -17,7 +17,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=d5d699fd43faffd924dd51bfb5781a5a7cbabb55c1c9cb4abfb8c2840a9e8fcd
+checksum=c6c161d6dbd99c2f10758ff347cbc6848223c7381f311de62522f22b0a16de64
replaces="apparmor-vim>=0"
if [ -z "$CROSS_BUILD" ]; then
next prev parent reply other threads:[~2024-06-12 11:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-09 23:55 [PR PATCH] " piekay
2024-06-09 23:56 ` piekay
2024-06-10 0:07 ` piekay
2024-06-10 0:26 ` classabbyamp
2024-06-10 2:04 ` piekay
2024-06-10 15:04 ` piekay
2024-06-10 15:10 ` piekay
2024-06-12 11:10 ` piekay [this message]
2024-06-14 3:53 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240612111018.282D9285DE@inbox.vuxu.org \
--to=piekay@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).