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

author mhoellein <mario@hoellein.online>

Mon, 13 May 2024 09:19:51 +0000 (11:19 +0200)

committer mhoellein <mario@hoellein.online>

Mon, 13 May 2024 09:19:51 +0000 (11:19 +0200)
author mhoellein <mario@hoellein.online>
Mon, 13 May 2024 09:19:51 +0000 (11:19 +0200)
committer mhoellein <mario@hoellein.online>
Mon, 13 May 2024 09:19:51 +0000 (11:19 +0200)
diff --git a/.etckeeper b/.etckeeper

index 267831f2ede98d04e5ce481cdc1a9a05dbdd709c..976896f141e9d0e52f53fc4429aaed25a990900f 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -315,6 +315,7 @@ maybe chmod 0644 'apparmor.d/abstractions/recent-documents-write'
  maybe chmod 0644 'apparmor.d/abstractions/ruby'
  maybe chmod 0644 'apparmor.d/abstractions/samba'
  maybe chmod 0644 'apparmor.d/abstractions/smbpass'
+maybe chmod 0644 'apparmor.d/abstractions/snap_browsers'
  maybe chmod 0644 'apparmor.d/abstractions/ssl_certs'
  maybe chmod 0644 'apparmor.d/abstractions/ssl_keys'
  maybe chmod 0644 'apparmor.d/abstractions/svn-repositories'
diff --git a/apache2/mods-available/setenvif.conf b/apache2/mods-available/setenvif.conf

index b6c4cc474419a79ba09905648b7dd6b5c43afb0c..e03913cadcbcd4199b5902331cffa0b157750e3d 100644 (file)
--- a/apache2/mods-available/setenvif.conf
+++ b/apache2/mods-available/setenvif.conf
@@ -26,6 +26,8 @@
         BrowserMatch "^XML Spy" redirect-carefully
         BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
         BrowserMatch " Konqueror/4" redirect-carefully
+       BrowserMatch " Konqueror/5" redirect-carefully
+       BrowserMatch " dolphin/" redirect-carefully
  
  </IfModule>
  
diff --git a/apparmor.d/abstractions/snap_browsers b/apparmor.d/abstractions/snap_browsers

new file mode 100644 (file)

index 0000000..98fdeed
--- /dev/null
+++ b/apparmor.d/abstractions/snap_browsers
@@ -0,0 +1,43 @@
+profile snap_browsers {
+  include if exists <abstractions/snap_browsers.d>
+  include <abstractions/base>
+  include <abstractions/dbus-session-strict>
+
+  /etc/passwd r,
+  /etc/nsswitch.conf r,
+  /etc/fstab r,
+
+  # noisy
+  deny owner /run/user/[0-9]*/gdm/Xauthority r, # not needed on Ubuntu
+
+  /{,snap/core/[0-9]*/,snap/snapd/[0-9]*/}usr/bin/snap mrix, # re-exec
+  /{,snap/core/[0-9]*/,snap/snapd/[0-9]*/}usr/lib/snapd/info r,
+  /{,snap/core/[0-9]*/,snap/snapd/[0-9]*/}usr/lib/snapd/snapd r,
+  /{,snap/core/[0-9]*/,snap/snapd/[0-9]*/}usr/lib/snapd/snap-seccomp rPix,
+  /{,snap/core/[0-9]*/,snap/snapd/[0-9]*/}usr/lib/snapd/snap-confine Pix,
+  /var/lib/snapd/system-key r,
+  /run/snapd.socket rw,
+
+  @{PROC}/version r,
+  @{PROC}/cmdline r,
+  @{PROC}/sys/net/core/somaxconn r,
+  @{PROC}/sys/kernel/seccomp/actions_avail r,
+  @{PROC}/sys/kernel/random/uuid r,
+  owner @{PROC}/@{pid}/cgroup r,
+  owner @{PROC}/@{pid}/mountinfo r,
+  owner @{HOME}/.snap/auth.json r, # if exists, required
+
+  dbus send bus="session" path="/org/freedesktop/systemd1" interface="org.freedesktop.systemd1.Manager" member="StartTransientUnit" peer=(name="org.freedesktop.systemd1"),
+  dbus receive bus="session" path="/org/freedesktop/systemd1" interface="org.freedesktop.systemd1.Manager" member="JobRemoved",
+
+  /sys/kernel/security/apparmor/features/ r,
+
+  # allow launching official browser snaps.
+  /snap/chromium/[0-9]*/meta/{snap.yaml,hooks/} r,
+  /snap/firefox/[0-9]*/meta/{snap.yaml,hooks/} r,
+  /snap/opera/[0-9]*/meta/{snap.yaml,hooks/} r,
+
+  /var/lib/snapd/sequence/{chromium,firefox,opera}.json r,
+  /var/lib/snapd/inhibit/{chromium,firefox,opera}.lock rk,
+  # add other browsers here
+}
diff --git a/apparmor.d/usr.bin.tcpdump b/apparmor.d/usr.bin.tcpdump

