[Pkg-shadow-commits] r844 - trunk/debian/patches
Nicolas FRANCOIS
nekral-guest at costa.debian.org
Tue Feb 7 22:00:54 UTC 2006
Author: nekral-guest
Date: 2006-02-07 22:00:46 +0000 (Tue, 07 Feb 2006)
New Revision: 844
Added:
trunk/debian/patches/302_fix_generated_man_pages
trunk/debian/patches/339_su_PAM_session
trunk/debian/patches/381_userdel_remove_remove_group
trunk/debian/patches/386_nowarn
trunk/debian/patches/390_useradd_always_unlock_group_databases
Removed:
trunk/debian/patches/439_su_PAM_session
trunk/debian/patches/481_userdel_remove_remove_group
trunk/debian/patches/486_nowarn
trunk/debian/patches/490_useradd_always_unlock_group_databases
trunk/debian/patches/502_fix_generated_man_pages
Modified:
trunk/debian/patches/series
Log:
Move applied patches to 3xx.
Copied: trunk/debian/patches/302_fix_generated_man_pages (from rev 841, trunk/debian/patches/502_fix_generated_man_pages)
Copied: trunk/debian/patches/339_su_PAM_session (from rev 843, trunk/debian/patches/439_su_PAM_session)
Copied: trunk/debian/patches/381_userdel_remove_remove_group (from rev 843, trunk/debian/patches/481_userdel_remove_remove_group)
Copied: trunk/debian/patches/386_nowarn (from rev 843, trunk/debian/patches/486_nowarn)
Copied: trunk/debian/patches/390_useradd_always_unlock_group_databases (from rev 843, trunk/debian/patches/490_useradd_always_unlock_group_databases)
Deleted: trunk/debian/patches/439_su_PAM_session
===================================================================
--- trunk/debian/patches/439_su_PAM_session 2006-02-07 21:56:18 UTC (rev 843)
+++ trunk/debian/patches/439_su_PAM_session 2006-02-07 22:00:46 UTC (rev 844)
@@ -1,29 +0,0 @@
-Goal: add pam session ability to su (patch from Topi Miettinen)
-Fixes: #57526, #55873, #57532
-
-Note: this is a rewrite of the previous 439_su_PAM_session
- One difference may be that the session is not closed as root (changing
- this will require a major rewrite of su).
-
-Status wrt upstream: will be in 4.0.15
-
-Index: shadow-4.0.14/src/su.c
-===================================================================
---- shadow-4.0.14.orig/src/su.c 2006-01-03 08:25:00.575824149 +0100
-+++ shadow-4.0.14/src/su.c 2006-01-03 08:25:00.899758382 +0100
-@@ -771,6 +771,7 @@
- SYSLOG ((LOG_ERR, "pam_open_session: %s",
- pam_strerror (pamh, ret)));
- fprintf (stderr, _("%s: %s\n"), Prog, pam_strerror (pamh, ret));
-+ pam_setcred(pamh, PAM_DELETE_CRED);
- pam_end (pamh, ret);
- exit (1);
- }
-@@ -794,6 +795,7 @@
-
- /* become the new user */
- if (change_uid (&pwent)) {
-+ pam_close_session(pamh, 0);
- pam_setcred (pamh, PAM_DELETE_CRED);
- pam_end (pamh, PAM_ABORT);
- exit (1);
Deleted: trunk/debian/patches/481_userdel_remove_remove_group
===================================================================
--- trunk/debian/patches/481_userdel_remove_remove_group 2006-02-07 21:56:18 UTC (rev 843)
+++ trunk/debian/patches/481_userdel_remove_remove_group 2006-02-07 22:00:46 UTC (rev 844)
@@ -1,119 +0,0 @@
-Goal: avoid a warning when removing an user.
-
-The user's group is already removed by update_groups. remove_group is not
-needed.
-Thus userdel reports a warning:
-userdel: error removing group entry
-userdel: error removing shadow group entry
-
-Status wrt upstream: will be in 4.0.15
-
-Index: shadow-4.0.14/src/userdel.c
-===================================================================
---- shadow-4.0.14.orig/src/userdel.c 2006-01-09 21:27:19.000000000 +0100
-+++ shadow-4.0.14/src/userdel.c 2006-01-09 21:59:33.000000000 +0100
-@@ -66,9 +66,7 @@
- #define E_HOMEDIR 12 /* can't remove home directory */
- static char *user_name;
- static uid_t user_id;
--static gid_t user_gid;
- static char *user_home;
--static char *user_group;
-
- static char *Prog;
- static int fflg = 0, rflg = 0;
-@@ -265,65 +263,6 @@
- }
-
- /*
-- * remove_group - remove the user's group unless it is not really a user-private group
-- */
--static void remove_group ()
--{
-- char *glist_name;
-- struct group *gr;
-- struct passwd *pwd;
--
-- if (user_group == NULL || user_name == NULL)
-- return;
--
-- if (strcmp (user_name, user_group)) {
-- return;
-- }
--
-- glist_name = NULL;
-- gr = getgrnam (user_group);
-- if (gr)
-- glist_name = *(gr->gr_mem);
-- while (glist_name) {
-- while (glist_name && *glist_name) {
-- if (strncmp (glist_name, user_name, 16)) {
-- return;
-- }
-- glist_name++;
-- }
-- }
--
-- setpwent ();
-- while ((pwd = getpwent ())) {
-- if (strcmp (pwd->pw_name, user_name) == 0)
-- continue;
--
-- if (pwd->pw_gid == user_gid) {
-- return;
-- }
-- }
--
-- /* now actually do the removal if we haven't already returned */
--
-- if (!gr_remove (user_group)) {
-- fprintf (stderr, _("%s: error removing group entry\n"), Prog);
-- }
--#ifdef SHADOWGRP
--
-- /*
-- * Delete the shadow group entries as well.
-- */
--
-- if (is_shadow_grp && !sgr_remove (user_group)) {
-- fprintf (stderr, _("%s: error removing shadow group entry\n"),
-- Prog);
-- }
--#endif /* SHADOWGRP */
-- SYSLOG ((LOG_INFO, "remove group `%s'\n", user_group));
-- return;
--}
--
--/*
- * close_files - close all of the files that were opened
- *
- * close_files() closes all of the files that were opened for this
-@@ -658,7 +597,6 @@
- int main (int argc, char **argv)
- {
- struct passwd *pwd;
-- struct group *grp;
- int arg;
- int errors = 0;
-
-@@ -766,10 +704,6 @@
- #endif
- user_id = pwd->pw_uid;
- user_home = xstrdup (pwd->pw_dir);
-- user_gid = pwd->pw_gid;
-- grp = getgrgid (user_gid);
-- if (grp)
-- user_group = xstrdup (grp->gr_name);
- /*
- * Check to make certain the user isn't logged in.
- */
-@@ -823,9 +757,6 @@
- }
- #endif
-
-- /* Remove the user's group if appropriate. */
-- remove_group ();
--
- if (rflg) {
- if (remove_tree (user_home)
- || rmdir (user_home)) {
Deleted: trunk/debian/patches/486_nowarn
===================================================================
--- trunk/debian/patches/486_nowarn 2006-02-07 21:56:18 UTC (rev 843)
+++ trunk/debian/patches/486_nowarn 2006-02-07 22:00:46 UTC (rev 844)
@@ -1,280 +0,0 @@
-Goal: make possible compilation of shadow with -Wall -Werror
-
-Eliminates several reasons for warnings:
-* unused variables
-* non-declared static functions
-* missing extern declarations like nscd_flush_cache ("nscd.h")
-* ambiguaos "else"
-* ??? (what else I forgot)
-
-Status wrt upstream: will be in 4.0.15
-
-Index: shadow-4.0.14/libmisc/setupenv.c
-===================================================================
---- shadow-4.0.14.orig/libmisc/setupenv.c 2006-01-16 18:12:10.862077290 +0200
-+++ shadow-4.0.14/libmisc/setupenv.c 2006-01-16 18:18:17.185919272 +0200
-@@ -43,6 +43,8 @@
- #include "defines.h"
- #include <pwd.h>
- #include "getdef.h"
-+
-+#ifndef USE_PAM
- static void
- addenv_path (const char *varname, const char *dirname, const char *filename)
- {
-@@ -54,8 +56,6 @@
- free (buf);
- }
-
--
--#ifndef USE_PAM
- static void read_env_file (const char *filename)
- {
- FILE *fp;
-Index: shadow-4.0.14/src/login.c
-===================================================================
---- shadow-4.0.14.orig/src/login.c 2006-01-16 18:12:11.252045186 +0200
-+++ shadow-4.0.14/src/login.c 2006-01-16 18:19:31.372811754 +0200
-@@ -261,7 +261,10 @@
-
- static void init_env (void)
- {
-- char *cp, *tmp;
-+#ifndef USE_PAM
-+ char *cp;
-+#endif
-+ char *tmp;
-
- if ((tmp = getenv ("LANG"))) {
- addenv ("LANG", tmp);
-Index: shadow-4.0.14/src/chage.c
-===================================================================
---- shadow-4.0.14.orig/src/chage.c 2006-01-16 18:12:10.735087745 +0200
-+++ shadow-4.0.14/src/chage.c 2006-01-16 18:21:42.643004789 +0200
-@@ -338,7 +338,6 @@
-
- int main (int argc, char **argv)
- {
-- int flag;
- const struct spwd *sp;
- struct spwd spwd;
- uid_t ruid;
-Index: shadow-4.0.14/src/chsh.c
-===================================================================
---- shadow-4.0.14.orig/src/chsh.c 2006-01-16 18:12:11.025063872 +0200
-+++ shadow-4.0.14/src/chsh.c 2006-01-16 18:23:17.887163708 +0200
-@@ -68,6 +68,7 @@
- /* local function prototypes */
- static void usage (void);
- static void new_fields (void);
-+static int check_shell (const char *);
- static int restricted_shell (const char *);
-
- /*
-@@ -117,7 +118,7 @@
- * If getusershell() is available (Linux, *BSD, possibly others), use it
- * instead of re-implementing it.
- */
--int check_shell (const char *sh)
-+static int check_shell (const char *sh)
- {
- char *cp;
- int found = 0;
-Index: shadow-4.0.14/src/gpasswd.c
-===================================================================
---- shadow-4.0.14.orig/src/gpasswd.c 2005-12-06 23:24:59.000000000 +0200
-+++ shadow-4.0.14/src/gpasswd.c 2006-01-16 18:24:46.917834159 +0200
-@@ -45,6 +45,7 @@
- #ifdef SHADOWGRP
- #include "sgroupio.h"
- #endif
-+#include "nscd.h"
- /*
- * Global variables
- */
-Index: shadow-4.0.14/src/newgrp.c
-===================================================================
---- shadow-4.0.14.orig/src/newgrp.c 2006-01-16 18:12:11.253045104 +0200
-+++ shadow-4.0.14/src/newgrp.c 2006-01-16 18:25:52.712417546 +0200
-@@ -485,8 +485,8 @@
- /* wake child when resumed */
- kill (child, SIGCONT);
- }
-- } while (pid == child && WIFSTOPPED (cst) ||
-- pid != child && errno == EINTR);
-+ } while ((pid == child && WIFSTOPPED (cst)) ||
-+ (pid != child && errno == EINTR));
- SYSLOG ((LOG_INFO,
- "user `%s' (login `%s' on %s) returned to group `%s'",
- name, loginname, tty,
-Index: shadow-4.0.14/src/passwd.c
-===================================================================
---- shadow-4.0.14.orig/src/passwd.c 2005-12-06 23:25:00.000000000 +0200
-+++ shadow-4.0.14/src/passwd.c 2006-01-16 18:26:49.170769550 +0200
-@@ -603,7 +603,6 @@
- */
- int main (int argc, char **argv)
- {
-- int flag; /* Current option to process */
- const struct passwd *pw; /* Password file entry for user */
-
- #ifndef USE_PAM
-@@ -898,11 +897,12 @@
-
- SYSLOG ((LOG_INFO, "password for `%s' changed by `%s'", name, myname));
- closelog ();
-- if (!qflg)
-+ if (!qflg) {
- if (!eflg)
- printf (_("Password changed.\n"));
- else
- printf (_("Password set to expire.\n"));
-+ }
- exit (E_SUCCESS);
- /* NOT REACHED */
- }
-Index: shadow-4.0.14/src/groupadd.c
-===================================================================
---- shadow-4.0.14.orig/src/groupadd.c 2006-01-16 18:12:10.736087663 +0200
-+++ shadow-4.0.14/src/groupadd.c 2006-01-16 18:27:32.077237227 +0200
-@@ -86,7 +86,6 @@
- static void grp_update (void);
- static void find_new_gid (void);
- static void check_new_name (void);
--static void process_flags (int, char **);
- static void close_files (void);
- static void open_files (void);
- static void fail_exit (int);
-Index: shadow-4.0.14/src/groupdel.c
-===================================================================
---- shadow-4.0.14.orig/src/groupdel.c 2006-01-16 18:12:10.736087663 +0200
-+++ shadow-4.0.14/src/groupdel.c 2006-01-16 18:28:08.534235864 +0200
-@@ -346,4 +346,5 @@
- #endif
- exit (errors == 0 ? E_SUCCESS : E_GRP_UPDATE);
- /* NOT REACHED */
-+ return 0;
- }
-Index: shadow-4.0.14/src/grpck.c
-===================================================================
---- shadow-4.0.14.orig/src/grpck.c 2006-01-16 18:12:11.004065601 +0200
-+++ shadow-4.0.14/src/grpck.c 2006-01-16 18:29:36.566988470 +0200
-@@ -40,6 +40,7 @@
- #include "defines.h"
- #include "groupio.h"
- #include "prototypes.h"
-+#include "nscd.h"
- extern void __gr_del_entry (const struct commonio_entry *);
- extern struct commonio_entry *__gr_get_head (void);
-
-Index: shadow-4.0.14/src/grpconv.c
-===================================================================
---- shadow-4.0.14.orig/src/grpconv.c 2005-12-06 23:25:00.000000000 +0200
-+++ shadow-4.0.14/src/grpconv.c 2006-01-16 18:30:05.539603267 +0200
-@@ -20,6 +20,7 @@
- #include <time.h>
- #include <unistd.h>
- #include "prototypes.h"
-+#include "nscd.h"
- #ifdef SHADOWGRP
- #include "groupio.h"
- #include "sgroupio.h"
-Index: shadow-4.0.14/src/grpunconv.c
-===================================================================
---- shadow-4.0.14.orig/src/grpunconv.c 2005-12-06 23:25:00.000000000 +0200
-+++ shadow-4.0.14/src/grpunconv.c 2006-01-16 18:30:19.012494096 +0200
-@@ -20,6 +20,7 @@
- #include <unistd.h>
- #include <grp.h>
- #include "prototypes.h"
-+#include "nscd.h"
- #ifdef SHADOWGRP
- #include "groupio.h"
- #include "sgroupio.h"
-Index: shadow-4.0.14/src/newusers.c
-===================================================================
---- shadow-4.0.14.orig/src/newusers.c 2006-01-16 18:12:10.738087498 +0200
-+++ shadow-4.0.14/src/newusers.c 2006-01-16 18:30:47.998107823 +0200
-@@ -53,6 +53,7 @@
- #include "pwio.h"
- #include "groupio.h"
- #include "shadowio.h"
-+#include "nscd.h"
- /*
- * Global variables
- */
-Index: shadow-4.0.14/src/pwck.c
-===================================================================
---- shadow-4.0.14.orig/src/pwck.c 2006-01-16 18:12:11.004065601 +0200
-+++ shadow-4.0.14/src/pwck.c 2006-01-16 18:31:19.454518139 +0200
-@@ -42,6 +42,7 @@
- #include "pwio.h"
- #include "shadowio.h"
- #include "getdef.h"
-+#include "nscd.h"
- extern void __pw_del_entry (const struct commonio_entry *);
- extern struct commonio_entry *__pw_get_head (void);
-
-Index: shadow-4.0.14/src/pwconv.c
-===================================================================
---- shadow-4.0.14.orig/src/pwconv.c 2005-12-06 23:25:00.000000000 +0200
-+++ shadow-4.0.14/src/pwconv.c 2006-01-16 18:31:41.501703080 +0200
-@@ -43,6 +43,7 @@
- #include "prototypes.h"
- #include "pwio.h"
- #include "shadowio.h"
-+#include "nscd.h"
- /*
- * exit status values
- */
-Index: shadow-4.0.14/src/usermod.c
-===================================================================
---- shadow-4.0.14.orig/src/usermod.c 2006-01-16 18:12:10.741087251 +0200
-+++ shadow-4.0.14/src/usermod.c 2006-01-16 18:34:40.291983971 +0200
-@@ -88,19 +88,21 @@
- static gid_t user_gid;
- static gid_t user_newgid;
- static char *user_comment;
--static char *user_newcomment; /* Audit */
- static char *user_home;
- static char *user_newhome;
- static char *user_shell;
--static char *user_newshell; /* Audit */
--
- static long user_expire;
--static long user_newexpire; /* Audit */
- static long user_inactive;
--static long user_newinactive; /* Audit */
- static long sys_ngroups;
- static char **user_groups; /* NULL-terminated list */
-
-+#ifdef WITH_AUDIT
-+static char *user_newcomment; /* Audit */
-+static char *user_newshell; /* Audit */
-+static long user_newexpire; /* Audit */
-+static long user_newinactive; /* Audit */
-+#endif
-+
- static char *Prog;
-
- static int
-@@ -841,7 +843,6 @@
-
- const struct spwd *spwd = NULL;
- int anyflag = 0;
-- int arg;
-
- if (argc == 1 || argv[argc - 1][0] == '-')
- usage ();
-Index: shadow-4.0.14/src/vipw.c
-===================================================================
---- shadow-4.0.14.orig/src/vipw.c 2006-01-16 18:12:10.982067412 +0200
-+++ shadow-4.0.14/src/vipw.c 2006-01-16 18:34:58.995444188 +0200
-@@ -241,7 +241,6 @@
-
- int main (int argc, char **argv)
- {
-- int flag;
- int editshadow = 0;
- char *a;
- int do_vipw;
Deleted: trunk/debian/patches/490_useradd_always_unlock_group_databases
===================================================================
--- trunk/debian/patches/490_useradd_always_unlock_group_databases 2006-02-07 21:56:18 UTC (rev 843)
+++ trunk/debian/patches/490_useradd_always_unlock_group_databases 2006-02-07 22:00:46 UTC (rev 844)
@@ -1,38 +0,0 @@
-Goal: A lock is always created on the group and gshadow databases, it
- should always be removed (not only if do_grp_update).
-
-Fixes: #348250
-
-Status wrt upstream: will be in 4.0.15
-
-Index: shadow-4.0.14/src/useradd.c
-===================================================================
---- shadow-4.0.14.orig/src/useradd.c 2006-02-07 13:11:46.000000000 +0100
-+++ shadow-4.0.14/src/useradd.c 2006-02-07 13:13:15.000000000 +0100
-@@ -1273,7 +1273,6 @@
- _("%s: cannot rewrite group file\n"), Prog);
- fail_exit (E_GRP_UPDATE);
- }
-- gr_unlock ();
- #ifdef SHADOWGRP
- if (is_shadow_grp && !sgr_close ()) {
- fprintf (stderr,
-@@ -1282,13 +1281,16 @@
- Prog);
- fail_exit (E_GRP_UPDATE);
- }
-- if (is_shadow_grp)
-- sgr_unlock ();
- #endif
- }
- if (is_shadow_pwd)
- spw_unlock ();
- pw_unlock ();
-+ gr_unlock ();
-+#ifdef SHADOWGRP
-+ if (is_shadow_grp)
-+ sgr_unlock ();
-+#endif
- }
-
- /*
Deleted: trunk/debian/patches/502_fix_generated_man_pages
===================================================================
--- trunk/debian/patches/502_fix_generated_man_pages 2006-02-07 21:56:18 UTC (rev 843)
+++ trunk/debian/patches/502_fix_generated_man_pages 2006-02-07 22:00:46 UTC (rev 844)
@@ -1,60 +0,0 @@
-Goal: Fix the man pages generation on Debian
- The occurences "’" generated some "’"
-
-Fixes: #341489
-
-Status wrt upstream: will be in 4.0.15 (committed at 2006-01-07)
-
-Note: this could probably be removed if docbook-xsl was updated (1.69.1
- IIRC)
-
-Index: shadow-4.0.14/man/passwd.1.xml
-===================================================================
---- shadow-4.0.14.orig/man/passwd.1.xml 2006-01-03 08:25:06.786563200 +0100
-+++ shadow-4.0.14/man/passwd.1.xml 2006-01-03 08:25:08.843145652 +0100
-@@ -185,8 +185,8 @@
- </term>
- <listitem>
- <para>
-- Immediately expire an account’s password. This in effect can
-- force a user to change his/her password at the user’s next login.
-+ Immediately expire an account's password. This in effect can
-+ force a user to change his/her password at the user's next login.
- </para>
- </listitem>
- </varlistentry>
-@@ -271,7 +271,7 @@
- <listitem>
- <para>
- Display account status information. The status information
-- consists of 7 fields. The first field is the user’s login name.
-+ consists of 7 fields. The first field is the user's login name.
- The second field indicates if the user account is locked (L),
- has no password (NP), or has a usable password (P). The third
- field gives the date of the last password change. The next four
-Index: shadow-4.0.14/man/login.1.xml
-===================================================================
---- shadow-4.0.14.orig/man/login.1.xml 2006-01-03 08:23:47.177723987 +0100
-+++ shadow-4.0.14/man/login.1.xml 2006-01-03 08:25:08.843145652 +0100
-@@ -39,7 +39,7 @@
- <para>
- <command>login</command> is used to establish a new session with the
- system. It is normally invoked automatically by responding to the
-- <emphasis remap='I'>login:</emphasis> prompt on the user´s
-+ <emphasis remap='I'>login:</emphasis> prompt on the user's
- terminal. <command>login</command> may be special to the shell and may
- not be invoked as a sub-process. Typically, <command>login</command>
- is treated by the shell as <emphasis remap='B'>exec login</emphasis>
-Index: shadow-4.0.14/man/su.1.xml
-===================================================================
---- shadow-4.0.14.orig/man/su.1.xml 2006-01-03 08:23:47.178723784 +0100
-+++ shadow-4.0.14/man/su.1.xml 2006-01-03 08:25:08.844145449 +0100
-@@ -42,7 +42,7 @@
-
- <para>
- Additional arguments may be provided after the username, in which case
-- they are supplied to the user´s login shell. In particular, an
-+ they are supplied to the user's login shell. In particular, an
- argument of <option>-c</option> will cause the next argument to be
- treated as a command by most command interpreters. The command will be
- executed by the shell specified in <filename>/etc/passwd</filename>
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-02-07 21:56:18 UTC (rev 843)
+++ trunk/debian/patches/series 2006-02-07 22:00:46 UTC (rev 844)
@@ -5,7 +5,7 @@
431_su_uid_0_not_root
008_su_no_sanitize_env
008_su_get_PAM_username
-439_su_PAM_session
+339_su_PAM_session
428_grpck_add_prune_option
434_login_stop_checking_args_after--
433_login_more_LOG_UNKFAIL_ENAB
@@ -38,20 +38,20 @@
#End of holiday patches
466_fflush-prompt
468_duplicate_passwd_struct_before_usage
-502_fix_generated_man_pages
+302_fix_generated_man_pages
437_su_-c_option
423_su_arguments_are_concatenated
478_nologin.8.xml
479_chowntty_debug
480_getopt_args_reorder
-481_userdel_remove_remove_group
+381_userdel_remove_remove_group
482_libmisc_copydir_check_return_values
483_su_fakelogin_wrong_arg0
484_su-p_preserve_PATH
485_shell-env-exitcodes
-486_nowarn
+386_nowarn
489_useradd_allow_non_uniq_uid
-490_useradd_always_unlock_group_databases
+390_useradd_always_unlock_group_databases
# 999-2 is about using cdbs. It does not patch upstream files
# so shouldn't be here, but we keep it for the future
# 999-2_build_using_cdbs
More information about the Pkg-shadow-commits
mailing list