Date: Tuesday, October 18, 2022 @ 19:26:02 Author: dvzrv Revision: 458377
Change login.defs patch to use the previous UMASK. The initial patch accidentally left the UMASK setting to the default (022), but the default has been 077 before: https://github.com/archlinux/svntogit-packages/commit/dba90befffd92c81816bfaf78453934ba83bdbe1 Additionally, comment all unsupported options and mark them as unsupported. Modified: shadow/trunk/PKGBUILD shadow/trunk/shadow-4.11.1-login.defs.patch --------------------------------+ PKGBUILD | 8 - shadow-4.11.1-login.defs.patch | 158 +++++++++++++++++++++++++++++---------- 2 files changed, 122 insertions(+), 44 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-18 19:01:55 UTC (rev 458376) +++ PKGBUILD 2022-10-18 19:26:02 UTC (rev 458377) @@ -46,8 +46,8 @@ '4fb7474ea9dedf86e4c65bf18f503a6d8c00d477a7c32be3cfdfd026bd62ef866d009c50e5a2dc2101bea332c5697bc1e0d55225f39c83252860f5b9b7461aeb' 'e4edf705dd04e088c6b561713eaa1afeb92f42ac13722bff037aede6ac5ad7d4d00828cfb677f7b1ff048db8b6788238c1ab6a71dfcfd3e02ef6cb78ae09a621' '67a49415f676a443f81021bfa29d198462008da1224086f8c549b19c2fd21514ca3302d5ac23edec28b9c724fef921596586423ebe41e852ebfbe7216af727e6' - 'b681401895de553674cfc7f51809565db03cb4351f85b492460d09abfd703e73c41ba1dfd708964e0f6ea356dc9c929818c62e7d740d55fb795a2e9b7de271fc' - 'fab778c3afe0f78272de01396968f0f0c40ec8469d12a121e1a53f1d8b4af046a441291ca8020b5cfd5f91b776e6e0f39b63c3dcedf36b25b8b85c9e1ad59715') + 'e9ffea021ee4031b9ad3a534bfb94dbf9d0dfd45a55ecac5dedb2453ea0c17fb80bbb9ad039686bc1f3349dc371977eb548e3a665c56531469c22f29fc4eced8' + 'f5f1fad77363db46ca513c76f22654924dd732cdf2e596fcfccb0a47a70d6099b6705e90adb661cd45af076959ef1f9f6bba66942500e603df9421caa9ed2f80') b2sums=('d459a1e0ffb342b6b455caf65e6af60b32eee72d4a9b1ab126485fb4632503a42061d3f0b960554c8155af6dc0564c585335b27aecca6538b394a0d58d927588' 'SKIP' '31e74eebedf8cb6e5ade36096b4399892d7091b9dce4645fde591f64802dc8befd73ae8019e78f8d326a605b224c7828694d21788bd6073db43c41cf5a9c2805' @@ -57,8 +57,8 @@ '5b4e20609d38dcec82eae66acdfb7d45288574e7bf9684fa0f66bc0fb1c45cd78ee503d04a5084e28755fb7a1c6cea95854c93b33d76ab20964f45420c68403c' '5cfc936555aa2b2e15f8830ff83764dad6e11a80e2a102c5f2bd3b7c83db22a5457a3afdd182e3648c9d7d5bca90fa550f59576d0ac47a11a31dfb636cb18f2b' '4a9cb6fe6658f2182655d42761d9d669654c6f0e891610e1b7fd256ce32a561f05e71daf8e473d98f16f5ee9d16d46a097a2d0de42eac58b4ce3be1525a74856' - '75738ba7705fe4f8c22d07bff738a5c2c3bc0fd44d9aaca170cb4e6e7bb3f1e05f729f6decfaa4dec8a037e09fdea83b3500aaa8d6693fd4ae20d7fb0ede420e' - 'a03644975fa0720ffba26578b84d0ef06ad31b7eeb1e80e3c5e6cb1e9bde32bfc455754e81bac060fba070169fa39b7dd1631058b4290cbdafe2bf99d1d3e76f') + 'd5bea0cfc2e6d3d1749c65440ca911533d41b6f8117fe09e9efec23524637cfa823d230303a7fbb45d3cd251bf8036d48b9b21049ced208f7ed191fcbd75e879' + 'ecc517a22ba12bd7afa3a0eefb68febf27b164cfac6502e66930bd12c62947ae362b4113472544fddc2f39e9c64d78cc662605a359c9988baaba8613d4c0f468') validpgpkeys=('66D0387DB85D320F8408166DB175CFA98F192AF2') # Serge Hallyn <[email protected]> prepare() { Modified: shadow-4.11.1-login.defs.patch =================================================================== --- shadow-4.11.1-login.defs.patch 2022-10-18 19:01:55 UTC (rev 458376) +++ shadow-4.11.1-login.defs.patch 2022-10-18 19:26:02 UTC (rev 458377) @@ -1,5 +1,5 @@ diff --git i/etc/login.defs w/etc/login.defs -index 114dbcd9..1315e546 100644 +index 114dbcd9..4cb8cdf5 100644 --- i/etc/login.defs +++ w/etc/login.defs @@ -3,6 +3,8 @@ @@ -7,7 +7,7 @@ # $Id$ # +# This file is adapted for the use on Arch Linux. -+# Options overlapping with tooling from util-linux are commented. ++# Options unsupported due to the use of util-linux or PAM are commented. # # Delay in seconds before being allowed another attempt after a login failure @@ -16,7 +16,7 @@ # Enable logging and display of /var/log/faillog login(1) failure info. # -FAILLOG_ENAB yes -+# FAILLOG_ENAB yes ++# FAILLOG_ENAB is currently not supported # # Enable display of unknown usernames when login(1) failures are recorded. @@ -25,13 +25,13 @@ # Enable logging of successful logins # -LOG_OK_LOGINS no -+# LOG_OK_LOGINS no ++# LOG_OK_LOGINS is currently not supported # # Enable logging and display of /var/log/lastlog login(1) time info. # -LASTLOG_ENAB yes -+# LASTLOG_ENAB yes ++# LASTLOG_ENAB is currently not supported # # Limit the highest user ID number for which the lastlog entries should @@ -40,25 +40,25 @@ # ("mailx -e" or equivalent). # -MAIL_CHECK_ENAB yes -+# MAIL_CHECK_ENAB yes ++# MAIL_CHECK_ENAB is currently not supported # # Enable additional checks upon password changes. # -OBSCURE_CHECKS_ENAB yes -+# OBSCURE_CHECKS_ENAB yes ++# OBSCURE_CHECKS_ENAB is currently not supported # # Enable checking of time restrictions specified in /etc/porttime. # -PORTTIME_CHECKS_ENAB yes -+# PORTTIME_CHECKS_ENAB yes ++# PORTTIME_CHECKS_ENAB is currently not supported # # Enable setting of ulimit, umask, and niceness from passwd(5) gecos field. # -QUOTAS_ENAB yes -+# QUOTAS_ENAB yes ++# QUOTAS_ENAB is currently not supported # # Enable "syslog" logging of su(1) activity - in addition to sulog file logging. @@ -65,11 +65,25 @@ # SYSLOG_SG_ENAB does the same for newgrp(1) and sg(1). # -SYSLOG_SU_ENAB yes -+# SYSLOG_SU_ENAB yes ++# SYSLOG_SU_ENAB is currently not supported SYSLOG_SG_ENAB yes # -@@ -87,7 +89,7 @@ CONSOLE /etc/securetty +@@ -75,44 +77,43 @@ SYSLOG_SG_ENAB yes + # a ":" delimited list of device names. Root logins will be allowed only + # from these devices. + # +-CONSOLE /etc/securetty +-#CONSOLE console:tty01:tty02:tty03:tty04 ++# CONSOLE is currently not supported + + # + # If defined, all su(1) activity is logged to this file. + # +-#SULOG_FILE /var/log/sulog ++# SULOG_FILE is currently not supported + + # # If defined, ":" delimited list of "message of the day" files to # be displayed upon login. # @@ -78,12 +92,24 @@ #MOTD_FILE /etc/motd:/usr/lib/news/news-motd # -@@ -105,14 +107,14 @@ MOTD_FILE /etc/motd + # If defined, this file will be output before each login(1) prompt. + # +-#ISSUE_FILE /etc/issue ++# ISSUE_FILE is currently not supported + + # + # If defined, file which maps tty line to TERM environment parameter. + # Each line of the file is in a format similar to "vt100 tty01". + # +-#TTYTYPE_FILE /etc/ttytype ++# TTYTYPE_FILE is currently not supported + + # # If defined, login(1) failures will be logged here in a utmp format. # last(1), when invoked as lastb(1), will read /var/log/btmp, so... # -FTMP_FILE /var/log/btmp -+# FTMP_FILE /var/log/btmp ++# FTMP_FILE is currently not supported # # If defined, name of file whose presence will inhibit non-root @@ -91,20 +117,28 @@ # why logins are inhibited. # -NOLOGINS_FILE /etc/nologin -+# NOLOGINS_FILE /etc/nologin ++# NOLOGINS_FILE is currently not supported # # If defined, the command name to display when running "su -". For -@@ -120,7 +122,7 @@ NOLOGINS_FILE /etc/nologin +@@ -120,7 +121,7 @@ NOLOGINS_FILE /etc/nologin # command as "-su". If not defined, then ps(1) will display the # name of the shell actually being run, e.g. something like "-sh". # -SU_NAME su -+# SU_NAME su ++# SU_NAME is currently not supported # # *REQUIRED* -@@ -150,7 +152,7 @@ HUSHLOGIN_FILE .hushlogin +@@ -143,23 +144,22 @@ HUSHLOGIN_FILE .hushlogin + # If defined, either a TZ environment parameter spec or the + # fully-rooted pathname of a file containing such a spec. + # +-#ENV_TZ TZ=CST6CDT +-#ENV_TZ /etc/tzname ++# ENV_TZ is currently not supported + + # # If defined, an HZ environment parameter spec. # # for Linux/x86 @@ -111,9 +145,10 @@ -ENV_HZ HZ=100 +# ENV_HZ HZ=100 # For Linux/Alpha... - #ENV_HZ HZ=1024 +-#ENV_HZ HZ=1024 ++# ENV_HZ is currently not supported -@@ -158,8 +160,8 @@ ENV_HZ HZ=100 + # # *REQUIRED* The default PATH settings, for superuser and normal users. # # (they are minimal, add the rest in the shell startup files) @@ -124,42 +159,53 @@ # # Terminal permissions -@@ -188,8 +190,8 @@ TTYPERM 0600 +@@ -188,9 +188,9 @@ TTYPERM 0600 # # Prefix these values with "0" to get octal, "0x" to get hexadecimal. # -ERASECHAR 0177 -KILLCHAR 025 -+# ERASECHAR 0177 -+# KILLCHAR 025 - #ULIMIT 2097152 +-#ULIMIT 2097152 ++# ERASECHAR is currently not supported ++# KILLCHAR is currently not supported ++# ULIMIT is currently not supported # Default initial "umask" value used by login(1) on non-PAM enabled systems. -@@ -216,7 +218,7 @@ UMASK 022 + # Default "umask" value for pam_umask(8) on PAM enabled systems. +@@ -199,7 +199,7 @@ KILLCHAR 025 + # 022 is the default value, but 027, or even 077, could be considered + # for increased privacy. There is no One True Answer here: each sysadmin + # must make up their mind. +-UMASK 022 ++UMASK 077 + + # HOME_MODE is used by useradd(8) and newusers(8) to set the mode for new + # home directories. +@@ -216,7 +216,7 @@ UMASK 022 # PASS_MAX_DAYS 99999 PASS_MIN_DAYS 0 -PASS_MIN_LEN 5 -+# PASS_MIN_LEN 5 ++# PASS_MIN_LEN is currently not supported PASS_WARN_AGE 7 # -@@ -225,12 +227,12 @@ PASS_WARN_AGE 7 +@@ -225,12 +225,12 @@ PASS_WARN_AGE 7 # to uid 0 accounts. If the group doesn't exist or is empty, no one # will be able to "su" to uid 0. # -SU_WHEEL_ONLY no -+# SU_WHEEL_ONLY no ++# SU_WHEEL_ONLY is currently not supported # # If compiled with cracklib support, sets the path to the dictionaries # -CRACKLIB_DICTPATH /var/cache/cracklib/cracklib_dict -+# CRACKLIB_DICTPATH /var/cache/cracklib/cracklib_dict ++# CRACKLIB_DICTPATH is currently not supported # # Min/max values for automatic uid selection in useradd(8) -@@ -238,7 +240,7 @@ CRACKLIB_DICTPATH /var/cache/cracklib/cracklib_dict +@@ -238,7 +238,7 @@ CRACKLIB_DICTPATH /var/cache/cracklib/cracklib_dict UID_MIN 1000 UID_MAX 60000 # System accounts @@ -168,7 +214,7 @@ SYS_UID_MAX 999 # Extra per user uids SUB_UID_MIN 100000 -@@ -251,7 +253,7 @@ SUB_UID_COUNT 65536 +@@ -251,7 +251,7 @@ SUB_UID_COUNT 65536 GID_MIN 1000 GID_MAX 60000 # System accounts @@ -177,31 +223,54 @@ SYS_GID_MAX 999 # Extra per user group ids SUB_GID_MIN 100000 -@@ -271,12 +273,12 @@ LOGIN_TIMEOUT 60 +@@ -271,24 +271,24 @@ LOGIN_TIMEOUT 60 # # Maximum number of attempts to change password if rejected (too easy) # -PASS_CHANGE_TRIES 5 -+# PASS_CHANGE_TRIES 5 ++# PASS_CHANGE_TRIES is currently not supported # # Warn about weak passwords (but still allow them) if you are root. # -PASS_ALWAYS_WARN yes -+# PASS_ALWAYS_WARN yes ++# PASS_ALWAYS_WARN is currently not supported # # Number of significant characters in the password for crypt(). -@@ -288,7 +290,7 @@ PASS_ALWAYS_WARN yes + # Default is 8, don't change unless your crypt() is better. + # Ignored if MD5_CRYPT_ENAB set to "yes". # +-#PASS_MAX_LEN 8 ++# PASS_MAX_LEN is currently not supported + + # # Require password before chfn(1)/chsh(1) can make any changes. # -CHFN_AUTH yes -+# CHFN_AUTH yes ++# CHFN_AUTH is currently not supported # # Which fields may be changed by regular users using chfn(1) - use -@@ -334,7 +336,7 @@ CHFN_RESTRICT rwh +@@ -303,7 +303,7 @@ CHFN_RESTRICT rwh + # + # XXX - it doesn't work correctly yet, for now leave it commented out + # to use the default which is just "Password: ". +-#LOGIN_STRING "%s's Password: " ++# LOGIN_STRING is currently not supported + + # + # Only works if compiled with MD5_CRYPT defined: +@@ -318,7 +318,7 @@ CHFN_RESTRICT rwh + # + # This variable is deprecated. You should use ENCRYPT_METHOD instead. + # +-#MD5_CRYPT_ENAB no ++# MD5_CRYPT_ENAB is currently not supported + + # + # Only works if compiled with ENCRYPTMETHOD_SELECT defined: +@@ -334,7 +334,7 @@ CHFN_RESTRICT rwh # Note: If you use PAM, it is recommended to use a value consistent with # the PAM modules configuration. # @@ -210,21 +279,30 @@ # # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512. -@@ -410,7 +412,7 @@ NONEXISTENT /nonexistent +@@ -390,7 +390,7 @@ CHFN_RESTRICT rwh + # access to these groups, even when not logged in from the console. + # How to do it is left as an exercise for the reader... + # +-#CONSOLE_GROUPS floppy:audio:cdrom ++# CONSOLE_GROUPS is currently not supported + + # + # Should login be allowed if we can't cd to the home directory? +@@ -410,7 +410,7 @@ NONEXISTENT /nonexistent # If this file exists and is readable, login environment will be # read from it. Every line should be in the form name=value. # -ENVIRON_FILE /etc/environment -+# ENVIRON_FILE /etc/environment ++# ENVIRON_FILE is currently not supported # # If defined, this command is run when removing a user. -@@ -465,7 +467,7 @@ USERGROUPS_ENAB yes +@@ -465,7 +465,7 @@ USERGROUPS_ENAB yes # Set to "yes" to prevent for all accounts # Set to "superuser" to prevent for UID 0 / root (default) # Set to "no" to not prevent for any account (dangerous, historical default) -PREVENT_NO_AUTH superuser -+# PREVENT_NO_AUTH superuser ++# PREVENT_NO_AUTH is currently not supported # # Select the HMAC cryptography algorithm.
