diff options
| -rw-r--r-- | system/shadow/APKBUILD | 36 | ||||
| -rw-r--r-- | system/shadow/dots-in-usernames.patch | 2 | ||||
| -rw-r--r-- | system/shadow/useradd-defaults.patch | 18 | ||||
| -rw-r--r-- | system/shadow/useradd-usergroups.patch | 8 | ||||
| -rw-r--r-- | system/shadow/useradd-zsh.patch | 10 |
5 files changed, 38 insertions, 36 deletions
diff --git a/system/shadow/APKBUILD b/system/shadow/APKBUILD index 4d929eca0..b8f4993fa 100644 --- a/system/shadow/APKBUILD +++ b/system/shadow/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=shadow -pkgver=4.7 +pkgver=4.11.1 pkgrel=0 pkgdesc="Login and password management utilities" url="https://github.com/shadow-maint/shadow" @@ -10,14 +10,14 @@ arch="all" options="suid" license="BSD-3-Clause OR Artistic-1.0-Perl" depends="" -makedepends="linux-pam-dev utmps-dev" +makedepends_build="docbook-xml docbook-xsl itstool libxslt" +makedepends_host="linux-pam-dev utmps-dev" subpackages="$pkgname-doc $pkgname-dbg $pkgname-lang $pkgname-uidmap" -source="https://github.com/shadow-maint/shadow/releases/download/$pkgver/shadow-$pkgver.tar.xz +source="https://github.com/shadow-maint/shadow/releases/download/v$pkgver/shadow-$pkgver.tar.xz login.pamd dots-in-usernames.patch - useradd-usergroups.patch + useradd-defaults.patch pam-useradd.patch - useradd-zsh.patch " # secfixes: # 4.5-r0: @@ -45,7 +45,9 @@ build() { --without-attr \ --without-tcb \ --without-nscd \ - --without-group-name-max-length + --without-su \ + --without-group-name-max-length \ + --enable-man make } @@ -59,6 +61,9 @@ package() { # Do not install these pam.d files they are broken and outdated. rm "$pkgdir"/etc/pam.d/* + # However, install our own for login. + cp "$srcdir"/login.pamd "$pkgdir"/etc/pam.d/login + # install some pam.d files based on a patched useradd for pamf in groupadd groupdel groupmems groupmod \ useradd userdel usermod @@ -66,21 +71,19 @@ package() { install -m0644 etc/pam.d/useradd \ "$pkgdir/etc/pam.d/$pamf" done + # nologin is provided by util-linux. rm "$pkgdir"/sbin/nologin - # However, install our own for login. - cp "$srcdir"/login.pamd "$pkgdir"/etc/pam.d/login - # /etc/login.defs is not very useful - replace it with an *almost* blank file. rm "$pkgdir"/etc/login.defs echo "USERGROUPS_ENAB yes" > "$pkgdir"/etc/login.defs # Avoid conflict with man-pages. rm "$pkgdir"/usr/share/man/man3/getspnam.3* \ - "$pkgdir"/usr/share/man/man5/passwd.5* \ - "$pkgdir"/usr/share/man/man1/groups.1* \ - "$pkgdir"/usr/share/man/man8/nologin.8* + "$pkgdir"/usr/share/man/man5/passwd.5* + # and util-linux-doc + rm "$pkgdir"/usr/share/man/man8/nologin.8* } uidmap() { @@ -95,9 +98,8 @@ uidmap() { touch "$subpkgdir"/etc/subuid "$subpkgdir"/etc/subgid } -sha512sums="331ff09ec084149b88ac23c0f7e3b3eb02deba03a1623d46f0abdab4dbae50db2146c3cab8c1e36e8f0b496089204d2cc274265f552fb81bc2deb49ce44c7284 shadow-4.7.tar.xz +sha512sums="12fbe4d6ac929ad3c21525ed0f1026b5b678ccec9762f2ec7e611d9c180934def506325f2835fb750dd30af035b592f827ff151cd6e4c805aaaf8e01425c279f shadow-4.11.1.tar.xz 46a6f83f3698e101b58b8682852da749619412f75dfa85cecad03d0847f6c3dc452d984510db7094220e4570a0565b83b0556e16198ad894a3ec84b3e513d58d login.pamd -e5b276be0852c7c50257e73237144141991b628c2032e47e066d3ae1f8a480d4aff9ccb3f29a9ee25cb3fd39a1f6e1f8349be4ace5e1db7c392b3c3dd3a08845 dots-in-usernames.patch -49f1d5ded82d2d479805c77d7cc6274c30233596e375b28306b31a33f8fbfc3611dbc77d606081b8300247908c267297dbb6c5d1a30d56095dda53c6a636fb56 useradd-usergroups.patch -0b4587e263cb6be12fa5ae6bc3b3fc4d3696dae355bc67d085dc58c52ff96edb4d163b95db2092b8c2f3310839430cac03c7af356641b42e24ee4aa6410f5cf1 pam-useradd.patch -7f8e19cdf0b6dfb111feedd528f31aa06e79450c5bb35549ba3ebabede2661f65833adf164237fced77780d1254a66a3595b6b1c05571695e322514f549f3cc7 useradd-zsh.patch" +6492e8d07a595cbefedeb9009d39eef48195bc2e8caeb523827b83f243d872c912df95a9479d6fc274ff105d2902ebc5c74bdec04f82e7c0d1340d0ae8607f73 dots-in-usernames.patch +fb6b19b05a58f5200d4ad39c7393735ef8e0db853c50ba2ad29efb7bdd871bc8659f6845c9cc0660ce12372dbc78b7df9cfd8a06f6913036d905e5372f2ed99f useradd-defaults.patch +0b4587e263cb6be12fa5ae6bc3b3fc4d3696dae355bc67d085dc58c52ff96edb4d163b95db2092b8c2f3310839430cac03c7af356641b42e24ee4aa6410f5cf1 pam-useradd.patch" diff --git a/system/shadow/dots-in-usernames.patch b/system/shadow/dots-in-usernames.patch index 552c5eea9..17ddab151 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 -@@ -61,6 +61,7 @@ +@@ -45,6 +45,7 @@ ( ('0' <= *name) && ('9' >= *name) ) || ('_' == *name) || ('-' == *name) || diff --git a/system/shadow/useradd-defaults.patch b/system/shadow/useradd-defaults.patch new file mode 100644 index 000000000..0078e867f --- /dev/null +++ b/system/shadow/useradd-defaults.patch @@ -0,0 +1,18 @@ +--- shadow-4.11.1/src/useradd.c.old 2022-01-02 18:46:53.000000000 -0600 ++++ shadow-4.11.1/src/useradd.c 2022-04-24 23:26:03.511726397 -0500 +@@ -79,12 +79,12 @@ + /* + * These defaults are used if there is no defaults file. + */ +-static gid_t def_group = 1000; ++static gid_t def_group = 100; + static const char *def_gname = "other"; + static const char *def_home = "/home"; +-static const char *def_shell = "/bin/bash"; ++static const char *def_shell = "/bin/zsh"; + static const char *def_template = SKEL_DIR; +-static const char *def_create_mail_spool = "yes"; ++static const char *def_create_mail_spool = "no"; + static const char *def_log_init = "yes"; + + static long def_inactive = -1; diff --git a/system/shadow/useradd-usergroups.patch b/system/shadow/useradd-usergroups.patch deleted file mode 100644 index adf297231..000000000 --- a/system/shadow/useradd-usergroups.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/etc/useradd -+++ b/etc/useradd -@@ -1,5 +1,4 @@ - # useradd defaults file --GROUP=1000 - HOME=/home - INACTIVE=-1 - EXPIRE= diff --git a/system/shadow/useradd-zsh.patch b/system/shadow/useradd-zsh.patch deleted file mode 100644 index afadc380f..000000000 --- a/system/shadow/useradd-zsh.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 |