[Pkg-shadow-commits] r253 - trunk/debian/patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-06-14 00:07:21 +0000 (Tue, 14 Jun 2005)
New Revision: 253

Added:
   trunk/debian/patches/351_libmisc_failure_UTMPX
Removed:
   trunk/debian/patches/006_libmisc.dpatch
Modified:
   trunk/debian/patches/series
Log:
006_libmisc.dpatch was accepted upstream. Move it to 351, and document it.


Deleted: trunk/debian/patches/006_libmisc.dpatch
===================================================================
--- trunk/debian/patches/006_libmisc.dpatch	2005-06-13 23:12:43 UTC (rev 252)
+++ trunk/debian/patches/006_libmisc.dpatch	2005-06-14 00:07:21 UTC (rev 253)
@@ -1,85 +0,0 @@
-#! /bin/sh -e
-## 006_libmisc.dpatch by <unknown>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Various patches in libmisc for the Debian package (before switch to dpatch)
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-
-Index: shadow-4.0.3/libmisc/failure.c
-===================================================================
---- shadow-4.0.3.orig/libmisc/failure.c	2005-06-10 01:15:35.652729000 +0200
-+++ shadow-4.0.3/libmisc/failure.c	2005-06-10 01:16:28.902729000 +0200
-@@ -39,7 +39,11 @@
- #include "getdef.h"
- #include "failure.h"
- 
-+#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
-+#else
- #include <utmp.h>
-+#endif
- 
- #define	YEAR	(365L*DAY)
- 
-@@ -248,7 +252,13 @@
-  */
- 
- void
--failtmp(const struct utmp *failent)
-+failtmp(
-+#ifdef HAVE_UTMPX_H
-+	const struct utmpx *failent
-+#else
-+	const struct utmp *failent
-+#endif
-+)
- {
- 	char *ftmp;
- 	int fd;
-Index: shadow-4.0.3/libmisc/failure.h
-===================================================================
---- shadow-4.0.3.orig/libmisc/failure.h	2005-06-10 01:15:35.652729000 +0200
-+++ shadow-4.0.3/libmisc/failure.h	2005-06-10 01:16:28.902729000 +0200
-@@ -4,7 +4,11 @@
- 
- #include "defines.h"
- #include "faillog.h"
-+#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
-+#else
- #include <utmp.h>
-+#endif
- 
- /*
-  * failure - make failure entry
-@@ -38,7 +42,11 @@
-  *	failtmp updates the (struct utmp) formatted failure log which
-  *	maintains a record of all login failures.
-  */
-+#ifdef HAVE_UTMPX_H
-+extern void failtmp(const struct utmpx *);
-+#else
- extern void failtmp(const struct utmp *);
-+#endif
- 
- #endif
- 

Copied: trunk/debian/patches/351_libmisc_failure_UTMPX (from rev 234, trunk/debian/patches/006_libmisc.dpatch)
===================================================================
--- trunk/debian/patches/006_libmisc.dpatch	2005-06-10 10:42:42 UTC (rev 234)
+++ trunk/debian/patches/351_libmisc_failure_UTMPX	2005-06-14 00:07:21 UTC (rev 253)
@@ -0,0 +1,65 @@
+Goal: Use UTMPX, if available, for the failure log.
+
+Status wrt upstream: Applied (2005 06 10, should enter 4.0.10)
+
+Upstream also noted that it affects login when compiled without PAM.
+
+Index: shadow-4.0.3/libmisc/failure.c
+===================================================================
+--- shadow-4.0.3.orig/libmisc/failure.c	2005-06-10 01:15:35.652729000 +0200
++++ shadow-4.0.3/libmisc/failure.c	2005-06-10 01:16:28.902729000 +0200
+@@ -39,7 +39,11 @@
+ #include "getdef.h"
+ #include "failure.h"
+ 
++#ifdef HAVE_UTMPX_H
++#include <utmpx.h>
++#else
+ #include <utmp.h>
++#endif
+ 
+ #define	YEAR	(365L*DAY)
+ 
+@@ -248,7 +252,13 @@
+  */
+ 
+ void
+-failtmp(const struct utmp *failent)
++failtmp(
++#ifdef HAVE_UTMPX_H
++	const struct utmpx *failent
++#else
++	const struct utmp *failent
++#endif
++)
+ {
+ 	char *ftmp;
+ 	int fd;
+Index: shadow-4.0.3/libmisc/failure.h
+===================================================================
+--- shadow-4.0.3.orig/libmisc/failure.h	2005-06-10 01:15:35.652729000 +0200
++++ shadow-4.0.3/libmisc/failure.h	2005-06-10 01:16:28.902729000 +0200
+@@ -4,7 +4,11 @@
+ 
+ #include "defines.h"
+ #include "faillog.h"
++#ifdef HAVE_UTMPX_H
++#include <utmpx.h>
++#else
+ #include <utmp.h>
++#endif
+ 
+ /*
+  * failure - make failure entry
+@@ -38,7 +42,11 @@
+  *	failtmp updates the (struct utmp) formatted failure log which
+  *	maintains a record of all login failures.
+  */
++#ifdef HAVE_UTMPX_H
++extern void failtmp(const struct utmpx *);
++#else
+ extern void failtmp(const struct utmp *);
++#endif
+ 
+ #endif
+ 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-06-13 23:12:43 UTC (rev 252)
+++ trunk/debian/patches/series	2005-06-14 00:07:21 UTC (rev 253)
@@ -19,7 +19,7 @@
 346_suauth.5
 352_userdel.8
 353_groupdel.8
-006_libmisc.dpatch
+351_libmisc_failure_UTMPX
 006_libmisc_chowntty_ro_root_fs
 008_su_addenv_HOME_and_SHELL
 008_su_uid_0_not_root