From 2aa1167f50d249e155a9cd11ee3cc2db0e0fc0e3 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Thu, 6 Apr 2023 14:30:07 +0200 Subject: [PATCH] committing changes in /etc made by "apt-get upgrade" Package changes: -apache2 2.4.41-4ubuntu3.13 amd64 -apache2-bin 2.4.41-4ubuntu3.13 amd64 -apache2-data 2.4.41-4ubuntu3.13 all -apache2-utils 2.4.41-4ubuntu3.13 amd64 -apparmor 2.13.3-7ubuntu5.1 amd64 +apache2 2.4.41-4ubuntu3.14 amd64 +apache2-bin 2.4.41-4ubuntu3.14 amd64 +apache2-data 2.4.41-4ubuntu3.14 all +apache2-utils 2.4.41-4ubuntu3.14 amd64 +apparmor 2.13.3-7ubuntu5.2 amd64 -base-files 11ubuntu5.6 amd64 +base-files 11ubuntu5.7 amd64 -bind9 1:9.16.1-0ubuntu2.12 amd64 -bind9-dnsutils 1:9.16.1-0ubuntu2.12 amd64 -bind9-host 1:9.16.1-0ubuntu2.12 amd64 -bind9-libs 1:9.16.1-0ubuntu2.12 amd64 -bind9-utils 1:9.16.1-0ubuntu2.12 amd64 +bind9 1:9.16.1-0ubuntu2.14 amd64 +bind9-dnsutils 1:9.16.1-0ubuntu2.14 amd64 +bind9-host 1:9.16.1-0ubuntu2.14 amd64 +bind9-libs 1:9.16.1-0ubuntu2.14 amd64 +bind9-utils 1:9.16.1-0ubuntu2.14 amd64 -curl 7.68.0-1ubuntu2.15 amd64 +curl 7.68.0-1ubuntu2.18 amd64 -distro-info-data 0.43ubuntu1.11 all +distro-info-data 0.43ubuntu1.12 all -dnsutils 1:9.16.1-0ubuntu2.12 all +dnsutils 1:9.16.1-0ubuntu2.14 all -isc-dhcp-client 4.4.1-2.1ubuntu5.20.04.4 amd64 -isc-dhcp-common 4.4.1-2.1ubuntu5.20.04.4 amd64 +isc-dhcp-client 4.4.1-2.1ubuntu5.20.04.5 amd64 +isc-dhcp-common 4.4.1-2.1ubuntu5.20.04.5 amd64 -krb5-locales 1.17-6ubuntu4.2 all +krb5-locales 1.17-6ubuntu4.3 all -libapparmor1 2.13.3-7ubuntu5.1 amd64 +libapparmor1 2.13.3-7ubuntu5.2 amd64 -libcurl3-gnutls 7.68.0-1ubuntu2.15 amd64 -libcurl4 7.68.0-1ubuntu2.15 amd64 +libcurl3-gnutls 7.68.0-1ubuntu2.18 amd64 +libcurl4 7.68.0-1ubuntu2.18 amd64 -libgnutls30 3.6.13-2ubuntu1.7 amd64 +libgnutls30 3.6.13-2ubuntu1.8 amd64 -libgssapi-krb5-2 1.17-6ubuntu4.2 amd64 +libgssapi-krb5-2 1.17-6ubuntu4.3 amd64 -libk5crypto3 1.17-6ubuntu4.2 amd64 +libk5crypto3 1.17-6ubuntu4.3 amd64 -libkrb5-3 1.17-6ubuntu4.2 amd64 -libkrb5support0 1.17-6ubuntu4.2 amd64 +libkrb5-3 1.17-6ubuntu4.3 amd64 +libkrb5support0 1.17-6ubuntu4.3 amd64 -libldb2 2:2.2.3-0ubuntu0.20.04.3 amd64 +libldb2 2:2.4.4-0ubuntu0.20.04.2 amd64 -libnss-systemd 245.4-4ubuntu3.19 amd64 +libnss-systemd 245.4-4ubuntu3.20 amd64 -libpam-systemd 245.4-4ubuntu3.19 amd64 +libpam-systemd 245.4-4ubuntu3.20 amd64 -libpq5 12.13-0ubuntu0.20.04.1 amd64 +libpq5 12.14-0ubuntu0.20.04.1 amd64 -libpython3.8 3.8.10-0ubuntu1~20.04.6 amd64 -libpython3.8-minimal 3.8.10-0ubuntu1~20.04.6 amd64 -libpython3.8-stdlib 3.8.10-0ubuntu1~20.04.6 amd64 +libpython3.8 3.8.10-0ubuntu1~20.04.7 amd64 +libpython3.8-minimal 3.8.10-0ubuntu1~20.04.7 amd64 +libpython3.8-stdlib 3.8.10-0ubuntu1~20.04.7 amd64 -libruby2.7 2.7.0-5ubuntu1.7 amd64 +libruby2.7 2.7.0-5ubuntu1.8 amd64 -libsmbclient 2:4.13.17~dfsg-0ubuntu1.20.04.5 amd64 -libsnmp-base 5.8+dfsg-2ubuntu2.6 all -libsnmp35 5.8+dfsg-2ubuntu2.6 amd64 +libsmbclient 2:4.15.13+dfsg-0ubuntu0.20.04.2 amd64 +libsnmp-base 5.8+dfsg-2ubuntu2.7 all +libsnmp35 5.8+dfsg-2ubuntu2.7 amd64 -libsystemd0 245.4-4ubuntu3.19 amd64 -libtalloc2 2.3.1-0ubuntu0.20.04.1 amd64 +libsystemd0 245.4-4ubuntu3.20 amd64 +libtalloc2 2.3.3-0ubuntu0.20.04.1 amd64 -libtdb1 1.4.3-0ubuntu0.20.04.1 amd64 -libtevent0 0.10.2-0ubuntu0.20.04.1 amd64 +libtdb1 1.4.5-0ubuntu0.20.04.1 amd64 +libtevent0 0.11.0-0ubuntu0.20.04.1 amd64 -libudev1 245.4-4ubuntu3.19 amd64 +libudev1 245.4-4ubuntu3.20 amd64 -libunwind8 1.2.1-9build1 amd64 +libunwind8 1.2.1-9ubuntu0.1 amd64 -libwbclient0 2:4.13.17~dfsg-0ubuntu1.20.04.5 amd64 +libwbclient0 2:4.15.13+dfsg-0ubuntu0.20.04.2 amd64 -linux-firmware 1.187.36 all +linux-firmware 1.187.38 all -python-apt-common 2.0.1 all +python-apt-common 2.0.1ubuntu0.20.04.1 all -python3-apt 2.0.1 amd64 +python3-apt 2.0.1ubuntu0.20.04.1 amd64 -python3-distupgrade 1:20.04.40 all +python3-distupgrade 1:20.04.41 all -python3-ldb 2:2.2.3-0ubuntu0.20.04.3 amd64 +python3-ldb 2:2.4.4-0ubuntu0.20.04.2 amd64 -python3-samba 2:4.13.17~dfsg-0ubuntu1.20.04.5 amd64 +python3-samba 2:4.15.13+dfsg-0ubuntu0.20.04.2 amd64 -python3-talloc 2.3.1-0ubuntu0.20.04.1 amd64 -python3-tdb 1.4.3-0ubuntu0.20.04.1 amd64 +python3-talloc 2.3.3-0ubuntu0.20.04.1 amd64 +python3-tdb 1.4.5-0ubuntu0.20.04.1 amd64 -python3.8 3.8.10-0ubuntu1~20.04.6 amd64 -python3.8-minimal 3.8.10-0ubuntu1~20.04.6 amd64 +python3.8 3.8.10-0ubuntu1~20.04.7 amd64 +python3.8-minimal 3.8.10-0ubuntu1~20.04.7 amd64 -rsync 3.1.3-8ubuntu0.4 amd64 +rsync 3.1.3-8ubuntu0.5 amd64 -ruby2.7 2.7.0-5ubuntu1.7 amd64 +ruby2.7 2.7.0-5ubuntu1.8 amd64 -samba-common 2:4.13.17~dfsg-0ubuntu1.20.04.5 all -samba-common-bin 2:4.13.17~dfsg-0ubuntu1.20.04.5 amd64 -samba-dsdb-modules 2:4.13.17~dfsg-0ubuntu1.20.04.5 amd64 -samba-libs 2:4.13.17~dfsg-0ubuntu1.20.04.5 amd64 +samba-common 2:4.15.13+dfsg-0ubuntu0.20.04.2 all +samba-common-bin 2:4.15.13+dfsg-0ubuntu0.20.04.2 amd64 +samba-dsdb-modules 2:4.15.13+dfsg-0ubuntu0.20.04.2 amd64 +samba-libs 2:4.15.13+dfsg-0ubuntu0.20.04.2 amd64 -smbclient 2:4.13.17~dfsg-0ubuntu1.20.04.5 amd64 -snmp 5.8+dfsg-2ubuntu2.6 amd64 +smbclient 2:4.15.13+dfsg-0ubuntu0.20.04.2 amd64 +snmp 5.8+dfsg-2ubuntu2.7 amd64 -systemd 245.4-4ubuntu3.19 amd64 -systemd-sysv 245.4-4ubuntu3.19 amd64 -systemd-timesyncd 245.4-4ubuntu3.19 amd64 +systemd 245.4-4ubuntu3.20 amd64 +systemd-sysv 245.4-4ubuntu3.20 amd64 +systemd-timesyncd 245.4-4ubuntu3.20 amd64 -tar 1.30+dfsg-7ubuntu0.20.04.2 amd64 +tar 1.30+dfsg-7ubuntu0.20.04.3 amd64 -tcpdump 4.9.3-4ubuntu0.1 amd64 +tcpdump 4.9.3-4ubuntu0.2 amd64 -ubuntu-release-upgrader-core 1:20.04.40 all +ubuntu-release-upgrader-core 1:20.04.41 all -udev 245.4-4ubuntu3.19 amd64 +udev 245.4-4ubuntu3.20 amd64 -vim 2:8.1.2269-1ubuntu5.11 amd64 +vim 2:8.1.2269-1ubuntu5.13 amd64 -vim-common 2:8.1.2269-1ubuntu5.11 all +vim-common 2:8.1.2269-1ubuntu5.13 all -vim-runtime 2:8.1.2269-1ubuntu5.11 all -vim-tiny 2:8.1.2269-1ubuntu5.11 amd64 +vim-runtime 2:8.1.2269-1ubuntu5.13 all +vim-tiny 2:8.1.2269-1ubuntu5.13 amd64 -xxd 2:8.1.2269-1ubuntu5.11 amd64 +xxd 2:8.1.2269-1ubuntu5.13 amd64 --- .etckeeper | 2 + apparmor.d/abi/2.13 | 80 +++++++++++++++++++++++++++++++++++++ apparmor.d/sbin.dhclient | 3 ++ apparmor.d/usr.sbin.tcpdump | 4 ++ apparmor/parser.conf | 3 ++ issue | 2 +- issue.net | 2 +- lsb-release | 2 +- 8 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 apparmor.d/abi/2.13 diff --git a/.etckeeper b/.etckeeper index 0424d1a..e00f710 100755 --- a/.etckeeper +++ b/.etckeeper @@ -227,6 +227,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' diff --git a/apparmor.d/abi/2.13 b/apparmor.d/abi/2.13 new file mode 100644 index 0000000..3463f37 --- /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.d/sbin.dhclient b/apparmor.d/sbin.dhclient index 1acc6b9..7e77525 100644 --- a/apparmor.d/sbin.dhclient +++ b/apparmor.d/sbin.dhclient @@ -22,6 +22,9 @@ # see LP: #1918410 owner @{PROC}/@{pid}/task/[0-9]*/comm rw, + # LP: #1926139 + @{PROC}/cmdline r, + /{,usr/}sbin/dhclient mr, # LP: #1197484 and LP: #1202203 - why is this needed? :( /{,usr/}bin/bash mr, diff --git a/apparmor.d/usr.sbin.tcpdump b/apparmor.d/usr.sbin.tcpdump index d0a7037..c4e3bec 100644 --- a/apparmor.d/usr.sbin.tcpdump +++ b/apparmor.d/usr.sbin.tcpdump @@ -60,6 +60,10 @@ /usr/sbin/tcpdump mr, + # allow printing to stdout/stderr when inside a container + # (LP: #1667016) + /dev/pts/* rw, + # Site-specific additions and overrides. See local/README for details. #include } diff --git a/apparmor/parser.conf b/apparmor/parser.conf index 641cf1d..93bb9d4 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/issue b/issue index ebf55ab..c7b6088 100644 --- a/issue +++ b/issue @@ -1,2 +1,2 @@ -Ubuntu 20.04.5 LTS \n \l +Ubuntu 20.04.6 LTS \n \l diff --git a/issue.net b/issue.net index 1f83fc8..f3da527 100644 --- a/issue.net +++ b/issue.net @@ -1 +1 @@ -Ubuntu 20.04.5 LTS +Ubuntu 20.04.6 LTS diff --git a/lsb-release b/lsb-release index e3394f9..a567d3b 100644 --- a/lsb-release +++ b/lsb-release @@ -1,4 +1,4 @@ DISTRIB_ID=Ubuntu DISTRIB_RELEASE=20.04 DISTRIB_CODENAME=focal -DISTRIB_DESCRIPTION="Ubuntu 20.04.5 LTS" +DISTRIB_DESCRIPTION="Ubuntu 20.04.6 LTS" -- 2.43.0