diff --git a/.gitignore b/.gitignore index d2a6f98..cc4cfc7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/samba-4.21.1.tar.xz +SOURCES/samba-4.21.2.tar.xz SOURCES/samba-pubkey_AA99442FB680B620.gpg diff --git a/.samba.metadata b/.samba.metadata index 480b9c9..bb3c70c 100644 --- a/.samba.metadata +++ b/.samba.metadata @@ -1,2 +1,2 @@ -b27af807fb5a38f97492b114fca9678cb57886c3 SOURCES/samba-4.21.1.tar.xz +079b147bb7da5cf6730656b142aeb4f994442eb8 SOURCES/samba-4.21.2.tar.xz 971f563c447eda8d144d6c9e743cd0f0488c0d9e SOURCES/samba-pubkey_AA99442FB680B620.gpg diff --git a/SOURCES/samba-4.21.1.tar.asc b/SOURCES/samba-4.21.1.tar.asc deleted file mode 100644 index cd11bdb..0000000 --- a/SOURCES/samba-4.21.1.tar.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEgfXigyvSVFoYl7cTqplEL7aAtiAFAmcNARQACgkQqplEL7aA -tiCgHw//Z+S3Q+bGXNSgAa7NfsYLOSuqMBir19xXTo1dXwefW7TtQCEDIy38+kpS -zSvzViDyOqfObK7Jt5RDDybulHZQiMTGI9hL6TbpNBReMdPQO46YCDbP/j4RaiIp -Gg5i4uxrYjrygMjW3nvlJPGLPt23bR3xsJzbF4k/sxcLdyJX1Ky9hgXy1qboL6cn -NF2Oi+fwn3OI9hBFBKV9F3PlnyJyDkf6co9B4Y/ItlrD6APjB2bapjJJT+1RNpLa -k2C26Sl0qTJmqbCm2Ckqb2+1Wnm5F5aUXxyCyJKVTT+NOvxOKE+9WrPVIHxNcN4O -Cri/kGcabmPNFyvgTJld+17eBPeX+bwlQwtk2Fefca0COFYr+dTNnX/a6Zq7+F1H -km3VBCEvHH01ABV0oau8NKGMHxT07FOijUz9qsolH8K00HYb25jHkGP75YE6NaGw -EB45n84eoX2kyrcnYbX9D8Y6+zr0EZNvL8OCtsGgPmUxwfT3EOTs5nPSfc9/3bmR -BOJqwjlJxEkwACwBwqslZn1dUExVEFzn8OMoFxR0K6lxeK9tXdmbpAacF11PvJQ1 -9hoSkkBiRGY56cpIBWTyf+0Dcg16RhD2X5MOUAJkFjYQCnQkiaiOoZukvYcZscyG -If+qc4PK4Q3wJL2ryiBRuGfqjyNfqIOXgyIaNjdrXT+r2gdeTn8= -=b4qd ------END PGP SIGNATURE----- diff --git a/SOURCES/samba-4.21.2.tar.asc b/SOURCES/samba-4.21.2.tar.asc new file mode 100644 index 0000000..10b7b52 --- /dev/null +++ b/SOURCES/samba-4.21.2.tar.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEgfXigyvSVFoYl7cTqplEL7aAtiAFAmdEkyUACgkQqplEL7aA +tiCNUg/9E7MZLFgLoVP9H+JNWdClLwAE4E5uP2DwYzvZy6R51FXeV27vcFhtbkIf +u0qfMQ5Wn78FGlC+aGWc4fZx8c82ZMcYhLQVaraqaX4/MtvLl5lyMI3jNKd+Al1+ +SDQITuUOQzSLBDS5YdKK/jxY4kWRto5YaVhietmIRKTTdfV64XBLi9EHiBe/7cLV +9ncZ+Cd8h2zBqgShzjXNh8T785xSB3xYYFU1mFdhzVbPk+r3C/XyDdZ0MJlNokFA +JDK6kY7kVjWswpYFgTILl91HK9XUhZ7iQdyedThqm1tXtDK8W5X+xjbIEzUDiqNy +L0k8fL3EMxxI5zBhyqoM6kuAKpkm9rhgkG4Ml7oZ7uHI9mYiZfR5uU9KxxgeNhQz +wC9DwSdre+sMnL3KbRMxijzw3L1FxFrqSiQ9bW969WxQNxq3E4mI9UKHlF1Sx27v +eFOxx90APk5w+HCLCCD9rGynUlK+P573M0+vBrzHZKMCvKb/iufH6pfeE9EGK1Cq +CweRfUfUiPlLg1Li0fy9sAm2ZF+nz7N2vnW7kEF324Zo9psv841lSFpie/Tj4l7q +lHtRGqlrV6E6CTd7l54WbHnk0MdhuuPCifacIhDTYThlIme46WAXRa9YUuem125e +m/ZaTeI296W1oO9FpymcxquWafF53AUFZ6Hm/mMDaO2T7TwM028= +=QaTC +-----END PGP SIGNATURE----- diff --git a/SPECS/samba.spec b/SPECS/samba.spec index 209da91..ca16bd0 100644 --- a/SPECS/samba.spec +++ b/SPECS/samba.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.6.5) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 5; + release_number = 3; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -158,9 +158,7 @@ %bcond lmdb 0 %endif -%define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") - -%global samba_version 4.21.1 +%global samba_version 4.21.2 # The release field is extended: # [.][.]%%{?dist}[.] @@ -1604,6 +1602,12 @@ cp -a lib/ldb/apidocs/man/* %{buildroot}%{_mandir} rm -f %{buildroot}%{_mandir}/man3/_* rm -f %{buildroot}%{_mandir}/man3/PyLdb* +# CTDB +%if %{with clustering} +touch %{buildroot}%{_libexecdir}/ctdb/statd_callout +#endif with clustering +%endif + %if %{with testsuite} %check # @@ -2660,6 +2664,7 @@ fi %{python3_sitearch}/samba/dcerpc/ntlmssp.*.so %{python3_sitearch}/samba/dcerpc/preg.*.so %{python3_sitearch}/samba/dcerpc/samr.*.so +%{python3_sitearch}/samba/dcerpc/schannel.*.so %{python3_sitearch}/samba/dcerpc/security.*.so %{python3_sitearch}/samba/dcerpc/server_id.*.so %{python3_sitearch}/samba/dcerpc/smb_acl.*.so @@ -3829,7 +3834,7 @@ fi %{_sysconfdir}/ctdb/functions %{_sysconfdir}/ctdb/nfs-linux-kernel-callout -%{_sysconfdir}/ctdb/statd-callout +%ghost %{_sysconfdir}/ctdb/statd-callout # CTDB scripts, no config files # script with executable bit means activated @@ -4829,6 +4834,17 @@ fi %changelog ## START: Generated by rpmautospec +* Tue Nov 26 2024 Pavel Filipenský - 0:4.21.2-102 +- resolves: RHEL-68945 - Fix libsmbclient for mounting CIFS share from + gnome + +* Mon Nov 25 2024 Pavel Filipenský - 0:4.21.2-101 +- resolves: RHEL-65730 - Fix winexe + +* Mon Nov 25 2024 Pavel Filipenský - 0:4.21.2-100 +- Update to version 4.21.2 +- related: RHEL-59777 + * Fri Oct 25 2024 MSVSphere Packaging Team - 0:4.21.1-104 - Rebuilt for MSVSphere 10