开源软件构建与测试

_service:tar_scm:samba.spec Changed

@@ -1,11 +1,12 @@
 %bcond_with testsuite
 %bcond_without clustering
+%{?python3_sitearch: %global python3_sitearch %{python3_sitearch}}
 
 %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 talloc_version 2.4.0
-%global tdb_version 1.4.8
-%global tevent_version 0.14.1
-%global ldb_version 2.7.2
+%global talloc_version 2.4.1
+%global tdb_version 1.4.9
+%global tevent_version 0.15.0
+%global ldb_version 2.8.0
 
 %undefine _strict_symbol_defs_build
 
@@ -49,8 +50,8 @@
 %global samba_depver %{version}-%{release}
 
 Name:           samba
-Version:        4.18.5
-Release:        1
+Version:        4.19.3
+Release:        3
 
 Summary:        A suite for Linux to interoperate with Windows
 License:        GPL-3.0-or-later AND LGPL-3.0-or-later
@@ -68,6 +69,9 @@
 
 Source201:      README.downgrade
 
+Patch1:         remove-sensitive-info.patch
+
+
 BuildRequires: avahi-devel bison dbus-devel docbook-style-xsl e2fsprogs-devel flex gawk gnupg2 gnutls-devel >= 3.4.7 gpgme-devel
 BuildRequires: jansson-devel krb5-devel >= %{required_mit_krb5} libacl-devel libaio-devel libarchive-devel libattr-devel 
 BuildRequires: libcap-devel libicu-devel libcmocka-devel libtirpc-devel libuuid-devel libxslt lmdb ncurses-devel openldap-devel
@@ -105,7 +109,7 @@
 BuildRequires: libldb-devel >= %{ldb_version} python3-ldb-devel >= %{ldb_version}
 
 %if %{with testsuite} || %{with_dc}
-BuildRequires: ldb-tools tdb-tools python3-dateutil python3-gpg python3-markdown
+BuildRequires: ldb-tools tdb-tools python3-dateutil python3-gpgme python3-markdown
 %endif
 
 %if %{with_vfs_io_uring}
@@ -215,6 +219,16 @@
 %description common-tools
 This package contains some tools for %{name} server and client.
 
+%package tools
+Summary:        Tools for Samba servers
+Requires:       python3-%{name} = %{samba_depver} python3-%{name}-dc = %{samba_depver}
+%if %{with dc}
+Requires:       lmdb tdb-tools python3-gpgme
+%endif
+
+%description tools
+The samba-tools package contains tools for Samba servers and for GPO management 
+on domain members.
 
 %package dc
 Summary:        Domain Controller package for %{name}
@@ -396,6 +410,7 @@
 Summary:        The Samba Python libraries for Samba AD
 Requires:       python3-%{name} = %{samba_depver}
 Requires:       %{name}-dc-libs = %{samba_depver}
+Requires: 	python3-markdown
 
 %description -n python3-samba-dc
 This contains the Python libraries needed by programs
@@ -827,7 +842,6 @@
 chrpath -d %{buildroot}%{_libexecdir}/%{name}/rpcd_fsrvp
 chrpath -d %{buildroot}%{_libexecdir}/%{name}/rpcd_lsad
 chrpath -d %{buildroot}%{_libexecdir}/%{name}/rpcd_mdssvc
-chrpath -d %{buildroot}%{_libexecdir}/%{name}/rpcd_rpcecho
 chrpath -d %{buildroot}%{_libexecdir}/%{name}/rpcd_spoolss
 chrpath -d %{buildroot}%{_libexecdir}/%{name}/rpcd_winreg
 
@@ -836,51 +850,7 @@
 
 %if ! %with_dc
 for i in \
-    %{_libdir}/samba/libdfs-server-ad-samba4.so \
-    %{_libdir}/samba/libdsdb-garbage-collect-tombstones-samba4.so \
-    %{_libdir}/samba/libscavenge-dns-records-samba4.so \
     %{_unitdir}/samba.service \
