Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] apparmor: update to 3.0.4.
@ 2022-06-02 12:19 mhmdanas
  2022-06-02 14:47 ` paper42
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: mhmdanas @ 2022-06-02 12:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1217 bytes --]

There is a new pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages apparmor-3.0.4
https://github.com/void-linux/void-packages/pull/37383

apparmor: update to 3.0.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37383.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apparmor-3.0.4-37383.patch --]
[-- Type: text/x-diff, Size: 7280 bytes --]

From 67def8ac08d0ef8b87c89648023637ef200df271 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 2 Jun 2022 15:19:59 +0300
Subject: [PATCH] apparmor: update to 3.0.4.

---
 .../apparmor/patches/fix_logprofconf.patch    | 10 ---
 srcpkgs/apparmor/patches/python-3.10.patch    | 84 -------------------
 .../apparmor/patches/python-distutils.patch   | 13 ---
 srcpkgs/apparmor/template                     |  9 +-
 4 files changed, 5 insertions(+), 111 deletions(-)
 delete mode 100644 srcpkgs/apparmor/patches/python-3.10.patch
 delete mode 100644 srcpkgs/apparmor/patches/python-distutils.patch

diff --git a/srcpkgs/apparmor/patches/fix_logprofconf.patch b/srcpkgs/apparmor/patches/fix_logprofconf.patch
index 62de9909717e..9b0101181ba6 100644
--- a/srcpkgs/apparmor/patches/fix_logprofconf.patch
+++ b/srcpkgs/apparmor/patches/fix_logprofconf.patch
@@ -63,13 +63,3 @@ modify logprof.conf for Void Linux
  
    # these ones shouln't have their own profiles
    /bin/awk      = icn
-@@ -112,6 +113,9 @@
-   /usr/bin/python3.5    = icn
-   /usr/bin/python3.6    = icn
-   /usr/bin/python3.7    = icn
-+  /usr/bin/python3.8    = icn
-+  /usr/bin/python3.9    = icn
-+  /usr/bin/python3.10    = icn
-   /usr/bin/tr   = icn
- 
- [required_hats]
diff --git a/srcpkgs/apparmor/patches/python-3.10.patch b/srcpkgs/apparmor/patches/python-3.10.patch
deleted file mode 100644
index 90d176d3b8c2..000000000000
--- a/srcpkgs/apparmor/patches/python-3.10.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From ea7b201ba48b87469297d58751c57b03ceb82320 Mon Sep 17 00:00:00 2001
-From: Christian Boltz <apparmor@cboltz.de>
-Date: Wed, 11 Aug 2021 21:37:40 +0200
-Subject: [PATCH] Update abstractions/python and profiles for python 3.10
-
-Fixes: https://gitlab.com/apparmor/apparmor/-/issues/187
----
- profiles/apparmor.d/abstractions/python        | 18 +++++++++---------
- profiles/apparmor.d/lsb_release                |  2 +-
- .../profiles/extras/usr.bin.chromium-browser   |  4 ++--
- 3 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/profiles/apparmor.d/abstractions/python b/profiles/apparmor.d/abstractions/python
-index 1b5cc9d0d..727030bdf 100644
---- a/profiles/apparmor.d/abstractions/python
-+++ b/profiles/apparmor.d/abstractions/python
-@@ -12,18 +12,18 @@
- 
-   abi <abi/3.0>,
- 
--  /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/**.{pyc,so}           mr,
--  /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/**.{egg,py,pth}       r,
--  /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/{site,dist}-packages/ r,
-+  /usr/lib{,32,64}/python{2.[4-7],3.[0-9],3.1[0-9]}/**.{pyc,so}           mr,
-+  /usr/lib{,32,64}/python{2.[4-7],3.[0-9],3.1[0-9]}/**.{egg,py,pth}       r,
-+  /usr/lib{,32,64}/python{2.[4-7],3.[0-9],3.1[0-9]}/{site,dist}-packages/ r,
-   /usr/lib{,32,64}/python3.[0-9]/lib-dynload/*.so            mr,
- 
--  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/**.{pyc,so}           mr,
--  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/**.{egg,py,pth}       r,
--  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/{site,dist}-packages/ r,
--  /usr/local/lib{,32,64}/python3.[0-9]/lib-dynload/*.so            mr,
-+  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9],3.1[0-9]}/**.{pyc,so}           mr,
-+  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9],3.1[0-9]}/**.{egg,py,pth}       r,
-+  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9],3.1[0-9]}/{site,dist}-packages/ r,
-+  /usr/local/lib{,32,64}/python3.{1,}[0-9]/lib-dynload/*.so            mr,
- 
-   # Site-wide configuration
--  /etc/python{2.[4-7],3.[0-9]}/** r,
-+  /etc/python{2.[4-7],3.[0-9],3.1[0-9]}/** r,
- 
-   # shared python paths
-   /usr/share/{pyshared,pycentral,python-support}/**      r,
-@@ -36,7 +36,7 @@
-   /usr/lib/wx/python/*.pth r,
- 
-   # python build configuration and headers
--  /usr/include/python{2.[4-7],3.[0-9]}*/pyconfig.h r,
-+  /usr/include/python{2.[4-7],3.[0-9],3.1[0-9]}*/pyconfig.h r,
- 
-   # Include additions to the abstraction
-   include if exists <abstractions/python.d>
-diff --git a/profiles/apparmor.d/lsb_release b/profiles/apparmor.d/lsb_release
-index 33a1c71db..ad8b998fc 100644
---- a/profiles/apparmor.d/lsb_release
-+++ b/profiles/apparmor.d/lsb_release
-@@ -18,7 +18,7 @@ profile lsb_release {
-   /dev/tty rw,
- 
-   /usr/bin/lsb_release r,
--  /usr/bin/python3.[0-9] mr,
-+  /usr/bin/python3.{1,}[0-9] mr,
- 
-   /etc/debian_version r,
-   /etc/default/apport r,
-diff --git a/profiles/apparmor/profiles/extras/usr.bin.chromium-browser b/profiles/apparmor/profiles/extras/usr.bin.chromium-browser
-index 2df5338db..b47b6f721 100644
---- a/profiles/apparmor/profiles/extras/usr.bin.chromium-browser
-+++ b/profiles/apparmor/profiles/extras/usr.bin.chromium-browser
-@@ -267,9 +267,9 @@ profile chromium_browser /usr/lib/@{chromium}/@{chromium} flags=(attach_disconne
-     /usr/share/distro-info/** r,
-     /var/lib/dpkg/** r,
- 
--    /usr/local/lib/python3.[0-9]/dist-packages/ r,
-+    /usr/local/lib/python3.{1,}[0-9]/dist-packages/ r,
-     /usr/bin/ r,
--    /usr/bin/python3.[0-9] mr,
-+    /usr/bin/python3.{1,}[0-9] mr,
-   }
- 
-   profile sandbox {
--- 
-GitLab
-
diff --git a/srcpkgs/apparmor/patches/python-distutils.patch b/srcpkgs/apparmor/patches/python-distutils.patch
deleted file mode 100644
index 9c22c7f11649..000000000000
--- a/srcpkgs/apparmor/patches/python-distutils.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-distutils is deprecated in python 3.10, which means it imports but prints warnings
-
---- a/libraries/libapparmor/m4/ac_python_devel.m4
-+++ b/libraries/libapparmor/m4/ac_python_devel.m4
-@@ -69,7 +69,7 @@
-         # Check if you have distutils, else fail
-         #
-         AC_MSG_CHECKING([for the distutils Python package])
--        ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
-+        ac_distutils_result=`$PYTHON -W ignore -c "import distutils" 2>&1`
-         if test -z "$ac_distutils_result"; then
-                 AC_MSG_RESULT([yes])
-         else
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index 64140c0dbc5c..2341c88f8606 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,13 +1,14 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.0.3
-revision=2
+version=3.0.4
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
 conf_files="/etc/apparmor.d/local/* /etc/apparmor/*"
 make_dirs="/etc/apparmor.d/disable 0755 root root"
-hostmakedepends="bison flex autoconf automake libtool gettext swig python3 which"
+hostmakedepends="bison flex autoconf automake libtool gettext swig python3
+ python3-setuptools which"
 makedepends="perl python3-devel"
 depends="runit-void-apparmor libapparmor-${version}_${revision} python3-notify2
  python3-psutil python3-dbus iproute2 which"
@@ -18,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://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz"
-checksum=51b1db60e962dd01856a1ec6a9d43b11ed4350dcc5738ef901097c999bcbf50e
+checksum=85dd3aaaf6f5358db723c24c4f74fd2b2ffe99f76f3ac6d188c4e3b048a53346
 replaces="apparmor-vim>=0"
 
 if [ -z "$CROSS_BUILD" ]; then

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: apparmor: update to 3.0.4.
  2022-06-02 12:19 [PR PATCH] apparmor: update to 3.0.4 mhmdanas
@ 2022-06-02 14:47 ` paper42
  2022-09-09  2:15 ` github-actions
  2022-09-24  2:14 ` [PR PATCH] [Closed]: " github-actions
  2 siblings, 0 replies; 4+ messages in thread
