summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-07-28 01:29:20 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-07-28 01:29:20 +0000
commit54fb0bf199ac8cc1c0b831c87359a505b8e8231a (patch)
treecd3a97324cae261984b7de9a69d126ced85ae4bd /system
parentc8fd7ec16f6a72dc6cd6cdbfcc488c8ad4e36b5a (diff)
downloadpackages-54fb0bf199ac8cc1c0b831c87359a505b8e8231a.tar.gz
packages-54fb0bf199ac8cc1c0b831c87359a505b8e8231a.tar.bz2
packages-54fb0bf199ac8cc1c0b831c87359a505b8e8231a.tar.xz
packages-54fb0bf199ac8cc1c0b831c87359a505b8e8231a.zip
system/shadow: zsh is now the default user shell
Diffstat (limited to 'system')
-rw-r--r--system/shadow/APKBUILD8
-rw-r--r--system/shadow/dots-in-usernames.patch2
-rw-r--r--system/shadow/useradd-zsh.patch10
3 files changed, 16 insertions, 4 deletions
diff --git a/system/shadow/APKBUILD b/system/shadow/APKBUILD
index 32ec48eda..5c27eedf5 100644
--- a/system/shadow/APKBUILD
+++ b/system/shadow/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=shadow
pkgver=4.6
-pkgrel=2
+pkgrel=3
pkgdesc="Login and password management utilities"
url="https://github.com/shadow-maint/shadow"
arch="all"
@@ -19,6 +19,7 @@ source="https://github.com/shadow-maint/shadow/releases/download/$pkgver/shadow-
pam-useradd.patch
utmpx.patch
support-m4-dirs.patch
+ useradd-zsh.patch
"
# secfixes:
# 4.5-r0:
@@ -109,8 +110,9 @@ uidmap() {
sha512sums="e8eee52c649d9973f724bc2d5aeee71fa2e6a2e41ec3487cd6cf6d47af70c32e0cdf304df29b32eae2b6eb6f9066866b5f2c891add0ec87ba583bea3207b3631 shadow-4.6.tar.xz
46a6f83f3698e101b58b8682852da749619412f75dfa85cecad03d0847f6c3dc452d984510db7094220e4570a0565b83b0556e16198ad894a3ec84b3e513d58d login.pamd
-745eea04c054226feba165b635dbb8570b8a04537d41e914400a4c54633c3a9cf350da0aabfec754fb8cf3e58fc1c8cf597b895506312f19469071760c11f31d dots-in-usernames.patch
+e5b276be0852c7c50257e73237144141991b628c2032e47e066d3ae1f8a480d4aff9ccb3f29a9ee25cb3fd39a1f6e1f8349be4ace5e1db7c392b3c3dd3a08845 dots-in-usernames.patch
49f1d5ded82d2d479805c77d7cc6274c30233596e375b28306b31a33f8fbfc3611dbc77d606081b8300247908c267297dbb6c5d1a30d56095dda53c6a636fb56 useradd-usergroups.patch
0b4587e263cb6be12fa5ae6bc3b3fc4d3696dae355bc67d085dc58c52ff96edb4d163b95db2092b8c2f3310839430cac03c7af356641b42e24ee4aa6410f5cf1 pam-useradd.patch
0ae5df1a287b8fa07fa9b9061dd3d5e6198527a6d9e9d4a9e2885f7a3884d1935e56856e25f1c092475aa31cee31b11d3bc7f9efe0347b0811ae53a805b2f26e utmpx.patch
-ec0ef7038b385954b7e47b0414839d30c99edcc96863a06a8e90f04bcc943c6c30274fc382f15ca74ceca57bef36c90feae6e7d363ed8c6408ae4f2bf938dacb support-m4-dirs.patch"
+ec0ef7038b385954b7e47b0414839d30c99edcc96863a06a8e90f04bcc943c6c30274fc382f15ca74ceca57bef36c90feae6e7d363ed8c6408ae4f2bf938dacb support-m4-dirs.patch
+7f8e19cdf0b6dfb111feedd528f31aa06e79450c5bb35549ba3ebabede2661f65833adf164237fced77780d1254a66a3595b6b1c05571695e322514f549f3cc7 useradd-zsh.patch"
diff --git a/system/shadow/dots-in-usernames.patch b/system/shadow/dots-in-usernames.patch
index b684c9d02..552c5eea9 100644
--- a/system/shadow/dots-in-usernames.patch
+++ b/system/shadow/dots-in-usernames.patch
@@ -1,6 +1,6 @@
--- shadow-4.1.3/libmisc/chkname.c
+++ shadow-4.1.3/libmisc/chkname.c
-@@ -66,6 +66,7 @@
+@@ -61,6 +61,7 @@
( ('0' <= *name) && ('9' >= *name) ) ||
('_' == *name) ||
('-' == *name) ||
diff --git a/system/shadow/useradd-zsh.patch b/system/shadow/useradd-zsh.patch
new file mode 100644
index 000000000..afadc380f
--- /dev/null
+++ b/system/shadow/useradd-zsh.patch
@@ -0,0 +1,10 @@
+--- shadow-4.6/etc/useradd.old 2019-07-28 01:22:05.484517718 +0000
++++ shadow-4.6/etc/useradd 2019-07-28 01:26:46.044542644 +0000
+@@ -2,6 +2,6 @@
+ HOME=/home
+ INACTIVE=-1
+ EXPIRE=
+-SHELL=/bin/bash
++SHELL=/bin/zsh
+ SKEL=/etc/skel
+ CREATE_MAIL_SPOOL=yes