-    %{python3_sitearch}/samba/dcerpc/dnsserver.*.so \
-    %{python3_sitearch}/samba/dnsserver.py \
-    %{python3_sitearch}/samba/domain_update.py \
-    %{python3_sitearch}/samba/forest_update.py \
-    %{python3_sitearch}/samba/kcc/__init__.py \
-    %{python3_sitearch}/samba/kcc/debug.py \
-    %{python3_sitearch}/samba/kcc/graph.py \
-    %{python3_sitearch}/samba/kcc/graph_utils.py \
-    %{python3_sitearch}/samba/kcc/kcc_utils.py \
-    %{python3_sitearch}/samba/kcc/ldif_import_export.py \
-    %{python3_sitearch}/samba/kcc/__pycache__/__init__.*.pyc \
-    %{python3_sitearch}/samba/kcc/__pycache__/debug.*.pyc \
-    %{python3_sitearch}/samba/kcc/__pycache__/graph.*.pyc \
-    %{python3_sitearch}/samba/kcc/__pycache__/graph_utils.*.pyc \
-    %{python3_sitearch}/samba/kcc/__pycache__/kcc_utils.*.pyc \
-    %{python3_sitearch}/samba/kcc/__pycache__/ldif_import_export.*.pyc \
-    %{python3_sitearch}/samba/ms_forest_updates_markdown.py \
-    %{python3_sitearch}/samba/ms_schema_markdown.py \
-    %{python3_sitearch}/samba/provision/__init__.py \
-    %{python3_sitearch}/samba/provision/backend.py \
-    %{python3_sitearch}/samba/provision/common.py \
-    %{python3_sitearch}/samba/provision/kerberos_implementation.py \
-    %{python3_sitearch}/samba/provision/kerberos.py \
-    %{python3_sitearch}/samba/provision/sambadns.py \
-    %{python3_sitearch}/samba/provision/__pycache__/__init__.*.pyc \
-    %{python3_sitearch}/samba/provision/__pycache__/backend.*.pyc \
-    %{python3_sitearch}/samba/provision/__pycache__/common.*.pyc \
-    %{python3_sitearch}/samba/provision/__pycache__/kerberos_implementation.*.pyc \
-    %{python3_sitearch}/samba/provision/__pycache__/kerberos.*.pyc \
-    %{python3_sitearch}/samba/provision/__pycache__/sambadns.*.pyc \
-    %{python3_sitearch}/samba/__pycache__/domain_update.*.pyc \
-    %{python3_sitearch}/samba/__pycache__/forest_update.*.pyc \
-    %{python3_sitearch}/samba/__pycache__/ms_forest_updates_markdown.*.pyc \
-    %{python3_sitearch}/samba/__pycache__/ms_schema_markdown.*.pyc \
-    %{python3_sitearch}/samba/__pycache__/remove_dc.*.pyc \
-    %{python3_sitearch}/samba/__pycache__/schema.*.pyc \
-    %{python3_sitearch}/samba/__pycache__/uptodateness.*.pyc \
-    %{python3_sitearch}/samba/remove_dc.py \
-    %{python3_sitearch}/samba/samdb.py \
-    %{python3_sitearch}/samba/schema.py \
-    %{python3_sitearch}/samba/uptodateness.py \
     %{_sbindir}/samba-gpupdate \
     ; do
     rm -f %{buildroot}$i
@@ -934,7 +904,7 @@
 %systemd_preun smb.service
 %systemd_preun nmb.service
 
-%postun
+%posttrans
 %systemd_postun_with_restart smb.service
 %systemd_postun_with_restart nmb.service
 /sbin/ldconfig
@@ -1161,7 +1131,9 @@
 %{_libexecdir}/samba/rpcd_fsrvp
 %{_libexecdir}/samba/rpcd_lsad
 %{_libexecdir}/samba/rpcd_mdssvc
+%if %{with testsuite}
 %{_libexecdir}/samba/rpcd_rpcecho
+%endif
 %{_libexecdir}/samba/rpcd_spoolss
 %{_libexecdir}/samba/rpcd_winreg
 %dir %{_datadir}/samba
@@ -1365,12 +1337,15 @@
 %{_bindir}/net
 %{_bindir}/pdbedit
 %{_bindir}/profiles
