[Pkg-shadow-devel] Ubuntu shadow 1:4.8.1-1ubuntu4

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.8
Date: Mon, 06 Apr 2020 09:51:10 +0200
Source: shadow
Binary: passwd login uidmap
Architecture: source
Version: 1:4.8.1-1ubuntu4
Distribution: focal
Urgency: medium
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Didier Roche <didrocks at ubuntu.com>
Description: 
 login      - system login tools
 passwd     - change and administer password and group data
 uidmap     - programs to help use subuids
Changes: 
 shadow (1:4.8.1-1ubuntu4) focal; urgency=medium
 .
   * debian/patches/1015_add_zsys_support.patch:
     - use now zsysctl command instead of zsys which isn't available anymore.
       This fix creation of new user dataset on ZFS.
Checksums-Sha1: 
 584ba419a18ccf4b094bde7b6420ec6f514f0d15 1705 shadow_4.8.1-1ubuntu4.dsc
 8eda5e9f8b9cf1d44dd4c3529f759e85f241fc6d 85188 shadow_4.8.1-1ubuntu4.debian.tar.xz
Checksums-Sha256: 
 9e317e00ae4f12bdea2401a035c4ce4265bda4e30dc68d8e1298f7753186d5a0 1705 shadow_4.8.1-1ubuntu4.dsc
 1dfc4fc07e3a0b5b015064fcc15953e1388308c7b3da39b60f8334f09f2cc4f6 85188 shadow_4.8.1-1ubuntu4.debian.tar.xz
Files: 
 42177ec17436efe58c2f5a983112730e 1705 admin required shadow_4.8.1-1ubuntu4.dsc
 ef9797bfd8b5a6e42543e7609f8f768a 85188 admin required shadow_4.8.1-1ubuntu4.debian.tar.xz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.8.1-1ubuntu3/debian/changelog 1:4.8.1-1ubuntu4/debian/changelog
--- 1:4.8.1-1ubuntu3/debian/changelog	2020-03-09 09:43:16.000000000 +0000
+++ 1:4.8.1-1ubuntu4/debian/changelog	2020-04-06 07:51:10.000000000 +0000
@@ -1,3 +1,11 @@
+shadow (1:4.8.1-1ubuntu4) focal; urgency=medium
+
+  * debian/patches/1015_add_zsys_support.patch:
+    - use now zsysctl command instead of zsys which isn't available anymore.
+      This fix creation of new user dataset on ZFS.
+
+ -- Didier Roche <didrocks at ubuntu.com>  Mon, 06 Apr 2020 09:51:10 +0200
+
 shadow (1:4.8.1-1ubuntu3) focal; urgency=medium
 
   * debian/patches/1013_extrausers_deluser.patch:
diff -pruN 1:4.8.1-1ubuntu3/debian/patches/1015_add_zsys_support.patch 1:4.8.1-1ubuntu4/debian/patches/1015_add_zsys_support.patch
--- 1:4.8.1-1ubuntu3/debian/patches/1015_add_zsys_support.patch	2020-02-07 15:32:06.000000000 +0000
+++ 1:4.8.1-1ubuntu4/debian/patches/1015_add_zsys_support.patch	2020-04-06 07:50:26.000000000 +0000
@@ -23,8 +23,8 @@ Origin: ubuntu
   */
  static void create_home (void)
  {
-+	const char zsys[] = "/sbin/zsys";
-+	const char *pname = "zsys";
++	const char zsys[] = "/sbin/zsysctl";
++	const char *pname = "zsysctl";
 +	pid_t childpid;
 +	int devnull_fd;
 +	int zsys_failed;
@@ -82,8 +82,8 @@ Origin: ubuntu
  static void move_home (void)
  {
  	struct stat sb;
-+	const char zsys[] = "/sbin/zsys";
-+	const char *pname = "zsys";
++	const char zsys[] = "/sbin/zsysctl";
++	const char *pname = "zsysctl";
 +	int devnull_fd;
 +	pid_t childpid;
 +	int zsys_failed;