From d13891485fd6f44dddf2d9835357283ee84e185e Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 5 Jan 2024 17:37:20 +0100 Subject: [PATCH] automatic version update by autodist [release 4.11.4-1mamba;Fri Jan 03 2020] --- samba-4.11.4-glibc-2.30.patch | 13 +++++++++++ samba.spec | 41 ++++++++++++++++++++--------------- 2 files changed, 36 insertions(+), 18 deletions(-) create mode 100644 samba-4.11.4-glibc-2.30.patch diff --git a/samba-4.11.4-glibc-2.30.patch b/samba-4.11.4-glibc-2.30.patch new file mode 100644 index 0000000..143f0c0 --- /dev/null +++ b/samba-4.11.4-glibc-2.30.patch @@ -0,0 +1,13 @@ +--- a/lib/replace/system/network.h 2019-01-15 21:07:00.000000000 +1100 ++++ b/lib/replace/system/network.h.new 2019-08-27 23:28:56.106742843 +1000 +@@ -87,10 +87,6 @@ + #include + #endif + +-#ifdef HAVE_STROPTS_H +-#include +-#endif +- + #ifndef HAVE_SOCKLEN_T + #define HAVE_SOCKLEN_T + typedef int socklen_t; diff --git a/samba.spec b/samba.spec index 28badcb..9e4e516 100644 --- a/samba.spec +++ b/samba.spec @@ -6,8 +6,8 @@ %define smbldap_tools_ver 0.9.2 Name: samba -Version: 4.10.6 -Release: 2mamba +Version: 4.11.4 +Release: 1mamba Summary: Samba provides seamless file and print services to SMB/CIFS clients Group: System/Servers Vendor: openmamba @@ -37,6 +37,7 @@ Patch2: samba-4.9.4-conf-idmap.patch Patch10: %{name}-3.0.23-smbldaptools-rootbinddn.patch Patch11: %{name}-3.2.4-remove_strlcpy_strlcat.patch Patch12: %{name}-3.5.8-mount_disable_setuid_check.patch +Patch13: samba-4.11.4-glibc-2.30.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -75,9 +76,9 @@ BuildRequires: libopenssl-devel BuildRequires: valgrind BuildRequires: libldb-devel #BuildRequires: python-tdb -BuildRequires: python-ldb-py36 -BuildRequires: python-tdb-py36 -BuildRequires: python-tevent-py36 +BuildRequires: python-ldb +BuildRequires: python-tdb +BuildRequires: python-tevent Requires: perl Requires: pam >= 0.78-10 Requires: libldb >= 1:1.4 @@ -86,9 +87,9 @@ Requires(pre): setup Requires(post):libwbclient = %{?epoch:%epoch:}%{version}-%{release} Requires(post):lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: cifs-utils -Requires: python-ldb-py36 -Requires: python-tdb-py36 -Requires: python-tevent-py36 +Requires: python-ldb +Requires: python-tdb +Requires: python-tevent Obsoletes: samba-common %systemd_requires BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -232,7 +233,6 @@ This package contains the winbind daemon and the wbinfo tool. %debug_package - %prep %setup -q #-D -T @@ -240,6 +240,7 @@ This package contains the winbind daemon and the wbinfo tool. #%patch0 -p1 #%patch1 -p1 %patch2 -p1 +%patch13 -p1 %build #:<< _EOF @@ -271,8 +272,8 @@ PATH=/usr/bin:$PATH \ --enable-cups \ --bundled-libraries=auto \ --systemd-nmb-extra "TimeoutStartSec=300" \ - --python=%{__python36} \ - PYTHON=%{__python36} + --python=%{__python3} \ + PYTHON=%{__python3} # --bundled-libraries=wind,roken,hx509,asn1,heimbase,hcrypto,krb5,gssapi,heimntlm,hdb,\ #kdc,ntdb,subunit @@ -585,8 +586,8 @@ fi %{_presetdir}/50-samba.preset #%dir %{python3_sitearch}/samba #%{python3_sitearch}/samba/* -%dir %{python36_sitearch}/samba -%{python36_sitearch}/samba/* +%dir %{python3_sitearch}/samba +%{python3_sitearch}/samba/* %dir /var/log/samba %{_mandir}/man1/* %exclude %{_mandir}/man1/wbinfo.* @@ -711,7 +712,7 @@ fi #%{_bindir}/ntdbrestore #%{_bindir}/ntdbtool %{_bindir}/oLschema2ldif -%{_bindir}/pidl +#%{_bindir}/pidl %{_bindir}/regdiff %{_bindir}/regpatch %{_bindir}/regshell @@ -720,6 +721,7 @@ fi %{_bindir}/smbtorture %{_sbindir}/samba %{_sbindir}/samba_dnsupdate +%{_sbindir}/samba_downgrade_db %{_sbindir}/samba_kcc %{_sbindir}/samba-gpupdate %{_sbindir}/samba_spnupdate @@ -738,9 +740,9 @@ fi %dir %{_libdir}/samba/service %{_libdir}/samba/service/*.so %dir /var/cache/samba -%dir %{perl_vendorlib}/Parse -%{perl_vendorlib}/Parse/* -%{_mandir}/man3/Parse::Pidl::*.3pm* +#%dir %{perl_vendorlib}/Parse +#%{perl_vendorlib}/Parse/* +#%{_mandir}/man3/Parse::Pidl::*.3pm* #%{_mandir}/man3/ntdb.3* %files -n libsmbclient @@ -813,6 +815,9 @@ fi %{_mandir}/man8/winbindd.* %changelog +* Fri Jan 03 2020 Automatic Build System 4.11.4-1mamba +- automatic version update by autodist + * Sat Aug 03 2019 Silvan Calarco 4.10.6-2mamba - rebuilt with --systemd-nmb-extra TimeoutStartSec=300 to workaround nmb start at boot @@ -1339,7 +1344,7 @@ fi * Sun May 09 2004 Silvan Calarco 3.0.4-1qilnx - new version build -* Wed May 07 2004 Silvan Calarco 3.0.3-4qilnx +* Fri May 07 2004 Silvan Calarco 3.0.3-4qilnx - smbumount installed setuid root * Wed May 05 2004 Silvan Calarco 3.0.3-3qilnx