Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pam for openSUSE:Factory checked in at 2022-12-10 21:17:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pam (Old) and /work/SRC/openSUSE:Factory/.pam.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pam" Sat Dec 10 21:17:22 2022 rev:125 rq:1041656 version:1.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/pam/pam.changes 2022-12-06 14:22:42.753355139 +0100 +++ /work/SRC/openSUSE:Factory/.pam.new.1835/pam.changes 2022-12-10 21:17:23.717404564 +0100 @@ -1,0 +2,14 @@ +Tue Dec 6 16:43:49 UTC 2022 - Thorsten Kukuk <ku...@suse.com> + +- pam_pwhistory-docu.patch, docbook5.patch: convert docu to + docbook5 + +------------------------------------------------------------------- +Thu Dec 1 13:51:35 UTC 2022 - Thorsten Kukuk <ku...@suse.com> + +- pam-git.diff: update to current git + - obsoletes pam-hostnames-in-access_conf.patch + - obsoletes tst-pam_env-retval.c +- pam_env_econf.patch refresh + +------------------------------------------------------------------- Old: ---- pam-hostnames-in-access_conf.patch tst-pam_env-retval.c New: ---- docbook5.patch pam_pwhistory-docu.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam.spec ++++++ --- /var/tmp/diff_new_pack.MvIR8n/_old 2022-12-10 21:17:24.517409242 +0100 +++ /var/tmp/diff_new_pack.MvIR8n/_new 2022-12-10 21:17:24.521409265 +0100 @@ -64,14 +64,14 @@ Source13: pam.tmpfiles Source14: Linux-PAM-%{version}-docs.tar.xz.asc Source15: Linux-PAM-%{version}.tar.xz.asc -Source16: tst-pam_env-retval.c Patch1: pam-limit-nproc.patch -Patch2: pam-hostnames-in-access_conf.patch Patch3: pam-xauth_ownership.patch Patch4: pam-bsc1177858-dont-free-environment-string.patch Patch10: pam_xauth_data.3.xml.patch Patch11: pam-git.diff Patch12: pam_env_econf.patch +Patch13: pam_pwhistory-docu.patch +Patch14: docbook5.patch BuildRequires: audit-devel BuildRequires: bison BuildRequires: flex @@ -147,7 +147,7 @@ Group: Documentation/HTML Provides: pam:/%{_mandir}/man8/PAM.8.gz BuildArch: noarch -BuildRequires: docbook-xsl-stylesheets +BuildRequires: docbook5-xsl-stylesheets BuildRequires: elinks BuildRequires: xmlgraphics-fop @@ -177,14 +177,16 @@ %prep %setup -q -n Linux-PAM-%{version} -b 1 cp -a %{SOURCE12} . -cp %{SOURCE16} ./modules/pam_env +%patch11 -p1 %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch10 -p1 -%patch11 -p1 %patch12 -p1 +%if %{build_doc} +%patch13 -p1 +%patch14 -p1 +%endif %build bash ./pam-login_defs-check.sh @@ -343,6 +345,7 @@ %config(noreplace) %{_pam_secconfdir}/time.conf %config(noreplace) %{_pam_secconfdir}/namespace.conf %config(noreplace) %{_pam_secconfdir}/namespace.init +%config(noreplace) %{_pam_secconfdir}/pwhistory.conf %dir %{_pam_secconfdir}/namespace.d %{_libdir}/libpam.so.0 %{_libdir}/libpam.so.%{libpam_so_version} ++++++ docbook5.patch ++++++ ++++ 20424 lines (skipped) ++++++ pam-git.diff ++++++ ++++ 5502 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/pam/pam-git.diff ++++ and /work/SRC/openSUSE:Factory/.pam.new.1835/pam-git.diff ++++++ pam_env_econf.patch ++++++ ++++ 1149 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/pam/pam_env_econf.patch ++++ and /work/SRC/openSUSE:Factory/.pam.new.1835/pam_env_econf.patch ++++++ pam_pwhistory-docu.patch ++++++ diff --git a/modules/pam_pwhistory/Makefile.am b/modules/pam_pwhistory/Makefile.am index 8a4dbcb2..c29a8e11 100644 --- a/modules/pam_pwhistory/Makefile.am +++ b/modules/pam_pwhistory/Makefile.am @@ -9,9 +9,10 @@ MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = $(XMLS) if HAVE_DOC -dist_man_MANS = pam_pwhistory.8 pwhistory_helper.8 +dist_man_MANS = pam_pwhistory.8 pwhistory_helper.8 pwhistory.conf.5 endif -XMLS = README.xml pam_pwhistory.8.xml pwhistory_helper.8.xml +XMLS = README.xml pam_pwhistory.8.xml pwhistory_helper.8.xml \ + pwhistory.conf.5.xml dist_check_SCRIPTS = tst-pam_pwhistory TESTS = $(dist_check_SCRIPTS) diff --git a/modules/pam_pwhistory/pam_pwhistory.8.xml b/modules/pam_pwhistory/pam_pwhistory.8.xml index d88115c2..2a8fa7f6 100644 --- a/modules/pam_pwhistory/pam_pwhistory.8.xml +++ b/modules/pam_pwhistory/pam_pwhistory.8.xml @@ -36,6 +36,12 @@ <arg choice="opt"> authtok_type=<replaceable>STRING</replaceable> </arg> + <arg choice="opt"> + file=<replaceable>/path/filename</replaceable> + </arg> + <arg choice="opt"> + conf=<replaceable>/path/to/config-file</replaceable> + </arg> </cmdsynopsis> </refsynopsisdiv> @@ -104,7 +110,7 @@ <listitem> <para> The last <replaceable>N</replaceable> passwords for each - user are saved in <filename>/etc/security/opasswd</filename>. + user are saved. The default is <emphasis>10</emphasis>. Value of <emphasis>0</emphasis> makes the module to keep the existing contents of the <filename>opasswd</filename> file unchanged. @@ -137,7 +143,39 @@ </listitem> </varlistentry> + <varlistentry> + <term> + <option>file=<replaceable>/path/filename</replaceable></option> + </term> + <listitem> + <para> + Store password history in file <filename>/path/filename</filename> + rather than the default location. The default location is + <filename>/etc/security/opasswd</filename>. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term> + <option>conf=<replaceable>/path/to/config-file</replaceable></option> + </term> + <listitem> + <para> + Use another configuration file instead of the default + <filename>/etc/security/pwhistory.conf</filename>. + </para> + </listitem> + </varlistentry> + </variablelist> + <para> + The options for configuring the module behavior are described in the + <citerefentry><refentrytitle>pwhistory.conf</refentrytitle> + <manvolnum>5</manvolnum></citerefentry> manual page. The options + specified on the module command line override the values from the + configuration file. + </para> </refsect1> <refsect1 id="pam_pwhistory-types"> @@ -213,7 +251,7 @@ password required pam_unix.so use_authtok <varlistentry> <term><filename>/etc/security/opasswd</filename></term> <listitem> - <para>File with password history</para> + <para>Default file with password history</para> </listitem> </varlistentry> </variablelist> @@ -222,6 +260,9 @@ password required pam_unix.so use_authtok <refsect1 id='pam_pwhistory-see_also'> <title>SEE ALSO</title> <para> + <citerefentry> + <refentrytitle>pwhistory.conf</refentrytitle><manvolnum>5</manvolnum> + </citerefentry>, <citerefentry> <refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum> </citerefentry>, diff --git a/modules/pam_pwhistory/pwhistory.conf.5.xml b/modules/pam_pwhistory/pwhistory.conf.5.xml new file mode 100644 index 00000000..bac5ffed --- /dev/null +++ b/modules/pam_pwhistory/pwhistory.conf.5.xml @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding='UTF-8'?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> + +<refentry id="pwhistory.conf"> + + <refmeta> + <refentrytitle>pwhistory.conf</refentrytitle> + <manvolnum>5</manvolnum> + <refmiscinfo class="sectdesc">Linux-PAM Manual</refmiscinfo> + </refmeta> + + <refnamediv id="pwhistory.conf-name"> + <refname>pwhistory.conf</refname> + <refpurpose>pam_pwhistory configuration file</refpurpose> + </refnamediv> + + <refsect1 id="pwhistory.conf-description"> + + <title>DESCRIPTION</title> + <para> + <emphasis remap='B'>pwhistory.conf</emphasis> provides a way to configure the + default settings for saving the last passwords for each user. + This file is read by the <emphasis>pam_pwhistory</emphasis> module and is the + preferred method over configuring <emphasis>pam_pwhistory</emphasis> directly. + </para> + <para> + The file has a very simple <emphasis>name = value</emphasis> format with possible comments + starting with <emphasis>#</emphasis> character. The whitespace at the beginning of line, end + of line, and around the <emphasis>=</emphasis> sign is ignored. + </para> + </refsect1> + + <refsect1 id="pwhistory.conf-options"> + + <title>OPTIONS</title> + <variablelist> + <varlistentry> + <term> + <option>debug</option> + </term> + <listitem> + <para> + Turns on debugging via + <citerefentry> + <refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum> + </citerefentry>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <option>enforce_for_root</option> + </term> + <listitem> + <para> + If this option is set, the check is enforced for root, too. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <option>remember=<replaceable>N</replaceable></option> + </term> + <listitem> + <para> + The last <replaceable>N</replaceable> passwords for each + user are saved. + The default is <emphasis>10</emphasis>. Value of + <emphasis>0</emphasis> makes the module to keep the existing + contents of the <filename>opasswd</filename> file unchanged. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <option>retry=<replaceable>N</replaceable></option> + </term> + <listitem> + <para> + Prompt user at most <replaceable>N</replaceable> times + before returning with error. The default is 1. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <option>file=<replaceable>/path/filename</replaceable></option> + </term> + <listitem> + <para> + Store password history in file + <replaceable>/path/filename</replaceable> rather than the default + location. The default location is + <filename>/etc/security/opasswd</filename>. + </para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + + <refsect1 id='pwhistory.conf-examples'> + <title>EXAMPLES</title> + <para> + /etc/security/pwhistory.conf file example: + </para> + <programlisting> +debug +remember=5 +file=/tmp/opasswd + </programlisting> + </refsect1> + + <refsect1 id="pwhistory.conf-files"> + <title>FILES</title> + <variablelist> + <varlistentry> + <term><filename>/etc/security/pwhistory.conf</filename></term> + <listitem> + <para>the config file for custom options</para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + + <refsect1 id='pwhistory.conf-see_also'> + <title>SEE ALSO</title> + <para> + <citerefentry> + <refentrytitle>pwhistory</refentrytitle><manvolnum>8</manvolnum> + </citerefentry>, + <citerefentry> + <refentrytitle>pam_pwhistory</refentrytitle><manvolnum>8</manvolnum> + </citerefentry>, + <citerefentry> + <refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum> + </citerefentry>, + <citerefentry> + <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum> + </citerefentry>, + <citerefentry> + <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum> + </citerefentry> + </para> + </refsect1> + + <refsect1 id='pwhistory.conf-author'> + <title>AUTHOR</title> + <para> + pam_pwhistory was written by Thorsten Kukuk. The support for + pwhistory.conf was written by Iker Pedrosa. + </para> + </refsect1> + +</refentry>