From: paper42 @ 2022-06-02 14:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/37383#issuecomment-1144953757

Comment:
marking with help-wanted for testing

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: apparmor: update to 3.0.4.
  2022-06-02 12:19 [PR PATCH] apparmor: update to 3.0.4 mhmdanas
  2022-06-02 14:47 ` paper42
@ 2022-09-09  2:15 ` github-actions
  2022-09-24  2:14 ` [PR PATCH] [Closed]: " github-actions
  2 siblings, 0 replies; 4+ messages in thread
From: github-actions @ 2022-09-09  2:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/37383#issuecomment-1241420640

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Closed]: apparmor: update to 3.0.4.
  2022-06-02 12:19 [PR PATCH] apparmor: update to 3.0.4 mhmdanas
  2022-06-02 14:47 ` paper42
  2022-09-09  2:15 ` github-actions
@ 2022-09-24  2:14 ` github-actions
  2 siblings, 0 replies; 4+ messages in thread
From: github-actions @ 2022-09-24  2:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1057 bytes --]

There's a closed pull request on the void-packages repository

apparmor: update to 3.0.4.
https://github.com/void-linux/void-packages/pull/37383

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-09-24  2:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-02 12:19 [PR PATCH] apparmor: update to 3.0.4 mhmdanas
2022-06-02 14:47 ` paper42
2022-09-09  2:15 ` github-actions
2022-09-24  2:14 ` [PR PATCH] [Closed]: " github-actions

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).