[arch-commits] Commit in devtools/repos/testing-any (4 files)
Allan McRae
allan at archlinux.org
Tue May 29 00:53:22 UTC 2018
Date: Tuesday, May 29, 2018 @ 00:53:22
Author: allan
Revision: 325103
archrelease: copy trunk to testing-any
Added:
devtools/repos/testing-any/PKGBUILD
(from rev 325102, devtools/trunk/PKGBUILD)
devtools/repos/testing-any/add-etc-shadow-entry-for-builduser.patch
(from rev 325102, devtools/trunk/add-etc-shadow-entry-for-builduser.patch)
Deleted:
devtools/repos/testing-any/PKGBUILD
devtools/repos/testing-any/add-etc-shadow-entry-for-builduser.patch
------------------------------------------+
PKGBUILD | 66 ++++++++++++++---------------
add-etc-shadow-entry-for-builduser.patch | 64 ++++++++++++++--------------
2 files changed, 65 insertions(+), 65 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-29 00:49:15 UTC (rev 325102)
+++ PKGBUILD 2018-05-29 00:53:22 UTC (rev 325103)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=devtools
-pkgver=20180528
-pkgrel=1
-pkgdesc='Tools for Arch Linux package maintainers'
-arch=('any')
-license=('GPL')
-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})
-validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'
- '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC'
- '86CFFCA918CF3AF47147588051E8B148A9999C34'
- '8FC15A064950A99DD1BD14DD39E4B877E62EB915'
- '8218F88849AAC522E94CF470A5E9288C4FA415FA'
- 'B81B051F2D7FC867AAFF35A58DBD63B82072D77A'
- 'F3691687D867B81B51CE07D9BBE43771487328A9'
- '6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')
-md5sums=('8bbf0ecf0f5a564e1282ac6a6ae4176d'
- 'SKIP')
-
-build() {
- cd "${pkgname}-${pkgver}"
- make PREFIX=/usr
-}
-
-package() {
- cd "${pkgname}-${pkgver}"
- make PREFIX=/usr DESTDIR=${pkgdir} install
-}
Copied: devtools/repos/testing-any/PKGBUILD (from rev 325102, devtools/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-05-29 00:53:22 UTC (rev 325103)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=devtools
+pkgver=20180528
+pkgrel=1
+pkgdesc='Tools for Arch Linux package maintainers'
+arch=('any')
+license=('GPL')
+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})
+validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'
+ '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC'
+ '86CFFCA918CF3AF47147588051E8B148A9999C34'
+ '8FC15A064950A99DD1BD14DD39E4B877E62EB915'
+ '8218F88849AAC522E94CF470A5E9288C4FA415FA'
+ 'B81B051F2D7FC867AAFF35A58DBD63B82072D77A'
+ 'F3691687D867B81B51CE07D9BBE43771487328A9'
+ '6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')
+md5sums=('8bbf0ecf0f5a564e1282ac6a6ae4176d'
+ 'SKIP')
+
+build() {
+ cd "${pkgname}-${pkgver}"
+ make PREFIX=/usr
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+ make PREFIX=/usr DESTDIR=${pkgdir} install
+}
Deleted: add-etc-shadow-entry-for-builduser.patch
===================================================================
--- add-etc-shadow-entry-for-builduser.patch 2018-05-29 00:49:15 UTC (rev 325102)
+++ add-etc-shadow-entry-for-builduser.patch 2018-05-29 00:53:22 UTC (rev 325103)
@@ -1,32 +0,0 @@
-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
-
Copied: devtools/repos/testing-any/add-etc-shadow-entry-for-builduser.patch (from rev 325102, devtools/trunk/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-29 00:53:22 UTC (rev 325103)
@@ -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
+
More information about the arch-commits
mailing list