pool/apparmor
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 947009 from home:scabrero:branches:network:samba:STABLE

Browse Source 
- add update-samba-abstractions-ldb2.diff: Cater for changes to ldb
  packaging to allow parallel installation with libldb;
  (bsc#1192684).

OBS-URL: https://build.opensuse.org/request/show/947009
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=314
This commit is contained in:
Christian Boltz 2022-01-17 19:17:01 +00:00 committed by Git OBS Bridge
parent 808d4c74f6
commit b6bdf3e03b
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apparmor.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jan 17 10:27:38 UTC 2022 - Samuel Cabrero <scabrero@suse.de>
- add update-samba-abstractions-ldb2.diff: Cater for changes to ldb
packaging to allow parallel installation with libldb;
(bsc#1192684).
-------------------------------------------------------------------
Mon Dec 20 11:01:50 UTC 2021 - Noel Power <nopower@suse.com>

7
apparmor.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package apparmor
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2011-2021 Christian Boltz
#
# All modifications and additions to the file contributed by third parties
@ -91,6 +91,10 @@ Patch9: aa-notify-more-arch-mr809.diff
# allow reading /etc/ssl/engdef.d/ and /etc/ssl/engines.d/ in abstractions/openssl (submitted upstream 2021-12-19 - https://gitlab.com/apparmor/apparmor/-/merge_requests/818)
Patch10: openssl-engdef-mr818.diff
# add update-samba-abstractions-ldb2.diff to cater for changes to ldb
# packaging to allow parallel installation with libldb bsc#1192684
Patch11: update-samba-abstractions-ldb2.diff
PreReq: sed
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define apparmor_bin_prefix %{?usrmerged:/usr}/lib/apparmor
@ -357,6 +361,7 @@ mv -v profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 profiles/apparmor/
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%build
%define _lto_cflags %{nil}

2
libapparmor.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libapparmor
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2011-2020 Christian Boltz
#
# All modifications and additions to the file contributed by third parties

12
update-samba-abstractions-ldb2.diff Normal file
View File

@ -0,0 +1,12 @@
diff -ruNp apparmor-3.0.3.orig/profiles/apparmor.d/abstractions/samba apparmor-3.0.3/profiles/apparmor.d/abstractions/samba
--- apparmor-3.0.3.orig/profiles/apparmor.d/abstractions/samba 2021-08-07 10:40:00.000000000 +0200
+++ apparmor-3.0.3/profiles/apparmor.d/abstractions/samba 2022-01-17 16:25:37.552673486 +0100
@@ -13,6 +13,8 @@
/etc/samba/* r,
/usr/lib*/ldb/*.so mr,
+ /usr/lib*/ldb2/*.so mr,
+ /usr/lib*/ldb2/modules/ldb/*.so mr,
/usr/lib*/samba/ldb/*.so mr,
/usr/share/samba/*.dat r,
/usr/share/samba/codepages/{lowcase,upcase,valid}.dat r,