Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(24.04): add polkitd and dependencies #325

Open
wants to merge 8 commits into
base: ubuntu-24.04
Choose a base branch
from
38 changes: 38 additions & 0 deletions slices/dbus-broker.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package: dbus-broker
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you also test these slices pls?


essential:
- dbus-broker_copyright

slices:
bins:
essential:
- dbus-broker_catalog
- dbus-system-bus-common_config
- init-system-helpers_bins
- libapparmor1_libs
- libaudit1_libs
- libc6_libs
- libcap-ng0_libs
- libexpat1_libs
- libselinux1_libs
- libsystemd0_libs
- systemd-sysv_bins
contents:
/usr/bin/dbus-broker:
/usr/bin/dbus-broker-launch:

catalog:
contents:
/usr/lib/systemd/catalog/dbus-broker-launch.catalog:
/usr/lib/systemd/catalog/dbus-broker.catalog:

services:
essential:
- dbus-broker_bins
contents:
/usr/lib/systemd/system/dbus-broker.service:
/usr/lib/systemd/user/dbus-broker.service:

copyright:
contents:
/usr/share/doc/dbus-broker/copyright:
15 changes: 15 additions & 0 deletions slices/libduktape207.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package: libduktape207

essential:
- libduktape207_copyright

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/libduktape.so.207:

copyright:
contents:
/usr/share/doc/libduktape207/copyright:
8 changes: 8 additions & 0 deletions slices/libglib2.0-0t64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ essential:
- libglib2.0-0t64_copyright

slices:
bins:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you test this pls?

essential:
- libglib2.0-0t64_libs
contents:
/usr/lib/*-linux-*/glib-2.0/gio-launch-desktop:
/usr/lib/*-linux-*/glib-2.0/gio-querymodules:
/usr/lib/*-linux-*/glib-2.0/glib-compile-schemas:

core:
essential:
- libc6_libs
Expand Down
17 changes: 17 additions & 0 deletions slices/libpolkit-agent-1-0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package: libpolkit-agent-1-0

essential:
- libpolkit-agent-1-0_copyright

slices:
libs:
essential:
- libc6_libs
- libglib2.0-0t64_libs
- libpolkit-gobject-1-0_libs
contents:
/usr/lib/*-linux-*/libpolkit-agent-1.so.0*:

copyright:
contents:
/usr/share/doc/libpolkit-agent-1-0/copyright:
17 changes: 17 additions & 0 deletions slices/libpolkit-gobject-1-0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package: libpolkit-gobject-1-0

essential:
- libpolkit-gobject-1-0_copyright

slices:
libs:
essential:
- libc6_libs
- libglib2.0-0t64_libs
- libsystemd0_libs
contents:
/usr/lib/*-linux-*/libpolkit-gobject-1.so.0*:

copyright:
contents:
/usr/share/doc/libpolkit-gobject-1-0/copyright:
31 changes: 31 additions & 0 deletions slices/login.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package: login
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you please test this?


essential:
- login_copyright

slices:
bins:
essential:
- libaudit1_libs
- libc6_libs
- libcrypt1_libs
- libpam-modules_libs
- libpam-runtime_config
- libpam0g_libs
- login_config
contents:
/usr/bin/faillog:
/usr/bin/lastlog:
/usr/bin/login:
/usr/bin/newgrp:
/usr/bin/sg:
/usr/sbin/nologin:

config:
contents:
/etc/login.defs:
/etc/pam.d/login:

copyright:
contents:
/usr/share/doc/login/copyright:
15 changes: 15 additions & 0 deletions slices/opensysusers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package: opensysusers

essential:
- opensysusers_copyright

slices:
bins:
contents:
/bin/systemd-sysusers:
/etc/init.d/opensysusers:
/usr/bin/opensysusers-sysusers:
Comment on lines +9 to +11
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here, can you pls test them?


copyright:
contents:
/usr/share/doc/opensysusers/copyright:
65 changes: 65 additions & 0 deletions slices/polkitd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package: polkitd

