This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 3e3816c3802331ba2cdc8c02a1a81d0dd0dbfa44 (commit) from af45e4c5145b6231f2b50801e4a9701f05cc8af7 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 3e3816c3802331ba2cdc8c02a1a81d0dd0dbfa44 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Aug 9 13:28:03 2011 +0200
shadow-utils: Rename shadow to shadow-utils.
-----------------------------------------------------------------------
Summary of changes: pkgs/{shadow => shadow-utils}/login.defs | 0 .../patches/shadow-4.1.4.2-ipfire.patch | 0 .../patches/shadow-4.1.4.3-goodname.patch | 0 .../shadow.nm => shadow-utils/shadow-utils.nm} | 10 ++++++---- pkgs/{shadow => shadow-utils}/useradd.default | 0 5 files changed, 6 insertions(+), 4 deletions(-) rename pkgs/{shadow => shadow-utils}/login.defs (100%) rename pkgs/{shadow => shadow-utils}/patches/shadow-4.1.4.2-ipfire.patch (100%) rename pkgs/{shadow => shadow-utils}/patches/shadow-4.1.4.3-goodname.patch (100%) rename pkgs/{shadow/shadow.nm => shadow-utils/shadow-utils.nm} (94%) rename pkgs/{shadow => shadow-utils}/useradd.default (100%)
Difference in files: diff --git a/pkgs/shadow-utils/login.defs b/pkgs/shadow-utils/login.defs new file mode 100644 index 0000000..3f27f88 --- /dev/null +++ b/pkgs/shadow-utils/login.defs @@ -0,0 +1,72 @@ +# +# Please note that the parameters in this configuration file control the +# behavior of the tools from the shadow-utils component. None of these +# tools uses the PAM mechanism, and the utilities that use PAM (such as the +# passwd command) should therefore be configured elsewhere. Refer to +# /etc/pam.d/system-auth for more information. +# + +# *REQUIRED* +# Directory where mailboxes reside, _or_ name of file, relative to the +# home directory. If you _do_ define both, MAIL_DIR takes precedence. +# QMAIL_DIR is for Qmail +# +#QMAIL_DIR Maildir +MAIL_DIR /var/spool/mail +#MAIL_FILE .mail + +# Password aging controls: +# +# PASS_MAX_DAYS Maximum number of days a password may be used. +# PASS_MIN_DAYS Minimum number of days allowed between password changes. +# PASS_MIN_LEN Minimum acceptable password length. +# PASS_WARN_AGE Number of days warning given before a password expires. +# +PASS_MAX_DAYS 99999 +PASS_MIN_DAYS 0 +PASS_MIN_LEN 5 +PASS_WARN_AGE 7 + +# +# Min/max values for automatic uid selection in useradd +# +UID_MIN 1000 +UID_MAX 60000 +# System accounts +SYS_UID_MIN 201 +SYS_UID_MAX 999 + +# +# Min/max values for automatic gid selection in groupadd +# +GID_MIN 1000 +GID_MAX 60000 +# System accounts +SYS_GID_MIN 201 +SYS_GID_MAX 999 + +# +# If defined, this command is run when removing a user. +# It should remove any at/cron/print jobs etc. owned by +# the user to be removed (passed as the first argument). +# +#USERDEL_CMD /usr/sbin/userdel_local + +# +# If useradd should create home directories for users by default +# On RH systems, we do. This option is overridden with the -m flag on +# useradd command line. +# +CREATE_HOME yes + +# The permission mask is initialized to this value. If not specified, +# the permission mask will be initialized to 022. +UMASK 077 + +# This enables userdel to remove user groups if no members exist. +# +USERGROUPS_ENAB yes + +# Use SHA512 to encrypt password. +ENCRYPT_METHOD SHA512 + diff --git a/pkgs/shadow-utils/patches/shadow-4.1.4.2-ipfire.patch b/pkgs/shadow-utils/patches/shadow-4.1.4.2-ipfire.patch new file mode 100644 index 0000000..e15eeb2 --- /dev/null +++ b/pkgs/shadow-utils/patches/shadow-4.1.4.2-ipfire.patch @@ -0,0 +1,75 @@ +diff -Nur shadow-4.1.4.2_orig/libmisc/find_new_gid.c shadow-4.1.4.2/libmisc/find_new_gid.c +--- shadow-4.1.4.2_orig/libmisc/find_new_gid.c 2009-07-17 23:53:42.000000000 +0000 ++++ shadow-4.1.4.2/libmisc/find_new_gid.c 2009-08-03 18:16:37.000000000 +0000 +@@ -58,11 +58,11 @@ + assert (gid != NULL); + + if (!sys_group) { +- gid_min = (gid_t) getdef_ulong ("GID_MIN", 1000UL); ++ gid_min = (gid_t) getdef_ulong ("GID_MIN", 500UL); + gid_max = (gid_t) getdef_ulong ("GID_MAX", 60000UL); + } else { + gid_min = (gid_t) getdef_ulong ("SYS_GID_MIN", 101UL); +- gid_max = (gid_t) getdef_ulong ("GID_MIN", 1000UL) - 1; ++ gid_max = (gid_t) getdef_ulong ("GID_MIN", 500UL) - 1; + gid_max = (gid_t) getdef_ulong ("SYS_GID_MAX", (unsigned long) gid_max); + } + used_gids = alloca (sizeof (bool) * (gid_max +1)); +diff -Nur shadow-4.1.4.2_orig/libmisc/find_new_uid.c shadow-4.1.4.2/libmisc/find_new_uid.c +--- shadow-4.1.4.2_orig/libmisc/find_new_uid.c 2009-07-17 23:53:43.000000000 +0000 ++++ shadow-4.1.4.2/libmisc/find_new_uid.c 2009-08-03 18:17:20.000000000 +0000 +@@ -58,11 +58,11 @@ + assert (uid != NULL); + + if (!sys_user) { +- uid_min = (uid_t) getdef_ulong ("UID_MIN", 1000UL); ++ uid_min = (uid_t) getdef_ulong ("UID_MIN", 500UL); + uid_max = (uid_t) getdef_ulong ("UID_MAX", 60000UL); + } else { + uid_min = (uid_t) getdef_ulong ("SYS_UID_MIN", 101UL); +- uid_max = (uid_t) getdef_ulong ("UID_MIN", 1000UL) - 1; ++ uid_max = (uid_t) getdef_ulong ("UID_MIN", 500UL) - 1; + uid_max = (uid_t) getdef_ulong ("SYS_UID_MAX", (unsigned long) uid_max); + } + used_uids = alloca (sizeof (bool) * (uid_max +1)); +diff -Nur shadow-4.1.4.2_orig/src/useradd.c shadow-4.1.4.2/src/useradd.c +--- shadow-4.1.4.2_orig/src/useradd.c 2009-06-05 22:16:58.000000000 +0000 ++++ shadow-4.1.4.2/src/useradd.c 2009-08-03 18:26:31.000000000 +0000 +@@ -90,7 +90,7 @@ + static gid_t def_group = 100; + static const char *def_gname = "other"; + static const char *def_home = "/home"; +-static const char *def_shell = ""; ++static const char *def_shell = "/sbin/nologin"; + static const char *def_template = SKEL_DIR; + static const char *def_create_mail_spool = "no"; + +@@ -102,7 +102,7 @@ + #define VALID(s) (strcspn (s, ":\n") == strlen (s)) + + static const char *user_name = ""; +-static const char *user_pass = "!"; ++static const char *user_pass = "!!"; + static uid_t user_id; + static gid_t user_gid; + static const char *user_comment = ""; +@@ -989,9 +989,9 @@ + }; + while ((c = getopt_long (argc, argv, + #ifdef WITH_SELINUX +- "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:UZ:", ++ "b:c:d:De:f:g:G:k:K:lmMnNop:rs:u:UZ:", + #else +- "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:U", ++ "b:c:d:De:f:g:G:k:K:lmMnNop:rs:u:U", + #endif + long_options, NULL)) != -1) { + switch (c) { +@@ -1141,6 +1141,7 @@ + case 'M': + Mflg = true; + break; ++ case 'n': + case 'N': + Nflg = true; + break; diff --git a/pkgs/shadow-utils/patches/shadow-4.1.4.3-goodname.patch b/pkgs/shadow-utils/patches/shadow-4.1.4.3-goodname.patch new file mode 100644 index 0000000..fe49765 --- /dev/null +++ b/pkgs/shadow-utils/patches/shadow-4.1.4.3-goodname.patch @@ -0,0 +1,70 @@ +diff -Nur shadow-4.1.4.2_orig/libmisc/chkname.c shadow-4.1.4.2/libmisc/chkname.c +--- shadow-4.1.4.2_orig/libmisc/chkname.c 2009-04-28 19:14:04.000000000 +0000 ++++ shadow-4.1.4.2/libmisc/chkname.c 2009-08-03 18:47:59.000000000 +0000 +@@ -49,21 +49,29 @@ + static bool is_valid_name (const char *name) + { + /* +- * User/group names must match [a-z_][a-z0-9_-]*[$] +- */ +- if (('\0' == *name) || +- !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) { ++ * User/group names must match gnu e-regex: ++ * [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]? ++ * ++ * as a non-POSIX, extension, allow "$" as the last char for ++ * sake of Samba 3.x "add machine script" ++ */ ++ if ( ('\0' == *name) || ++ !((*name >= 'a' && *name <= 'z') || ++ (*name >= 'A' && *name <= 'Z') || ++ (*name >= '0' && *name <= '9') || ++ (*name == '_') || (*name == '.') ++ )) { + return false; + } + + while ('\0' != *++name) { +- if (!(( ('a' <= *name) && ('z' >= *name) ) || +- ( ('0' <= *name) && ('9' >= *name) ) || +- ('_' == *name) || +- ('-' == *name) || +- ( ('$' == *name) && ('\0' == *(name + 1)) ) +- )) { +- return false; ++ if (!( (*name >= 'a' && *name <= 'z') || ++ (*name >= 'A' && *name <= 'Z') || ++ (*name >= '0' && *name <= '9') || ++ (*name == '_') || (*name == '.') || (*name == '-') || ++ (*name == '$' && *(name + 1) == '\0') ++ )) { ++ return false; + } + } + +diff -Nur shadow-4.1.4.2_orig/man/groupadd.8 shadow-4.1.4.2/man/groupadd.8 +--- shadow-4.1.4.2_orig/man/groupadd.8 2009-07-24 01:16:24.000000000 +0000 ++++ shadow-4.1.4.2/man/groupadd.8 2009-08-03 18:51:10.000000000 +0000 +@@ -153,9 +153,7 @@ + .RE + .SH "CAVEATS" + .PP +-Groupnames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes&. They can end with a dollar sign&. In regular expression terms: [a-z_][a-z0-9_-]*[$]? +-.PP +-Groupnames may only be up to characters long&. ++Groupnames may only be up to 32 characters long&. + .PP + You may not add a NIS or LDAP group&. This must be performed on the corresponding server&. + .PP +diff -Nur shadow-4.1.4.2_orig/man/useradd.8 shadow-4.1.4.2/man/useradd.8 +--- shadow-4.1.4.2_orig/man/useradd.8 2009-07-24 01:16:44.000000000 +0000 ++++ shadow-4.1.4.2/man/useradd.8 2009-08-03 18:51:52.000000000 +0000 +@@ -405,8 +405,6 @@ + \fBuseradd\fR + will deny the user account creation request&. + .PP +-Usernames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes&. They can end with a dollar sign&. In regular expression terms: [a-z_][a-z0-9_-]*[$]? +-.PP + Usernames may only be up to 32 characters long&. + .SH "CONFIGURATION" + .PP diff --git a/pkgs/shadow-utils/shadow-utils.nm b/pkgs/shadow-utils/shadow-utils.nm new file mode 100644 index 0000000..712b674 --- /dev/null +++ b/pkgs/shadow-utils/shadow-utils.nm @@ -0,0 +1,91 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = shadow-utils +PKG_VER = 4.1.4.3 +PKG_REL = 1 + +PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org +PKG_GROUPS = Base System/Base +PKG_URL = ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/ +PKG_LICENSE = GPLv2+ +PKG_SUMMARY = Utilities to deal with user accounts. + +PKG_BUILD_DEPS+= audit-devel libcap-devel libselinux-devel +PKG_OBSOLETES += shadow + +define PKG_DESCRIPTION + The shadow-utils package includes the necessary programs \ + for converting UNIX password files to the shadow password \ + format, plus programs for managing user and group accounts. +endef + +THISAPP = shadow-$(PKG_VER) +PKG_TARBALL = $(THISAPP).tar.bz2 + +CONFIGURE_OPTIONS += \ + --sysconfdir=/etc \ + --enable-shadowgrp \ + --with-sha-crypt \ + --with-selinux \ + --without-libcrack \ + --without-libpam \ + --disable-static + +define STAGE_PREPARE_CMDS + # Do not build these files: + cd $(DIR_APP) && \ + for i in nologin chfn chgpasswd chpasswd chsh expiry gpasswd groups login \ + logoutd passwd su; do \ + sed -i "s/$$i$$(EXEEXT)//" src/Makefile.in; \ + find man -name Makefile.in -exec sed -i "s/$$i.1/ /" {} ;; \ + done + cd $(DIR_APP) && sed -i src/Makefile.in \ + -e "s/^suidbins.*/# &/" -e "s/^suidubins.*/# &/" + + # Do not install korean and zh man pages + cd $(DIR_APP) && sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile.in + + # Do not install russion man pages - was broken in 4.1.4.3 + cd $(DIR_APP) && sed -i -e 's/ ru//' man/Makefile.in +endef + +define STAGE_INSTALL_CMDS + # Remove man pages in other languages + rm -rfv $(BUILDROOT)/usr/share/man/{cs,de,fi,fr,hu,id,it,ja,pl,pt_BR,ru,sv,tr} +endef + +define STAGE_INSTALL_POST + # Capabilities + chmod u-s $(BUILDROOT)/usr/bin/chage + setcap cap_dac_read_search+ep $(BUILDROOT)/usr/bin/chage + + chmod u-s $(BUILDROOT)/usr/bin/newgrp + setcap cap_dac_override,cap_setgid+ep $(BUILDROOT)/usr/bin/newgrp + + # Configuration + install -p -c -m 0644 $(DIR_SOURCE)/login.defs $(BUILDROOT)/etc/login.defs +endef diff --git a/pkgs/shadow-utils/useradd.default b/pkgs/shadow-utils/useradd.default new file mode 100644 index 0000000..4e81146 --- /dev/null +++ b/pkgs/shadow-utils/useradd.default @@ -0,0 +1,9 @@ +# useradd defaults file +GROUP=100 +HOME=/home +INACTIVE=-1 +EXPIRE= +SHELL=/bin/bash +SKEL=/etc/skel +CREATE_MAIL_SPOOL=yes + diff --git a/pkgs/shadow/login.defs b/pkgs/shadow/login.defs deleted file mode 100644 index 3f27f88..0000000 --- a/pkgs/shadow/login.defs +++ /dev/null @@ -1,72 +0,0 @@ -# -# Please note that the parameters in this configuration file control the -# behavior of the tools from the shadow-utils component. None of these -# tools uses the PAM mechanism, and the utilities that use PAM (such as the -# passwd command) should therefore be configured elsewhere. Refer to -# /etc/pam.d/system-auth for more information. -# - -# *REQUIRED* -# Directory where mailboxes reside, _or_ name of file, relative to the -# home directory. If you _do_ define both, MAIL_DIR takes precedence. -# QMAIL_DIR is for Qmail -# -#QMAIL_DIR Maildir -MAIL_DIR /var/spool/mail -#MAIL_FILE .mail - -# Password aging controls: -# -# PASS_MAX_DAYS Maximum number of days a password may be used. -# PASS_MIN_DAYS Minimum number of days allowed between password changes. -# PASS_MIN_LEN Minimum acceptable password length. -# PASS_WARN_AGE Number of days warning given before a password expires. -# -PASS_MAX_DAYS 99999 -PASS_MIN_DAYS 0 -PASS_MIN_LEN 5 -PASS_WARN_AGE 7 - -# -# Min/max values for automatic uid selection in useradd -# -UID_MIN 1000 -UID_MAX 60000 -# System accounts -SYS_UID_MIN 201 -SYS_UID_MAX 999 - -# -# Min/max values for automatic gid selection in groupadd -# -GID_MIN 1000 -GID_MAX 60000 -# System accounts -SYS_GID_MIN 201 -SYS_GID_MAX 999 - -# -# If defined, this command is run when removing a user. -# It should remove any at/cron/print jobs etc. owned by -# the user to be removed (passed as the first argument). -# -#USERDEL_CMD /usr/sbin/userdel_local - -# -# If useradd should create home directories for users by default -# On RH systems, we do. This option is overridden with the -m flag on -# useradd command line. -# -CREATE_HOME yes - -# The permission mask is initialized to this value. If not specified, -# the permission mask will be initialized to 022. -UMASK 077 - -# This enables userdel to remove user groups if no members exist. -# -USERGROUPS_ENAB yes - -# Use SHA512 to encrypt password. -ENCRYPT_METHOD SHA512 - diff --git a/pkgs/shadow/patches/shadow-4.1.4.2-ipfire.patch b/pkgs/shadow/patches/shadow-4.1.4.2-ipfire.patch deleted file mode 100644 index e15eeb2..0000000 --- a/pkgs/shadow/patches/shadow-4.1.4.2-ipfire.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -Nur shadow-4.1.4.2_orig/libmisc/find_new_gid.c shadow-4.1.4.2/libmisc/find_new_gid.c ---- shadow-4.1.4.2_orig/libmisc/find_new_gid.c 2009-07-17 23:53:42.000000000 +0000 -+++ shadow-4.1.4.2/libmisc/find_new_gid.c 2009-08-03 18:16:37.000000000 +0000 -@@ -58,11 +58,11 @@ - assert (gid != NULL); - - if (!sys_group) { -- gid_min = (gid_t) getdef_ulong ("GID_MIN", 1000UL); -+ gid_min = (gid_t) getdef_ulong ("GID_MIN", 500UL); - gid_max = (gid_t) getdef_ulong ("GID_MAX", 60000UL); - } else { - gid_min = (gid_t) getdef_ulong ("SYS_GID_MIN", 101UL); -- gid_max = (gid_t) getdef_ulong ("GID_MIN", 1000UL) - 1; -+ gid_max = (gid_t) getdef_ulong ("GID_MIN", 500UL) - 1; - gid_max = (gid_t) getdef_ulong ("SYS_GID_MAX", (unsigned long) gid_max); - } - used_gids = alloca (sizeof (bool) * (gid_max +1)); -diff -Nur shadow-4.1.4.2_orig/libmisc/find_new_uid.c shadow-4.1.4.2/libmisc/find_new_uid.c ---- shadow-4.1.4.2_orig/libmisc/find_new_uid.c 2009-07-17 23:53:43.000000000 +0000 -+++ shadow-4.1.4.2/libmisc/find_new_uid.c 2009-08-03 18:17:20.000000000 +0000 -@@ -58,11 +58,11 @@ - assert (uid != NULL); - - if (!sys_user) { -- uid_min = (uid_t) getdef_ulong ("UID_MIN", 1000UL); -+ uid_min = (uid_t) getdef_ulong ("UID_MIN", 500UL); - uid_max = (uid_t) getdef_ulong ("UID_MAX", 60000UL); - } else { - uid_min = (uid_t) getdef_ulong ("SYS_UID_MIN", 101UL); -- uid_max = (uid_t) getdef_ulong ("UID_MIN", 1000UL) - 1; -+ uid_max = (uid_t) getdef_ulong ("UID_MIN", 500UL) - 1; - uid_max = (uid_t) getdef_ulong ("SYS_UID_MAX", (unsigned long) uid_max); - } - used_uids = alloca (sizeof (bool) * (uid_max +1)); -diff -Nur shadow-4.1.4.2_orig/src/useradd.c shadow-4.1.4.2/src/useradd.c ---- shadow-4.1.4.2_orig/src/useradd.c 2009-06-05 22:16:58.000000000 +0000 -+++ shadow-4.1.4.2/src/useradd.c 2009-08-03 18:26:31.000000000 +0000 -@@ -90,7 +90,7 @@ - static gid_t def_group = 100; - static const char *def_gname = "other"; - static const char *def_home = "/home"; --static const char *def_shell = ""; -+static const char *def_shell = "/sbin/nologin"; - static const char *def_template = SKEL_DIR; - static const char *def_create_mail_spool = "no"; - -@@ -102,7 +102,7 @@ - #define VALID(s) (strcspn (s, ":\n") == strlen (s)) - - static const char *user_name = ""; --static const char *user_pass = "!"; -+static const char *user_pass = "!!"; - static uid_t user_id; - static gid_t user_gid; - static const char *user_comment = ""; -@@ -989,9 +989,9 @@ - }; - while ((c = getopt_long (argc, argv, - #ifdef WITH_SELINUX -- "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:UZ:", -+ "b:c:d:De:f:g:G:k:K:lmMnNop:rs:u:UZ:", - #else -- "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:U", -+ "b:c:d:De:f:g:G:k:K:lmMnNop:rs:u:U", - #endif - long_options, NULL)) != -1) { - switch (c) { -@@ -1141,6 +1141,7 @@ - case 'M': - Mflg = true; - break; -+ case 'n': - case 'N': - Nflg = true; - break; diff --git a/pkgs/shadow/patches/shadow-4.1.4.3-goodname.patch b/pkgs/shadow/patches/shadow-4.1.4.3-goodname.patch deleted file mode 100644 index fe49765..0000000 --- a/pkgs/shadow/patches/shadow-4.1.4.3-goodname.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -Nur shadow-4.1.4.2_orig/libmisc/chkname.c shadow-4.1.4.2/libmisc/chkname.c ---- shadow-4.1.4.2_orig/libmisc/chkname.c 2009-04-28 19:14:04.000000000 +0000 -+++ shadow-4.1.4.2/libmisc/chkname.c 2009-08-03 18:47:59.000000000 +0000 -@@ -49,21 +49,29 @@ - static bool is_valid_name (const char *name) - { - /* -- * User/group names must match [a-z_][a-z0-9_-]*[$] -- */ -- if (('\0' == *name) || -- !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) { -+ * User/group names must match gnu e-regex: -+ * [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]? -+ * -+ * as a non-POSIX, extension, allow "$" as the last char for -+ * sake of Samba 3.x "add machine script" -+ */ -+ if ( ('\0' == *name) || -+ !((*name >= 'a' && *name <= 'z') || -+ (*name >= 'A' && *name <= 'Z') || -+ (*name >= '0' && *name <= '9') || -+ (*name == '_') || (*name == '.') -+ )) { - return false; - } - - while ('\0' != *++name) { -- if (!(( ('a' <= *name) && ('z' >= *name) ) || -- ( ('0' <= *name) && ('9' >= *name) ) || -- ('_' == *name) || -- ('-' == *name) || -- ( ('$' == *name) && ('\0' == *(name + 1)) ) -- )) { -- return false; -+ if (!( (*name >= 'a' && *name <= 'z') || -+ (*name >= 'A' && *name <= 'Z') || -+ (*name >= '0' && *name <= '9') || -+ (*name == '_') || (*name == '.') || (*name == '-') || -+ (*name == '$' && *(name + 1) == '\0') -+ )) { -+ return false; - } - } - -diff -Nur shadow-4.1.4.2_orig/man/groupadd.8 shadow-4.1.4.2/man/groupadd.8 ---- shadow-4.1.4.2_orig/man/groupadd.8 2009-07-24 01:16:24.000000000 +0000 -+++ shadow-4.1.4.2/man/groupadd.8 2009-08-03 18:51:10.000000000 +0000 -@@ -153,9 +153,7 @@ - .RE - .SH "CAVEATS" - .PP --Groupnames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes&. They can end with a dollar sign&. In regular expression terms: [a-z_][a-z0-9_-]*[$]? --.PP --Groupnames may only be up to characters long&. -+Groupnames may only be up to 32 characters long&. - .PP - You may not add a NIS or LDAP group&. This must be performed on the corresponding server&. - .PP -diff -Nur shadow-4.1.4.2_orig/man/useradd.8 shadow-4.1.4.2/man/useradd.8 ---- shadow-4.1.4.2_orig/man/useradd.8 2009-07-24 01:16:44.000000000 +0000 -+++ shadow-4.1.4.2/man/useradd.8 2009-08-03 18:51:52.000000000 +0000 -@@ -405,8 +405,6 @@ - \fBuseradd\fR - will deny the user account creation request&. - .PP --Usernames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes&. They can end with a dollar sign&. In regular expression terms: [a-z_][a-z0-9_-]*[$]? --.PP - Usernames may only be up to 32 characters long&. - .SH "CONFIGURATION" - .PP diff --git a/pkgs/shadow/shadow.nm b/pkgs/shadow/shadow.nm deleted file mode 100644 index 401692b..0000000 --- a/pkgs/shadow/shadow.nm +++ /dev/null @@ -1,89 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include $(PKGROOT)/Include - -PKG_NAME = shadow -PKG_VER = 4.1.4.3 -PKG_REL = 5 - -PKG_MAINTAINER = -PKG_GROUPS = System/Base -PKG_URL = ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/ -PKG_LICENSE = GPLv2+ -PKG_SUMMARY = Utilities to deal with user accounts. - -PKG_BUILD_DEPS+= audit-devel libcap-devel libselinux-devel - -define PKG_DESCRIPTION - The shadow-utils package includes the necessary programs \ - for converting UNIX password files to the shadow password \ - format, plus programs for managing user and group accounts. -endef - -PKG_TARBALL = $(THISAPP).tar.bz2 - -CONFIGURE_OPTIONS += \ - --sysconfdir=/etc \ - --enable-shadowgrp \ - --with-sha-crypt \ - --with-selinux \ - --without-libcrack \ - --without-libpam \ - --disable-static - -define STAGE_PREPARE_CMDS - # Do not build these files: - cd $(DIR_APP) && \ - for i in nologin chfn chgpasswd chpasswd chsh expiry gpasswd groups login \ - logoutd passwd su; do \ - sed -i "s/$$i$$(EXEEXT)//" src/Makefile.in; \ - find man -name Makefile.in -exec sed -i "s/$$i.1/ /" {} ;; \ - done - cd $(DIR_APP) && sed -i src/Makefile.in \ - -e "s/^suidbins.*/# &/" -e "s/^suidubins.*/# &/" - - # Do not install korean and zh man pages - cd $(DIR_APP) && sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile.in - - # Do not install russion man pages - was broken in 4.1.4.3 - cd $(DIR_APP) && sed -i -e 's/ ru//' man/Makefile.in -endef - -define STAGE_INSTALL_CMDS - # Remove man pages in other languages - rm -rfv $(BUILDROOT)/usr/share/man/{cs,de,fi,fr,hu,id,it,ja,pl,pt_BR,ru,sv,tr} -endef - -define STAGE_INSTALL_POST - # Capabilities - chmod u-s $(BUILDROOT)/usr/bin/chage - setcap cap_dac_read_search+ep $(BUILDROOT)/usr/bin/chage - - chmod u-s $(BUILDROOT)/usr/bin/newgrp - setcap cap_dac_override,cap_setgid+ep $(BUILDROOT)/usr/bin/newgrp - - # Configuration - install -p -c -m 0644 $(DIR_SOURCE)/login.defs $(BUILDROOT)/etc/login.defs -endef diff --git a/pkgs/shadow/useradd.default b/pkgs/shadow/useradd.default deleted file mode 100644 index 4e81146..0000000 --- a/pkgs/shadow/useradd.default +++ /dev/null @@ -1,9 +0,0 @@ -# useradd defaults file -GROUP=100 -HOME=/home -INACTIVE=-1 -EXPIRE= -SHELL=/bin/bash -SKEL=/etc/skel -CREATE_MAIL_SPOOL=yes -
hooks/post-receive -- IPFire 3.x development tree