[arch-commits] Commit in shadow/trunk (3 files)

[Dave Reisner]

    Date: Monday, December 31, 2018 @ 13:14:03
  Author: dreisner
Revision: 342839

upgpkg: shadow 4.6-2

- backport fix for crash with `useradd -s <shell>` (FS#60924)
- cherrypick two commits for fixing crashes in usermod
- drop our own local patches (the patches, they do nothing!)

Modified:
  shadow/trunk/PKGBUILD
Deleted:
  shadow/trunk/shadow-strncpy-usage.patch
  shadow/trunk/xstrdup.patch

----------------------------+
 PKGBUILD                   |   25 +++++++++++++++----------
 shadow-strncpy-usage.patch |   25 -------------------------
 xstrdup.patch              |    9 ---------
 3 files changed, 15 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-31 08:49:38 UTC (rev 342838)
+++ PKGBUILD	2018-12-31 13:14:03 UTC (rev 342839)
@@ -3,7 +3,7 @@
 
 pkgname=shadow
 pkgver=4.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Password and account management tool suite with support for shadow files and PAM"
 arch=('x86_64')
 url='https://github.com/shadow-maint/shadow'
@@ -28,9 +28,7 @@
         newusers
         passwd
         shadow.{timer,service}
-        useradd.defaults
-        xstrdup.patch
-        shadow-strncpy-usage.patch)
+        useradd.defaults)
 sha1sums=('SKIP'
           '33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
           '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
@@ -41,9 +39,7 @@
           '611be25d91c3f8f307c7fe2485d5f781e5dee75f'
           'a154a94b47a3d0c6c287253b98c0d10b861226d0'
           'b5540736f5acbc23b568973eb5645604762db3dd'
-          'c173208c5cf34528602f9931468a67b7f68abad3'
-          '6010fffeed1fc6673ad9875492e1193b1a847b53'
-          '21e12966a6befb25ec123b403cd9b5c492fe5b16')
+          'c173208c5cf34528602f9931468a67b7f68abad3')
 
 pkgver() {
   cd "$pkgname"
@@ -54,10 +50,19 @@
 prepare() {
   cd "$pkgname"
 
-  # need to offer these upstream
-  patch -Np1 <"$srcdir/xstrdup.patch"
-  patch -Np1 <"$srcdir/shadow-strncpy-usage.patch"
+  local backports=(
+    # Fix usermod crash
+    73a876a05612c278da747faeaeea40c3b8d34a53
+    # usermod: prevent a segv
+    48dcf7852e51b9d8e7926737cc7f7823978b7d7d
+    # https://github.com/shadow-maint/shadow/issues/125
+    10e388efc2c786d1ec4ed007891bfefa8826b6fd
+  )
 
+  for commit in "${backports[@]}"; do
+    git cherry-pick -n "$commit"
+  done
+
   autoreconf -v -f --install
 
   # supress etc/pam.d/*, we provide our own

Deleted: shadow-strncpy-usage.patch
===================================================================
--- shadow-strncpy-usage.patch	2018-12-31 08:49:38 UTC (rev 342838)
+++ shadow-strncpy-usage.patch	2018-12-31 13:14:03 UTC (rev 342839)
@@ -1,25 +0,0 @@
-diff -u shadow-4.1.5/src/usermod.c.orig shadow-4.1.5/src/usermod.c
---- shadow-4.1.5/src/usermod.c.orig	2012-02-13 08:19:43.792146449 -0500
-+++ shadow-4.1.5/src/usermod.c	2012-02-13 08:21:19.375114500 -0500
-@@ -182,7 +182,7 @@
- 	struct tm *tp;
- 
- 	if (date < 0) {
--		strncpy (buf, "never", maxsize);
-+		strncpy (buf, "never", maxsize - 1);
- 	} else {
- 		time_t t = (time_t) date;
- 		tp = gmtime (&t);
-diff -u shadow-4.1.5/src/login.c.orig shadow-4.1.5/src/login.c
---- shadow-4.1.5/src/login.c.orig	2012-02-13 08:19:50.951994454 -0500
-+++ shadow-4.1.5/src/login.c	2012-02-13 08:21:04.490430937 -0500
-@@ -752,7 +752,8 @@
- 			          _("%s login: "), hostn);
- 		} else {
- 			strncpy (loginprompt, _("login: "),
--			         sizeof (loginprompt));
-+			         sizeof (loginprompt) - 1);
-+			loginprompt[sizeof (loginprompt) - 1] = '\0';
- 		}
- 
- 		retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt);

Deleted: xstrdup.patch
===================================================================
--- xstrdup.patch	2018-12-31 08:49:38 UTC (rev 342838)
+++ xstrdup.patch	2018-12-31 13:14:03 UTC (rev 342839)
@@ -1,9 +0,0 @@
---- shadow-4.1.2.1/libmisc/xmalloc.c	2008-08-30 21:55:44.000000000 -0500
-+++ shadow-4.1.2.1/libmisc/xmalloc.c.new	2008-08-30 21:55:36.000000000 -0500
-@@ -61,5 +61,6 @@
- 
- char *xstrdup (const char *str)
- {
-+	if(str == NULL) return NULL;
- 	return strcpy (xmalloc (strlen (str) + 1), str);
- }