Skip to content

Commit 5cd0414

Browse files
Merge pull request #1394 from mgerstner/systemd-258
[opensuse] systemd v258 partial whitelisting
2 parents 1bb9656 + 380a770 commit 5cd0414

2 files changed

Lines changed: 26 additions & 45 deletions

File tree

configs/openSUSE/dbus-services.toml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,7 @@ hash = "6c74cd8824a587ccd281886c655718dfecd1da530bb823e6625be4a22c5a09e6"
7878
package = "gdm"
7979
type = "dbus"
8080
note = "D-Bus interface for managing GDM sessions"
81-
bugs = ["bsc#1204052", "bsc#1218922", "bsc#1230466"]
82-
[[FileDigestGroup.digests]]
83-
path = "/usr/share/dbus-1/system.d/gdm.conf"
84-
digester = "xml"
85-
hash = "127c6446350030991bd98c583eab96d7a5ff4b9301faa8e88bc7928c48dba0a8"
86-
87-
# TODO: merge with entry above once GNOME 49 enters Factory
88-
[[FileDigestGroup]]
89-
package = "gdm"
90-
note = "GNOME 49 beta changes to entry above"
91-
bug = "bsc#1248881"
92-
type = "dbus"
81+
bugs = ["bsc#1204052", "bsc#1218922", "bsc#1230466", "bsc#1248881"]
9382
[[FileDigestGroup.digests]]
9483
path = "/usr/share/dbus-1/system.d/gdm.conf"
9584
digester = "xml"
@@ -1141,6 +1130,21 @@ path = "/usr/share/dbus-1/system-services/org.freedesktop.home1.service"
11411130
digester = "shell"
11421131
hash = "c4281ad74af8c43a963806142e2770751b153df8c1217da4edf212b334ecddcf"
11431132

1133+
# TODO: merge with entry above once v258 reaches Factory
1134+
[[FileDigestGroup]]
1135+
package = "systemd-homed"
1136+
note = "systemd-homed v258 changes"
1137+
bug = "bsc#1250884"
1138+
type = "dbus"
1139+
[[FileDigestGroup.digests]]
1140+
path = "/usr/share/dbus-1/system.d/org.freedesktop.home1.conf"
1141+
digester = "xml"
1142+
hash = "1f5955ba5955830ca518f206d751401adb6caec36d82c6434b60ab5398d17a0b"
1143+
[[FileDigestGroup.digests]]
1144+
path = "/usr/share/dbus-1/system-services/org.freedesktop.home1.service"
1145+
digester = "shell"
1146+
hash = "c4281ad74af8c43a963806142e2770751b153df8c1217da4edf212b334ecddcf"
1147+
11441148
[[FileDigestGroup]]
11451149
package = "systemd-experimental"
11461150
type = "dbus"

configs/openSUSE/polkit-rules-whitelist.toml

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -102,21 +102,10 @@ hash = "6daefe0a835dc1b34513302f393e98089c137602823f41fd0c3dd984c40902d8"
102102
package = "gnome-initial-setup"
103103
type = "polkit"
104104
note = "Follow-up whitelisting, upstream added org.fedoraproject.thirdparty.* to the rules"
105-
bug = "bsc#1192542"
105+
bugs = ["bsc#1192542", "bsc#1249067"]
106106
[[FileDigestGroup.digests]]
107107
path = "/usr/share/polkit-1/rules.d/20-gnome-initial-setup.rules"
108-
hash = "e8d930c2f4ef56727ab4e64ebe21c98e3ab7aaf3a4079d15ddc6acf324a5a412"
109-
110-
# TODO: merge the three GIS entries once GNOME49 enters Factory
111-
[[FileDigestGroup]]
112-
package = "gnome-initial-setup"
113-
note = "GNOME49 Beta changes"
114-
bug = "bsc#1249067"
115-
type = "polkit"
116-
[[FileDigestGroup.digests]]
117-
path = "/usr/share/polkit-1/rules.d/20-gnome-initial-setup.rules"
118-
digester = "default"
119-
hash = "6241e147d107fbc2f786b7149c26abb75185cf9db5d921401e310f78f4e8bced"
108+
hash = "6241e147d107fbc2f786b7149c26abb75185cf9db5d921401e310f78f4e8bced"
120109

121110
[[FileDigestGroup]]
122111
package = "libvirt-dbus"
@@ -202,18 +191,7 @@ hash = "9e12a279a21d11c92a41ccd818edcb9b7c89a162984a6e1ca5609b9bbcbbf989"
202191
[[FileDigestGroup]]
203192
package = "gnome-remote-desktop"
204193
note = "allows the g-r-d system user to enable/disable itself"
205-
bug = "bsc#1222159"
206-
type = "polkit"
207-
[[FileDigestGroup.digests]]
208-
path = "/usr/share/polkit-1/rules.d/20-gnome-remote-desktop.rules"
209-
digester = "default"
210-
hash = "559f983aa50bbea8f4927fa96dc06a4e0f781617495339155b2bd4d077ec4607"
211-
212-
# TODO: merge with entry above once GNOME 49 enters Factory
213-
[[FileDigestGroup]]
214-
package = "gnome-remote-desktop"
215-
note = "GNOME49 beta changes"
216-
bug = "bsc#1248979"
194+
bugs = ["bsc#1222159", "bsc#1248979"]
217195
type = "polkit"
218196
[[FileDigestGroup.digests]]
219197
path = "/usr/share/polkit-1/rules.d/20-gnome-remote-desktop.rules"
@@ -243,20 +221,19 @@ hash = "fb2bcf81da84890c74de32b1f4dd6d829058a43bbef9ae7862b92372efe4ddc0"
243221
[[FileDigestGroup]]
244222
package = "gdm"
245223
note = "allows the display manager to add WiFi connections via NetworkManager"
246-
bug = "bsc#1239719"
224+
bugs = ["bsc#1239719","bsc#1248881"]
247225
type = "polkit"
248226
[[FileDigestGroup.digests]]
249227
path = "/usr/share/polkit-1/rules.d/20-gdm.rules"
250228
digester = "default"
251-
hash = "c752f8f6c304404e256fbd3f4bbb04d0ec42408f311454268b667597cb1c8265"
229+
hash = "38aaac33cd24fca2db1bdf35389b0d52bc17741ae55f0de4ea35d16d5817cd24"
252230

253-
# TODO: merge with entry above once GNOME 49 enters Factory
254231
[[FileDigestGroup]]
255-
package = "gdm"
256-
note = "GNOME 49 beta changes to entry above"
257-
bug = "bsc#1248881"
232+
package = "systemd"
233+
note = "This is just an example file that will not be active by default"
234+
bug = "bsc#1250844"
258235
type = "polkit"
259236
[[FileDigestGroup.digests]]
260-
path = "/usr/share/polkit-1/rules.d/20-gdm.rules"
237+
path = "/usr/share/polkit-1/rules.d/10-systemd-logind-root-ignore-inhibitors.rules.example"
261238
digester = "default"
262-
hash = "38aaac33cd24fca2db1bdf35389b0d52bc17741ae55f0de4ea35d16d5817cd24"
239+
hash = "0dcb4cdb6a4b43f23c4dc798e729ab605c3c0c470fe1c90f2db6351e4ae47418"

0 commit comments

Comments
 (0)