From 5a4cd443c96e41b432e06271db5024dbbb28b80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Thu, 12 Jul 2018 12:43:59 +0200 Subject: [PATCH] Update to Samba 4.9.0rc1 Guenther --- .gitignore | 2 + samba-4.8.3-fix_krb5_plugins.patch | 270 --------------- samba-4.9.0-test_tldap.patch | 29 ++ samba.spec | 513 +++++++++++++++++++++-------- sources | 4 +- 5 files changed, 403 insertions(+), 415 deletions(-) delete mode 100644 samba-4.8.3-fix_krb5_plugins.patch create mode 100644 samba-4.9.0-test_tldap.patch diff --git a/.gitignore b/.gitignore index d1ca2ab..5c83d28 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,5 @@ samba-3.6.0pre1.tar.gz /samba-4.8.2.tar.asc /samba-4.8.3.tar.asc /samba-4.8.3.tar.xz +/samba-4.9.0rc1.tar.xz +/samba-4.9.0rc1.tar.asc diff --git a/samba-4.8.3-fix_krb5_plugins.patch b/samba-4.8.3-fix_krb5_plugins.patch deleted file mode 100644 index 86aeadb..0000000 --- a/samba-4.8.3-fix_krb5_plugins.patch +++ /dev/null @@ -1,270 +0,0 @@ -From 341da4f38809d0efaa282d5281ee69c62a826f9a Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Wed, 27 Jun 2018 14:06:39 +0200 -Subject: [PATCH 1/4] krb5_plugin: Install plugins to krb5 modules dir - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=13489 - -Signed-off-by: Andreas Schneider -Reviewed-by: Alexander Bokovoy ---- - nsswitch/wscript_build | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build -index 15e93db2f05..576855bb56c 100644 ---- a/nsswitch/wscript_build -+++ b/nsswitch/wscript_build -@@ -105,16 +105,18 @@ if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'): - ) - - if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'): -- bld.SAMBA_LIBRARY('winbind_krb5_locator', -- source='winbind_krb5_locator.c', -- deps='wbclient krb5 com_err', -- realname='winbind_krb5_locator.so') -+ bld.SAMBA_LIBRARY('winbind_krb5_locator', -+ source='winbind_krb5_locator.c', -+ deps='wbclient krb5 com_err', -+ realname='winbind_krb5_locator.so', -+ install_path='${MODULESDIR}/krb5') - - if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'): - bld.SAMBA_LIBRARY('winbind_krb5_localauth', - source='krb5_plugin/winbind_krb5_localauth.c', - deps='wbclient krb5 com_err', -- realname='winbind-krb5-localauth.so') -+ realname='winbind_krb5_localauth.so', -+ install_path='${MODULESDIR}/krb5') - - bld.SAMBA_SUBSYSTEM('WB_REQTRANS', - source='wb_reqtrans.c', --- -2.17.1 - - -From a1e9527b207b4bb045012cf78649362b42351313 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Wed, 27 Jun 2018 14:08:56 +0200 -Subject: [PATCH 2/4] krb5_plugin: Move krb5 locator plugin to krb5_plugin - subdir - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=13489 - -Signed-off-by: Andreas Schneider -Reviewed-by: Alexander Bokovoy ---- - nsswitch/{ => krb5_plugin}/winbind_krb5_locator.c | 0 - nsswitch/wscript_build | 2 +- - 2 files changed, 1 insertion(+), 1 deletion(-) - rename nsswitch/{ => krb5_plugin}/winbind_krb5_locator.c (100%) - -diff --git a/nsswitch/winbind_krb5_locator.c b/nsswitch/krb5_plugin/winbind_krb5_locator.c -similarity index 100% -rename from nsswitch/winbind_krb5_locator.c -rename to nsswitch/krb5_plugin/winbind_krb5_locator.c -diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build -index 576855bb56c..dd1952b799b 100644 ---- a/nsswitch/wscript_build -+++ b/nsswitch/wscript_build -@@ -106,7 +106,7 @@ if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'): - - if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'): - bld.SAMBA_LIBRARY('winbind_krb5_locator', -- source='winbind_krb5_locator.c', -+ source='krb5_plugin/winbind_krb5_locator.c', - deps='wbclient krb5 com_err', - realname='winbind_krb5_locator.so', - install_path='${MODULESDIR}/krb5') --- -2.17.1 - - -From b0fa360161aba9aa092bf4ecf0533a49d621a068 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Wed, 27 Jun 2018 15:14:15 +0200 -Subject: [PATCH 3/4] docs: Move winbind_krb5_locator manpage to volume 8 - -The vfs and idmap manpages are in volume 8 too. - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=13489 - -Signed-off-by: Andreas Schneider -Reviewed-by: Alexander Bokovoy ---- - ...inbind_krb5_locator.7.xml => winbind_krb5_locator.8.xml} | 6 +++--- - docs-xml/wscript_build | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - rename docs-xml/manpages/{winbind_krb5_locator.7.xml => winbind_krb5_locator.8.xml} (96%) - -diff --git a/docs-xml/manpages/winbind_krb5_locator.7.xml b/docs-xml/manpages/winbind_krb5_locator.8.xml -similarity index 96% -rename from docs-xml/manpages/winbind_krb5_locator.7.xml -rename to docs-xml/manpages/winbind_krb5_locator.8.xml -index 17e401a9da0..0af0c2cc95f 100644 ---- a/docs-xml/manpages/winbind_krb5_locator.7.xml -+++ b/docs-xml/manpages/winbind_krb5_locator.8.xml -@@ -1,12 +1,12 @@ - - -- -+ - - - winbind_krb5_locator -- 7 -+ 8 - Samba -- 7 -+ 8 - &doc.version; - - -diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build -index 954c62a29bc..2d686eb38b0 100644 ---- a/docs-xml/wscript_build -+++ b/docs-xml/wscript_build -@@ -103,7 +103,7 @@ pam_winbind_manpages = ''' - manpages/pam_winbind.conf.5 - ''' - --krb5_locator_manpages = 'manpages/winbind_krb5_locator.7' -+krb5_locator_manpages = 'manpages/winbind_krb5_locator.8' - - def smbdotconf_generate_parameter_list(task): - parameter_all = task.outputs[0].bldpath(task.env) --- -2.17.1 - - -From d16a8b65af5de19c1ccbb95e3542d01f77696be3 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Wed, 27 Jun 2018 15:06:07 +0200 -Subject: [PATCH 4/4] docs: Add manpage for winbind_krb5_localauth.8 - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=13489 - -Signed-off-by: Andreas Schneider -Reviewed-by: Alexander Bokovoy ---- - .../manpages/winbind_krb5_localauth.8.xml | 86 +++++++++++++++++++ - docs-xml/wscript_build | 4 + - 2 files changed, 90 insertions(+) - create mode 100644 docs-xml/manpages/winbind_krb5_localauth.8.xml - -diff --git a/docs-xml/manpages/winbind_krb5_localauth.8.xml b/docs-xml/manpages/winbind_krb5_localauth.8.xml -new file mode 100644 -index 00000000000..a382e71ead3 ---- /dev/null -+++ b/docs-xml/manpages/winbind_krb5_localauth.8.xml -@@ -0,0 +1,86 @@ -+ -+ -+ -+ -+ -+ winbind_krb5_localauth -+ 8 -+ Samba -+ 8 -+ &doc.version; -+ -+ -+ -+ -+ winbind_krb5_localauth -+ A plugin for MIT Kerberos for mapping user accounts. -+ -+ -+ -+ -+ DESCRIPTION -+ -+ -+ This plugin is part of the -+ samba -+ 7 suite. -+ -+ -+ -+ winbind_krb5_localauth is a plugin that -+ permits the MIT Kerberos libraries that Kerberos principals can -+ be validated against local user accounts. -+ -+ -+ -+ PREREQUISITES -+ -+ MIT Kerberos (at least version 1.12) is required. -+ -+ -+ -+ The plugin queries the winbindd -+ 8 daemon which needs to be configured -+ and started separately. -+ -+ -+ -+ The following sections needs to be added to the -+ krb5.conf file. -+ -+ -+[plugins] -+ localauth = { -+ module = winbind:/usr/lib64/samba/krb5/winbind_krb5_localauth.so -+ enable_only = winbind -+ } -+ -+ -+ -+ -+ -+ VERSION -+ -+ -+ This man page is part of version &doc.version; of the Samba -+ suite. -+ -+ -+ -+ -+ AUTHOR -+ -+ -+ The original Samba software and related utilities were created -+ by Andrew Tridgell. Samba is now developed by the Samba Team as -+ an Open Source project similar to the way the Linux kernel is -+ developed. -+ -+ -+ -+ The winbind_krb5_localauth manpage was written by Andreas -+ Schneider. -+ -+ -+ -+ -diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build -index 2d686eb38b0..ec5d28fc62a 100644 ---- a/docs-xml/wscript_build -+++ b/docs-xml/wscript_build -@@ -104,6 +104,7 @@ pam_winbind_manpages = ''' - ''' - - krb5_locator_manpages = 'manpages/winbind_krb5_locator.8' -+krb5_localauth_manpages = 'manpages/winbind_krb5_localauth.8' - - def smbdotconf_generate_parameter_list(task): - parameter_all = task.outputs[0].bldpath(task.env) -@@ -162,5 +163,8 @@ if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']): - if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'): - bld.SAMBAMANPAGES(krb5_locator_manpages) - -+ if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'): -+ bld.SAMBAMANPAGES(krb5_localauth_manpages) -+ - if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'): - bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8') --- -2.17.1 - diff --git a/samba-4.9.0-test_tldap.patch b/samba-4.9.0-test_tldap.patch new file mode 100644 index 0000000..5dba368 --- /dev/null +++ b/samba-4.9.0-test_tldap.patch @@ -0,0 +1,29 @@ +From 7c19caf31cd139ded15f634de20d95589253c49e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 12 Jul 2018 23:32:36 +0200 +Subject: [PATCH] s3-tldap: do not install test_tldap + +Guenther + +Signed-off-by: Guenther Deschner +--- + source3/wscript_build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/source3/wscript_build b/source3/wscript_build +index 03d5724ee11..becaffe61c4 100644 +--- a/source3/wscript_build ++++ b/source3/wscript_build +@@ -114,7 +114,8 @@ bld.SAMBA3_BINARY('test_tldap', + samba3util + smbconf + cmocka +- ''') ++ ''', ++ install=False) + + # libpdb.so should not expose internal symbols that are only usable + # to the statically linked modules that are merged into libpdb. +-- +2.17.1 + diff --git a/samba.spec b/samba.spec index 05962dd..8a9413a 100644 --- a/samba.spec +++ b/samba.spec @@ -6,15 +6,15 @@ # ctdb is enabled by default, you can disable it with: --without clustering %bcond_without clustering -%define main_release 4.1 +%define main_release 0 -%define samba_version 4.8.3 -%define talloc_version 2.1.11 -%define tdb_version 1.3.15 -%define tevent_version 0.9.36 -%define ldb_version 1.3.3 +%define samba_version 4.9.0 +%define talloc_version 2.1.14 +%define tdb_version 1.3.16 +%define tevent_version 0.9.37 +%define ldb_version 1.4.1 # This should be rc1 or nil -%define pre_release %nil +%define pre_release rc1 %if "x%{?pre_release}" != "x" %define samba_release 0.%{main_release}.%{pre_release}%{?dist} @@ -122,7 +122,7 @@ Source14: samba.pamd Source200: README.dc Source201: README.downgrade -Patch0: samba-4.8.3-fix_krb5_plugins.patch +Patch0: samba-4.9.0-test_tldap.patch Patch1: samba-4.8.3-vscript.local.patch Requires(pre): /usr/sbin/groupadd @@ -168,6 +168,8 @@ BuildRequires: docbook-style-xsl BuildRequires: e2fsprogs-devel BuildRequires: gawk BuildRequires: gnupg2 +BuildRequires: gpgme-devel +BuildRequires: jansson-devel BuildRequires: krb5-devel >= %{required_mit_krb5} BuildRequires: libacl-devel BuildRequires: libaio-devel @@ -903,62 +905,8 @@ done # (needs to be done after install; before that the py2 and py3 versions # are the same) filenames=$(echo " - dbchecker.py - drs_utils.py - join.py - kcc/__init__.py - kcc/graph_utils.py - kcc/kcc_utils.py - kcc/ldif_import_export.py - ms_display_specifiers.py - ms_schema.py - netcmd/__init__.py - netcmd/common.py - netcmd/delegation.py - netcmd/dns.py - netcmd/domain.py - netcmd/drs.py - netcmd/fsmo.py - netcmd/gpo.py - netcmd/group.py - netcmd/ldapcmp.py - netcmd/ntacl.py - netcmd/rodc.py - netcmd/sites.py - netcmd/testparm.py - netcmd/user.py - ntacls.py - provision/__init__.py - provision/backend.py - provision/sambadns.py - remove_dc.py - sites.py - subnets.py - tests/auth_log.py - tests/auth_log_base.py - tests/auth_log_pass_change.py - tests/blackbox/ndrdump.py - tests/dcerpc/array.py - tests/dcerpc/dnsserver.py tests/dcerpc/integer.py - tests/dcerpc/sam.py - tests/dcerpc/testrpc.py tests/dcerpc/unix.py - tests/dns.py - tests/dns_base.py - tests/dns_forwarder.py - tests/dns_forwarder_helpers/server.py - tests/docs.py - tests/netcmd.py - tests/posixacl.py - tests/samba3.py - tests/samba3sam.py - tests/samba_tool/dnscmd.py - tests/samba_tool/fsmo.py - tests/source.py - upgrade.py - upgradehelpers.py - web_server/__init__.py ") for file in $filenames; do filename="%{buildroot}/%{python3_sitearch}/samba/$file" @@ -1034,11 +982,11 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig install -m 0644 packaging/systemd/samba.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/samba %if %with_clustering_support cat > %{buildroot}%{_sysconfdir}/sysconfig/ctdb < - 4.9.0rc1-0 +- Update to Samba 4.9.0rc1 + * Thu Jul 12 2018 Alexander Bokovoy - 2:4.8.3-4.1 - Scope to local __bss_start symbol (typo in a patch) - Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1600035 diff --git a/sources b/sources index 4a33842..06a4e8e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.8.3.tar.asc) = bd56dd9e811b91abc98e0b7e09960a3fd4a988b3481af88193573b2582db035c46f5a8c803f8ffbcc4b6c85050e0b021e549512b807dcf6086e0322de8e920c5 -SHA512 (samba-4.8.3.tar.xz) = 0df56bebf00e2a3b54e5012d0888a637c1ff5d10f47907b15162cc786f6a2a4d77f78aa142c7ab532536110c0aee14ff662f0f23fe2e24bf3cfb169325c5a249 +SHA512 (samba-4.9.0rc1.tar.xz) = 544280a38912dd6f3c0fff6258ed1cdfba79b5cfd3c6d6cd250238af9527bf50f37a8357083d3abd68cffde20b8efe4c61924305f6bba80814f5fafe441c91e9 +SHA512 (samba-4.9.0rc1.tar.asc) = 86f213e80964fd798456c7909135acd7b1cabb1b9b8a1587e03df70d870a0ff603ec4ef0f2dbec4e77ecc14ca5a8b1ce733e940e6cd16b97c22fa2851d9eef84