Add new and sync all systemd uids&gids

– add the new users and groups introduced in this systemd verision
- sync systemd-provided sysusers.d configuration with our uid/gid db

Release: 0.2

diff --git a/systemd.spec b/systemd.spec
index 1767dc215579f589d4af996da3ad4e2e3920f27b..939858f03fc6d451e8e727824340f0e5f72e644f 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -21,7 +21,7 @@ Summary(pl.UTF-8):    systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
 Version:       218
-Release:       0.1
+Release:       0.2
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
@@ -67,6 +67,7 @@ Patch14:      dont-hash-null-keys.patch
 Patch16:       systemd-configfs.patch
 Patch17:       pld-boot_efi_mount.patch
 Patch18:       optional-tmp-on-tmpfs.patch
+Patch19:       uids_gids.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -140,7 +141,19 @@ Suggests:  ConsoleKit
 Suggests:      fsck >= 2.25.0
 Suggests:      service(klogd)
 Suggests:      service(syslog)
+Provides:      group(systemd-bus-proxy)
+Provides:      group(systemd-network)
+Provides:      group(systemd-resolve)
+Provides:      group(systemd-timesync)
 Provides:      group(systemd-journal)
+Provides:      group(systemd-journal-remote)
+Provides:      group(systemd-journal-upload)
+Provides:      user(systemd-bus-proxy)
+Provides:      user(systemd-network)
+Provides:      user(systemd-resolve)
+Provides:      user(systemd-timesync)
+Provides:      user(systemd-journal-remote)
+Provides:      user(systemd-journal-upload)
 Provides:      udev-acl = %{epoch}:%{version}-%{release}
 Obsoletes:     systemd-no-compat-tmpfiles
 Obsoletes:     udev-systemd
@@ -629,6 +642,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build
@@ -823,6 +837,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 %groupadd -g 288 systemd-journal
+%groupadd -g 315 systemd-bus-proxy
+%useradd -u 315 -g 315 -d /var/log/journal -s /bin/false -c "Systemd Bus Proxy" systemd-bus-proxy
+%groupadd -g 316 systemd-network
+%useradd -u 316 -g 316 -d /var/log/journal -s /bin/false -c "Systemd Network Management" systemd-network
+%groupadd -g 317 systemd-resolve
+%useradd -u 317 -g 317 -d /var/log/journal -s /bin/false -c "Systemd Resolver" systemd-resolve
+%groupadd -g 318 systemd-timesync
+%useradd -u 318 -g 318 -d /var/log/journal -s /bin/false -c "Systemd Time Synchronization" systemd-timesync
+%groupadd -g 319 systemd-journal-remote
+%useradd -u 319 -g 319 -d /var/log/journal -s /bin/false -c "Systemd Journal Remote" systemd-journal-remote
+%groupadd -g 320 systemd-journal-upload
+%useradd -u 320 -g 320 -d /var/log/journal -s /bin/false -c "Systemd Journal Upload" systemd-journal-upload
 
 %post
 /bin/systemd-machine-id-setup || :

diff --git a/uids_gids.patch b/uids_gids.patch
new file mode 100644 (file)
index 0000000..f3bb417
--- /dev/null
+++ b/uids_gids.patch
@@ -0,0 +1,74 @@
+diff -dur systemd-218.orig/sysusers.d/basic.conf.in systemd-218/sysusers.d/basic.conf.in
+--- systemd-218.orig/sysusers.d/basic.conf.in  2014-12-05 01:26:51.000000000 +0100
++++ systemd-218/sysusers.d/basic.conf.in       2015-04-20 08:47:12.000000000 +0200
+@@ -12,26 +12,26 @@
+ u nobody  65534 "Nobody"     -
+ 
+ # Administrator group: can *see* more than normal users
+-g adm     -     -            -
++g adm     3     -            -
+ 
+ # Administrator group: can *do* more than normal users
+-g wheel   -     -            -
++g wheel   10     -            -
+ 
+ # Access to certain kernel and userspace facilities
+-g kmem    -     -            -
+-g lock    -     -            -
++g kmem    9     -            -
++#g lock    -     -            -
+ g tty     @TTY_GID@     -            -
+-g utmp    -     -            -
++g utmp    22     -            -
+ 
+ # Hardware access groups
+-g audio   -     -            -
+-g cdrom   -     -            -
+-g dialout -     -            -
+-g disk    -     -            -
+-g input   -     -            -
+-g lp      -     -            -
+-g tape    -     -            -
+-g video   -     -            -
++g audio   23     -            -
++g cdrom   27     -            -
++g dialout 16     -            -
++g disk    6     -            -
++g input   182     -            -
++g lp      7     -            -
++g tape    68     -            -
++g video   24     -            -
+ 
+ # Default group for normal users
+-g users   -     -            -
++g users   1000     -            -
+diff -dur systemd-218.orig/sysusers.d/systemd.conf systemd-218/sysusers.d/systemd.conf
+--- systemd-218.orig/sysusers.d/systemd.conf   2014-12-05 01:31:29.000000000 +0100
++++ systemd-218/sysusers.d/systemd.conf        2015-04-20 08:49:13.000000000 +0200
+@@ -5,8 +5,8 @@
+ #  the Free Software Foundation; either version 2.1 of the License, or
+ #  (at your option) any later version.
+ 
+-g systemd-journal   - -
+-u systemd-bus-proxy - "systemd Bus Proxy"
+-u systemd-network   - "systemd Network Management"
+-u systemd-resolve   - "systemd Resolver"
+-u systemd-timesync  - "systemd Time Synchronization"
++g systemd-journal   288 -
++u systemd-bus-proxy 315 "systemd Bus Proxy"
++u systemd-network   316 "systemd Network Management"
++u systemd-resolve   317 "systemd Resolver"
++u systemd-timesync  318 "systemd Time Synchronization"
+diff -dur systemd-218.orig/sysusers.d/systemd-remote.conf systemd-218/sysusers.d/systemd-remote.conf
+--- systemd-218.orig/sysusers.d/systemd-remote.conf    2014-12-05 01:26:51.000000000 +0100
++++ systemd-218/sysusers.d/systemd-remote.conf 2015-04-20 08:48:22.000000000 +0200
+@@ -5,6 +5,6 @@
+ #  the Free Software Foundation; either version 2.1 of the License, or
+ #  (at your option) any later version.
+ 
+-u systemd-journal-gateway - "systemd Journal Gateway"
+-u systemd-journal-remote  - "systemd Journal Remote"
+-u systemd-journal-upload  - "systemd Journal Upload"
++u systemd-journal-gateway 287 "systemd Journal Gateway"
++u systemd-journal-remote  319 "systemd Journal Remote"
++u systemd-journal-upload  320 "systemd Journal Upload"