diff options
author | Steve Langasek <steve.langasek@canonical.com> | 2019-02-13 05:56:19 +0000 |
---|---|---|
committer | Steve Langasek <steve.langasek@canonical.com> | 2019-02-13 05:57:45 +0000 |
commit | a9dd1decec411144331c877babdf9df8166952c0 (patch) | |
tree | 75e0258cc201ba3fccef1411a47e775696fd7941 /debian | |
parent | 8915bdc8af28a490e14079503f7bf72807701d96 (diff) |
Fix d/p/update-motd to apply the correct changes to the README
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/patches-applied/update-motd | 18 |
2 files changed, 16 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 4254e9d1..5315fc03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pam (1.3.1-3) UNRELEASED; urgency=medium + + * Fix debian/patches-applied/update-motd to apply the correct changes + to the README (should be forwarded to Debian) + + -- Steve Langasek <vorlon@debian.org> Wed, 13 Feb 2019 05:57:21 +0000 + pam (1.3.1-2) unstable; urgency=medium * Bump the version check for service restarts to 1.3.1-2. diff --git a/debian/patches-applied/update-motd b/debian/patches-applied/update-motd index 3d49d682..dececee5 100644 --- a/debian/patches-applied/update-motd +++ b/debian/patches-applied/update-motd @@ -1,10 +1,10 @@ -Patch for Ubuntu bug #399071 - Provide a more dynamic MOTD, based on the short-lived update-motd project. Authors: Dustin Kirkland <kirkland@canonical.com> -Upstream status: not yet submitted +Last-Update: 2019-02-12 +Forwarded: no +Bug-Ubuntu: https://bugs.launchpad.net/bugs/399071 Index: pam/modules/pam_motd/pam_motd.c =================================================================== @@ -95,14 +95,14 @@ Index: pam/modules/pam_motd/README =================================================================== --- pam.orig/modules/pam_motd/README +++ pam/modules/pam_motd/README -@@ -23,6 +23,10 @@ - contents of /etc/motd.d. Specifying either option (or both) will disable this - default behavior. +@@ -19,6 +19,10 @@ + The /path/dirname.d directory is scanned and each file contained inside of + it is displayed. +noupdate + + Don't run the scripts in /etc/update-motd.d to refresh the motd file. + - EXAMPLES - - The suggested usage for /etc/pam.d/login is: + 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. |