patch 051 also superseded upstream

2 files changed, 3 insertions, 39 deletions

diff --git a/changelog b/changelog
index 7056fdfe..cd246c45 100644
--- a/changelog
+++ b/changelog
@@ -6,8 +6,9 @@ pam (0.79-1) UNRELEASED; urgency=low
     025_pam_group_conffile_name, 028_pam_mail_delete_only_when_set,
     033_use_gcc_not_ld, 034_pam_dispatch_ignore_PAM_IGNORE,
     035_pam_unix_security, 039_pam_mkhomedir_no_maxpathlen_required,
-    041_call_bootstrap, and 042_pam_mkhomedir_dest_not_source_for_errors
-    which have been integrated upstream.
+    041_call_bootstrap, 042_pam_mkhomedir_dest_not_source_for_errors,
+    and 051_32_bit_pam_lastlog_ll_time which have been integrated
+    upstream.
 
  -- Steve Langasek <vorlon@debian.org>  Wed, 13 Jul 2005 03:37:12 -0700
 
diff --git a/patches-applied/051_32_bit_pam_lastlog_ll_time b/patches-applied/051_32_bit_pam_lastlog_ll_time
deleted file mode 100644
index 808d95af..00000000
--- a/patches-applied/051_32_bit_pam_lastlog_ll_time
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: Linux-PAM/modules/pam_lastlog/pam_lastlog.c
-===================================================================
-RCS file: /afs/sipb.mit.edu/project/debian/cvs/pam/Linux-PAM/modules/pam_lastlog/pam_lastlog.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 pam_lastlog.c
---- Linux-PAM/modules/pam_lastlog/pam_lastlog.c	15 Sep 2002 20:08:49 -0000	1.1.1.2
-+++ Linux-PAM/modules/pam_lastlog/pam_lastlog.c	24 Mar 2004 00:26:20 -0000
-@@ -256,8 +256,13 @@
- 	    if (last_login.ll_time) {
- 		char *the_time;
- 		char *remark;
-+		/*We use a temporary to store the time because on some Linux
-+		  ABIS (x86-64) the value is 32-bits even though
-+		  time_t is larger.*/
-+		time_t t;
- 
--		the_time = ctime(&last_login.ll_time);
-+		t = last_login.ll_time;
-+		the_time = ctime(&t);
- 		the_time[-1+strlen(the_time)] = '\0';    /* delete '\n' */
- 
- 		remark = malloc(LASTLOG_MAXSIZE);
-@@ -321,11 +326,13 @@
- 	{
- 	    const char *remote_host=NULL
- 		, *terminal_line=DEFAULT_TERM;
-+	    time_t t;
- 
- 	    /* set this login date */
- 	    D(("set the most recent login time"));
- 
--	    (void) time(&last_login.ll_time);    /* set the time */
-+	    (void) time(&t);    /* set the time */
-+	    last_login.ll_time = t;
- 
- 	    /* set the remote host */
- 	    (void) pam_get_item(pamh, PAM_RHOST, (const void **)&remote_host);