Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package samba for openSUSE:Factory checked
in at 2023-01-25 17:42:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/samba (Old)
and /work/SRC/openSUSE:Factory/.samba.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba"
Wed Jan 25 17:42:18 2023 rev:292 rq:1060506 version:4.17.4+git.314.7b07e3c51a6
Changes:
--------
--- /work/SRC/openSUSE:Factory/samba/samba.changes 2023-01-11
14:34:19.288982302 +0100
+++ /work/SRC/openSUSE:Factory/.samba.new.32243/samba.changes 2023-01-25
17:59:47.441385800 +0100
@@ -1,0 +2,12 @@
+Mon Jan 23 09:24:07 UTC 2023 - Noel Power <nopo...@suse.com>
+
+- libdsdb-module-samba4 should be packaged as part of samba-libs and
+ not samba-ad-dc-libs. Additionally no need for it to be
+ removed conditionally.
+
+-------------------------------------------------------------------
+Thu Jan 12 15:24:55 UTC 2023 - Noel Power <nopo...@suse.com>
+
+- Clean up logic for PAM migration settings in spec file.
+
+-------------------------------------------------------------------
Old:
----
samba-4.17.4+git.303.89e23854eb7.tar.bz2
New:
----
samba-4.17.4+git.314.7b07e3c51a6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.o5FmVv/_old 2023-01-25 17:59:48.453391207 +0100
+++ /var/tmp/diff_new_pack.o5FmVv/_new 2023-01-25 17:59:48.457391228 +0100
@@ -24,8 +24,10 @@
%{!?_pam_moduledir:%global _pam_moduledir /%{_lib}/security}
%if 0%{?suse_version} > 1500
%{!?_pam_vendordir:%global _pam_vendordir %{_prefix}/lib/pam.d}
+%global samba_pamdir %_pam_vendordir
%else
%{!?_pam_confdir:%global _pam_confdir %{_sysconfdir}/pam.d}
+%global samba_pamdir %_pam_confdir
%endif
%{!?_pam_secconfdir:%global _pam_secconfdir %{_sysconfdir}/security}
@@ -157,7 +159,7 @@
%endif
BuildRequires: sysuser-tools
-Version: 4.17.4+git.303.89e23854eb7
+Version: 4.17.4+git.314.7b07e3c51a6
Release: 0
URL: https://www.samba.org/
Obsoletes: samba-32bit < %{version}
@@ -716,13 +718,8 @@
%install
-%if 0%{?suse_version} > 1500
-install -d -m 0755 -p \
- %{buildroot}/%_pam_vendordir
-%else
install -d -m 0755 -p \
- %{buildroot}/%_pam_confdir
-%endif
+ %{buildroot}/%samba_pamdir
install -d -m 0755 -p \
%{buildroot}/%{_sysconfdir}/{xinetd.d,logrotate.d} \
@@ -760,8 +757,7 @@
rm \
%{buildroot}/%{_mandir}/man8/samba.8* \
%{buildroot}/%{_mandir}/man8/samba_downgrade_db.8* \
- %{buildroot}/%{_unitdir}/samba-ad-dc.service \
- %{buildroot}/%{_libdir}/samba/libdsdb-module-samba4.so
+ %{buildroot}/%{_unitdir}/samba-ad-dc.service
%endif
# CTDB
@@ -837,11 +833,7 @@
# 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/samba.pamd-common %{buildroot}/%samba_pamdir/samba
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
@@ -1134,9 +1126,9 @@
%ghost %{CONFIGDIR}/smbpasswd
%config(noreplace) %{CONFIGDIR}/smbusers
%if 0%{?suse_version} > 1500
-%_pam_vendordir/samba
+%samba_pamdir/samba
%else
-%config %_pam_confdir/samba
+%config %samba_pamdir/samba
%endif
%{_sysconfdir}/slp.reg.d
%dir %{_libdir}/samba
@@ -1527,6 +1519,7 @@
%{_libdir}/samba/libREG-FULL-samba4.so
%{_libdir}/samba/libRPC-SERVER-LOOP-samba4.so
%{_libdir}/samba/libRPC-WORKER-samba4.so
+%{_libdir}/samba/libdsdb-module-samba4.so
%if ! %{with_mitkrb5}
%{_libdir}/samba/libasn1-samba4.so
%{_libdir}/samba/libcom-err-samba4.so
@@ -1865,7 +1858,6 @@
%files ad-dc-libs
%defattr(-,root,root)
%{_libdir}/samba/libdb-glue-samba4.so
-%{_libdir}/samba/libdsdb-module-samba4.so
%{_libdir}/samba/libdsdb-garbage-collect-tombstones-samba4.so
%{_libdir}/samba/libscavenge-dns-records-samba4.so
%{_libdir}/samba/libprocess-model-samba4.so
++++++ samba-4.17.4+git.303.89e23854eb7.tar.bz2 ->
samba-4.17.4+git.314.7b07e3c51a6.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/samba/samba-4.17.4+git.303.89e23854eb7.tar.bz2
/work/SRC/openSUSE:Factory/.samba.new.32243/samba-4.17.4+git.314.7b07e3c51a6.tar.bz2
differ: char 11, line 1