-%{_bindir}/samba-tool
+%{_bindir}/samba-log-parser
 %{_bindir}/smbcontrol
 %{_bindir}/smbpasswd
 %{_bindir}/testparm
 %config(noreplace) /etc/ld.so.conf.d/*
 
+%files tools
+%{_bindir}/samba-tool
+
 %if %{with_dc}
 %files dc
 %{_unitdir}/samba.service
@@ -1469,6 +1444,8 @@
 %{_libdir}/samba/service/winbindd.so
 %{_libdir}/samba/service/wrepl.so
 %{_libdir}/libdcerpc-server.so.*
+%{_libdir}/samba/libad-claims-samba4.so
+%{_libdir}/samba/libauthn-policy-util-samba4.so
 %{_libdir}/samba/libdsdb-module-samba4.so
 %{_libdir}/samba/libdsdb-garbage-collect-tombstones-samba4.so
 %{_libdir}/samba/libscavenge-dns-records-samba4.so
@@ -1708,6 +1685,7 @@
 %{python3_sitearch}/samba/__pycache__/descriptor.*.pyc
 %{python3_sitearch}/samba/__pycache__/dnsresolver.*.pyc
 %{python3_sitearch}/samba/__pycache__/drs_utils.*.pyc
+%{python3_sitearch}/samba/__pycache__/functional_level.*.pyc
 %{python3_sitearch}/samba/__pycache__/getopt.*.pyc
 %{python3_sitearch}/samba/__pycache__/graph.*.pyc
 %{python3_sitearch}/samba/__pycache__/hostconfig.*.pyc
@@ -1719,6 +1697,7 @@
 %{python3_sitearch}/samba/__pycache__/ms_schema.*.pyc
 %{python3_sitearch}/samba/__pycache__/ndr.*.pyc
 %{python3_sitearch}/samba/__pycache__/ntacls.*.pyc
+%{python3_sitearch}/samba/__pycache__/policies.*.pyc
 %{python3_sitearch}/samba/__pycache__/safe_tarfile.*.pyc
 %{python3_sitearch}/samba/__pycache__/sd_utils.*.pyc
 %{python3_sitearch}/samba/__pycache__/sites.*.pyc
@@ -1788,6 +1767,7 @@
 %{python3_sitearch}/samba/drs_utils.py
 %{python3_sitearch}/samba/dsdb.*.so            
 %{python3_sitearch}/samba/dsdb_dns.*.so
+%{python3_sitearch}/samba/functional_level.py
 %{python3_sitearch}/samba/gensec.*.so
 %{python3_sitearch}/samba/getopt.py

_service:tar_scm:remove-sensitive-info.patch Added

@@ -0,0 +1,144 @@
+From 54e951d6795bad1f0451ea2e03403e791df3856a Mon Sep 17 00:00:00 2001
+From: zhouyihang <zhouyihang3@huawei.com>
+Date: Fri, 25 Dec 2020 00:11:23 +0800
+Subject: PATCH remove sensitive info
+
+Conflict: NA
+Reference: NA
+
+---
+ source3/lib/netapi/examples/share/share_enum.c    | 1 -
+ source3/lib/netapi/examples/share/share_getinfo.c | 1 -
+ source3/lib/netapi/examples/user/user_getinfo.c   | 3 ---
+ source3/rpcclient/cmd_lsarpc.c                    | 3 ---
+ source3/rpcclient/cmd_srvsvc.c                    | 2 --
+ source3/utils/net_rpc.c                           | 1 -
+ source4/scripting/bin/samba3dump                  | 2 --
+ source4/torture/shell.c                           | 1 -
+ 8 files changed, 14 deletions(-)
+
+diff --git a/source3/lib/netapi/examples/share/share_enum.c b/source3/lib/netapi/examples/share/share_enum.c
+index b1f4043..ee69d60 100644
+--- a/source3/lib/netapi/examples/share/share_enum.c
++++ b/source3/lib/netapi/examples/share/share_enum.c
+@@ -118,7 +118,6 @@ int main(int argc, const char **argv)
+ 						printf("#%d max users: %d\n", i, i2->shi2_max_uses);
+ 						printf("#%d current users: %d\n", i, i2->shi2_current_uses);
+ 						printf("#%d path: %s\n", i, i2->shi2_path);
+-						printf("#%d password: %s\n", i, i2->shi2_passwd);
+ 						i2++;
+ 						break;
+ 					default:
+diff --git a/source3/lib/netapi/examples/share/share_getinfo.c b/source3/lib/netapi/examples/share/share_getinfo.c
+index 479da5c..3ef7825 100644
+--- a/source3/lib/netapi/examples/share/share_getinfo.c
++++ b/source3/lib/netapi/examples/share/share_getinfo.c
+@@ -128,7 +128,6 @@ int main(int argc, const char **argv)
+ 			printf("max users: %d\n", i2->shi2_max_uses);
+ 			printf("current users: %d\n", i2->shi2_current_uses);
+ 			printf("path: %s\n", i2->shi2_path);
+-			printf("password: %s\n", i2->shi2_passwd);
+ 			break;
+ 		case 501:
+ 			printf("netname: %s\n", i501->shi501_netname);
+diff --git a/source3/lib/netapi/examples/user/user_getinfo.c b/source3/lib/netapi/examples/user/user_getinfo.c
+index 9e95260..154aa7d 100644
+--- a/source3/lib/netapi/examples/user/user_getinfo.c
++++ b/source3/lib/netapi/examples/user/user_getinfo.c
+@@ -104,7 +104,6 @@ int main(int argc, const char **argv)
+ 		case 1:
+ 			u1 = (struct USER_INFO_1 *)buffer;
+ 			printf("name: %s\n", u1->usri1_name);
+-			printf("password: %s\n", u1->usri1_password);
+ 			printf("password_age: %d\n", u1->usri1_password_age);
+ 			printf("priv: %d\n", u1->usri1_priv);
+ 			printf("homedir: %s\n", u1->usri1_home_dir);
+@@ -115,7 +114,6 @@ int main(int argc, const char **argv)
+ 		case 2:
+ 			u2 = (struct USER_INFO_2 *)buffer;
+ 			printf("name: %s\n", u2->usri2_name);
+-			printf("password: %s\n", u2->usri2_password);
+ 			printf("password_age: %d\n", u2->usri2_password_age);
+ 			printf("priv: %d\n", u2->usri2_priv);
+ 			printf("homedir: %s\n", u2->usri2_home_dir);
+@@ -187,7 +185,6 @@ int main(int argc, const char **argv)
+ 		case 4:
+ 			u4 = (struct USER_INFO_4 *)buffer;
+ 			printf("name: %s\n", u4->usri4_name);
+-			printf("password: %s\n", u4->usri4_password);
+ 			printf("password_age: %d\n", u4->usri4_password_age);
+ 			printf("priv: %d\n", u4->usri4_priv);
+ 			printf("homedir: %s\n", u4->usri4_home_dir);
+diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
+index abb4543..81baece 100644
+--- a/source3/rpcclient/cmd_lsarpc.c
++++ b/source3/rpcclient/cmd_lsarpc.c
+@@ -1289,9 +1289,6 @@ static void display_trust_dom_info_4(struct lsa_TrustDomainInfoPassword *p,
+ 	pwd 	= sess_decrypt_string(talloc_tos(), &data, &session_key);
+ 	pwd_old = sess_decrypt_string(talloc_tos(), &data_old, &session_key);
+ 
+-	d_printf("Password:\t%s\n", pwd);
+-	d_printf("Old Password:\t%s\n", pwd_old);
+-
+ 	talloc_free(pwd);
+ 	talloc_free(pwd_old);
+ }
+diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c
+index 9c00060..b107741 100644
+--- a/source3/rpcclient/cmd_srvsvc.c
++++ b/source3/rpcclient/cmd_srvsvc.c
+@@ -233,7 +233,6 @@ static void display_share_info_2(struct srvsvc_NetShareInfo2 *r)
+ 	printf("netname: %s\n", r->name);
+ 	printf("\tremark:\t%s\n", r->comment);
+ 	printf("\tpath:\t%s\n", r->path);
+-	printf("\tpassword:\t%s\n", r->password);
+ }
+ 
+ static void display_share_info_502(struct srvsvc_NetShareInfo502 *r)
+@@ -241,7 +240,6 @@ static void display_share_info_502(struct srvsvc_NetShareInfo502 *r)
+ 	printf("netname: %s\n", r->name);
+ 	printf("\tremark:\t%s\n", r->comment);
+ 	printf("\tpath:\t%s\n", r->path);
+-	printf("\tpassword:\t%s\n", r->password);
+ 
+ 	printf("\ttype:\t0x%x\n", r->type);
+ 	printf("\tperms:\t%d\n", r->permissions);
+diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
+index a56190f..28a1808 100644
+--- a/source3/utils/net_rpc.c
++++ b/source3/utils/net_rpc.c
+@@ -5582,7 +5582,6 @@ static NTSTATUS rpc_sh_share_info(struct net_context *c,
+ 	d_printf(_("Name:     %s\n"), info.info2->name);
+ 	d_printf(_("Comment:  %s\n"), info.info2->comment);
+ 	d_printf(_("Path:     %s\n"), info.info2->path);
+-	d_printf(_("Password: %s\n"), info.info2->password);
+ 
+  done:
+ 	return werror_to_ntstatus(result);
+diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
+index 1a5d74f..4b311c2 100755
+--- a/source4/scripting/bin/samba3dump
++++ b/source4/scripting/bin/samba3dump
+@@ -70,8 +70,6 @@ def print_samba3_secrets(secrets):
+         print("IPC Credentials:")
+         if secrets.get_auth_user():
+             print("    User: %s\n" % secrets.get_auth_user())
+-        if secrets.get_auth_password():
+-            print("    Password: %s\n" % secrets.get_auth_password())
+         if secrets.get_auth_domain():
+             print("    Domain: %s\n" % secrets.get_auth_domain())
+ 
+diff --git a/source4/torture/shell.c b/source4/torture/shell.c
+index 195149a..f63694a 100644
+--- a/source4/torture/shell.c
++++ b/source4/torture/shell.c
+@@ -240,7 +240,6 @@ static void shell_auth(const struct shell_command * command,
+ 	    printf("User Principal: %s\n", principal ? principal : "");
+ 	    printf("Domain: %s\n", domain ? domain : "");
+ 	    printf("Realm: %s\n", realm ? realm : "");
+-	    printf("Password: %s\n", password ? password : "");
+     } else if (argc == 2) {
+ 	    bool result;
+ 
+-- 
+2.23.0
\ No newline at end of file

_service Changed

_service:tar_scm:samba-4.18.5.tar.asc Deleted

_service:tar_scm:samba-4.19.3.tar.asc Added

_service:tar_scm:samba-4.18.5.tar.gz -> _service:tar_scm:samba-4.19.3.tar.gz Changed

Changes of Revision 3