diff --git a/debian/changelog b/debian/changelog index 07bf86fb..999f5877 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ shadow (1:4.1.2-1) experimental; urgency=low + debian/patches/406_vipw_resume_properly + debian/patches/414_remove-unwise-advices + debian/patches/300_SHA_crypt_method + + debian/patches/301_manpages_missing_options - Updated patches: + debian/patches/431_su_uid_0_not_root + debian/patches/463_login_delay_obeys_to_PAM diff --git a/debian/patches/301_manpages_missing_options b/debian/patches/301_manpages_missing_options deleted file mode 100644 index 78cc56ca..00000000 --- a/debian/patches/301_manpages_missing_options +++ /dev/null @@ -1,233 +0,0 @@ -Goal: Add missing documentation of options in useradd, groupadd and - newusers - Implement the -r, --system option of newusers (already documented in - --help, implemented in code, but missing getopt handling) - -Status wrt upstream: Already applied. - -Index: shadow-4.1.1/man/useradd.8.xml -=================================================================== ---- shadow-4.1.1.orig/man/useradd.8.xml 2008-06-12 23:29:12.210795802 +0200 -+++ shadow-4.1.1/man/useradd.8.xml 2008-06-12 23:29:12.258795502 +0200 -@@ -189,23 +189,25 @@ - - - -- , -+ , -+ SKEL_DIR - - - -- The user's home directory will be created if it does not exist. -- The files contained in SKEL_DIR will -- be copied to the home directory if the -- option is used, otherwise the files contained in -- /etc/skel will be used instead. Any -- directories contained in SKEL_DIR or -- /etc/skel will be created in the user's -- home directory as well. The option is only -- valid in conjunction with the option. The -- default is to not create the directory and to not copy any -- files. -- This option may not function correctly if the username has a / in it. -+ The skeleton directory, which contains files and directories -+ to be copied in the user's home directory, when the home -+ directory is created by useradd. -+ -+ -+ This option is only valid if the (or -+ ) option is specified. - -+ -+ If this option is not set, the skeleton directory is defined -+ in /etc/default/useradd or, by default, -+ /etc/skel. -+ -+ This option may not function correctly if the username has a / in it. - - - -@@ -255,6 +257,22 @@ - - - -+ , -+ -+ -+ -+ Create the user's home directory if it does not exist. -+ The files and directories contained in the skeleton directory -+ (which can be defined with the option) -+ will be copied to the home directory. -+ -+ -+ By default, no home directories are created. -+ -+ -+ -+ -+ - , - - -@@ -295,6 +313,25 @@ - - - -+ , -+ -+ -+ -+ Create a system account. -+ -+ -+ System users will be created with no aging information in -+ /etc/shadow, and their numeric -+ identifiers are choosen in the -+ - -+ range, defined in login.defs, instead of -+ - (and their -+ counterparts for the creation of groups). -+ -+ -+ -+ -+ - , - SHELL - -Index: shadow-4.1.1/man/groupadd.8.xml -=================================================================== ---- shadow-4.1.1.orig/man/groupadd.8.xml 2008-02-25 22:14:56.000000000 +0100 -+++ shadow-4.1.1/man/groupadd.8.xml 2008-06-12 23:29:12.258795502 +0200 -@@ -126,6 +126,22 @@ - - - -+ -+ -+ , -+ -+ -+ -+ Create a system group. -+ -+ -+ The numeric identifiers of new system groups are choosen in -+ the - -+ range, defined in login.defs, instead of -+ -. -+ -+ -+ - - - -Index: shadow-4.1.1/man/newusers.8.xml -=================================================================== ---- shadow-4.1.1.orig/man/newusers.8.xml 2008-02-25 22:14:56.000000000 +0100 -+++ shadow-4.1.1/man/newusers.8.xml 2008-06-12 23:29:12.258795502 +0200 -@@ -94,6 +94,68 @@ - - - -+ -+ OPTIONS -+ The options which apply to the newusers command are: -+ -+ -+ -+ , -+ -+ Use the specified method to encrypt the passwords. -+ -+ The available methods are DES, MD5, NONE, and SHA256 or SHA512 -+ if your libc support these methods. -+ -+ -+ -+ -+ -+ , -+ -+ -+ -+ Create a system account. -+ -+ -+ System users will be created with no aging information in -+ /etc/shadow, and their numeric -+ identifiers are choosen in the -+ - -+ range, defined in login.defs, instead of -+ - (and their -+ counterparts for the creation of groups). -+ -+ -+ -+ -+ , -+ -+ -+ Use the specified number of rounds to encrypt the passwords. -+ -+ -+ The value 0 means that the system will choose the default -+ number of rounds for the crypt method (5000). -+ -+ -+ A minimal value of 1000 and a maximal value of 999,999,999 -+ will be enforced. -+ -+ -+ You can only use this option with the SHA256 or SHA512 -+ crypt method. -+ -+ -+ By default, the number of rounds is defined by the -+ SHA_CRYPT_MIN_ROUNDS and SHA_CRYPT_MAX_ROUNDS variables in -+ /etc/login.defs. -+ -+ -+ -+ -+ -+ - - CAVEATS - -Index: shadow-4.1.1/src/newusers.c -=================================================================== ---- shadow-4.1.1.orig/src/newusers.c 2008-06-12 23:34:34.859795564 +0200 -+++ shadow-4.1.1/src/newusers.c 2008-06-12 23:38:33.290795654 +0200 -@@ -443,6 +443,7 @@ - static struct option long_options[] = { - {"crypt-method", required_argument, NULL, 'c'}, - {"help", no_argument, NULL, 'h'}, -+ {"system", no_argument, NULL, 'r'}, - #ifdef USE_SHA_CRYPT - {"sha-rounds", required_argument, NULL, 's'}, - #endif -@@ -451,9 +452,9 @@ - - while ((c = getopt_long (argc, argv, - #ifdef USE_SHA_CRYPT -- "c:hs:", -+ "c:hrs:", - #else -- "c:h", -+ "c:hr", - #endif - long_options, &option_index)) != -1) { - switch (c) { -@@ -464,6 +465,9 @@ - case 'h': - usage (); - break; -+ case 'r': -+ rflg = 1; -+ break; - #ifdef USE_SHA_CRYPT - case 's': - sflg = 1; diff --git a/debian/patches/series b/debian/patches/series index 1b3d2f27..8de1d914 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,7 +26,6 @@ 508_nologin_in_usr_sbin 505_useradd_recommend_adduser 415_login_put-echoctl-back -301_manpages_missing_options 302_vim_selinux_support 200_Czech_binary_translation 494_passwd_lock-no_account_lock