From a8653bd01599ea8ce33acc86a6d6d61d16f2c421e86f4e3c44963a828f53dfbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sat, 31 Aug 2013 23:14:24 +0000 Subject: [PATCH 1/4] Move optinal passdb_backend_defaults_smbpasswd patch to the end of the series file OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=334 --- patches.tar.bz2 | 4 ++-- samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index b7264a1..d377333 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5d899a9e4652ce32f60947249189ca20de94a055d3f992c0a3288e55ed21847 -size 52315 +oid sha256:27ccee08c3047e7ee64b15553e81205bb4917e2cf05cc035f6ef80fae2db8452 +size 52154 diff --git a/samba.spec b/samba.spec index f55137d..ffd75e1 100644 --- a/samba.spec +++ b/samba.spec @@ -125,7 +125,7 @@ BuildRequires: libxslt-tools %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3071 +%define SOURCE_TIMESTAMP 3072 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 1456d8d..e9a91c8 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3aa1d1ba4f998f95becebf36609f5e70336cbc8fc7f548b03ffeefc05a111ac -size 53834 +oid sha256:bf276ad5b39e9a8c23ca528b86d22d02330b531086ae47fe6131be4a7d0ca54d +size 53547 From e40719959a4a26c9e745de3aec73e42603e0ba74d1af6ffa1564964b9dea371f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 3 Sep 2013 15:28:04 +0000 Subject: [PATCH 2/4] - Update to 4.1.0rc2. + Add vfs_btrfs module. + Add support for server-side copy operations via the SMB2 FSCTL_SRV_COPYCHUNK request. + Fix replication with --domain-crictical-only to fill in backlinks; (bso#9029). + Windows 8 Roaming profiles fail; (bso#9678). + Fix crash of winbind after "ls -l /usr/local/samba/var/locks/sysvol"; + Windows error 0x800700FE when copying files with xattr names containing ":"; (bso#9992). + Do not delete an existing valid credential cache (s3-winbind); (bso#9994). + Fix segfault while reading incomplete session info; (bso#10003). + Missing integer wrap protection in EA list reading can cause server to loop with DOS (CVE-2013-4124); (bso#10010). + Fix a 100% loop at shutdown time (smbd); (bso#10013). + Rename regedit to samba-regedit; (bso#10040). + Remove obsolete swat manpage and references; (bso#10041). + Fix crashes in socket_get_local_addr(); (bso#10042). + Remove a redundant inlined substitution of ACLs; (bso#10045). + nsswitch: Add OPT_KRB5CCNAME to avoid an error message; (bso#10048). + dsdb improvements; (bso#10056). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=335 --- patches.tar.bz2 | 4 +-- samba-4.0.9.tar.gz | 3 -- samba-4.1.0rc2.tar.gz | 3 ++ samba.changes | 73 +++++++++++++++++++++++++------------------ samba.spec | 23 +++++++++----- vendor-files.tar.bz2 | 4 +-- 6 files changed, 64 insertions(+), 46 deletions(-) delete mode 100644 samba-4.0.9.tar.gz create mode 100644 samba-4.1.0rc2.tar.gz diff --git a/patches.tar.bz2 b/patches.tar.bz2 index d377333..c638021 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27ccee08c3047e7ee64b15553e81205bb4917e2cf05cc035f6ef80fae2db8452 -size 52154 +oid sha256:e1ff7ed55a2f6e70c431e2dc26719501c51574ba6faccf13eb22276afa4be12f +size 24604 diff --git a/samba-4.0.9.tar.gz b/samba-4.0.9.tar.gz deleted file mode 100644 index 61f415b..0000000 --- a/samba-4.0.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1d6c0fa077a82550f2e80c8302ca407413da605906b7184ca98fe6846c362a5 -size 22089529 diff --git a/samba-4.1.0rc2.tar.gz b/samba-4.1.0rc2.tar.gz new file mode 100644 index 0000000..95c54b4 --- /dev/null +++ b/samba-4.1.0rc2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1268e978ad318725649c28ab90fc8e4b0651e0fd84f85915cd79de3fba2ce85 +size 19428575 diff --git a/samba.changes b/samba.changes index a4c094b..5581190 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Sat Aug 31 22:47:49 UTC 2013 - lmuelle@suse.com + +- Update to 4.1.0rc2. + + Add vfs_btrfs module. + + Add support for server-side copy operations via the + SMB2 FSCTL_SRV_COPYCHUNK request. + + + Fix replication with --domain-crictical-only to fill in backlinks; + (bso#9029). + + Windows 8 Roaming profiles fail; (bso#9678). + + Fix crash of winbind after "ls -l /usr/local/samba/var/locks/sysvol"; + (bso#9820). + + Windows error 0x800700FE when copying files with xattr names containing + ":"; (bso#9992). + + Do not delete an existing valid credential cache (s3-winbind); (bso#9994). + + Fix segfault while reading incomplete session info; (bso#10003). + + Missing integer wrap protection in EA list reading can cause server to + loop with DOS (CVE-2013-4124); (bso#10010). + + Fix a 100% loop at shutdown time (smbd); (bso#10013). + + Fix/improve debug options; (bso#10015). + + Rename regedit to samba-regedit; (bso#10040). + + Remove obsolete swat manpage and references; (bso#10041). + + Fix crashes in socket_get_local_addr(); (bso#10042). + + Allow to change the default location for Kerberos credential caches; + (bso#10043). + + Remove a redundant inlined substitution of ACLs; (bso#10045). + + nsswitch: Add OPT_KRB5CCNAME to avoid an error message; (bso#10048). + + dsdb improvements; (bso#10056). + + Linux kernel oplock breaks can miss signals; (bso#10064). + ------------------------------------------------------------------- Thu Aug 29 12:47:26 UTC 2013 - lmuelle@suse.com @@ -9,44 +40,24 @@ Wed Aug 28 14:56:09 UTC 2013 - lmuelle@suse.com - Add libnetapi0 and samba-libs to baselibs.conf. ------------------------------------------------------------------- -Thu Aug 22 12:01:15 UTC 2013 - lmuelle@suse.de +Thu Jul 25 14:39:09 UTC 2013 - lmuelle@suse.com -- Update to 4.0.9. - + Fix crash of Winbind after "ls -l /usr/local/samba/var/locks/sysvol"; - (bso#9820). - + s3-lib: Fix segmentation fault while reading incomplete session info; - (bso#10003). - + smbd: Fix a 100% loop at shutdown time; (bso#10013). - - + Windows 8 Roaming profiles fail; (bso#9678). - + Add UPN enumeration to passdb internal API; (bso#9779). - + smbd: Cleanup disonnected durable handles; (bso#9930). - + vfs_streams_xattr: Do not attempt to write empty attribute twice; - (bso#9970). - + Fix Windows error 0x800700FE when copying files with xattr names - containing ":"; (bso#9992). - + s3-winbind: Do not delete an existing valid credential cache; (bso#9994). - + Fix excessive RID allocation; (bso#10014). - + Add debugclass for DNS server; (bso#10015). - + Fix/improve debug options; (bso#10015). - + Allow to change the default location for Kerberos credential caches; - (bso#10043). - + Linux kernel oplock breaks can miss signals; (bso#10064). - + net ads join: Fix segmentation fault in - create_local_private_krb5_conf_for_domain; (bso#10073). - -------------------------------------------------------------------- -Mon Aug 5 10:56:56 UTC 2013 - lmuelle@suse.com - -- Update to 4.0.8. - + Samba 3.0.x to 4.0.7 are affected by a denial of service attack on - authenticated or guest connections; CVE-2013-4124; (bnc#829969). +- Samba 3.0.x to 4.0.7 are affected by a denial of service attack on + authenticated or guest connections; CVE-2013-4124; (bnc#829969). ------------------------------------------------------------------- Mon Jul 22 08:41:07 UTC 2013 - lmuelle@suse.com - Require krb5 and not the non existing krb5-libs package. +------------------------------------------------------------------- +Wed Jul 17 17:42:23 UTC 2013 - lmuelle@suse.com + +- Update to 4.1.0rc1. + + Directory database replication (AD DC mode) + + Server-Side Copy Support + + Btrfs Filesystem Integration + ------------------------------------------------------------------- Fri Jul 12 13:07:11 UTC 2013 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index ffd75e1..e21b338 100644 --- a/samba.spec +++ b/samba.spec @@ -105,8 +105,8 @@ BuildRequires: libxslt1 %if 0%{?suse_version} > 1210 BuildRequires: libxslt-tools %endif -%define samba_ver 4.0.9 -%define samba_ver_suffix %nil +%define samba_ver 4.1.0 +%define samba_ver_suffix rc2 %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 @@ -125,12 +125,12 @@ BuildRequires: libxslt-tools %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3072 +%define SOURCE_TIMESTAMP 3073 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 %global with_get_printing_ticket 0 -Version: 4.0.9 +Version: 4.1.0 Release: 0 License: GPL-3.0+ Url: http://www.samba.org/ @@ -186,7 +186,7 @@ PreReq: grep %define NET_CFGDIR network-scripts %endif %define auth_modules auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 -%define idmap_modules idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_rid,idmap_tdb2 +%define idmap_modules idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_rfc2307,idmap_rid,idmap_tdb2 %define pdb_modules pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4 %define vfs_modules vfs_cacheprime,vfs_readahead %if 0%{?ul_version} >= 1 @@ -678,7 +678,6 @@ CONFIGURE_OPTIONS="\ --with-utmp \ --with-winbind \ --with-shared-modules=%{auth_modules},%{vfs_modules},%{pdb_modules},%{idmap_modules} \ - --without-swat \ %if %with_mitkrb5 --with-system-mitkrb5 \ %endif @@ -1125,7 +1124,6 @@ fi %attr(0775,root,ntadmin) %{LOCKDIR}/drivers %{LOCKDIR}/netlogon %attr(0770,root,users) %dir %{LOCKDIR}/profiles -%exclude %{_datadir}/samba/swat %{_bindir}/smbstatus %{_sbindir}/nmbd %{_sbindir}/rcnmb @@ -1145,13 +1143,13 @@ fi %doc %{_mandir}/man8/nmbd.8.* %doc %{_mandir}/man8/smbd.8.* %doc %{_mandir}/man8/smbta-util.8.* -%exclude %{_mandir}/man8/swat.8.* %doc %{_mandir}/man8/vfs_acl_tdb.8.* %doc %{_mandir}/man8/vfs_acl_xattr.8.* %doc %{_mandir}/man8/vfs_aio_fork.8.* %doc %{_mandir}/man8/vfs_aio_linux.8.* %doc %{_mandir}/man8/vfs_aio_pthread.8.* %doc %{_mandir}/man8/vfs_audit.8.* +%doc %{_mandir}/man8/vfs_btrfs.8.* %doc %{_mandir}/man8/vfs_cacheprime.8.* %doc %{_mandir}/man8/vfs_cap.8.* %doc %{_mandir}/man8/vfs_catia.8.* @@ -1224,10 +1222,15 @@ fi %{_bindir}/nmblookup4 %{_bindir}/oLschema2ldif %{_bindir}/regdiff +%{_bindir}/samba-regedit %{_bindir}/regpatch %{_bindir}/regshell %{_bindir}/regtree %{_bindir}/nmbstatus +%{_bindir}/ntdbbackup +%{_bindir}/ntdbdump +%{_bindir}/ntdbrestore +%{_bindir}/ntdbtool %{_bindir}/pdbedit %{_bindir}/profiles %{_bindir}/rpcclient @@ -1366,6 +1369,7 @@ fi %{_libdir}/libsmbldap.so.* %{_libdir}/libtevent-util.so.* %dir %{_libdir}/samba +%{_libdir}/samba/libntdb.so.* %{_libdir}/samba/libCHARSET3.so %{_libdir}/samba/libLIBWBCLIENT_OLD.so %{_libdir}/samba/libMESSAGING.so @@ -1410,8 +1414,10 @@ fi %{_libdir}/samba/libndr-samba4.so %{_libdir}/samba/libnet_keytab.so %{_libdir}/samba/libnetif.so +%{_libdir}/samba/libnon_posix_acls.so %{_libdir}/samba/libnpa_tstream.so %{_libdir}/samba/libnss_info.so +%{_libdir}/samba/libutil_ntdb.so %{_libdir}/samba/libpopt_samba3.so %{_libdir}/samba/libprinting_migrate.so %{_libdir}/samba/libreplace.so @@ -1506,6 +1512,7 @@ fi %doc %{_mandir}/man8/idmap_hash.8.* %doc %{_mandir}/man8/idmap_ldap.8.* %doc %{_mandir}/man8/idmap_nss.8.* +%doc %{_mandir}/man8/idmap_rfc2307.8.* %doc %{_mandir}/man8/idmap_rid.8.* %doc %{_mandir}/man8/idmap_tdb.8.* %doc %{_mandir}/man8/idmap_tdb2.8.* diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index e9a91c8..76e5a12 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf276ad5b39e9a8c23ca528b86d22d02330b531086ae47fe6131be4a7d0ca54d -size 53547 +oid sha256:274754a6733b1623a602766521aad1b60fe028d14ab03934a67b509571b026c0 +size 54024 From 597cdb3a525b0691e13efe8a973d1528289cc6c003538a81b71dab0c68c5a47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 3 Sep 2013 16:16:49 +0000 Subject: [PATCH 3/4] Megre missing 4.0.9 package change log hunk and align the CVE-2013-4124 date. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=336 --- patches.tar.bz2 | 4 ++-- samba.changes | 34 +++++++++++++++++++++++++++++++--- samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index c638021..8e37d65 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1ff7ed55a2f6e70c431e2dc26719501c51574ba6faccf13eb22276afa4be12f -size 24604 +oid sha256:7a1541efd3c249747339cc4f5940cf6ebc77ca8bcceb0cd75bf2797a455029e5 +size 24596 diff --git a/samba.changes b/samba.changes index 5581190..54892fe 100644 --- a/samba.changes +++ b/samba.changes @@ -40,10 +40,38 @@ Wed Aug 28 14:56:09 UTC 2013 - lmuelle@suse.com - Add libnetapi0 and samba-libs to baselibs.conf. ------------------------------------------------------------------- -Thu Jul 25 14:39:09 UTC 2013 - lmuelle@suse.com +Thu Aug 22 12:01:15 UTC 2013 - lmuelle@suse.de -- Samba 3.0.x to 4.0.7 are affected by a denial of service attack on - authenticated or guest connections; CVE-2013-4124; (bnc#829969). +- Update to 4.0.9. + + Fix crash of Winbind after "ls -l /usr/local/samba/var/locks/sysvol"; + (bso#9820). + + s3-lib: Fix segmentation fault while reading incomplete session info; + (bso#10003). + + smbd: Fix a 100% loop at shutdown time; (bso#10013). + + + Windows 8 Roaming profiles fail; (bso#9678). + + Add UPN enumeration to passdb internal API; (bso#9779). + + smbd: Cleanup disonnected durable handles; (bso#9930). + + vfs_streams_xattr: Do not attempt to write empty attribute twice; + (bso#9970). + + Fix Windows error 0x800700FE when copying files with xattr names + containing ":"; (bso#9992). + + s3-winbind: Do not delete an existing valid credential cache; (bso#9994). + + Fix excessive RID allocation; (bso#10014). + + Add debugclass for DNS server; (bso#10015). + + Fix/improve debug options; (bso#10015). + + Allow to change the default location for Kerberos credential caches; + (bso#10043). + + Linux kernel oplock breaks can miss signals; (bso#10064). + + net ads join: Fix segmentation fault in + create_local_private_krb5_conf_for_domain; (bso#10073). + +------------------------------------------------------------------- +Mon Aug 5 10:56:56 UTC 2013 - lmuelle@suse.com + +- Update to 4.0.8. + + Samba 3.0.x to 4.0.7 are affected by a denial of service attack on + authenticated or guest connections; CVE-2013-4124; (bnc#829969). ------------------------------------------------------------------- Mon Jul 22 08:41:07 UTC 2013 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index e21b338..7ade6b7 100644 --- a/samba.spec +++ b/samba.spec @@ -125,7 +125,7 @@ BuildRequires: libxslt-tools %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3073 +%define SOURCE_TIMESTAMP 3074 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 76e5a12..ebc9f34 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:274754a6733b1623a602766521aad1b60fe028d14ab03934a67b509571b026c0 -size 54024 +oid sha256:25fb121bd0fc43a6eb559d8f862edc45a49b6074187cce830bdf3b7a3afe7624 +size 53892 From 0c352750746f49b233f650ef84ad5546cd5269fee815c298b61250d4f7e6a86d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 3 Sep 2013 17:42:52 +0000 Subject: [PATCH 4/4] Define the source URL differently in the case of a release candidate. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=337 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 9 +++++++-- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 8e37d65..8bf2a90 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a1541efd3c249747339cc4f5940cf6ebc77ca8bcceb0cd75bf2797a455029e5 -size 24596 +oid sha256:5c1780d44c4c8edcca409906998af221472d02de7d444603e1f7d29cf765619d +size 24611 diff --git a/samba.changes b/samba.changes index 54892fe..285e77f 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 3 17:30:08 UTC 2013 - lmuelle@suse.com + +- Define the source URL differently in the case of a release candidate. + ------------------------------------------------------------------- Sat Aug 31 22:47:49 UTC 2013 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 7ade6b7..970b676 100644 --- a/samba.spec +++ b/samba.spec @@ -107,6 +107,11 @@ BuildRequires: libxslt-tools %endif %define samba_ver 4.1.0 %define samba_ver_suffix rc2 +%if "%{samba_ver_suffix}" == "" +%define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz +%else +%define samba_source_location http://ftp.samba.org/pub/samba/rc/samba-%{version}%{samba_ver_suffix}.tar.gz +%endif %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 @@ -125,7 +130,7 @@ BuildRequires: libxslt-tools %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3074 +%define SOURCE_TIMESTAMP 3075 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -146,7 +151,7 @@ Recommends: cron Recommends: logrotate %endif Summary: A SMB/CIFS File, Print, and Authentication Server -Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.gz +Source: %{samba_source_location} Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 Source4: baselibs.conf diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index ebc9f34..1db9ba6 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25fb121bd0fc43a6eb559d8f862edc45a49b6074187cce830bdf3b7a3afe7624 -size 53892 +oid sha256:64a74a7184bae9703ff51438f82e06b5a5745abd872dd95aa89e93f5c889d52d +size 53935