Hello community,
here is the log from the commit of package apparmor for openSUSE:Factory
checked in at 2020-11-05 21:53:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apparmor (Old)
and /work/SRC/openSUSE:Factory/.apparmor.new.11331 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor"
Thu Nov 5 21:53:01 2020 rev:145 rq:845533 version:3.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2020-10-20
16:11:35.702043449 +0200
+++ /work/SRC/openSUSE:Factory/.apparmor.new.11331/apparmor.changes
2020-11-05 21:53:03.780434676 +0100
@@ -1,0 +2,58 @@
+Sat Oct 31 19:05:14 UTC 2020 - Christian Boltz <suse-b...@cboltz.de>
+
+- add utils-fix-hotkey-conflict.diff to fix a hotkey conflict in
+ de, id and sv translations (and fix the test) (MR 675)
+- add extra-profiles-fix-Pux.diff to fix an inactive profile -
+ prevents a crash in aa-logprof and aa-genprof when creating a new
+ profile (MR 676)
+
+-------------------------------------------------------------------
+Sun Oct 25 11:32:16 UTC 2020 - Christian Boltz <suse-b...@cboltz.de>
+
+- update to AppArmor 3.0.0
+ - introduce feature abi declaration in profiles to enable use of
+ new rule types (for openSUSE: dbus and unix rules)
+ - support xattr attachment conditionals
+ - experimental support for kill and unconfined profile modes
+ - rewritten aa-status (in C), including support for new profile modes
+ - rewritten aa-notify (in python), finally dropping the perl
+ requirement at runtime
+ - new tool aa-features-abi for extracting feature abis from the kernel
+ - update profiles to have profile names and to use 3.0 feature abi
+ - introduce @{etc_ro} and @{etc_rw} profile variables
+ - new profile for php-fpm
+ - several updates to profiles and abstractions (including boo#1166007)
+ - fully support 'include if exists' in the aa-* tools
+ - rewrite handling of alias, include, link and variable rules in
+ the aa-* tools
+ - rewrite and simplify log handling in the aa-logprof and aa-genprof
+ - see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.0
+ for the detailed upstream changelog
+- patches:
+ - add changes-since-3.0.0.diff with upstream fixes since the 3.0.0
+ release up to 3e18c0785abc03ee42a022a67a27a085516a7921
+ - drop upstreamed usr-etc-abstractions-base-nameservice.diff
+ - drop 2.13-only libapparmor-so-number.diff
+ - refresh apparmor-enable-profile-cache.diff - partially upstreamed
+ - update apparmor-samba-include-permissions-for-shares.diff and
+ apparmor-lessopen-profile.patch - switch to "include if exists"
+ - apparmor-lessopen-profile.patch: add abi rule to lessopen profile
+ - refresh apparmor-lessopen-nfs-workaround.diff
+- move away very loose apache profile that doesn't even match the
+ apache2 binary path in openSUSE to avoid confusion (boo#872984)
+- move rewritten aa-status from utils to parser subpackage
+- add aa-features-abi to parser subpackage
+- replace perl and libnotify-tools requires with requiring
+ python3-notify2 and python3-psutil (needed by the rewritten
+ aa-notify)
+- drop ancient cleanup for /etc/init.d/subdomain from parser %pre
+- drop (never enabled) conditionals to build with python2 and to
+ build the python-apparmor subpackage (upstream dropped python2
+ support)
+- drop setting PYTHON and PYTHON_VERSIONS env variable, no longer needed
+- set PYFLAKES path for utils check
+- add precompiled_cache build conditional to allow faster local
+ builds without using kvm
+- remove duplicated BuildRequires: swig
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/apparmor/libapparmor.changes 2020-10-20
16:11:46.306048470 +0200
+++ /work/SRC/openSUSE:Factory/.apparmor.new.11331/libapparmor.changes
2020-11-05 21:53:03.896434415 +0100
@@ -1,0 +2,10 @@
+Sun Oct 25 11:15:54 UTC 2020 - Christian Boltz <suse-b...@cboltz.de>
+
+- update to AppArmor 3.0.0
+ - see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.0
+ for the detailed upstream changelog
+- add changes-since-3.0.0.diff with upstream fixes since the 3.0.0
+ release up to 3e18c0785abc03ee42a022a67a27a085516a7921
+- drop 2.13-only patch libapparmor-so-number.diff
+
+-------------------------------------------------------------------
Old:
----
apparmor-2.13.5.tar.gz
apparmor-2.13.5.tar.gz.asc
libapparmor-so-number.diff
usr-etc-abstractions-base-nameservice.diff
New:
----
apparmor-3.0.0.tar.gz
apparmor-3.0.0.tar.gz.asc
changes-since-3.0.0.diff
extra-profiles-fix-Pux.diff
utils-fix-hotkey-conflict.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apparmor.spec ++++++
--- /var/tmp/diff_new_pack.guikcZ/_old 2020-11-05 21:53:05.224431429 +0100
+++ /var/tmp/diff_new_pack.guikcZ/_new 2020-11-05 21:53:05.232431411 +0100
@@ -24,9 +24,9 @@
%bcond_without pam
%bcond_without apache
%bcond_without perl
-%bcond_with python
%bcond_without python3
%bcond_without ruby
+%bcond_without precompiled_cache
%define CATALINA_HOME /usr/share/tomcat6
#define APPARMOR_DOC_DIR /usr/share/doc/packages/apparmor-docs/
@@ -35,7 +35,7 @@
%define apache_module_path %(/usr/sbin/apxs2 -q LIBEXECDIR)
Name: apparmor
-Version: 2.13.5
+Version: 3.0.0
Release: 0
Summary: AppArmor userlevel parser utility
License: GPL-2.0-or-later
@@ -65,11 +65,14 @@
# workaround for boo#1119937 / lp#1784499 - allow network access for reading
files on NFS (proper solution needs kernel fix)
Patch5: apparmor-lessopen-nfs-workaround.diff
-# update abstractions/base and nameservice for /usr/etc (submitted upstream
2020-01-25 https://gitlab.com/apparmor/apparmor/merge_requests/447, only merged
to master, not 2.13.x)
-Patch10: ./usr-etc-abstractions-base-nameservice.diff
+# changes since 3.0.0 release up to 3e18c0785abc03ee42a022a67a27a085516a7921
+Patch6: changes-since-3.0.0.diff
-# fix libapparmor so version (submitted upstream 2020-10-17
https://gitlab.com/apparmor/apparmor/-/merge_requests/658)
-Patch11: libapparmor-so-number.diff
+# fix hotkey conflict for utils (de, id and sv), and fix the test (accepted
upstream 2020-11-01 https://gitlab.com/apparmor/apparmor/-/merge_requests/675)
+Patch10: utils-fix-hotkey-conflict.diff
+
+# fix invalid Pux (should be PUx) in inactive profile - breaks creating a new
profile with aa-autodep, aa-logprof and aa-genprof (accepted upstream
2020-11-01 https://gitlab.com/apparmor/apparmor/-/merge_requests/676)
+Patch11: extra-profiles-fix-Pux.diff
PreReq: sed
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -86,19 +89,14 @@
BuildRequires: swig
-%if %{with python}
-BuildRequires: python-devel
-BuildRequires: swig
-%endif
-
%if %{with python3}
BuildRequires: python3-devel
-BuildRequires: swig
+BuildRequires: python3-notify2
+BuildRequires: python3-psutil
%endif
%if %{with ruby}
BuildRequires: ruby-devel
-BuildRequires: swig
%endif
%if %{with apache}
@@ -186,25 +184,6 @@
%endif
-%if %{with python}
-
-%package -n python-apparmor
-Summary: Python 2 interface for libapparmor functions
-License: GPL-2.0-only AND LGPL-2.1-or-later
-Group: Development/Libraries/Python
-BuildRequires: python
-Requires: libapparmor1 = %{version}
-Requires: python = %{python_version}
-Requires: python(abi) = %{python_version}
-Provides: python-libapparmor = %{version}
-Obsoletes: python-libapparmor < 2.5
-
-%description -n python-apparmor
-This package provides the python interface to AppArmor. It is used for python
-applications interfacing with AppArmor.
-
-%endif
-
%if %{with python3}
%package -n python3-apparmor
@@ -282,20 +261,12 @@
License: GPL-2.0-only AND LGPL-2.1-or-later
Group: Productivity/Security
Requires: libapparmor1 = %{version}
-# some of the tools are still perl-based (aa-decode and aa-notify)
-Requires: perl = %{perl_version}
-Requires: perl-apparmor = %{version}
-%if %{with python3}
Requires: python3-apparmor = %{version}
Requires: python3-base
-%else
-Requires: python-apparmor = %{version}
-Requires: python-base
-%endif
+Requires: python3-notify2
+Requires: python3-psutil
# aa-unconfined needs ss
Recommends: iproute2
-# aa-notify -p needs notify-send (only "Suggests", see boo#1067477)
-Suggests: libnotify-tools
BuildArch: noarch
%description utils
@@ -354,27 +325,23 @@
%prep
%setup -q
+
+# very loose profile that doesn't even match the apache2 binary path in
openSUSE. Move it away instead of confusing people (boo#872984)
+mv -v profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2
profiles/apparmor/profiles/extras/
+
%patch1
%patch2
%patch3 -p1
%patch4
%patch5
-
-%if 0%{?suse_version} > 1500
-# /usr/etc/ changes in abstractions, apply only to Tumbleweed, but not to Leap
15.x
+%patch6 -p1
%patch10 -p1
-%endif
-
%patch11 -p1
%build
%define _lto_cflags %{nil}
export SUSE_ASNEEDED=0
-%if %{with python3}
-export PYTHON=/usr/bin/python3
-%endif
-
# libapparmor:
(
cd ./libraries/libapparmor
@@ -382,7 +349,7 @@
%if %{with perl}
--with-perl \
%endif
-%if %{with python}%{with python3}
+%if %{with python3}
--with-python \
%else
--without-python \
@@ -424,33 +391,27 @@
# pre-build profile cache
# note that -L only works with an absolute path, therefore prefix it with
$(pwd)
-parser/apparmor_parser --write-cache -QT -L $(pwd)/profiles/cache -I
profiles/apparmor.d/ profiles/apparmor.d/
-
-%check
-%if %{with python3}
-export PYTHON=/usr/bin/python3
-export PYTHON_VERSIONS=python3
+%if %{with precompiled_cache}
+parser/apparmor_parser --config-file $(pwd)/parser/parser.conf --write-cache
-QT -L $(pwd)/profiles/cache -I profiles/apparmor.d/ profiles/apparmor.d/
%endif
+%check
make check -C libraries/libapparmor
make check -C parser
make check -C binutils
-# profiles make check fails for the utils (libapparmor PYTHONPATH issues),
therefore only do parser-based checks
+# profiles make check fails for the utils (they expect /sbin/apparmor_parser
to exist), therefore only do parser-based check
make -C profiles check-parser
# test for a few files that should exist in the cache
+%if %{with precompiled_cache}
test -f profiles/cache/*/bin.ping
test -f profiles/cache/*/.features
+%endif
-make check -C utils
+make check -C utils PYFLAKES=/usr/bin/pyflakes-%{py3_ver}
%install
-
-%if %{with python3}
-export PYTHON=/usr/bin/python3
-%endif
-
# libapparmor: swig bindings only, libapparmor is packaged via libapparmor.spec
%makeinstall -C libraries/libapparmor/swig
@@ -465,11 +426,13 @@
%makeinstall -C profiles
+%if %{with precompiled_cache}
install -d -m 755 %{buildroot}/usr/share/apparmor/cache
-echo "*** WARNING: precompiling cache is known to fail under 'osc build' - use
'osc build --vm-type kvm' instead ***"
+echo -e "\n\n *** WARNING: precompiling cache is known to fail under 'osc
build' - use 'osc build --vm-type kvm' instead or skip building the precompiled
cache with 'osc build --without precompiled_cache' ***\n\n"
cp -a profiles/cache/* %{buildroot}/usr/share/apparmor/cache
test -f %{buildroot}/usr/share/apparmor/cache/*/.features
test -f %{buildroot}/usr/share/apparmor/cache/*/bin.ping
+%endif
%makeinstall -C parser
# default cache dir (up to 2.12) is /etc/apparmor.d/cache - not the best
location.
@@ -523,12 +486,6 @@
# remove *.la files
rm -fv %{buildroot}%{_libdir}/libapparmor.la
-echo -------------------------------------------------------------------
-#find -ls
-echo -------------------------------------------------------------------
-#find %{buildroot} -ls
-echo -------------------------------------------------------------------
-
%files docs
%defattr(-,root,root)
%doc parser/*.[1-9].html
@@ -546,6 +503,10 @@
/sbin/apparmor_parser
%{_bindir}/aa-enabled
%{_bindir}/aa-exec
+%{_bindir}/aa-features-abi
+%{_sbindir}/aa-status
+%{_sbindir}/apparmor_status
+%{_sbindir}/status
%{_sbindir}/aa-teardown
%{_sbindir}/exec
%dir %attr(-, root, root) %{_sysconfdir}/apparmor
@@ -554,7 +515,6 @@
%{_sysconfdir}/apparmor.d/cache.d
/sbin/rcapparmor
%{_unitdir}/apparmor.service
-%config(noreplace) %{_sysconfdir}/apparmor/subdomain.conf
%config(noreplace) %{_sysconfdir}/apparmor/parser.conf
%{_localstatedir}/lib/apparmor
%{_localstatedir}/cache/apparmor
@@ -563,18 +523,18 @@
%{apparmor_bin_prefix}/apparmor.systemd
%doc %{_mandir}/man1/aa-enabled.1.gz
%doc %{_mandir}/man1/aa-exec.1.gz
+%doc %{_mandir}/man1/aa-features-abi.1.gz
%doc %{_mandir}/man1/exec.1.gz
%doc %{_mandir}/man5/apparmor.d.5.gz
%doc %{_mandir}/man5/apparmor.vim.5.gz
-%doc %{_mandir}/man5/subdomain.conf.5.gz
%doc %{_mandir}/man7/apparmor.7.gz
+%doc %{_mandir}/man7/apparmor_xattrs.7.gz
+%doc %{_mandir}/man8/aa-status.8.gz
%doc %{_mandir}/man8/aa-teardown.8.gz
%doc %{_mandir}/man8/apparmor_parser.8.gz
+%doc %{_mandir}/man8/apparmor_status.8.gz
%pre parser
-if [ -f %{_sysconfdir}/init.d/subdomain ] ; then
- chkconfig --del subdomain
-fi
%service_add_pre apparmor.service
%files parser-lang -f apparmor-parser.lang -f aa-binutils.lang
@@ -583,6 +543,10 @@
%files abstractions
%defattr(644,root,root,755)
%dir %{_sysconfdir}/apparmor.d/
+%dir %{_sysconfdir}/apparmor.d/abi
+%config(noreplace) %{_sysconfdir}/apparmor.d/abi/3.0
+%config(noreplace) %{_sysconfdir}/apparmor.d/abi/kernel-5.4-outoftree-network
+%config(noreplace) %{_sysconfdir}/apparmor.d/abi/kernel-5.4-vanilla
%dir %{_sysconfdir}/apparmor.d/abstractions
%config(noreplace) %{_sysconfdir}/apparmor.d/abstractions/*
%dir %{_sysconfdir}/apparmor.d/disable
@@ -599,9 +563,12 @@
%config(noreplace) %{_sysconfdir}/apparmor.d/usr.*
%config(noreplace) %{_sysconfdir}/apparmor.d/lsb_release
%config(noreplace) %{_sysconfdir}/apparmor.d/nvidia_modprobe
+%config(noreplace) %{_sysconfdir}/apparmor.d/php-fpm
%config(noreplace) %{_sysconfdir}/apparmor.d/local/*
%dir /usr/share/apparmor/
+%if %{with precompiled_cache}
/usr/share/apparmor/cache/
+%endif
/usr/share/apparmor/extra-profiles/
%files utils
@@ -623,9 +590,7 @@
%{_sbindir}/aa-mergeprof
%{_sbindir}/aa-notify
%{_sbindir}/aa-remove-unknown
-%{_sbindir}/aa-status
%{_sbindir}/aa-unconfined
-%{_sbindir}/apparmor_status
%{_sbindir}/audit
%{_sbindir}/autodep
%{_sbindir}/complain
@@ -635,7 +600,6 @@
%{_sbindir}/genprof
%{_sbindir}/logprof
%{_sbindir}/notify
-%{_sbindir}/status
%{_sbindir}/unconfined
%{_bindir}/aa-easyprof
%dir %{_datadir}/apparmor
@@ -656,10 +620,7 @@
%doc %{_mandir}/man8/aa-mergeprof.8.gz
%doc %{_mandir}/man8/aa-notify.8.gz
%doc %{_mandir}/man8/aa-remove-unknown.8.gz
-%doc %{_mandir}/man8/aa-status.8.gz
%doc %{_mandir}/man8/aa-unconfined.8.gz
-
-%doc %{_mandir}/man8/apparmor_status.8.gz
%doc %{_mandir}/man8/audit.8.gz
%doc %{_mandir}/man8/autodep.8.gz
%doc %{_mandir}/man8/complain.8.gz
@@ -681,19 +642,6 @@
%{perl_vendorarch}/LibAppArmor.pm
%endif
-%if %{with python}
-
-%files -n python-apparmor
-%defattr(-,root,root)
-%{python_sitearch}/LibAppArmor-%{version}-py%{python_version}.egg-info
-%dir %{python_sitearch}/LibAppArmor
-%{python_sitearch}/LibAppArmor/_LibAppArmor.so
-%{python_sitearch}/LibAppArmor/__init__.py
-%{python_sitearch}/LibAppArmor/__init__.pyc
-%{python_sitelib}/apparmor/
-%{python_sitelib}/apparmor-%{version}-py%{python_version}.egg-info
-%endif
-
%if %{with python3}
%files -n python3-apparmor
++++++ libapparmor.spec ++++++
--- /var/tmp/diff_new_pack.guikcZ/_old 2020-11-05 21:53:05.268431331 +0100
+++ /var/tmp/diff_new_pack.guikcZ/_new 2020-11-05 21:53:05.272431322 +0100
@@ -2,7 +2,7 @@
# spec file for package libapparmor
#
# Copyright (c) 2020 SUSE LLC
-# Copyright (c) 2011-2019 Christian Boltz
+# Copyright (c) 2011-2020 Christian Boltz
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: libapparmor
-Version: 2.13.5
+Version: 3.0.0
Release: 0
Summary: Utility library for AppArmor
License: LGPL-2.1-or-later
@@ -31,9 +31,7 @@
BuildRequires: flex
BuildRequires: pkg-config
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-# fix libapparmor so version (submitted upstream 2020-10-17
https://gitlab.com/apparmor/apparmor/-/merge_requests/658
-Patch1: libapparmor-so-number.diff
+Patch1: changes-since-3.0.0.diff
%description
This package provides the libapparmor library, which contains the
++++++ apparmor-2.13.5.tar.gz -> apparmor-3.0.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/apparmor/apparmor-2.13.5.tar.gz
/work/SRC/openSUSE:Factory/.apparmor.new.11331/apparmor-3.0.0.tar.gz differ:
char 5, line 1
++++++ apparmor-enable-profile-cache.diff ++++++
--- /var/tmp/diff_new_pack.guikcZ/_old 2020-11-05 21:53:05.380431079 +0100
+++ /var/tmp/diff_new_pack.guikcZ/_new 2020-11-05 21:53:05.384431070 +0100
@@ -9,8 +9,7 @@
Also set the cache location to /var/cache/apparmor/ (writeable) and
-/usr/share/apparmor/cache/ (packaged precompiled cache), and adjust
-the mount requirements in apparmor.service accordingly.
+/usr/share/apparmor/cache/ (packaged precompiled cache).
See boo#1069906 and boo#1074429
@@ -33,14 +32,4 @@
## Show cache hits
#show-cache
---- parser/apparmor.service_ORIG 2018-04-19 22:58:12.631443321 +0200
-+++ parser/apparmor.service 2018-04-19 22:58:47.903343044 +0200
-@@ -4,7 +4,7 @@ DefaultDependencies=no
- Before=sysinit.target
- After=systemd-journald-audit.socket
- # profile cache
--After=var.mount var-lib.mount
-+After=var.mount var-cache.mount usr.mount usr-share.mount
- ConditionSecurity=apparmor
-
- [Service]
+
++++++ apparmor-lessopen-nfs-workaround.diff ++++++
--- /var/tmp/diff_new_pack.guikcZ/_old 2020-11-05 21:53:05.404431025 +0100
+++ /var/tmp/diff_new_pack.guikcZ/_new 2020-11-05 21:53:05.404431025 +0100
@@ -2,7 +2,7 @@
===================================================================
--- profiles/apparmor.d/usr.bin.lessopen.sh.orig 2019-01-06
20:05:38.582356924 +0100
+++ profiles/apparmor.d/usr.bin.lessopen.sh 2019-01-06 20:08:26.885706133
+0100
-@@ -10,6 +10,10 @@
+@@ -13,6 +13,10 @@
capability dac_override,
capability dac_read_search,
++++++ apparmor-lessopen-profile.patch ++++++
--- /var/tmp/diff_new_pack.guikcZ/_old 2020-11-05 21:53:05.416430998 +0100
+++ /var/tmp/diff_new_pack.guikcZ/_new 2020-11-05 21:53:05.416430998 +0100
@@ -2,8 +2,11 @@
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ profiles/apparmor.d/usr.bin.lessopen.sh 2017-10-28 14:15:12.624358664
+0200
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,52 @@
+# vim: ft=apparmor
++
++abi <abi/3.0>,
++
+#include <tunables/global>
+
+/usr/bin/lessopen.sh {
@@ -50,5 +53,5 @@
+ /usr/bin/which mrix,
+ /usr/bin/xz mrix,
+
-+ #include <local/usr.bin.lessopen.sh>
++ include if exists <local/usr.bin.lessopen.sh>
+}
++++++ apparmor-samba-include-permissions-for-shares.diff ++++++
--- /var/tmp/diff_new_pack.guikcZ/_old 2020-11-05 21:53:05.456430908 +0100
+++ /var/tmp/diff_new_pack.guikcZ/_new 2020-11-05 21:53:05.456430908 +0100
@@ -20,15 +20,15 @@
=== modified file 'profiles/apparmor.d/usr.sbin.smbd'
--- profiles/apparmor.d/usr.sbin.smbd 2011-08-27 18:50:42 +0000
+++ profiles/apparmor.d/usr.sbin.smbd 2011-10-19 09:37:04 +0000
-@@ -55,6 +55,10 @@
-
+@@ -56,6 +56,10 @@
@{HOMEDIRS}/** lrwk,
+ /var/lib/samba/usershares/{,**} lrwk,
+ # permissions for all configured shares
+ # autogenerated by update-apparmor-samba-profile at samba start
-+ #include <local/usr.sbin.smbd-shares>
++ include <local/usr.sbin.smbd-shares>
+
# Site-specific additions and overrides. See local/README for details.
- #include <local/usr.sbin.smbd>
+ include if exists <local/usr.sbin.smbd>
}
++++++ changes-since-3.0.0.diff ++++++
++++ 2113 lines (skipped)
++++++ extra-profiles-fix-Pux.diff ++++++
>From d08d1a00a350964abae39337402ab1f2caf271b9 Mon Sep 17 00:00:00 2001
From: Christian Boltz <appar...@cboltz.de>
Date: Sat, 31 Oct 2020 20:52:30 +0100
Subject: [PATCH] Fix invalid Pux (should be PUx) permissions in
dhclient-script
---
profiles/apparmor/profiles/extras/sbin.dhclient-script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/profiles/apparmor/profiles/extras/sbin.dhclient-script
b/profiles/apparmor/profiles/extras/sbin.dhclient-script
index 7b3113525..d972b6093 100644
--- a/profiles/apparmor/profiles/extras/sbin.dhclient-script
+++ b/profiles/apparmor/profiles/extras/sbin.dhclient-script
@@ -25,7 +25,7 @@ profile dhclient-script /{usr/,}sbin/dhclient-script {
/etc/dhcp/{**,} r,
/{usr/,}sbin/dhclient-script r,
/{usr/,}sbin/ip rix,
- /{usr/,}sbin/resolvconf rPux,
+ /{usr/,}sbin/resolvconf rPUx,
include if exists <local/sbin.dhclient-script>
}
--
GitLab
++++++ utils-fix-hotkey-conflict.diff ++++++
>From 07bd11390ea16df17db7f7e6bd2c9678345d3ac5 Mon Sep 17 00:00:00 2001
From: Christian Boltz <appar...@cboltz.de>
Date: Sat, 31 Oct 2020 20:21:29 +0100
Subject: [PATCH 1/2] Check hotkey conflicts case-insensitive
This is needed to catch conflicts between uppercase and lowercase
hotkeys of the same letter, as seen with `(B)enannt` and `A(b)lehnen` in
the german utils translations.
---
utils/test/test-translations.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/test/test-translations.py b/utils/test/test-translations.py
index 4ca50c3d2..e1b91623d 100644
--- a/utils/test/test-translations.py
+++ b/utils/test/test-translations.py
@@ -61,7 +61,7 @@ class TestHotkeyConflicts(AATest):
keys = dict()
for key in params:
text = t.gettext(CMDS[key])
- hotkey = get_translated_hotkey(text)
+ hotkey = get_translated_hotkey(text).lower()
if keys.get(hotkey):
raise Exception("Hotkey conflict: '%s' and '%s' in
language %s" % (keys[hotkey], text, language))
--
GitLab
>From 7cf54f2cd83938cd3b51d588864eb8cc890d63f6 Mon Sep 17 00:00:00 2001
From: Christian Boltz <appar...@cboltz.de>
Date: Sat, 31 Oct 2020 20:27:28 +0100
Subject: [PATCH 2/2] Fix hotkey conflict in utils de.po, id.po and sv.po
---
utils/po/de.po | 8 ++++----
utils/po/id.po | 8 ++++----
utils/po/sv.po | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/utils/po/de.po b/utils/po/de.po
index 161b3fcd4..ecafc5dad 100644
--- a/utils/po/de.po
+++ b/utils/po/de.po
@@ -1079,11 +1079,11 @@ msgstr "(C)hild sauber ausführen"
#: ../apparmor/ui.py:239
msgid "(N)amed"
-msgstr "(B)enannt"
+msgstr "Be(n)annt"
#: ../apparmor/ui.py:240
msgid "(N)amed Clean Exec"
-msgstr "(B)enannte sauber ausführen"
+msgstr "Be(n)annte sauber ausführen"
#: ../apparmor/ui.py:241
msgid "(U)nconfined"
@@ -1111,11 +1111,11 @@ msgstr "(C)hild vererbt saubere Ausführung"
#: ../apparmor/ui.py:247
msgid "(N)amed Inherit"
-msgstr "(B)enannte Vererbung"
+msgstr "Be(n)annte Vererbung"
#: ../apparmor/ui.py:248
msgid "(N)amed Inherit Clean Exec"
-msgstr "(B)enannte Vererbung sauber ausführen"
+msgstr "Be(n)annte Vererbung sauber ausführen"
#: ../apparmor/ui.py:249
msgid "(X) ix On"
diff --git a/utils/po/id.po b/utils/po/id.po
index e35a315a5..c88a1895d 100644
--- a/utils/po/id.po
+++ b/utils/po/id.po
@@ -1147,11 +1147,11 @@ msgstr "(B)aru"
#: ../apparmor/ui.py:254
msgid "(G)lob"
-msgstr "(G)umpal"
+msgstr "G(u)mpal"
#: ../apparmor/ui.py:255
msgid "Glob with (E)xtension"
-msgstr "Gumpal dengan (E)kstensi"
+msgstr "Gumpal dengan E(k)stensi"
#: ../apparmor/ui.py:256
msgid "(A)dd Requested Hat"
@@ -1159,7 +1159,7 @@ msgstr "(T)ambahkan Topi yang Diminta"
#: ../apparmor/ui.py:257
msgid "(U)se Default Hat"
-msgstr "(G)unakan Topi Default"
+msgstr "Gunakan Topi (D)efault"
#: ../apparmor/ui.py:258
msgid "(S)can system log for AppArmor events"
@@ -1175,7 +1175,7 @@ msgstr "(L)ihat Profil"
#: ../apparmor/ui.py:261
msgid "(U)se Profile"
-msgstr "(G)unakan Profil"
+msgstr "Gunakan (P)rofil"
#: ../apparmor/ui.py:262
msgid "(C)reate New Profile"
diff --git a/utils/po/sv.po b/utils/po/sv.po
index 702c71166..e128ffda5 100644
--- a/utils/po/sv.po
+++ b/utils/po/sv.po
@@ -1004,7 +1004,7 @@ msgstr ""
#: ../apparmor/ui.py:223
msgid "(A)llow"
-msgstr "(T)illåt"
+msgstr "Ti(l)låt"
#: ../apparmor/ui.py:224
msgid "(M)ore"
--
GitLab
