diff options
Diffstat (limited to 'source/a/shadow')
| -rw-r--r-- | source/a/shadow/adduser | 9 | ||||
| -rw-r--r-- | source/a/shadow/login.defs | 8 | ||||
| -rw-r--r-- | source/a/shadow/patches/README_PATCHES | 1 | ||||
| -rw-r--r-- | source/a/shadow/patches/r3090.diff | 11 | ||||
| -rw-r--r-- | source/a/shadow/patches/unused/r3299.diff (renamed from source/a/shadow/patches/r3299.diff) | 0 | ||||
| -rwxr-xr-x | source/a/shadow/shadow.SlackBuild | 10 | ||||
| -rw-r--r-- | source/a/shadow/shadow.man.nodups.diff | 11 |
7 files changed, 42 insertions, 8 deletions
diff --git a/source/a/shadow/adduser b/source/a/shadow/adduser index 5b674a852..ce06aac54 100644 --- a/source/a/shadow/adduser +++ b/source/a/shadow/adduser @@ -3,6 +3,7 @@ # Copyright 1995 Hrvoje Dogan, Croatia. # Copyright 2002-2004, 2008, 2009, 2010 Stuart Winter, Surrey, England, UK. # Copyright 2004, 2008-2010 Slackware Linux, Inc., Concord, CA, USA +# Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,12 +30,16 @@ # Author : Stuart Winter <mozes@slackware.com> # Based on the original Slackware adduser by Hrvoje Dogan # with modifications by Patrick Volkerding -# Version: 1.13 +# Version: 1.15 ########################################################################## # Usage..: adduser [<new_user_name>] ########################################################################## # History # ########### +# v1.15 - 2012-09-13 +# * Added scanner group, which may be required by third party drivers. +# v1.14 - 2012-08-24 +# * Added lp group, which is now required for scanning. <pjv> # v1.13 - 13/01/10 # * Fixed bug that removed underscore characters from UNIX group names. # Thanks to mRgOBLIN for the report and Jim Hawkins for the fix. <sw> @@ -107,7 +112,7 @@ defhome=/home defshell=/bin/bash defchmod=711 # home dir permissions - may be preferable to use 701, however. defgroup=users -AGID="audio cdrom floppy plugdev video power netdev" # additional groups for desktop users +AGID="audio cdrom floppy plugdev video power netdev lp scanner" # additional groups for desktop users # Determine what the minimum UID is (for UID recycling) # (we ignore it if it's not at the beginning of the line (i.e. commented out with #)) diff --git a/source/a/shadow/login.defs b/source/a/shadow/login.defs index dde37c97b..e52f91a53 100644 --- a/source/a/shadow/login.defs +++ b/source/a/shadow/login.defs @@ -300,7 +300,7 @@ CHFN_RESTRICT frwh # If set to DES, DES-based algorithm will be used for encrypting password (default) # Overrides the MD5_CRYPT_ENAB option # -ENCRYPT_METHOD MD5 +ENCRYPT_METHOD SHA256 # # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512. @@ -327,7 +327,9 @@ ENCRYPT_METHOD MD5 # access to these groups, even when not logged in on the console. # How to do it is left as an exercise for the reader... # -# Most of these groups are self-explanatory. +# Most of these groups are self-explanatory, but in the case of +# "lp", it is because group lp is needed to use a scanner that +# is part of a multifunction printer. # # Note that users are added to these default groups only when # logging into a shell with /bin/login, not when using a login @@ -336,7 +338,7 @@ ENCRYPT_METHOD MD5 # when the user is added with adduser or useradd, or by editing # /etc/group directly, preferably using "vigr" # -CONSOLE_GROUPS floppy:audio:cdrom:video:scanner +CONSOLE_GROUPS floppy:audio:cdrom:video:lp:scanner # # Should login be allowed if we can't cd to the home directory? diff --git a/source/a/shadow/patches/README_PATCHES b/source/a/shadow/patches/README_PATCHES index 0c639d1a2..1d1f2173a 100644 --- a/source/a/shadow/patches/README_PATCHES +++ b/source/a/shadow/patches/README_PATCHES @@ -4,6 +4,7 @@ r3055.diff: Help output to stderr not stdout. r3060.diff: Fix memory leaks r3062.diff: Avoid memzero() on a possibly NULL pointer. r3096.diff: Fix parsing of gshadow entries. +r3090.diff: Fix improper sanitizing of locale variables. r3160.diff: Fixed limits support (non PAM enabled versions only) r3194.diff: shell's name must be -su when a su fakes a login. r3299.diff: man/ru/Makefile.am: Remove double inclusion of $(man_nopam) diff --git a/source/a/shadow/patches/r3090.diff b/source/a/shadow/patches/r3090.diff new file mode 100644 index 000000000..46057673e --- /dev/null +++ b/source/a/shadow/patches/r3090.diff @@ -0,0 +1,11 @@ +--- libmisc/env.c.orig 2011-02-13 11:58:11.000000000 -0600 ++++ libmisc/env.c 2012-08-14 10:38:25.304917619 -0500 +@@ -251,7 +251,7 @@ + if (strncmp (*cur, *bad, strlen (*bad)) != 0) { + continue; + } +- if (strchr (*cur, '/') != NULL) { ++ if (strchr (*cur, '/') == NULL) { + continue; /* OK */ + } + for (move = cur; NULL != *move; move++) { diff --git a/source/a/shadow/patches/r3299.diff b/source/a/shadow/patches/unused/r3299.diff index a46b18f05..a46b18f05 100644 --- a/source/a/shadow/patches/r3299.diff +++ b/source/a/shadow/patches/unused/r3299.diff diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild index c3d2e9c72..41e9353ba 100755 --- a/source/a/shadow/shadow.SlackBuild +++ b/source/a/shadow/shadow.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ PKGNAM=shadow VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -63,8 +63,12 @@ for patch in $CWD/patches/*.diff.gz ; do zcat $patch | patch -p0 --verbose || exit 1 done +# Don't duplicate Russian man page installations: +zcat $CWD/shadow.man.nodups.diff.gz | patch -p1 --verbose || exit 1 + # Re-run automake because of r3299 patch to man/ru/Makefile.am: -automake -f +# (not used because it doesn't work... above patch does the intended fix) +#automake -f chown -R root:root . find . \ diff --git a/source/a/shadow/shadow.man.nodups.diff b/source/a/shadow/shadow.man.nodups.diff new file mode 100644 index 000000000..425321b99 --- /dev/null +++ b/source/a/shadow/shadow.man.nodups.diff @@ -0,0 +1,11 @@ +--- ./man/ru/Makefile.in.orig 2011-02-15 16:18:21.000000000 -0600 ++++ ./man/ru/Makefile.in 2012-06-26 23:21:34.866292111 -0500 +@@ -228,7 +228,7 @@ + grpunconv.8 gshadow.5 lastlog.8 login.1 login.defs.5 logoutd.8 \ + newgrp.1 newusers.8 nologin.8 passwd.1 passwd.5 pwck.8 \ + pwconv.8 pwunconv.8 sg.1 shadow.3 shadow.5 su.1 suauth.5 \ +- useradd.8 userdel.8 usermod.8 vigr.8 vipw.8 $(am__append_1) ++ useradd.8 userdel.8 usermod.8 vigr.8 vipw.8 + man_nopam = \ + limits.5 \ + login.access.5 \ |