index 48de5673be567a9c4b8d4d8154bbb1d2758f5082..f005a0b417280ff4d051ff8cf934817dd7afbbf9 100644 (file)
--- a/apparmor.d/usr.bin.tcpdump
+++ b/apparmor.d/usr.bin.tcpdump
@@ -54,7 +54,12 @@ profile tcpdump /usr/bin/tcpdump {
  
    # for -r, -F and -w
    /**.[pP][cC][aA][pP] rw,
+  /**.[pP][cC][aA][pP][nN][gG] rw,
    /**.[cC][aA][pP] rw,
+  # -W adds a numerical suffix
+  /**.[pP][cC][aA][pP][0-9]* rw,
+  /**.[pP][cC][aA][pP][nN][gG][0-9]* rw,
+  /**.[cC][aA][pP][0-9]* rw,
  
    # for convenience with -r (ie, read pcap files from other sources)
    /var/log/snort/*log* r,
diff --git a/issue b/issue

index c8130113daab01f4e4d3707a9080f54843c2c14b..d5d863dbb4f4104341e031233bf0db080d8107ff 100644 (file)
--- a/issue
+++ b/issue
@@ -1,2 +1,2 @@
-Ubuntu 22.04.3 LTS \n \l
+Ubuntu 22.04.4 LTS \n \l
  
diff --git a/issue.net b/issue.net

index 1b339ce222064b3dfd2efee19fc26bf5fe843345..68bd29cedf83ae4bd9827fc7c6a333ec8b12c0b7 100644 (file)
--- a/issue.net
+++ b/issue.net
@@ -1 +1 @@
-Ubuntu 22.04.3 LTS
+Ubuntu 22.04.4 LTS
diff --git a/lsb-release b/lsb-release

index 229ed43344ca2635c94cdbd557bfd4718940fed0..58947887cf3ee23ca6a98b4cc4604a5a7bb96052 100644 (file)
--- a/lsb-release
+++ b/lsb-release
@@ -1,4 +1,4 @@
  DISTRIB_ID=Ubuntu
  DISTRIB_RELEASE=22.04
  DISTRIB_CODENAME=jammy
-DISTRIB_DESCRIPTION="Ubuntu 22.04.3 LTS"
+DISTRIB_DESCRIPTION="Ubuntu 22.04.4 LTS"
diff --git a/update-motd.d/10-help-text b/update-motd.d/10-help-text

index 47f02b7b49fe98750a34b9ea8e6d9c1162a7942c..c4a186e0f2dbf9d22516ea2ba474a8c8741ec8c8 100755 (executable)
--- a/update-motd.d/10-help-text
+++ b/update-motd.d/10-help-text
@@ -23,4 +23,4 @@
  printf "\n"
  printf " * Documentation:  https://help.ubuntu.com\n"
  printf " * Management:     https://landscape.canonical.com\n"
-printf " * Support:        https://ubuntu.com/advantage\n"
+printf " * Support:        https://ubuntu.com/pro\n"
author	mhoellein <mario@hoellein.online>
	Mon, 13 May 2024 09:19:51 +0000 (11:19 +0200)
committer	mhoellein <mario@hoellein.online>
	Mon, 13 May 2024 09:19:51 +0000 (11:19 +0200)
.etckeeper		patch \| blob \| history
apache2/mods-available/setenvif.conf		patch \| blob \| history
apparmor.d/abstractions/snap_browsers	[new file with mode: 0644]	patch \| blob
apparmor.d/usr.bin.tcpdump		patch \| blob \| history
issue		patch \| blob \| history
issue.net		patch \| blob \| history
lsb-release		patch \| blob \| history
update-motd.d/10-help-text		patch \| blob \| history