From 65d6735c5949ec233df9813f734e918a93fa36cf Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <5908016+thkukuk@users.noreply.github.com>
Date: Mon, 16 Sep 2019 17:17:49 +0200
Subject: Add support for a vendor directory and libeconf (#136)

With this, it is possible for Linux distributors to store their
supplied default configuration files somewhere below /usr, while
/etc only contains the changes made by the user. The new option
--enable-vendordir defines where Linux-PAM should additional look
for pam.d/*, login.defs and securetty if this files are not in /etc.
libeconf is a key/value configuration file reading library, which
handles the split of configuration files in different locations
and merges them transparently for the application.
---
 doc/custom-html.xsl | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 doc/custom-html.xsl

(limited to 'doc/custom-html.xsl')

diff --git a/doc/custom-html.xsl b/doc/custom-html.xsl
new file mode 100644
index 00000000..081beaf6
--- /dev/null
+++ b/doc/custom-html.xsl
@@ -0,0 +1,19 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:ss="http://docbook.sf.net/xmlns/string.subst/1.0"
+  xmlns:exsl="http://exslt.org/common" version="1.0">
+
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
+  <xsl:param name="vendordir"/>
+
+  <xsl:template match="filename">
+    <xsl:variable name="replacements">
+      <ss:substitution oldstring="%vendordir%" newstring="{$vendordir}" />
+    </xsl:variable>
+    <xsl:call-template name="apply-string-subst-map">
+      <xsl:with-param name="content" select="."/>
+      <xsl:with-param name="map.contents" select="exsl:node-set($replacements)/*" />
+    </xsl:call-template>
+  </xsl:template>
+</xsl:stylesheet>
+
-- 
cgit v1.2.3


From 69097289e58777306fdd88b08c510eca0916b4a5 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Thu, 5 Mar 2020 00:58:23 +0000
Subject: Fix whitespace issues

Remove trailing whitespace introduced by commit
f9c9c72121eada731e010ab3620762bcf63db08f.
Remove blank lines at EOF introduced by commit
65d6735c5949ec233df9813f734e918a93fa36cf.

This makes the project free of warnings reported by
git diff --check 4b825dc642cb6eb9a060e54bf8d69288fbee4904 HEAD

* doc/custom-html.xsl: Remove blank line at EOF.
* doc/custom-man.xsl: Likewise.
* modules/pam_motd/pam_motd.c: Remove trailing whitespace.
---
 doc/custom-html.xsl         | 1 -
 doc/custom-man.xsl          | 1 -
 modules/pam_motd/pam_motd.c | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'doc/custom-html.xsl')

diff --git a/doc/custom-html.xsl b/doc/custom-html.xsl
index 081beaf6..fdd5df7d 100644
--- a/doc/custom-html.xsl
+++ b/doc/custom-html.xsl
@@ -16,4 +16,3 @@
     </xsl:call-template>
   </xsl:template>
 </xsl:stylesheet>
-
diff --git a/doc/custom-man.xsl b/doc/custom-man.xsl
index bf01d583..4c35e839 100644
--- a/doc/custom-man.xsl
+++ b/doc/custom-man.xsl
@@ -7,4 +7,3 @@
     <ss:substitution oldstring="%vendordir%" newstring="{$vendordir}" />
   </xsl:param>
 </xsl:stylesheet>
-
diff --git a/modules/pam_motd/pam_motd.c b/modules/pam_motd/pam_motd.c
index f22cea3a..0435a904 100644
--- a/modules/pam_motd/pam_motd.c
+++ b/modules/pam_motd/pam_motd.c
@@ -136,7 +136,7 @@ static int join_dir_strings(char **strp_out, const char *a_str, const char *b_st
     int has_sep = 0;
     int retval = -1;
     char *join_strp = NULL;
-    
+
     if (strp_out == NULL || a_str == NULL || b_str == NULL) {
 	goto out;
     }
-- 
cgit v1.2.3