Accepting request 1057016 from home:npower:branches:network:samba:STABLE

- Migration of PAM settings to /usr/lib/pam.d.

- Change with_dc default to 0 (for non TW builds).

OBS-URL: https://build.opensuse.org/request/show/1057016
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=675

samba-4.17.4+git.300.305b22bfce.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:651d971d759a6d7f82e05d82d4aa5797ef3aac49f70b3e697bfe23c6301f12a5
-size 34349253

samba-4.17.4+git.303.89e23854eb7.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1b46368d7558c16ba4ccfc461fb684bbac84beac53b4fa26f5ff1d8a3b107d4
+size 34354436

samba.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jan  4 14:05:15 UTC 2023 - Stefan Schubert <schubi@suse.com>
+
+- Migration of PAM settings to /usr/lib/pam.d.
+
+-------------------------------------------------------------------
+Wed Dec 21 12:17:58 UTC 2022 - Noel Power <nopower@suse.com>
+
+- Change with_dc default to 0 (for non TW builds).
+
 -------------------------------------------------------------------
 Thu Dec 15 16:45:28 UTC 2022 - Samuel Cabrero <scabrero@suse.de>
 

samba.spec

@@ -23,7 +23,7 @@
 %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
 %{!?_pam_moduledir:%global _pam_moduledir /%{_lib}/security}
 %if 0%{?suse_version} > 1500
-%global _pam_confdir %{_distconfdir}/pam.d
+%{!?_pam_vendordir:%global _pam_vendordir %{_prefix}/lib/pam.d}
 %else
 %{!?_pam_confdir:%global _pam_confdir %{_sysconfdir}/pam.d}
 %endif
@@ -58,7 +58,12 @@
 #---------------------------------------------------------
 %{!?with_mitkrb5: %define with_mitkrb5 1}
 %{!?with_mit_dc: %define with_mit_dc 1}
+# if factory/tw default with_dc to 1 (if not already defined in project config)
+%if 0%{?suse_version} > 1500
 %{!?with_dc: %define with_dc 1}
+%else
+%{!?with_dc: %define with_dc 0}
+%endif
 
 # Define whether smbd is built with SMB1 disabled
 %{!?without_smb1_server: %define without_smb1_server 1}
@@ -152,7 +157,7 @@ BuildRequires:  liburing-devel
 %endif
 BuildRequires:  sysuser-tools
 
-Version:        4.17.4+git.300.305b22bfce
+Version:        4.17.4+git.303.89e23854eb7
 Release:        0
 URL:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -710,8 +715,16 @@ popd
 %sysusers_generate_pre packaging/SuSE/systemd/sysusers.samba samba samba.conf
 
 %install
+
+%if 0%{?suse_version} > 1500
+install -d -m 0755 -p \
+	%{buildroot}/%_pam_vendordir
+%else
+install -d -m 0755 -p \
+	%{buildroot}/%_pam_confdir
+%endif
+
 install -d -m 0755 -p \
-	%{buildroot}/%_pam_confdir \
 	%{buildroot}/%{_sysconfdir}/{xinetd.d,logrotate.d} \
 	%{buildroot}/%{_sysconfdir}/openldap/schema \
 	%{buildroot}/%{_sysconfdir}/security \
@@ -824,7 +837,11 @@ install -m 0755 tools/update-apparmor-samba-profile \
 # PDF generator
 install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf
 install -m 0644 config/samba.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg
+%if 0%{?suse_version} > 1500
+install -m 0644 config/samba.pamd-common %{buildroot}/%_pam_vendordir/samba
+%else
 install -m 0644 config/samba.pamd-common %{buildroot}/%_pam_confdir/samba
+%endif
 install -m 0644 config/dhcp.conf %{buildroot}/%{_fillupdir}/samba-client-dhcp.conf
 install -m 0644 config/sysconfig.dhcp-samba-client %{buildroot}/%{_fillupdir}/sysconfig.dhcp-samba-client
 
@@ -1116,7 +1133,11 @@ exit 0
 %{_unitdir}/smb.service
 %ghost %{CONFIGDIR}/smbpasswd
 %config(noreplace) %{CONFIGDIR}/smbusers
+%if 0%{?suse_version} > 1500
+%_pam_vendordir/samba
+%else
 %config %_pam_confdir/samba
+%endif
 %{_sysconfdir}/slp.reg.d
 %dir %{_libdir}/samba
 %dir %{_libdir}/samba/vfs