essential:
- polkitd_copyright

slices:
bins:
essential:
- dbus-broker_bins
- libc6_gconv
- libc6_libs
- libduktape207_libs
- libexpat1_libs
- libglib2.0-0t64_libs
- libpam0g_libs
- libpolkit-agent-1-0_libs
- libpolkit-gobject-1-0_libs
- libsystemd0_libs
- login_bins
- opensysusers_bins
- polkitd_config
- polkitd_pam-profile
- polkitd_rules
- xml-core_catalog
contents:
/usr/bin/pkaction:
/usr/bin/pkcheck:
/usr/bin/pkttyagent:
/usr/lib/policykit-1/polkit-agent-helper-1:
/usr/lib/polkit-1/polkit-agent-helper-1:
Comment on lines +29 to +30
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are these helpers needed? Or could they belong to an additional slice?

/usr/lib/polkit-1/polkitd:
/usr/libexec/polkit-agent-helper-1:

config:
contents:
/usr/lib/sysusers.d/polkit.conf:
/usr/lib/tmpfiles.d/polkitd.conf:
/var/lib/polkit-1/: { make: true, mode: 0700 }

dbus-interface:
contents:
/usr/share/dbus-1/system-services/org.freedesktop.PolicyKit1.service:
/usr/share/dbus-1/system.d/org.freedesktop.PolicyKit1.conf:

pam-profile:
contents:
/usr/lib/pam.d/polkit-1:

rules:
contents:
/etc/polkit-1/rules.d/: { make: true, mode: 0755 }
/usr/share/polkit-1/actions/org.freedesktop.policykit.policy:
/usr/share/polkit-1/policyconfig-1.dtd:
/usr/share/polkit-1/rules.d/49-ubuntu-admin.rules:
/usr/share/polkit-1/rules.d/50-default.rules:

services:
essential:
- polkitd_bins
contents:
/usr/lib/systemd/system/polkit.service:

copyright:
contents:
/usr/share/doc/polkitd/copyright:
47 changes: 47 additions & 0 deletions slices/sgml-base.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package: sgml-base

slices:
# also contains some binary debian helpers, they are
# used only to generate or update the xml catalogue.
# /usr/sbin/install-sgmlcatalog
# /usr/sbin/update-catalog

catalog:
contents:
/etc/sgml/catalog: { symlink: /var/lib/sgml-base/supercatalog }
/usr/share/sgml-base/catalog.centralized:
/usr/share/sgml-base/catalog.super:
/usr/share/sgml-base/transitional.cat:
/var/lib/sgml-base/supercatalog: {text: '', mutable: true}
mutate: |
supercat_path = "/var/lib/sgml-base/supercatalog"
def check_catalog(path):
# ignore the one we generate
if path == "/etc/sgml/catalog":
return False
return True

def write_super(catalogs):
super = "--\n"
super += "## This file is created by update-catalog with update-super.\n"
super += "## Please see update-catalog(8) for how to modify this file.\n"
super += "--\n"
for c in catalogs:
super += "CATALOG " + c + "\n"
content.write(supercat_path, super)

def update_super():
cat_dir = "/etc/sgml/"
catalogs = content.list(cat_dir)
filtered = []
for c in catalogs:
if check_catalog(cat_dir + c):
filtered.append(c)
write_super(filtered)

# emulate the actions done by postinst
update_super()

copyright:
contents:
/usr/share/doc/sgml-base/copyright:
21 changes: 21 additions & 0 deletions slices/systemd-sysv.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package: systemd-sysv

essential:
- systemd-sysv_copyright

slices:
bins:
essential:
- systemd_bins
contents:
/usr/sbin/halt:
/usr/sbin/init:
/usr/sbin/poweroff:
/usr/sbin/reboot:
/usr/sbin/runlevel:
/usr/sbin/shutdown:
/usr/sbin/telinit:
Comment on lines +11 to +17
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you test these pls?


copyright:
contents:
/usr/share/doc/systemd-sysv/copyright:
Loading
Loading