[arch-commits] Commit in devtools/trunk (2 files)

[Evangelos Foutras]

    Date: Saturday, May 12, 2018 @ 09:01:30
  Author: foutrelis
Revision: 324004

20171108-2: fix /etc/shadow issue surfaced by sudo 1.8.23

Added:
  devtools/trunk/add-etc-shadow-entry-for-builduser.patch
Modified:
  devtools/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |    9 +++++---
 add-etc-shadow-entry-for-builduser.patch |   32 +++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-12 03:32:59 UTC (rev 324003)
+++ PKGBUILD	2018-05-12 09:01:30 UTC (rev 324004)
@@ -3,7 +3,7 @@
 
 pkgname=devtools
 pkgver=20171108
-pkgrel=1
+pkgrel=2
 pkgdesc='Tools for Arch Linux package maintainers'
 arch=('any')
 license=('GPL')
@@ -10,7 +10,8 @@
 url='https://git.archlinux.org/devtools.git/'
 depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts'
          'git' 'bzr' 'mercurial')
-source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+        'add-etc-shadow-entry-for-builduser.patch')
 validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'
               '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC'
               '86CFFCA918CF3AF47147588051E8B148A9999C34'
@@ -19,10 +20,12 @@
               'B81B051F2D7FC867AAFF35A58DBD63B82072D77A'
               'F3691687D867B81B51CE07D9BBE43771487328A9')
 md5sums=('4a24b99bc1cffc63634eb7b3f5b116f1'
-         'SKIP')
+         'SKIP'
+         '573830ee23ecffa4971fbc36e5e2b666')
 
 prepare() {
 	cd "${pkgname}-${pkgver}"
+	patch -Np1 -i ../add-etc-shadow-entry-for-builduser.patch
 }
 
 build() {

Added: add-etc-shadow-entry-for-builduser.patch
===================================================================
--- add-etc-shadow-entry-for-builduser.patch	                        (rev 0)
+++ add-etc-shadow-entry-for-builduser.patch	2018-05-12 09:01:30 UTC (rev 324004)
@@ -0,0 +1,32 @@
+From 5713cd629c97c7a12a600a1dd73ad81d87374eb1 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Sat, 12 May 2018 11:52:18 +0300
+Subject: [PATCH] makechrootpkg: add /etc/shadow entry for builduser
+
+Without it, sudo 1.8.23 will return an error:
+
+    sudo: PAM account management error: Authentication
+    service cannot retrieve authentication info
+---
+ makechrootpkg.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/makechrootpkg.in b/makechrootpkg.in
+index 8e33499..57231d5 100644
+--- a/makechrootpkg.in
++++ b/makechrootpkg.in
+@@ -176,9 +176,10 @@ prepare_chroot() {
+ 	# We can't use useradd without chrooting, otherwise it invokes PAM modules
+ 	# which we might not be able to load (i.e. when building i686 packages on
+ 	# an x86_64 host).
+-	sed -e '/^builduser:/d' -i "$copydir"/etc/{passwd,group}
++	sed -e '/^builduser:/d' -i "$copydir"/etc/{passwd,shadow,group}
+ 	printf >>"$copydir/etc/group"  'builduser:x:%d:\n' "$builduser_gid"
+ 	printf >>"$copydir/etc/passwd" 'builduser:x:%d:%d:builduser:/build:/bin/bash\n' "$builduser_uid" "$builduser_gid"
++	printf >>"$copydir/etc/shadow" 'builduser:!!:%d::::::\n' "$(( $(date -u +%s) / 86400 ))"
+ 
+ 	$install -d "$copydir"/{build,build/.gnupg,startdir,{pkg,srcpkg,src,log}dest}
+ 
+-- 
+2.17.0
+