[gentoo-commits] repo/gentoo:master commit in: acct-user/root/

[gentoo-commits] repo/gentoo:master commit in: acct-user/root/

[Mike Gilbert]

commit:     bc8600613c1c5732a2d3ef95306dadc4cb5649fb
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 19:28:22 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 00:27:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc860061

acct-user/root: new user (0)

Bug: https://bugs.gentoo.org/761763
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 acct-user/root/metadata.xml  |  7 +++++++
 acct-user/root/root-0.ebuild | 15 +++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/acct-user/root/metadata.xml b/acct-user/root/metadata.xml
new file mode 100644
index 00000000000..f540000d5aa
--- /dev/null
+++ b/acct-user/root/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>

diff --git a/acct-user/root/root-0.ebuild b/acct-user/root/root-0.ebuild
new file mode 100644
index 00000000000..a5fb1604d97
--- /dev/null
+++ b/acct-user/root/root-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=0
+ACCT_USER_ENFORCE_ID=yes
+ACCT_USER_SHELL="/bin/bash"
+ACCT_USER_HOME="/root"
+ACCT_USER_HOME_PERMS=0700
+ACCT_USER_GROUPS=( root )
+
+acct-user_add_deps

[gentoo-commits] repo/gentoo:master commit in: acct-user/root/

[Mike Gilbert]

commit:     9851e90f0a8e4cbfa680ce278bdd8812f92699fa
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 14:52:16 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 14:52:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9851e90f

acct-user/root: do not lock the account when removed

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 acct-user/root/{root-0.ebuild => root-0-r1.ebuild} | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/acct-user/root/root-0.ebuild b/acct-user/root/root-0-r1.ebuild
similarity index 84%
rename from acct-user/root/root-0.ebuild
rename to acct-user/root/root-0-r1.ebuild
index a5fb1604d97..f85c77b4cd5 100644
--- a/acct-user/root/root-0.ebuild
+++ b/acct-user/root/root-0-r1.ebuild
@@ -13,3 +13,8 @@ ACCT_USER_HOME_PERMS=0700
 ACCT_USER_GROUPS=( root )
 
 acct-user_add_deps
+
+pkg_prerm() {
+	# Don't lock out the superuser
+	:
+}

[gentoo-commits] repo/gentoo:master commit in: acct-user/root/

[Mike Gilbert]

commit:     7bdbc2e00e7f475f36d69eb13a523398800b569c
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  1 20:30:45 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 20:30:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bdbc2e0

acct-user/root: set ACCT_USER_NO_MODIFY

Closes: https://bugs.gentoo.org/827813
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 acct-user/root/root-0-r1.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/acct-user/root/root-0-r1.ebuild b/acct-user/root/root-0-r1.ebuild
index f85c77b4cd56..ea2e82dfcf29 100644
--- a/acct-user/root/root-0-r1.ebuild
+++ b/acct-user/root/root-0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,10 @@ ACCT_USER_HOME="/root"
 ACCT_USER_HOME_PERMS=0700
 ACCT_USER_GROUPS=( root )
 
+# Avoid reverting changes by the sysadmin.
+# https://bugs.gentoo.org/827813
+ACCT_USER_NO_MODIFY=1
+
 acct-user_add_deps
 
 pkg_prerm() {