try fixing build on x32 with new libseccomp

[packages/systemd.git] / uids_gids.patch

diff --git a/uids_gids.patch b/uids_gids.patch
index f55a8c385ff32d0f0d71f64f93a962c0421c5af9..d24000bfab6e0a3111e87539d282003b97525703 100644 (file)
--- a/uids_gids.patch
+++ b/uids_gids.patch
@@ -1,7 +1,7 @@
---- a/sysusers.d/basic.conf.in~        2016-11-03 18:16:42.000000000 +0100
-+++ b/sysusers.d/basic.conf.in 2016-11-12 20:05:11.934482095 +0100
-@@ -12,26 +12,26 @@ u root    0     "Super User" /root
- u nobody  65534 "Nobody"     -
+--- systemd-238/sysusers.d/basic.conf.in~      2018-03-05 23:16:37.000000000 +0100
++++ systemd-238/sysusers.d/basic.conf.in       2018-05-15 13:30:41.922818679 +0200
+@@ -12,27 +12,27 @@ u root    0     "Super User" /root
+ u @NOBODY_USER_NAME@  65534 "Nobody"     -
  
  # Administrator group: can *see* more than normal users
 -g adm     -     -            -
@@ -16,7 +16,7 @@
 +g kmem    9     -            -
  g tty     @TTY_GID@     -            -
 -g utmp    -     -            -
-+g utmp    22     -            -
++g utmp    22    -            -
  
  # Hardware access groups
 -g audio   -     -            -
@@ -24,58 +24,37 @@
 -g dialout -     -            -
 -g disk    -     -            -
 -g input   -     -            -
--g lp      -     -            -
 -g kvm     -     -            -
--g tape    -     -            -
--g video   -     -            -
+-g lp      -     -            -
 +g audio   23    -            -
 +g cdrom   27    -            -
 +g dialout 16    -            -
 +g disk    6     -            -
 +g input   182   -            -
-+g lp      7     -            -
 +g kvm     160   -            -
++g lp      7     -            -
+ g render  -     -            -
+-g tape    -     -            -
+-g video   -     -            -
 +g tape    68    -            -
 +g video   24    -            -
  
  # Default group for normal users
--g users   -     -            -
-+g users   1000  -            -
---- a/sysusers.d/systemd-remote.conf.m4~       2016-11-03 18:16:42.000000000 +0100
-+++ b/sysusers.d/systemd-remote.conf.m4        2016-11-12 20:07:22.838061991 +0100
-@@ -6,9 +6,9 @@
+ g users   @USERS_GID@     -            -
+--- systemd-238/sysusers.d/systemd-remote.conf.m4~     2018-03-05 23:16:37.000000000 +0100
++++ systemd-238/sysusers.d/systemd-remote.conf.m4      2018-05-15 13:33:04.453829878 +0200
+@@ -6,5 +6,5 @@
  #  (at your option) any later version.
  
  m4_ifdef(`HAVE_MICROHTTPD',
--u systemd-journal-gateway - "systemd Journal Gateway"
 -u systemd-journal-remote  - "systemd Journal Remote"
-+u systemd-journal-gateway 287 "systemd Journal Gateway"
 +u systemd-journal-remote  319 "systemd Journal Remote"
  )m4_dnl
- m4_ifdef(`HAVE_LIBCURL',
--u systemd-journal-upload  - "systemd Journal Upload"
-+u systemd-journal-upload  320 "systemd Journal Upload"
- )m4_dnl
---- a/sysusers.d/systemd.conf.m4~      2016-11-03 18:16:42.000000000 +0100
-+++ b/sysusers.d/systemd.conf.m4       2016-11-12 20:08:23.103080854 +0100
-@@ -5,16 +5,16 @@
- #  the Free Software Foundation; either version 2.1 of the License, or
+--- systemd-238/sysusers.d/systemd.conf.m4~    2018-03-05 23:16:37.000000000 +0100
++++ systemd-238/sysusers.d/systemd.conf.m4     2018-05-15 13:34:07.479084303 +0200
+@@ -5,6 +5,6 @@
  #  (at your option) any later version.
  
--g systemd-journal   - -
-+g systemd-journal   288 -
- m4_ifdef(`ENABLE_NETWORKD',
--u systemd-network   - "systemd Network Management"
-+u systemd-network   316 "systemd Network Management"
- )m4_dnl
- m4_ifdef(`ENABLE_RESOLVED',
--u systemd-resolve   - "systemd Resolver"
-+u systemd-resolve   317 "systemd Resolver"
- )m4_dnl
- m4_ifdef(`ENABLE_TIMESYNCD',
--u systemd-timesync  - "systemd Time Synchronization"
-+u systemd-timesync  318 "systemd Time Synchronization"
- )m4_dnl
  m4_ifdef(`ENABLE_COREDUMP',
 -u systemd-coredump  - "systemd Core Dumper"
 +u systemd-coredump  333 "systemd Core Dumper"