Refresh patches

1 files changed, 25 insertions, 20 deletions

diff --git a/debian/patches-applied/update-motd b/debian/patches-applied/update-motd
index dececee5..d84ecf57 100644
--- a/debian/patches-applied/update-motd
+++ b/debian/patches-applied/update-motd
@@ -10,18 +10,23 @@ Index: pam/modules/pam_motd/pam_motd.c
 ===================================================================
 --- pam.orig/modules/pam_motd/pam_motd.c
 +++ pam/modules/pam_motd/pam_motd.c
-@@ -101,8 +101,10 @@
+@@ -286,6 +286,7 @@
  			int argc, const char **argv)
  {
      int retval = PAM_IGNORE;
 +    int do_update = 1;
      const char *motd_path = NULL;
-     const char *motd_dir_path = NULL;
+     char *motd_path_copy = NULL;
+     unsigned int num_motd_paths = 0;
+@@ -295,6 +296,7 @@
+     unsigned int num_motd_dir_paths = 0;
+     char **motd_dir_path_split = NULL;
+     int report_missing;
 +    struct stat st;
  
      if (flags & PAM_SILENT) {
  	return retval;
-@@ -131,6 +133,9 @@
+@@ -324,6 +326,9 @@
  			   "motd_dir= specification missing argument - ignored");
  	    }
  	}
@@ -31,8 +36,8 @@ Index: pam/modules/pam_motd/pam_motd.c
  	else
  	    pam_syslog(pamh, LOG_ERR, "unknown option: %s", *argv);
      }
-@@ -140,6 +145,19 @@
- 	motd_dir_path = default_motd_dir;
+@@ -336,6 +341,19 @@
+ 	report_missing = 1;
      }
  
 +    /* Run the update-motd dynamic motd scripts, outputting to /run/motd.dynamic.
@@ -49,13 +54,13 @@ Index: pam/modules/pam_motd/pam_motd.c
 +    }
 +
      if (motd_path != NULL) {
- 	int fd = open(motd_path, O_RDONLY, 0);
- 
+ 	motd_path_copy = strdup(motd_path);
+     }
 Index: pam/modules/pam_motd/pam_motd.8.xml
 ===================================================================
 --- pam.orig/modules/pam_motd/pam_motd.8.xml
 +++ pam/modules/pam_motd/pam_motd.8.xml
-@@ -63,6 +63,17 @@
+@@ -114,6 +114,17 @@
            </para>
          </listitem>
        </varlistentry>
@@ -72,13 +77,13 @@ Index: pam/modules/pam_motd/pam_motd.8.xml
 +      </varlistentry>
      </variablelist>
      <para>
-       When no options are given, the default is to display both
+       When no options are given, the default behavior applies for both
 Index: pam/modules/pam_motd/pam_motd.8
 ===================================================================
 --- pam.orig/modules/pam_motd/pam_motd.8
 +++ pam/modules/pam_motd/pam_motd.8
-@@ -53,6 +53,13 @@
- directory is scanned and each file contained inside of it is displayed\&.
+@@ -109,6 +109,13 @@
+ /etc/motd\&.d:/run/motd\&.d:/usr/lib/motd\&.d\&.
  .RE
  .PP
 +\fBnoupdate\fR
@@ -88,21 +93,21 @@ Index: pam/modules/pam_motd/pam_motd.8
 +to refresh the motd file\&.
 +.RE
 +.PP
- When no options are given, the default is to display both
- /etc/motd
- and the contents of
+ When no options are given, the default behavior applies for both options\&. Specifying either option (or both) will disable the default behavior for both options\&.
+ .SH "MODULE TYPES PROVIDED"
+ .PP
 Index: pam/modules/pam_motd/README
 ===================================================================
 --- pam.orig/modules/pam_motd/README
 +++ pam/modules/pam_motd/README
-@@ -19,6 +19,10 @@
-     The /path/dirname.d directory is scanned and each file contained inside of
-     it is displayed.
+@@ -51,6 +51,10 @@
+     colon-separated list. By default this option is set to /etc/motd.d:/run/
+     motd.d:/usr/lib/motd.d.
  
 +noupdate
 +
 +    Don't run the scripts in /etc/update-motd.d to refresh the motd file.
 +
- When no options are given, the default is to display both /etc/motd and the
- contents of /etc/motd.d. Specifying either option (or both) will disable this
- default behavior.
+ When no options are given, the default behavior applies for both options.
+ Specifying either option (or both) will disable the default behavior for both
+ options.