From: mhoellein <mario@hoellein.online>
Date: Thu, 30 Mar 2023 06:21:10 +0000 (+0200)
Subject: committing changes in /etc made by "apt-get upgrade"
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=f7cb87461c5da7cf84a63fcf91b7d5321c5da3f3;p=vserver

committing changes in /etc made by "apt-get upgrade"

Package changes:
-apparmor 2.13.3-7ubuntu5.1 amd64
+apparmor 2.13.3-7ubuntu5.2 amd64
-libapparmor1 2.13.3-7ubuntu5.1 amd64
+libapparmor1 2.13.3-7ubuntu5.2 amd64
-linux-libc-dev 5.4.0-144.161 amd64
+linux-libc-dev 5.4.0-146.163 amd64
---

diff --git a/.etckeeper b/.etckeeper
index 45674c219..0fd62dd30 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -508,6 +508,8 @@ maybe chmod 0755 'apm'
 maybe chmod 0755 'apm/event.d'
 maybe chmod 0755 'apparmor'
 maybe chmod 0755 'apparmor.d'
+maybe chmod 0755 'apparmor.d/abi'
+maybe chmod 0644 'apparmor.d/abi/2.13'
 maybe chmod 0755 'apparmor.d/abstractions'
 maybe chmod 0644 'apparmor.d/abstractions/X'
 maybe chmod 0644 'apparmor.d/abstractions/apache2-common'
@@ -1624,6 +1626,7 @@ maybe chmod 0755 'ldap/schema'
 maybe chmod 0644 'ldap/schema/amavis.schema'
 maybe chmod 0644 'legal'
 maybe chmod 0755 'letsencrypt'
+maybe chmod 0600 'letsencrypt/.certbot.lock'
 maybe chmod 0644 'letsencrypt/.updated-options-ssl-apache-conf-digest.txt'
 maybe chmod 0700 'letsencrypt/accounts'
 maybe chmod 0700 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org'
diff --git a/apparmor.d/abi/2.13 b/apparmor.d/abi/2.13
new file mode 100644
index 000000000..3463f372a
--- /dev/null
+++ b/apparmor.d/abi/2.13
@@ -0,0 +1,80 @@
+capability {0xffffff
+}
+caps {mask {chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap mac_override mac_admin syslog wake_alarm block_suspend audit_read perfmon bpf checkpoint_restore
+}
+}
+dbus {mask {acquire send receive
+}
+}
+domain {attach_conditions {xattr {yes
+}
+}
+change_hat {yes
+}
+change_hatv {yes
+}
+change_onexec {yes
+}
+change_profile {yes
+}
+computed_longest_left {yes
+}
+fix_binfmt_elf_mmap {yes
+}
+post_nnp_subset {yes
+}
+stack {yes
+}
+version {1.2
+}
+}
+file {mask {create read write exec append mmap_exec link lock
+}
+}
+mount {mask {mount umount pivot_root
+}
+}
+namespaces {pivot_root {no
+}
+profile {yes
+}
+}
+network {af_mask {unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp
+}
+af_unix {yes
+}
+}
+network_v8 {af_mask {unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc ib mpls can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc vsock kcm qipcrtr smc xdp mctp
+}
+}
+policy {outofband {0x000001
+}
+set_load {yes
+}
+versions {v5 {yes
+}
+v6 {yes
+}
+v7 {yes
+}
+v8 {yes
+}
+}
+}
+ptrace {mask {read trace
+}
+}
+query {label {data {yes
+}
+multi_transaction {yes
+}
+perms {allow deny audit quiet
+}
+}
+}
+rlimit {mask {cpu fsize data stack core rss nproc nofile memlock as locks sigpending msgqueue nice rtprio rttime
+}
+}
+signal {mask {hup int quit ill trap abrt bus fpe kill usr1 segv usr2 pipe alrm term stkflt chld cont stop stp ttin ttou urg xcpu xfsz vtalrm prof winch io pwr sys emt lost
+}
+}
diff --git a/apparmor/parser.conf b/apparmor/parser.conf
index 641cf1db8..93bb9d458 100644
--- a/apparmor/parser.conf
+++ b/apparmor/parser.conf
@@ -59,3 +59,6 @@
 ## Adjust compression
 #Optimize=compress-small
 #Optimize=compress-fast
+
+## Pin older policies so they are not affected by new mediation
+policy-features=/etc/apparmor.d/abi/2.13
diff --git a/letsencrypt/.certbot.lock b/letsencrypt/.certbot.lock
new file mode 100644
index 000000000..e69de29bb