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

author root <root@localhost>

Fri, 25 Sep 2020 07:23:18 +0000 (09:23 +0200)

committer root <root@localhost>

Fri, 25 Sep 2020 07:23:18 +0000 (09:23 +0200)
author root <root@localhost>
Fri, 25 Sep 2020 07:23:18 +0000 (09:23 +0200)
committer root <root@localhost>
Fri, 25 Sep 2020 07:23:18 +0000 (09:23 +0200)
diff --git a/.etckeeper b/.etckeeper

index c118950868d9ca80627bfba07eb8f4c561226964..d7d01720ec64393833147c6bfd3af063d55c6e6d 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2921,6 +2921,7 @@ maybe chmod 0644 'profile.d/bash_completion.sh'
  maybe chmod 0644 'profile.d/cedilla-portuguese.sh'
  maybe chmod 0644 'profile.d/gawk.csh'
  maybe chmod 0644 'profile.d/gawk.sh'
+maybe chmod 0644 'profile.d/im-config_wayland.sh'
  maybe chmod 0755 'profile.d/jdk.csh'
  maybe chmod 0755 'profile.d/jdk.sh'
  maybe chmod 0644 'profile.d/libvirt-uri.sh'
diff --git a/apparmor.d/usr.lib.snapd.snap-confine.real b/apparmor.d/usr.lib.snapd.snap-confine.real

index 86fe1a12d7158668c01575f6b2f1f38c19884b10..c926e2f7d9cbaa225f624ff6e95f05f64791e1b2 100644 (file)
--- a/apparmor.d/usr.lib.snapd.snap-confine.real
+++ b/apparmor.d/usr.lib.snapd.snap-confine.real
@@ -68,13 +68,6 @@
      /sys/fs/cgroup/freezer/snap.*/ w,
      /sys/fs/cgroup/freezer/snap.*/cgroup.procs rw,
  
-    # cgroup: pids
-    # allow creating per snap-security-tag hierarchy and adding snap command (task)
-    # invocations to the controller.
-    /sys/fs/cgroup/pids/ r,
-    /sys/fs/cgroup/pids/snap.*/ w,
-    /sys/fs/cgroup/pids/snap.*/cgroup.procs w,
-
      # querying udev
      /etc/udev/udev.conf r,
      /sys/**/uevent r,
@@ -106,8 +99,11 @@
      # '/'. Use 'unsafe' to support snap-exec on armhf and its reliance on
      # the environment for determining the capabilities of the architecture.
      # 'unsafe' is ok here because the kernel will have already cleared the
-    # environment as part of launching snap-confine with
-    # CAP_SYS_ADMIN.
+    # environment as part of launching snap-confine with CAP_SYS_ADMIN. This
+    # does leave directories as configured by ld.so.preload as well as
+    # LD_PRELOAD to be set to a library which is in a directory configured by
+    # ld.so.conf, but access to those locations is mediated by this profile
+    # (which requires rules for specific locations).
      change_profile unsafe /** -> [^u/]**,
      change_profile unsafe /** -> u[^n]**,
      change_profile unsafe /** -> un[^c]**,
diff --git a/profile.d/apps-bin-path.sh b/profile.d/apps-bin-path.sh

index 6604dd81ae67ed897897392e4221e1ef9f4979bd..298a149f2419e87121fe000ae286f369fdd2f18e 100644 (file)
--- a/profile.d/apps-bin-path.sh
+++ b/profile.d/apps-bin-path.sh
@@ -2,7 +2,7 @@
  
  # Expand $PATH to include the directory where snappy applications go.
  snap_bin_path="/snap/bin"
-if [ -n "${PATH##*${snap_bin_path}}" -a -n "${PATH##*${snap_bin_path}:*}" ]; then
+if [ -n "${PATH##*${snap_bin_path}}" ] && [ -n "${PATH##*${snap_bin_path}:*}" ]; then
      export PATH=$PATH:${snap_bin_path}
  fi
  
@@ -16,7 +16,7 @@ fi
  # looked for in XDG_DATA_DIRS; make sure it includes the relevant directory for
  # snappy applications' desktop files.
  snap_xdg_path="/var/lib/snapd/desktop"
-if [ -n "${XDG_DATA_DIRS##*${snap_xdg_path}}" -a -n "${XDG_DATA_DIRS##*${snap_xdg_path}:*}" ]; then
+if [ -n "${XDG_DATA_DIRS##*${snap_xdg_path}}" ] && [ -n "${XDG_DATA_DIRS##*${snap_xdg_path}:*}" ]; then
      export XDG_DATA_DIRS="${XDG_DATA_DIRS}:${snap_xdg_path}"
  fi
  
diff --git a/profile.d/im-config_wayland.sh b/profile.d/im-config_wayland.sh

new file mode 100644 (file)

index 0000000..bdbf709
--- /dev/null
+++ b/profile.d/im-config_wayland.sh
@@ -0,0 +1,12 @@
+# /etc/profile.d/im-config_wayland.sh
+#
+# This sets the IM variables on Wayland.
+
+test "$XDG_SESSION_TYPE" = 'wayland' || return
+
+# don't do anything if im-config was removed but not purged
+test -r /usr/share/im-config/xinputrc.common || return
+
+if [ -r /etc/X11/Xsession.d/70im-config_launch ]; then
+    . /etc/X11/Xsession.d/70im-config_launch
+fi
diff --git a/xdg/autostart/im-launch.desktop b/xdg/autostart/im-launch.desktop

index 579c976edf16b85a74f3e67067f4907268e9698a..055b2d2b8b5d2b2bb701c455435b90ac04e213a3 100644 (file)
--- a/xdg/autostart/im-launch.desktop
+++ b/xdg/autostart/im-launch.desktop
@@ -1,5 +1,5 @@
  [Desktop Entry]
  Name=im-launch
-Exec=sh -c 'if ! [ -e "/usr/bin/ibus-daemon" ] && [ "x$XDG_SESSION_TYPE" = "xwayland" ] ; then exec env IM_CONFIG_CHECK_ENV=1 im-launch true; fi'
+Exec=sh -c 'if [ "x$XDG_SESSION_TYPE" = "xwayland" ] ; then exec env IM_CONFIG_CHECK_ENV=1 im-launch true; fi'
  TryExec=im-launch
  Type=Application
author	root <root@localhost>
	Fri, 25 Sep 2020 07:23:18 +0000 (09:23 +0200)
committer	root <root@localhost>
	Fri, 25 Sep 2020 07:23:18 +0000 (09:23 +0200)
.etckeeper		patch \| blob \| history
apparmor.d/usr.lib.snapd.snap-confine.real		patch \| blob \| history
profile.d/apps-bin-path.sh		patch \| blob \| history
profile.d/im-config_wayland.sh	[new file with mode: 0644]	patch \| blob
xdg/autostart/im-launch.desktop		patch \| blob \| history