[Pkg-shadow-commits] r449 - in branches/experimental/debian: . patches

[Christian Perrier]

Author: bubulle
Date: 2005-08-17 08:22:46 +0000 (Wed, 17 Aug 2005)
New Revision: 449

Modified:
   branches/experimental/debian/changelog
   branches/experimental/debian/patches/008_login_log_failure_in_FTMP
   branches/experimental/debian/patches/series
Log:
Refresh to apply properly upstream


Modified: branches/experimental/debian/changelog
===================================================================
--- branches/experimental/debian/changelog	2005-08-17 08:18:14 UTC (rev 448)
+++ branches/experimental/debian/changelog	2005-08-17 08:22:46 UTC (rev 449)
@@ -11,7 +11,7 @@
       have been fixed upstream and we assume that the man pages are
       generated from the XML files)
     - Disable patches now applied upstream:
-      002, 336
+      002, 336, 363
   * Debconf translation updates:
     - German updated. Closes: #321761
 

Modified: branches/experimental/debian/patches/008_login_log_failure_in_FTMP
===================================================================
--- branches/experimental/debian/patches/008_login_log_failure_in_FTMP	2005-08-17 08:18:14 UTC (rev 448)
+++ branches/experimental/debian/patches/008_login_log_failure_in_FTMP	2005-08-17 08:22:46 UTC (rev 449)
@@ -4,11 +4,11 @@
  * I'm not sure login should add an entry in the FTMP file when PAM is used.
    (but nothing in /etc/login.defs indicates that the failure is not logged)
 
-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-11 16:09:05.000000000 +0300
-+++ shadow-4.0.10/src/login.c	2005-07-11 19:39:14.000000000 +0300
-@@ -699,6 +699,20 @@
+--- shadow-4.0.12.orig/src/login.c	2005-08-17 10:19:58.000000000 +0200
++++ shadow-4.0.12/src/login.c	2005-08-17 10:21:20.000000000 +0200
+@@ -705,6 +705,20 @@
  			    break;
  			  
  			  fprintf(stderr,"Login incorrect\n\n");
@@ -29,19 +29,11 @@
  			  
  			  /* Let's give it another go around */
  			  pam_set_item(pamh,PAM_USER,NULL);
-Index: shadow-4.0.10/lib/getdef.c
+Index: shadow-4.0.12/lib/getdef.c
 ===================================================================
---- shadow-4.0.10.orig/lib/getdef.c	2005-07-11 19:36:42.000000000 +0300
-+++ shadow-4.0.10/lib/getdef.c	2005-07-11 19:41:09.000000000 +0300
-@@ -50,6 +50,7 @@
- 	{"CHFN_RESTRICT", NULL},
- 	{"DEFAULT_HOME", NULL},
- 	{"FAIL_DELAY", NULL},
-+	{"FTMP_FILE", NULL},
- 	{"PASS_MAX_DAYS", NULL},
- 	{"PASS_MIN_DAYS", NULL},
- 	{"PASS_WARN_AGE", NULL},
-@@ -67,7 +68,6 @@
+--- shadow-4.0.12.orig/lib/getdef.c	2005-08-11 13:26:11.000000000 +0200
++++ shadow-4.0.12/lib/getdef.c	2005-08-17 10:21:20.000000000 +0200
+@@ -88,7 +88,6 @@
  	{"ENV_TZ", NULL},
  	{"ENVIRON_FILE", NULL},
  	{"FAILLOG_ENAB", NULL},

Modified: branches/experimental/debian/patches/series
===================================================================
--- branches/experimental/debian/patches/series	2005-08-17 08:18:14 UTC (rev 448)
+++ branches/experimental/debian/patches/series	2005-08-17 08:22:46 UTC (rev 449)
@@ -18,7 +18,8 @@
 437_su_add_GNU_options_4
 437_su_add_GNU_options_5
 437_su_add_GNU_options_6
-363_su_ignore_SIGINT
+# 363 has been applied in 4.0.12
+# 363_su_ignore_SIGINT
 # 008_su_check_user_earlier # not used with 437_su_add_GNU_options_4
 008_su_no_sanitize_env
 008_su_get_PAM_username