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-25 15:14:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pam (Old)
and /work/SRC/openSUSE:Factory/.pam.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pam"
Sun Dec 25 15:14:17 2022 rev:126 rq:1045205 version:1.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/pam/pam.changes 2022-12-10 21:17:23.717404564
+0100
+++ /work/SRC/openSUSE:Factory/.pam.new.1563/pam.changes 2022-12-25
15:14:21.665206046 +0100
@@ -1,0 +2,19 @@
+Sat Dec 24 13:31:33 UTC 2022 - Dominique Leuenberger <dleuenber...@suse.com>
+
+- Also obsolete pam_unix-32bit to have clean upgrade path.
+
+-------------------------------------------------------------------
+Fri Dec 16 09:37:15 UTC 2022 - Thorsten Kukuk <ku...@suse.com>
+
+- Merge pam_unix back into pam, seperate package not needed anymore
+
+-------------------------------------------------------------------
+Thu Dec 15 12:47:53 UTC 2022 - Thorsten Kukuk <ku...@suse.com>
+
+- Update pam-git.diff to current upstream
+ - pam_env: Use vendor specific pam_env.conf and environment as fallback
+ - pam_shells: Use the vendor directory
+ obsoletes pam_env_econf.patch
+- Refresh docbook5.patch
+
+-------------------------------------------------------------------
Old:
----
pam_env_econf.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pam.spec ++++++
--- /var/tmp/diff_new_pack.lSYMBk/_old 2022-12-25 15:14:22.373210053 +0100
+++ /var/tmp/diff_new_pack.lSYMBk/_new 2022-12-25 15:14:22.377210077 +0100
@@ -67,9 +67,8 @@
Patch1: pam-limit-nproc.patch
Patch3: pam-xauth_ownership.patch
Patch4: pam-bsc1177858-dont-free-environment-string.patch
-Patch10: pam_xauth_data.3.xml.patch
+Patch5: 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
@@ -88,8 +87,8 @@
%if %{enable_selinux}
BuildRequires: libselinux-devel
%endif
-Requires: pam_unix.so
-Suggests: pam_unix
+Obsoletes: pam_unix
+Obsoletes: pam_unix-nis
Recommends: pam-manpages
%if 0%{?suse_version} >= 1330
Requires(pre): group(shadow)
@@ -101,18 +100,6 @@
allows system administrators to set authentication policies without
having to recompile programs that do authentication.
-%package -n pam_unix
-Summary: PAM module for standard UNIX authentication
-Group: System/Libraries
-Provides: pam:/%{_lib}/security/pam_unix.so
-Provides: pam_unix.so
-Conflicts: pam_unix-nis
-
-%description -n pam_unix
-This package contains the pam_unix module, which does the standard
-UNIX authentication against the passwd and shadow database. This
-module does not contain NIS support.
-
%package extra
Summary: PAM module to authenticate against a separate database
Group: System/Libraries
@@ -181,8 +168,7 @@
%patch1 -p1
%patch3 -p1
%patch4 -p1
-%patch10 -p1
-%patch12 -p1
+%patch5 -p1
%if %{build_doc}
%patch13 -p1
%patch14 -p1
@@ -396,6 +382,11 @@
%{_pam_moduledir}/pam_timestamp.so
%{_pam_moduledir}/pam_tty_audit.so
%{_pam_moduledir}/pam_umask.so
+%{_pam_moduledir}/pam_unix.so
+%{_pam_moduledir}/pam_unix_acct.so
+%{_pam_moduledir}/pam_unix_auth.so
+%{_pam_moduledir}/pam_unix_passwd.so
+%{_pam_moduledir}/pam_unix_session.so
%{_pam_moduledir}/pam_usertype.so
%{_pam_moduledir}/pam_warn.so
%{_pam_moduledir}/pam_wheel.so
@@ -411,14 +402,6 @@
%{_unitdir}/pam_namespace.service
%{_tmpfilesdir}/pam.conf
-%files -n pam_unix
-%defattr(-,root,root,755)
-%{_pam_moduledir}/pam_unix.so
-%{_pam_moduledir}/pam_unix_acct.so
-%{_pam_moduledir}/pam_unix_auth.so
-%{_pam_moduledir}/pam_unix_passwd.so
-%{_pam_moduledir}/pam_unix_session.so
-
%files extra
%defattr(-,root,root,755)
%{_pam_moduledir}/pam_userdb.so
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.lSYMBk/_old 2022-12-25 15:14:22.453210507 +0100
+++ /var/tmp/diff_new_pack.lSYMBk/_new 2022-12-25 15:14:22.457210529 +0100
@@ -1,7 +1,7 @@
pam
requires "(systemd-<targettype> if systemd)"
+ obsoletes "pam_unix-<targettype>"
+ obsoletes "pam_unix-nis-<targettype>"
pam-extra
pam-devel
-pam_unix
- conflicts "pam_unix-nis-<targettype>"
++++++ docbook5.patch ++++++
--- /var/tmp/diff_new_pack.lSYMBk/_old 2022-12-25 15:14:22.513210847 +0100
+++ /var/tmp/diff_new_pack.lSYMBk/_new 2022-12-25 15:14:22.517210869 +0100
@@ -1,4 +1,4 @@
-From 681e88a5428904b478a37e65154d7cf0ba1a9eb5 Mon Sep 17 00:00:00 2001
+From 55e4d5c4aac39602518dd5d4ce03a4313775180f Mon Sep 17 00:00:00 2001
From: Stefan Schubert <sch...@suse.de>
Date: Tue, 25 Oct 2022 16:29:41 +0200
Subject: [PATCH] doc: Update PAM documentation from DockBook 4 to DocBook 5
@@ -14,7 +14,7 @@
- Using RNG file instead of DTD file for checking XML files.
configure.ac:
-- Added a new option for selecting RNG check file (-enable-docbook-rng)
+- Adding a new option for selecting RNG check file (-enable-docbook-rng)
- Switching stylesheets to docbook 5
- Checking DocBook 5 environment instead of DocBook 4 environment
@@ -152,7 +152,6 @@
doc/sag/pam_warn.xml | 42 ++--
doc/sag/pam_wheel.xml | 42 ++--
doc/sag/pam_xauth.xml | 42 ++--
- examples/.gitignore | 2 +-
modules/pam_access/README.xml | 32 +--
modules/pam_access/access.conf.5.xml | 20 +-
modules/pam_access/pam_access.8.xml | 63 +++--
@@ -163,7 +162,7 @@
modules/pam_echo/README.xml | 29 +--
modules/pam_echo/pam_echo.8.xml | 45 ++--
modules/pam_env/README.xml | 34 +--
- modules/pam_env/pam_env.8.xml | 59 +++--
+ modules/pam_env/pam_env.8.xml | 63 +++--
modules/pam_env/pam_env.conf.5.xml | 19 +-
modules/pam_exec/README.xml | 32 +--
modules/pam_exec/pam_exec.8.xml | 65 +++--
@@ -257,7 +256,7 @@
modules/pam_wheel/pam_wheel.8.xml | 59 +++--
modules/pam_xauth/README.xml | 35 +--
modules/pam_xauth/pam_xauth.8.xml | 65 +++--
- 236 files changed, 3398 insertions(+), 5101 deletions(-)
+ 235 files changed, 3399 insertions(+), 5102 deletions(-)
diff --git a/Make.xml.rules.in b/Make.xml.rules.in
index 27bb510ec..98beb9ed7 100644
@@ -292,7 +291,7 @@
#CLEANFILES += $(man_MANS) README
diff --git a/configure.ac b/configure.ac
-index 2f74d1b49..84cda219d 100644
+index 538195e55..afa749cf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -243,26 +243,35 @@ if test x"$enable_debug" = x"yes" ; then
@@ -339,7 +338,7 @@
AC_SUBST(MAN_STYLESHEET)
sed "s+MAN_STYLESHEET+$MAN_STYLESHEET+g" <doc/custom-man.xsl.in
>doc/custom-man.xsl
-@@ -605,10 +614,10 @@ if test -z "$XSLTPROC"; then
+@@ -608,10 +617,10 @@ if test -z "$XSLTPROC"; then
enable_docu=no
fi
AC_PATH_PROG([XMLLINT], [xmllint],[/bin/true])
@@ -9561,7 +9560,7 @@
+</article>
\ No newline at end of file
diff --git a/modules/pam_env/pam_env.8.xml b/modules/pam_env/pam_env.8.xml
-index 75ff862be..bcb16036f 100644
+index d7687d6c9..fb172e17b 100644
--- a/modules/pam_env/pam_env.8.xml
+++ b/modules/pam_env/pam_env.8.xml
@@ -1,16 +1,13 @@
@@ -9625,7 +9624,7 @@
<title>DESCRIPTION</title>
<para>
The pam_env PAM module allows the (un)setting of environment
-@@ -77,13 +74,13 @@
+@@ -119,13 +116,13 @@
</para>
</refsect1>
@@ -9641,7 +9640,7 @@
</term>
<listitem>
<para>
-@@ -96,7 +93,7 @@
+@@ -138,7 +135,7 @@
<varlistentry>
<term>
@@ -9650,7 +9649,7 @@
</term>
<listitem>
<para>
-@@ -108,7 +105,7 @@
+@@ -150,7 +147,7 @@
<varlistentry>
<term>
@@ -9659,7 +9658,7 @@
</term>
<listitem>
<para>
-@@ -124,7 +121,7 @@
+@@ -166,7 +163,7 @@
<varlistentry>
<term>
@@ -9668,7 +9667,7 @@
</term>
<listitem>
<para>
-@@ -137,7 +134,7 @@
+@@ -179,7 +176,7 @@
<varlistentry>
<term>
@@ -9677,7 +9676,7 @@
</term>
<listitem>
<para>
-@@ -153,7 +150,7 @@
+@@ -195,7 +192,7 @@
<varlistentry>
<term>
@@ -9686,7 +9685,7 @@
</term>
<listitem>
<para>
-@@ -174,7 +171,7 @@
+@@ -216,7 +213,7 @@
</variablelist>
</refsect1>
@@ -9695,7 +9694,7 @@
<title>MODULE TYPES PROVIDED</title>
<para>
The <option>auth</option> and <option>session</option> module
-@@ -182,7 +179,7 @@
+@@ -224,7 +221,7 @@
</para>
</refsect1>
@@ -9704,7 +9703,7 @@
<title>RETURN VALUES</title>
<variablelist>
<varlistentry>
-@@ -220,23 +217,23 @@
+@@ -262,25 +259,25 @@
</variablelist>
</refsect1>
@@ -9713,14 +9712,18 @@
<title>FILES</title>
<variablelist>
<varlistentry>
+- <term
condition="with_vendordir"><filename>/usr/etc/security/pam_env.conf</filename></term>
- <term><filename>/etc/security/pam_env.conf</filename></term>
++ <term
condition="with_vendordir">%vendordir%/security/pam_env.conf</term>
+ <term>/etc/security/pam_env.conf</term>
<listitem>
<para>Default configuration file</para>
</listitem>
</varlistentry>
<varlistentry>
+- <term
condition="with_vendordir"><filename>/usr/etc/environment</filename></term>
- <term><filename>/etc/environment</filename></term>
++ <term condition="with_vendordir">%vendordir%/environment</term>
+ <term>/etc/environment</term>
<listitem>
<para>Default environment file</para>
@@ -9732,7 +9735,7 @@
<listitem>
<para>User specific environment file</para>
</listitem>
-@@ -244,7 +241,7 @@
+@@ -288,7 +285,7 @@
</variablelist>
</refsect1>
@@ -9741,7 +9744,7 @@
<title>SEE ALSO</title>
<para>
<citerefentry>
-@@ -262,10 +259,10 @@
+@@ -306,10 +303,10 @@
</para>
</refsect1>
@@ -9756,7 +9759,7 @@
+</refentry>
\ No newline at end of file
diff --git a/modules/pam_env/pam_env.conf.5.xml
b/modules/pam_env/pam_env.conf.5.xml
-index fca046fe3..f88791676 100644
+index 5c0dbcb8c..662ff0a00 100644
--- a/modules/pam_env/pam_env.conf.5.xml
+++ b/modules/pam_env/pam_env.conf.5.xml
@@ -1,13 +1,10 @@
@@ -9784,8 +9787,8 @@
+ <refsect1 xml:id="pam_env.conf-description">
<title>DESCRIPTION</title>
- <para>
-@@ -71,7 +68,7 @@
+ <para condition="with_vendordir">
+@@ -87,7 +84,7 @@
</para>
</refsect1>
@@ -9794,7 +9797,7 @@
<title>EXAMPLES</title>
<para>
These are some example lines which might be specified in
-@@ -117,7 +114,7 @@
+@@ -133,7 +130,7 @@
</programlisting>
</refsect1>
@@ -9803,7 +9806,7 @@
<title>SEE ALSO</title>
<para>
<citerefentry><refentrytitle>pam_env</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-@@ -127,10 +124,10 @@
+@@ -143,10 +140,10 @@
</para>
</refsect1>
@@ -16961,7 +16964,7 @@
+</article>
\ No newline at end of file
diff --git a/modules/pam_shells/pam_shells.8.xml
b/modules/pam_shells/pam_shells.8.xml
-index 15f476717..67d8ecf16 100644
+index 73b4855a3..b9f90e94a 100644
--- a/modules/pam_shells/pam_shells.8.xml
+++ b/modules/pam_shells/pam_shells.8.xml
@@ -1,27 +1,24 @@
@@ -16998,7 +17001,7 @@
<title>DESCRIPTION</title>
-@@ -35,13 +32,13 @@
+@@ -43,13 +40,13 @@
</para>
</refsect1>
@@ -17014,7 +17017,7 @@
<title>MODULE TYPES PROVIDED</title>
<para>
The <option>auth</option> and <option>account</option>
-@@ -49,7 +46,7 @@
+@@ -57,7 +54,7 @@
</para>
</refsect1>
@@ -17023,7 +17026,7 @@
<title>RETURN VALUES</title>
<variablelist>
<varlistentry>
-@@ -80,7 +77,7 @@
+@@ -88,7 +85,7 @@
</variablelist>
</refsect1>
@@ -17032,7 +17035,7 @@
<title>EXAMPLES</title>
<para>
<programlisting>
-@@ -89,7 +86,7 @@ auth required pam_shells.so
+@@ -97,7 +94,7 @@ auth required pam_shells.so
</para>
</refsect1>
@@ -17041,7 +17044,7 @@
<title>SEE ALSO</title>
<para>
<citerefentry>
-@@ -107,11 +104,11 @@ auth required pam_shells.so
+@@ -115,11 +112,11 @@ auth required pam_shells.so
</para>
</refsect1>
++++++ pam-git.diff ++++++
++++ 1473 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/pam/pam-git.diff
++++ and /work/SRC/openSUSE:Factory/.pam.new.1563/pam-git.diff
