[Pkg-shadow-commits] r455 - branches/experimental/debian/patches
Christian Perrier
bubulle at costa.debian.org
Wed Aug 17 09:14:19 UTC 2005
Author: bubulle
Date: 2005-08-17 09:14:18 +0000 (Wed, 17 Aug 2005)
New Revision: 455
Modified:
branches/experimental/debian/patches/010_more-i18ned-messages
Log:
Refresh to apply cleanly on 4.0.12
Modified: branches/experimental/debian/patches/010_more-i18ned-messages
===================================================================
--- branches/experimental/debian/patches/010_more-i18ned-messages 2005-08-17 08:30:19 UTC (rev 454)
+++ branches/experimental/debian/patches/010_more-i18ned-messages 2005-08-17 09:14:18 UTC (rev 455)
@@ -5,10 +5,10 @@
Status wrt upstream: submitted 20050613 (slightly differently as upstream
differs on some files)
-Index: shadow-4.0.10/libmisc/obscure.c
+Index: shadow-4.0.12/libmisc/obscure.c
===================================================================
---- shadow-4.0.10.orig/libmisc/obscure.c 2005-06-14 22:27:35.000000000 +0200
-+++ shadow-4.0.10/libmisc/obscure.c 2005-07-09 13:22:17.000000000 +0200
+--- shadow-4.0.12.orig/libmisc/obscure.c 2005-05-25 21:31:44.000000000 +0200
++++ shadow-4.0.12/libmisc/obscure.c 2005-08-17 11:12:06.000000000 +0200
@@ -158,7 +158,7 @@
#endif
@@ -52,10 +52,10 @@
/*
* Remaining checks are optional.
-Index: shadow-4.0.10/libmisc/utmp.c
+Index: shadow-4.0.12/libmisc/utmp.c
===================================================================
---- shadow-4.0.10.orig/libmisc/utmp.c 2005-06-14 22:27:35.000000000 +0200
-+++ shadow-4.0.10/libmisc/utmp.c 2005-07-09 13:22:17.000000000 +0200
+--- shadow-4.0.12.orig/libmisc/utmp.c 2005-07-06 17:29:58.000000000 +0200
++++ shadow-4.0.12/libmisc/utmp.c 2005-08-17 11:12:06.000000000 +0200
@@ -53,9 +53,9 @@
extern void endutent ();
@@ -68,20 +68,20 @@
/*
* checkutmp - see if utmp file is correct for this process
-Index: shadow-4.0.10/src/login.c
+Index: shadow-4.0.12/src/login.c
===================================================================
---- shadow-4.0.10.orig/src/login.c 2005-07-09 13:22:16.000000000 +0200
-+++ shadow-4.0.10/src/login.c 2005-07-09 13:22:17.000000000 +0200
-@@ -589,7 +589,7 @@
+--- shadow-4.0.12.orig/src/login.c 2005-08-17 10:24:47.000000000 +0200
++++ shadow-4.0.12/src/login.c 2005-08-17 11:13:15.000000000 +0200
+@@ -595,7 +595,7 @@
retcode = pam_start ("login", username, &conv, &pamh);
if (retcode != PAM_SUCCESS) {
fprintf (stderr,
- "login: PAM Failure, aborting: %s\n",
+ _("login: PAM Failure, aborting: %s\n"),
pam_strerror (pamh, retcode));
- syslog (LOG_ERR, "Couldn't initialize PAM: %s",
- pam_strerror (pamh, retcode));
-@@ -837,7 +837,7 @@
+ SYSLOG ((LOG_ERR, "Couldn't initialize PAM: %s",
+ pam_strerror (pamh, retcode)));
+@@ -713,7 +713,7 @@
if (!failed)
break;
@@ -90,19 +90,19 @@
if (pwd && getdef_bool("FAILLOG_ENAB"))
failure (pwent.pw_uid, tty, &faillog);
if (getdef_str("FTMP_FILE") != NULL) {
-@@ -975,7 +975,7 @@
- if (child < 0) {
- /* error in fork() */
- fprintf (stderr,
-- "login: failure forking: %s",
-+ _("login: failure forking: %s"),
- strerror (errno));
- PAM_END;
- exit (0);
-Index: shadow-4.0.10/src/logoutd.c
+@@ -1018,7 +1018,7 @@
+ child = fork ();
+ if (child < 0) {
+ /* error in fork() */
+- fprintf (stderr, "login: failure forking: %s",
++ fprintf (stderr, _("login: failure forking: %s"),
+ strerror (errno));
+ PAM_END;
+ exit (0);
+Index: shadow-4.0.12/src/logoutd.c
===================================================================
---- shadow-4.0.10.orig/src/logoutd.c 2005-06-20 11:35:09.000000000 +0200
-+++ shadow-4.0.10/src/logoutd.c 2005-07-09 13:22:17.000000000 +0200
+--- shadow-4.0.12.orig/src/logoutd.c 2005-08-09 17:25:56.000000000 +0200
++++ shadow-4.0.12/src/logoutd.c 2005-08-17 11:12:06.000000000 +0200
@@ -41,7 +41,7 @@
static char *Prog;
@@ -112,24 +112,24 @@
#endif
#ifndef HUP_MESG_FILE
-Index: shadow-4.0.10/src/newgrp.c
+Index: shadow-4.0.12/src/newgrp.c
===================================================================
---- shadow-4.0.10.orig/src/newgrp.c 2005-06-20 12:17:08.000000000 +0200
-+++ shadow-4.0.10/src/newgrp.c 2005-07-09 13:22:17.000000000 +0200
-@@ -422,7 +422,7 @@
- child = fork ();
- if (child < 0) {
- /* error in fork() */
-- fprintf (stderr, "%s: failure forking: %s",
-+ fprintf (stderr, _("%s: failure forking: %s"),
- is_newgrp ? "newgrp" : "sg",
- strerror (errno));
- exit (1);
-Index: shadow-4.0.10/src/su.c
+--- shadow-4.0.12.orig/src/newgrp.c 2005-08-11 13:26:11.000000000 +0200
++++ shadow-4.0.12/src/newgrp.c 2005-08-17 11:13:46.000000000 +0200
+@@ -467,7 +467,7 @@
+ child = fork ();
+ if (child < 0) {
+ /* error in fork() */
+- fprintf (stderr, "%s: failure forking: %s",
++ fprintf (stderr, _("%s: failure forking: %s"),
+ is_newgrp ? "newgrp" : "sg", strerror (errno));
+ exit (1);
+ } else if (child) {
+Index: shadow-4.0.12/src/su.c
===================================================================
---- shadow-4.0.10.orig/src/su.c 2005-07-09 13:22:17.000000000 +0200
-+++ shadow-4.0.10/src/su.c 2005-07-09 13:22:17.000000000 +0200
-@@ -238,7 +238,7 @@
+--- shadow-4.0.12.orig/src/su.c 2005-08-17 10:24:50.000000000 +0200
++++ shadow-4.0.12/src/su.c 2005-08-17 11:12:06.000000000 +0200
+@@ -329,7 +329,7 @@
if (ret != PAM_SUCCESS) {
SYSLOG ((LOG_ERR, "pam_close_session: %s",
pam_strerror (pamh, ret)));
@@ -138,7 +138,7 @@
pam_end (pamh, ret);
exit (1);
}
-@@ -449,7 +449,7 @@
+@@ -526,7 +526,7 @@
if (ret != PAM_SUCCESS) {
SYSLOG ((LOG_ERR, "pam_set_item: %s",
pam_strerror (pamh, ret)));
@@ -147,7 +147,7 @@
pam_end (pamh, ret);
exit (1);
}
-@@ -538,7 +538,7 @@
+@@ -649,7 +649,7 @@
if (ret != PAM_SUCCESS) {
SYSLOG ((LOG_ERR, "pam_authenticate: %s",
pam_strerror (pamh, ret)));
@@ -156,7 +156,7 @@
pam_end (pamh, ret);
su_failure (tty);
}
-@@ -551,7 +551,7 @@
+@@ -662,7 +662,7 @@
} else {
SYSLOG ((LOG_ERR, "pam_acct_mgmt: %s",
pam_strerror (pamh, ret)));
@@ -165,7 +165,7 @@
pam_strerror (pamh, ret));
pam_end (pamh, ret);
su_failure (tty);
-@@ -672,7 +672,7 @@
+@@ -798,7 +798,7 @@
ret = pam_setcred (pamh, PAM_ESTABLISH_CRED);
if (ret != PAM_SUCCESS) {
SYSLOG ((LOG_ERR, "pam_setcred: %s", pam_strerror (pamh, ret)));
@@ -174,7 +174,7 @@
pam_end (pamh, ret);
exit (1);
}
-@@ -681,8 +681,8 @@
+@@ -807,7 +807,7 @@
if (ret != PAM_SUCCESS) {
SYSLOG ((LOG_ERR, "pam_open_session: %s",
pam_strerror (pamh, ret)));
@@ -183,12 +183,11 @@
pam_setcred(pamh, PAM_DELETE_CRED);
pam_end (pamh, ret);
exit (1);
- }
-Index: shadow-4.0.10/src/useradd.c
+Index: shadow-4.0.12/src/useradd.c
===================================================================
---- shadow-4.0.10.orig/src/useradd.c 2005-07-09 13:22:17.000000000 +0200
-+++ shadow-4.0.10/src/useradd.c 2005-07-09 13:22:17.000000000 +0200
-@@ -774,7 +774,7 @@
+--- shadow-4.0.12.orig/src/useradd.c 2005-08-17 10:29:25.000000000 +0200
++++ shadow-4.0.12/src/useradd.c 2005-08-17 11:12:06.000000000 +0200
+@@ -790,7 +790,7 @@
ngrp->gr_mem = add_list (ngrp->gr_mem, user_name);
if (!gr_update (ngrp)) {
fprintf (stderr,
@@ -197,11 +196,11 @@
fail_exit (E_GRP_UPDATE);
}
SYSLOG ((LOG_INFO, "add `%s' to group `%s'",
-Index: shadow-4.0.10/src/chage.c
+Index: shadow-4.0.12/src/chage.c
===================================================================
---- shadow-4.0.10.orig/src/chage.c 2005-07-09 13:26:22.000000000 +0200
-+++ shadow-4.0.10/src/chage.c 2005-07-09 13:26:34.000000000 +0200
-@@ -565,7 +565,7 @@
+--- shadow-4.0.12.orig/src/chage.c 2005-08-17 10:29:25.000000000 +0200
++++ shadow-4.0.12/src/chage.c 2005-08-17 11:12:06.000000000 +0200
+@@ -563,7 +563,7 @@
}
if (lflg && (setgid (getgid ()) || setuid (ruid))) {
More information about the Pkg-shadow-commits
mailing list