Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/samba.git#95450ee5f88855bdf2ea1fa038839b60c94caf95
This commit is contained in:
parent
fb51dacee8
commit
84ac2dcc7d
2
.gitignore
vendored
2
.gitignore
vendored
@ -231,3 +231,5 @@ samba-3.6.0pre1.tar.gz
|
||||
/samba-4.13.3.tar.asc
|
||||
/samba-4.13.4.tar.xz
|
||||
/samba-4.13.4.tar.asc
|
||||
/samba-4.14.0rc1.tar.xz
|
||||
/samba-4.14.0rc1.tar.asc
|
||||
|
12524
samba-4.13-redhat.patch
12524
samba-4.13-redhat.patch
File diff suppressed because it is too large
Load Diff
72
samba.spec
72
samba.spec
@ -110,13 +110,13 @@
|
||||
|
||||
%global main_release 0
|
||||
|
||||
%global samba_version 4.13.4
|
||||
%global talloc_version 2.3.1
|
||||
%global samba_version 4.14.0
|
||||
%global talloc_version 2.3.2
|
||||
%global tdb_version 1.4.3
|
||||
%global tevent_version 0.10.2
|
||||
%global ldb_version 2.2.0
|
||||
# This should be rc1 or nil
|
||||
%global pre_release %nil
|
||||
%global pre_release rc1
|
||||
|
||||
%global samba_release %{main_release}%{?dist}
|
||||
%if "x%{?pre_release}" != "x"
|
||||
@ -177,11 +177,6 @@ Source14: samba.pamd
|
||||
|
||||
Source201: README.downgrade
|
||||
Patch1: samba-s4u.patch
|
||||
# Backport bug fixes to https://gitlab.com/samba-redhat/samba/-/tree/v4-13-redhat
|
||||
# This will give us CI and makes it easy to generate patchsets.
|
||||
#
|
||||
# Generate the patchset using: git format-patch -l1 --stdout -N > samba-4.13-redhat.patch
|
||||
Patch2: samba-4.13-redhat.patch
|
||||
|
||||
Requires(pre): /usr/sbin/groupadd
|
||||
Requires(post): systemd
|
||||
@ -258,6 +253,7 @@ BuildRequires: perl(Archive::Tar)
|
||||
BuildRequires: perl(Test::More)
|
||||
BuildRequires: popt-devel
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-dns
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: quota-devel
|
||||
BuildRequires: readline-devel
|
||||
@ -324,6 +320,7 @@ BuildRequires: krb5-server >= %{required_mit_krb5}
|
||||
BuildRequires: ldb-tools
|
||||
BuildRequires: python3-gpg
|
||||
BuildRequires: python3-markdown
|
||||
BuildRequires: python3-setproctitle
|
||||
BuildRequires: tdb-tools
|
||||
%endif
|
||||
|
||||
@ -439,6 +436,7 @@ Requires: tdb-tools
|
||||
# samba-tool needs mdb_copy
|
||||
Requires: lmdb
|
||||
Requires: ldb-tools
|
||||
Requires: python3-setproctitle
|
||||
# Force using libldb version to be the same as build version
|
||||
# Otherwise LDB modules will not be loaded and samba-tool will fail
|
||||
# See bug 1507420
|
||||
@ -858,6 +856,7 @@ projects to store temporary data. If an application is already using TDB for
|
||||
temporary data it is very easy to convert that application to be cluster aware
|
||||
and use CTDB instead.
|
||||
|
||||
%if %{with testsuite}
|
||||
### CTDB-TEST
|
||||
%package -n ctdb-tests
|
||||
Summary: CTDB clustered database test suite
|
||||
@ -877,6 +876,9 @@ CTDB is a cluster implementation of the TDB database used by Samba and other
|
||||
projects to store temporary data. If an application is already using TDB for
|
||||
temporary data it is very easy to convert that application to be cluster aware
|
||||
and use CTDB instead.
|
||||
|
||||
#endif with selftest
|
||||
%endif
|
||||
#endif with clustering
|
||||
%endif
|
||||
|
||||
@ -1967,7 +1969,6 @@ fi
|
||||
%{_includedir}/samba-4.0/util/idtree.h
|
||||
%{_includedir}/samba-4.0/util/idtree_random.h
|
||||
%{_includedir}/samba-4.0/util/signal.h
|
||||
%{_includedir}/samba-4.0/util/string_wrappers.h
|
||||
%{_includedir}/samba-4.0/util/substitute.h
|
||||
%{_includedir}/samba-4.0/util/tevent_ntstatus.h
|
||||
%{_includedir}/samba-4.0/util/tevent_unix.h
|
||||
@ -2137,7 +2138,6 @@ fi
|
||||
%{python3_sitearch}/samba/__pycache__/auth_util.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/colour.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/common.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/compat.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/dbchecker.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/descriptor.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/dnsresolver.*.pyc
|
||||
@ -2145,8 +2145,11 @@ fi
|
||||
%{python3_sitearch}/samba/__pycache__/getopt.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/gpclass.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/gp_ext_loader.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/gp_msgs_ext.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/gp_scripts_ext.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/gp_sec_ext.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/gp_smb_conf_ext.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/gp_sudoers_ext.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/graph.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/hostconfig.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/idmap.*.pyc
|
||||
@ -2164,6 +2167,7 @@ fi
|
||||
%{python3_sitearch}/samba/__pycache__/trust_utils.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/upgrade.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/upgradehelpers.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/vgp_sudoers_ext.*.pyc
|
||||
%{python3_sitearch}/samba/__pycache__/xattr.*.pyc
|
||||
%{python3_sitearch}/samba/_glue.*.so
|
||||
%{python3_sitearch}/samba/_ldb.*.so
|
||||
@ -2172,7 +2176,6 @@ fi
|
||||
%{python3_sitearch}/samba/dbchecker.py
|
||||
%{python3_sitearch}/samba/colour.py
|
||||
%{python3_sitearch}/samba/common.py
|
||||
%{python3_sitearch}/samba/compat.py
|
||||
%{python3_sitearch}/samba/credentials.*.so
|
||||
%{python3_sitearch}/samba/crypto.*.so
|
||||
%dir %{python3_sitearch}/samba/dcerpc
|
||||
@ -2245,6 +2248,9 @@ fi
|
||||
%{python3_sitearch}/samba/emulate/traffic.py
|
||||
%{python3_sitearch}/samba/emulate/traffic_packets.py
|
||||
%{python3_sitearch}/samba/gp_ext_loader.py
|
||||
%{python3_sitearch}/samba/gp_msgs_ext.py
|
||||
%{python3_sitearch}/samba/gp_smb_conf_ext.py
|
||||
%{python3_sitearch}/samba/gp_sudoers_ext.py
|
||||
%dir %{python3_sitearch}/samba/gp_parse
|
||||
%{python3_sitearch}/samba/gp_parse/__init__.py
|
||||
%dir %{python3_sitearch}/samba/gp_parse/__pycache__
|
||||
@ -2333,7 +2339,9 @@ fi
|
||||
%{python3_sitearch}/samba/samba3/__init__.py
|
||||
%dir %{python3_sitearch}/samba/samba3/__pycache__
|
||||
%{python3_sitearch}/samba/samba3/__pycache__/__init__.*.pyc
|
||||
%{python3_sitearch}/samba/samba3/libsmb_samba_internal.*.so
|
||||
%{python3_sitearch}/samba/samba3/__pycache__/libsmb_samba_internal.*.pyc
|
||||
%{python3_sitearch}/samba/samba3/libsmb_samba_cwrapper.cpython*.so
|
||||
%{python3_sitearch}/samba/samba3/libsmb_samba_internal.py
|
||||
%{python3_sitearch}/samba/samba3/mdscli.*.so
|
||||
%{python3_sitearch}/samba/samba3/param.*.so
|
||||
%{python3_sitearch}/samba/samba3/passdb.*.so
|
||||
@ -2348,13 +2356,10 @@ fi
|
||||
%{python3_sitearch}/samba/subunit/__pycache__/run.*.pyc
|
||||
%{python3_sitearch}/samba/subunit/run.py
|
||||
%{python3_sitearch}/samba/tdb_util.py
|
||||
%dir %{python3_sitearch}/samba/third_party
|
||||
%{python3_sitearch}/samba/third_party/__init__.py
|
||||
%dir %{python3_sitearch}/samba/third_party/__pycache__
|
||||
%{python3_sitearch}/samba/third_party/__pycache__/__init__.*.pyc
|
||||
%{python3_sitearch}/samba/trust_utils.py
|
||||
%{python3_sitearch}/samba/upgrade.py
|
||||
%{python3_sitearch}/samba/upgradehelpers.py
|
||||
%{python3_sitearch}/samba/vgp_sudoers_ext.py
|
||||
%{python3_sitearch}/samba/werror.*.so
|
||||
%{python3_sitearch}/samba/xattr.py
|
||||
%{python3_sitearch}/samba/xattr_native.*.so
|
||||
@ -2466,6 +2471,7 @@ fi
|
||||
%{python3_sitearch}/samba/tests/__pycache__/complex_expressions.*.pyc
|
||||
%{python3_sitearch}/samba/tests/__pycache__/core.*.pyc
|
||||
%{python3_sitearch}/samba/tests/__pycache__/credentials.*.pyc
|
||||
%{python3_sitearch}/samba/tests/__pycache__/cred_opt.*.pyc
|
||||
%{python3_sitearch}/samba/tests/__pycache__/dckeytab.*.pyc
|
||||
%{python3_sitearch}/samba/tests/__pycache__/dns.*.pyc
|
||||
%{python3_sitearch}/samba/tests/__pycache__/dns_base.*.pyc
|
||||
@ -2539,6 +2545,7 @@ fi
|
||||
%{python3_sitearch}/samba/tests/__pycache__/security.*.pyc
|
||||
%{python3_sitearch}/samba/tests/__pycache__/segfault.*.pyc
|
||||
%{python3_sitearch}/samba/tests/__pycache__/smb.*.pyc
|
||||
%{python3_sitearch}/samba/tests/__pycache__/smb-notify.*.pyc
|
||||
%{python3_sitearch}/samba/tests/__pycache__/smbd_base.*.pyc
|
||||
%{python3_sitearch}/samba/tests/__pycache__/smbd_fuzztest.*.pyc
|
||||
%{python3_sitearch}/samba/tests/__pycache__/source.*.pyc
|
||||
@ -2575,6 +2582,8 @@ fi
|
||||
%{python3_sitearch}/samba/tests/blackbox/__pycache__/samba_dnsupdate.*.pyc
|
||||
%{python3_sitearch}/samba/tests/blackbox/__pycache__/smbcacls.*.pyc
|
||||
%{python3_sitearch}/samba/tests/blackbox/__pycache__/smbcacls_basic.*.pyc
|
||||
%{python3_sitearch}/samba/tests/blackbox/__pycache__/smbcacls_dfs_propagate_inherit.*.pyc
|
||||
%{python3_sitearch}/samba/tests/blackbox/__pycache__/smbcacls_propagate_inhertance.*.pyc
|
||||
%{python3_sitearch}/samba/tests/blackbox/__pycache__/smbcontrol.*.pyc
|
||||
%{python3_sitearch}/samba/tests/blackbox/__pycache__/smbcontrol_process.*.pyc
|
||||
%{python3_sitearch}/samba/tests/blackbox/__pycache__/traffic_learner.*.pyc
|
||||
@ -2589,6 +2598,8 @@ fi
|
||||
%{python3_sitearch}/samba/tests/blackbox/samba_dnsupdate.py
|
||||
%{python3_sitearch}/samba/tests/blackbox/smbcacls.py
|
||||
%{python3_sitearch}/samba/tests/blackbox/smbcacls_basic.py
|
||||
%{python3_sitearch}/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py
|
||||
%{python3_sitearch}/samba/tests/blackbox/smbcacls_propagate_inhertance.py
|
||||
%{python3_sitearch}/samba/tests/blackbox/smbcontrol.py
|
||||
%{python3_sitearch}/samba/tests/blackbox/smbcontrol_process.py
|
||||
%{python3_sitearch}/samba/tests/blackbox/traffic_learner.py
|
||||
@ -2598,6 +2609,7 @@ fi
|
||||
%{python3_sitearch}/samba/tests/complex_expressions.py
|
||||
%{python3_sitearch}/samba/tests/core.py
|
||||
%{python3_sitearch}/samba/tests/credentials.py
|
||||
%{python3_sitearch}/samba/tests/cred_opt.py
|
||||
%dir %{python3_sitearch}/samba/tests/dcerpc
|
||||
%{python3_sitearch}/samba/tests/dcerpc/__init__.py
|
||||
%dir %{python3_sitearch}/samba/tests/dcerpc/__pycache__
|
||||
@ -2689,14 +2701,26 @@ fi
|
||||
%{python3_sitearch}/samba/tests/kcc/ldif_import_export.py
|
||||
%dir %{python3_sitearch}/samba/tests/krb5
|
||||
%dir %{python3_sitearch}/samba/tests/krb5/__pycache__
|
||||
%{python3_sitearch}/samba/tests/krb5/__pycache__/as_canonicalization_tests.*.pyc
|
||||
%{python3_sitearch}/samba/tests/krb5/__pycache__/compatability_tests.*.pyc
|
||||
%{python3_sitearch}/samba/tests/krb5/__pycache__/kcrypto.*.pyc
|
||||
%{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_base_test.*.pyc
|
||||
%{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_tests.*.pyc
|
||||
%{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_tgs_tests.*.pyc
|
||||
%{python3_sitearch}/samba/tests/krb5/__pycache__/raw_testcase.*.pyc
|
||||
%{python3_sitearch}/samba/tests/krb5/__pycache__/rfc4120_constants.*.pyc
|
||||
%{python3_sitearch}/samba/tests/krb5/__pycache__/rfc4120_pyasn1.*.pyc
|
||||
%{python3_sitearch}/samba/tests/krb5/__pycache__/simple_tests.*.pyc
|
||||
%{python3_sitearch}/samba/tests/krb5/__pycache__/s4u_tests.*.pyc
|
||||
%{python3_sitearch}/samba/tests/krb5/__pycache__/xrealm_tests.*.pyc
|
||||
%{python3_sitearch}/samba/tests/krb5/as_canonicalization_tests.py
|
||||
%{python3_sitearch}/samba/tests/krb5/compatability_tests.py
|
||||
%{python3_sitearch}/samba/tests/krb5/kcrypto.py
|
||||
%{python3_sitearch}/samba/tests/krb5/kdc_base_test.py
|
||||
%{python3_sitearch}/samba/tests/krb5/kdc_tests.py
|
||||
%{python3_sitearch}/samba/tests/krb5/kdc_tgs_tests.py
|
||||
%{python3_sitearch}/samba/tests/krb5/raw_testcase.py
|
||||
%{python3_sitearch}/samba/tests/krb5/rfc4120_constants.py
|
||||
%{python3_sitearch}/samba/tests/krb5/rfc4120_pyasn1.py
|
||||
%{python3_sitearch}/samba/tests/krb5/simple_tests.py
|
||||
%{python3_sitearch}/samba/tests/krb5/s4u_tests.py
|
||||
@ -2822,6 +2846,7 @@ fi
|
||||
%{python3_sitearch}/samba/tests/security.py
|
||||
%{python3_sitearch}/samba/tests/segfault.py
|
||||
%{python3_sitearch}/samba/tests/smb.py
|
||||
%{python3_sitearch}/samba/tests/smb-notify.py
|
||||
%{python3_sitearch}/samba/tests/smbd_base.py
|
||||
%{python3_sitearch}/samba/tests/smbd_fuzztest.py
|
||||
%{python3_sitearch}/samba/tests/source.py
|
||||
@ -2890,6 +2915,8 @@ fi
|
||||
%ghost %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
|
||||
%dir %{_libdir}/samba/krb5
|
||||
%{_libdir}/samba/krb5/winbind_krb5_locator.so
|
||||
# correct rpm package?
|
||||
%{_libdir}/samba/krb5/async_dns_krb5_locator.so
|
||||
%{_mandir}/man8/winbind_krb5_locator.8*
|
||||
|
||||
### WINBIND-MODULES
|
||||
@ -2941,11 +2968,10 @@ fi
|
||||
%{_sbindir}/ctdbd
|
||||
%{_sbindir}/ctdbd_wrapper
|
||||
%{_bindir}/ctdb
|
||||
%{_bindir}/ctdb_local_daemons
|
||||
%{_bindir}/ping_pong
|
||||
%{_bindir}/ltdbtool
|
||||
%{_bindir}/ctdb_diagnostics
|
||||
%{_bindir}/ltdbtool
|
||||
%{_bindir}/onnode
|
||||
%{_bindir}/ping_pong
|
||||
|
||||
%dir %{_libexecdir}/ctdb
|
||||
%{_libexecdir}/ctdb/ctdb-config
|
||||
@ -3006,8 +3032,10 @@ fi
|
||||
%{_datadir}/ctdb/events/legacy/70.iscsi.script
|
||||
%{_datadir}/ctdb/events/legacy/91.lvs.script
|
||||
|
||||
%if %{with testsuite}
|
||||
%files -n ctdb-tests
|
||||
%doc ctdb/tests/README
|
||||
%{_bindir}/ctdb_local_daemons
|
||||
%{_bindir}/ctdb_run_tests
|
||||
%{_bindir}/ctdb_run_cluster_tests
|
||||
|
||||
@ -3145,7 +3173,6 @@ fi
|
||||
%{_datadir}/ctdb/tests/INTEGRATION/simple/basics.005.process_exists.sh
|
||||
%{_datadir}/ctdb/tests/INTEGRATION/simple/basics.010.statistics.sh
|
||||
%{_datadir}/ctdb/tests/INTEGRATION/simple/basics.011.statistics_reset.sh
|
||||
%{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.001.isnotrecmaster.sh
|
||||
%{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.002.recmaster_yield.sh
|
||||
%{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.010.getrelock.sh
|
||||
%{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.012.reclock_command.sh
|
||||
@ -3786,6 +3813,8 @@ fi
|
||||
%{_datadir}/ctdb/tests/UNIT/tool/README
|
||||
%dir %{_datadir}/ctdb/tests/UNIT/tool/scripts
|
||||
%{_datadir}/ctdb/tests/UNIT/tool/scripts/local.sh
|
||||
#endif with selftest
|
||||
%endif
|
||||
|
||||
#endif with clustering
|
||||
%endif
|
||||
@ -3798,6 +3827,9 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jan 27 2021 Guenther Deschner <gdeschner@redhat.com> - 4.14.0rc1-0
|
||||
- Update to Samba 4.14.0rc1
|
||||
|
||||
* Tue Jan 26 2021 Guenther Deschner <gdeschner@redhat.com> - 4.13.4-0
|
||||
- Update to Samba 4.13.4
|
||||
|
||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (samba-4.13.4.tar.xz) = c6fb8b4186da25c69d1bc662780a12c6fa6fa70fc65fa487dba2d547c96e8f7f8f8736b8edc2564b599be875b00d891631fa37838632efac593bf83eb33392f9
|
||||
SHA512 (samba-4.13.4.tar.asc) = b8c0ccd7e716d2de6e9da2a53577bc31983eaec4ed4583bb88b52b2ca8b80045c8c0349a97a12e796df84a5942293f5a40e74eff8c003b3062f8f6454dc2a631
|
||||
SHA512 (samba-4.14.0rc1.tar.xz) = 1ae0401be3fbad6f46b3216649b7c00671136554bfa672fd01f5027ca3babb4fb7019863414fd7a49d443b8f5a913d4fb645ccf8df2d1aceb7214323ea66f87b
|
||||
SHA512 (samba-4.14.0rc1.tar.asc) = f876da3c00418ec2b612b52354a8bfd1544984d5dd69752f18ec78d0b30243ea6c6c976b6ece3988094a986cf8568f440b63eacaee4d8a1e60039d899d21bff3
|
||||
|
Loading…
Reference in New Issue
Block a user