From 851005e5e25203a707c8da3803d5474c09c29e2d25e6bc796f7a4da51a8c1946 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 15 Aug 2016 19:38:49 +0000 Subject: [PATCH 1/4] Accepting request 419509 from home:dmdiss:samba_vfs_ceph - Don't package man pages for VFS modules that aren't built; (boo#993707). - Fix population of ctdb sysconfig after source merge; (bsc#981566). - Enable vfs_ceph builds for Factory (x86-64) + Package as samba-ceph to avoid Ceph dependency in base package. OBS-URL: https://build.opensuse.org/request/show/419509 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=545 --- patches.tar.bz2 | 4 +- samba.changes | 17 +++++++ samba.keyring | 53 +++++++++++++++------- samba.spec | 103 ++++++++++++++++++++++++------------------- vendor-files.tar.bz2 | 4 +- 5 files changed, 115 insertions(+), 66 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 4eb2642..d1e7823 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f0a35855853aad21e788bd416b9727fa3f0ef0bde188c277c094a50012d57b0 -size 41711 +oid sha256:733933187629808895e1d5b6d9c6e07c16991c9486af8e5378ebdf123715fd35 +size 41359 diff --git a/samba.changes b/samba.changes index 4cf5dc9..c5f8f47 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Aug 15 14:54:14 UTC 2016 - ddiss@suse.com + +- Don't package man pages for VFS modules that aren't built; + (boo#993707). + +------------------------------------------------------------------- +Sat Aug 13 14:41:26 UTC 2016 - jmcdonough@suse.com + +- Fix population of ctdb sysconfig after source merge; (bsc#981566). + +------------------------------------------------------------------- +Fri Aug 12 16:22:33 UTC 2016 - ddiss@suse.com + +- Enable vfs_ceph builds for Factory (x86-64) + + Package as samba-ceph to avoid Ceph dependency in base package. + ------------------------------------------------------------------- Thu Jul 7 15:20:14 UTC 2016 - jmcdonough@suse.com diff --git a/samba.keyring b/samba.keyring index 572aa5f..ebc9e36 100644 --- a/samba.keyring +++ b/samba.keyring @@ -1,6 +1,6 @@ -pub 1024D/6568B7EA 2007-02-04 [expires: 2014-02-25] +pub 1024D/6568B7EA 2007-02-04 [expires: 2016-01-17] uid Samba Distribution Verification Key -sub 2048g/DA6DFB44 2007-02-04 [expires: 2014-02-25] +sub 2048g/DA6DFB44 2007-02-04 [expires: 2016-01-17] -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.11 (GNU/Linux) @@ -25,18 +25,39 @@ CgkQp6cLM3ld2XFzGwCffyD/eMhEKCN6j5FCSbb3rhkyR/kAn0PlFtYrTNkrc1dO ezhvaZZCPBHWiEYEEBECAAYFAkZQmboACgkQVVCoNUmKuAcl1wCdEzFgS3DIgIhY y6Id5a9EqUjArLkAnArdjXskM952gLuyJjgictCiHdIeiEYEEBECAAYFAkZdvkMA CgkQw1Ohknblb7ZN8gCgjD/SWG0qBCBD7w19I5kVTijU9j4AmwbPf4wU7hY942tn -1NxUyKwF+edxuQINBEXGOWEQCADIOV4TpVG6tDXU7YD1VjJ39xduomiWTg94dIOD -g1bZHLvwUa5I1X7zsjYmghZ5Qa6WxNknbRywWnaP0POMXSMspVWnqBQTZknxdApM -bMQEko0pPJSLwdTD3+0y5ht4edf08asWdSBT5yvu5Oak4O/Sa3P5lNIe8Q3SjfqR -YiSX12uWgqeh+2JsQC50Lr9rnz9AMjKqZEx2v7XKnCkxoaFy1XwOpPjJtIuPFaSI -5OunNsuhXYeGQv7MqqA2RNuulonoHgl9J6YzRBjdmDB28Lm+JKXyJpnHDrUkK6c5 -04EuxVXXQKOvLNPwod3U89OCZ3gFZU/zeESQdpWxXMiQvUqPAAQLCACnbn0cYaXh -l3UnnQgyPYVUJV12/sAjhlgAQq08SPgTJp4GE/Jx9C2KMS7dlWYH4tjDSbeO+RLL -d26npdhiy8Cn9UvsJvDs71/+5S2PTpV16eH5QzQZkvJ/PXkkRXQ1Ilovkvt5rKie -HCx4n6QZb5td9AuAeRZp75UXERO7pXKG/57o/SzswrD/tSEKRpBKQED4eHsPohLw -3dMKDWG6hLRf4GR8v+xKLFivqXr3ttELb9xS7ZyZqz6FSFucQAp6XY/xjnR3CFzf -Kq9pHO4PwvhU53uQeI9suAHSPecxfUIcQfrCaN6K6ktEMY+KxeTJUgqB7Fnskqyn -Cof0MN2OA40+iE8EGBECAA8CGwwFAk9Ki+YFCQ1GuYUACgkQbzORW2Vot+poJACe -Mx7cSix0y3zIgTvAIty06thlOMUAn1hZdeMtAkWjaKfu8LWk/umBetPI -=49fm +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 +9GHh4cjTsKMmRsY6FDkDm8mExQ== +=nU8K -----END PGP PUBLIC KEY BLOCK----- diff --git a/samba.spec b/samba.spec index f18e6d5..16bc802 100644 --- a/samba.spec +++ b/samba.spec @@ -21,6 +21,11 @@ %if 0%{?suse_version} > 1140 && 0%{?suse_version} != 1315 %define build_ctdb_pmda 1 %endif +%if 0%{?suse_version} > 1320 +%ifarch x86_64 +%define build_vfs_ceph 1 +%endif +%endif Name: samba BuildRequires: cups-devel @@ -120,6 +125,9 @@ BuildRequires: systemd-devel %if 0%{?build_ctdb_pmda} BuildRequires: libpcp-devel %endif +%if 0%{?build_vfs_ceph} +BuildRequires: libcephfs-devel +%endif %define samba_ver 4.4.5 %define samba_ver_suffix %nil %if "%{samba_ver_suffix}" == "" @@ -142,7 +150,7 @@ BuildRequires: libpcp-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3678 +%define SOURCE_TIMESTAMP 3686 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1027,6 +1035,16 @@ develop programs which make use of the wbclient programming interface. Source Timestamp: %{SOURCE_TIMESTAMP} Branch: %{BRANCH} +%if 0%{?build_vfs_ceph} +%package ceph +Summary: Ceph VFS Module for Samba +License: GPL-3.0+ +Group: Productivity/Networking/Samba + +%description ceph +The Ceph VFS module for Samba allows shares to be backed by the Ceph distributed file system. +%endif + %prep %setup -n samba-%{samba_ver_full} -q @@ -1359,8 +1377,37 @@ for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do echo "%doc ${file#%{buildroot}}" >>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" done for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do + # if built we don't want vfs_ceph in the base package + case "${file#%{buildroot}}" in + %{_libdir}/samba/vfs/ceph.so) continue ;; + esac echo "${file#%{buildroot}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba done +# only package Man pages for VFS modules that we ship +for file in %{buildroot}%{_mandir}/man8/vfs_*; do + case "${file#%{buildroot}}" in + %{_mandir}/man8/vfs_ceph.8) + %if 0%{?build_vfs_ceph} == 0 + rm ${file} + %endif + continue + ;; + %{_mandir}/man8/vfs_glusterfs.8) + rm ${file} + continue + ;; + %{_mandir}/man8/vfs_gpfs.8) + rm ${file} + continue + ;; + %{_mandir}/man8/vfs_tsmsm.8) + rm ${file} + continue + ;; + esac + # wildcard suffix to account for subsequent gzip + echo "${file#%{buildroot}}*" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba +done # copy the schema install -m 0644 examples/LDAP/samba.schema %{buildroot}/%{_sysconfdir}/openldap/schema/samba3.schema install -m 0644 examples/LDAP/samba-nds.schema %{buildroot}/%{_datadir}/samba/LDAP/samba-nds.schema @@ -1598,11 +1645,11 @@ exit 0 %post -n ctdb %if 0%{?suse_version} %if 0%{?suse_version} > 1220 -%{fillup_only} +%{fillup_only -n ctdb} %service_add_post ctdb.service %{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/ctdb.conf || : %else -%{fillup_and_insserv} +%{fillup_and_insserv -n ctdb} %endif %endif @@ -1676,49 +1723,6 @@ fi %{_mandir}/man5/smbpasswd.5.* %{_mandir}/man8/nmbd.8.* %{_mandir}/man8/smbd.8.* -%{_mandir}/man8/vfs_acl_tdb.8.* -%{_mandir}/man8/vfs_acl_xattr.8.* -%{_mandir}/man8/vfs_aio_fork.8.* -%{_mandir}/man8/vfs_aio_linux.8.* -%{_mandir}/man8/vfs_aio_pthread.8.* -%{_mandir}/man8/vfs_audit.8.* -%{_mandir}/man8/vfs_btrfs.8.* -%{_mandir}/man8/vfs_cacheprime.8.* -%{_mandir}/man8/vfs_cap.8.* -%{_mandir}/man8/vfs_catia.8.* -%{_mandir}/man8/vfs_ceph.8.* -%{_mandir}/man8/vfs_commit.8.* -%{_mandir}/man8/vfs_crossrename.8.* -%{_mandir}/man8/vfs_default_quota.8.* -%{_mandir}/man8/vfs_dirsort.8.* -%{_mandir}/man8/vfs_extd_audit.8.* -%{_mandir}/man8/vfs_fake_perms.8.* -%{_mandir}/man8/vfs_fileid.8.* -%{_mandir}/man8/vfs_full_audit.8.* -%{_mandir}/man8/vfs_fruit.8.* -%{_mandir}/man8/vfs_glusterfs.8.* -%{_mandir}/man8/vfs_gpfs.8.* -%{_mandir}/man8/vfs_linux_xfs_sgid.8.* -%{_mandir}/man8/vfs_media_harmony.8.* -%{_mandir}/man8/vfs_netatalk.8.* -%{_mandir}/man8/vfs_offline.8.* -%{_mandir}/man8/vfs_prealloc.8.* -%{_mandir}/man8/vfs_preopen.8.* -%{_mandir}/man8/vfs_readahead.8.* -%{_mandir}/man8/vfs_readonly.8.* -%{_mandir}/man8/vfs_recycle.8.* -%{_mandir}/man8/vfs_shadow_copy.8.* -%{_mandir}/man8/vfs_shadow_copy2.8.* -%{_mandir}/man8/vfs_shell_snap.8.* -%{_mandir}/man8/vfs_snapper.8.* -%{_mandir}/man8/vfs_streams_depot.8.* -%{_mandir}/man8/vfs_streams_xattr.8.* -%{_mandir}/man8/vfs_syncops.8.* -%{_mandir}/man8/vfs_time_audit.8.* -%{_mandir}/man8/vfs_tsmsm.8.* -%{_mandir}/man8/vfs_unityed_media.8.* -%{_mandir}/man8/vfs_worm.8.* -%{_mandir}/man8/vfs_xattr_tdb.8.* %if 0%{?suse_version} && 0%{?suse_version} < 1021 %{_includedir}/samba %endif @@ -2476,4 +2480,11 @@ fi %{_libdir}/libwbclient.so %{_libdir}/pkgconfig/wbclient.pc +%if 0%{?build_vfs_ceph} +%files ceph +%defattr(-,root,root) +%{_mandir}/man8/vfs_ceph.8.* +%{_libdir}/samba/vfs/ceph.so +%endif + %changelog diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 987e135..a5e8401 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:d9033976a18387687ee089b25401c9cf6cc07ab69915f21f885780e2f7ee12aa -size 55878 +oid sha256:26050ae25f8e0f6158dc4ca4fbc85f3389725d7761461ff9397ed28bfdfe5696 +size 55575 From 41a9a61feb37ea8a59b4021d051ebe2ccb4af366ad7495dba7402e6a263f3762 Mon Sep 17 00:00:00 2001 From: James McDonough Date: Thu, 15 Sep 2016 12:21:11 +0000 Subject: [PATCH 2/4] Accepting request 427927 from home:jmcdough:samba450 Update to 4.5.0 OBS-URL: https://build.opensuse.org/request/show/427927 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=546 --- patches.tar.bz2 | 4 +- samba-4.4.5.tar.asc | 7 --- samba-4.4.5.tar.gz | 3 -- samba-4.5.0.tar.asc | 7 +++ samba-4.5.0.tar.gz | 3 ++ samba.changes | 16 ++++++ samba.keyring | 116 +++++++++++++++++++++++++------------------ samba.spec | 79 +++++++++++++++-------------- vendor-files.tar.bz2 | 4 +- 9 files changed, 140 insertions(+), 99 deletions(-) delete mode 100644 samba-4.4.5.tar.asc delete mode 100644 samba-4.4.5.tar.gz create mode 100644 samba-4.5.0.tar.asc create mode 100644 samba-4.5.0.tar.gz diff --git a/patches.tar.bz2 b/patches.tar.bz2 index d1e7823..b792706 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:733933187629808895e1d5b6d9c6e07c16991c9486af8e5378ebdf123715fd35 -size 41359 +oid sha256:bf9054b4ff47d3257f82cf0b59e46dcfbdb41b582e62d61a1f74ba8d8d1e8373 +size 41229 diff --git a/samba-4.4.5.tar.asc b/samba-4.4.5.tar.asc deleted file mode 100644 index bc88a2a..0000000 --- a/samba-4.4.5.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iD8DBQBXe2QbbzORW2Vot+oRAkG4AKC1my5Id4fRSeG5lXivxdKDrbIeXACggaF/ -Av57apwb3KAn5tdPJMse0MU= -=foIb ------END PGP SIGNATURE----- diff --git a/samba-4.4.5.tar.gz b/samba-4.4.5.tar.gz deleted file mode 100644 index e453243..0000000 --- a/samba-4.4.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b876ef2e63f66265490e80a122e66ef2d7616112b839df68f56ac2e1ce17a7bd -size 20715838 diff --git a/samba-4.5.0.tar.asc b/samba-4.5.0.tar.asc new file mode 100644 index 0000000..83542f4 --- /dev/null +++ b/samba-4.5.0.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iD8DBQBX0CsibzORW2Vot+oRAuywAJwI2T4CkeTGUL/2ZBmqIYwJeTGlfQCeO1CQ +imC1dU+VLVvoMv9CtqY8d1Y= +=k4tw +-----END PGP SIGNATURE----- diff --git a/samba-4.5.0.tar.gz b/samba-4.5.0.tar.gz new file mode 100644 index 0000000..d5fd8b0 --- /dev/null +++ b/samba-4.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3a9a439b746ddd2c5f119f60c72ef8a026bcee1efb1199bf19e44f114f6b586 +size 20937551 diff --git a/samba.changes b/samba.changes index c5f8f47..3eec80a 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Sep 14 09:03:18 UTC 2016 - jmcdonough@suse.com + +- Update to 4.5.0 + + NTLM1 Authentication disabled by default + + SMB2.1 leases enabled by default + + Support for OFD locks + + ctdb tool rewritten + + Added shadow copy snapshot prefix parameter + +------------------------------------------------------------------- +Tue Aug 30 09:47:01 UTC 2016 - nopower@suse.com + +- Fix illegal memory access after memory has been deleted; + (bso#11836); (bsc#975299). + ------------------------------------------------------------------- Mon Aug 15 14:54:14 UTC 2016 - ddiss@suse.com diff --git a/samba.keyring b/samba.keyring index ebc9e36..39488f2 100644 --- a/samba.keyring +++ b/samba.keyring @@ -1,8 +1,5 @@ -pub 1024D/6568B7EA 2007-02-04 [expires: 2016-01-17] -uid Samba Distribution Verification Key -sub 2048g/DA6DFB44 2007-02-04 [expires: 2016-01-17] -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.11 (GNU/Linux) +Version: GnuPG v1 mQGiBEXGOUcRBACooMht/2pmNT3bKZn1WEFQa+sXe6nxi3G6lH5bIBUKp85SDM57 4qTcBIJXhwfGABeSvyUdZJbBxJDD5bNiO4k+Y5j3t8t9hb2FKgJ1bXL2aO5BbFnJ @@ -14,50 +11,73 @@ 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 -9GHh4cjTsKMmRsY6FDkDm8mExQ== -=nU8K +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 +9X0HBZcWAJoDDzpbIrmOIXfqVtVIygrSB2irjg== +=0Oxl -----END PGP PUBLIC KEY BLOCK----- diff --git a/samba.spec b/samba.spec index 16bc802..76d19b2 100644 --- a/samba.spec +++ b/samba.spec @@ -128,7 +128,7 @@ BuildRequires: libpcp-devel %if 0%{?build_vfs_ceph} BuildRequires: libcephfs-devel %endif -%define samba_ver 4.4.5 +%define samba_ver 4.5.0 %define samba_ver_suffix %nil %if "%{samba_ver_suffix}" == "" %define samba_source_location https://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz @@ -150,11 +150,11 @@ BuildRequires: libcephfs-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3686 +%define SOURCE_TIMESTAMP 3696 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 -Version: 4.4.5 +Version: 4.5.0 Release: 0 Url: https://www.samba.org/ Obsoletes: samba-gplv3 < %{version} @@ -1214,7 +1214,7 @@ install -m 0755 ctdb/config/ctdb.init ${RPM_BUILD_ROOT}/%{INITDIR}/ctdb ln -s %{_sysconfdir}/init.d/ctdb %{buildroot}/%{_sbindir}/rcctdb %endif mkdir %{buildroot}/%{_defaultdocdir}/ctdb -for file in README COPYING NEWS doc/examples doc/*.html doc/readonlyrecords.txt doc/recovery-process.txt ; do +for file in README COPYING doc/examples doc/*.html doc/readonlyrecords.txt doc/recovery-process.txt ; do cp -a ctdb/${file} %{buildroot}/%{_defaultdocdir}/ctdb done touch %{buildroot}/%{_sysconfdir}/ctdb/nodes @@ -1764,6 +1764,7 @@ fi %{_bindir}/cifsdd %{_bindir}/dbwrap_tool %{_bindir}/eventlogadm +%{_bindir}/findsmb %{_bindir}/net %{_bindir}/nmblookup %{_bindir}/oLschema2ldif @@ -1796,7 +1797,7 @@ fi %{_libdir}/samba/charset %{_libdir}/samba/smbspool_krb5_wrapper %{_mandir}/man1/dbwrap_tool.1.* -%exclude %doc %{_mandir}/man1/findsmb.1.* +%{_mandir}/man1/findsmb.1.* %{_mandir}/man1/log2pcap.1.* %{_mandir}/man1/nmblookup.1.* %{_mandir}/man1/nmbstatus.1.* @@ -1949,6 +1950,7 @@ fi %{_libdir}/samba/libnpa-tstream-samba4.so %{_libdir}/samba/libnss-info-samba4.so %{_libdir}/samba/libpopt-samba3-samba4.so +%{_libdir}/samba/libposix-eadb-samba4.so %{_libdir}/samba/libprinting-migrate-samba4.so %{_libdir}/samba/libregistry-samba4.so %{_libdir}/samba/libreplace-samba4.so @@ -2054,6 +2056,7 @@ fi %{_mandir}/man8/idmap_nss.8.* %{_mandir}/man8/idmap_rfc2307.8.* %{_mandir}/man8/idmap_rid.8.* +%{_mandir}/man8/idmap_script.8.* %{_mandir}/man8/idmap_tdb.8.* %{_mandir}/man8/idmap_tdb2.8.* %{_mandir}/man8/pam_winbind.8.* @@ -2105,6 +2108,7 @@ fi %config %{_sysconfdir}/ctdb/events.d/00.ctdb %config %{_sysconfdir}/ctdb/events.d/01.reclock %config %{_sysconfdir}/ctdb/events.d/05.system +%config %{_sysconfdir}/ctdb/events.d/06.nfs %config %{_sysconfdir}/ctdb/events.d/10.external %config %{_sysconfdir}/ctdb/events.d/10.interface %config %{_sysconfdir}/ctdb/events.d/11.natgw @@ -2147,6 +2151,9 @@ fi %{_libdir}/ctdb/ctdb_natgw %{_libdir}/ctdb/ctdb_recovery_helper %{_libdir}/ctdb/smnotify +%{_libdir}/ctdb/ctdb_killtcp +%{_libdir}/ctdb/ctdb_lvs +%{_libdir}/ctdb/ctdb_mutex_fcntl_helper %dir %{_localstatedir}/lib/ctdb %dir %{_localstatedir}/lib/ctdb/persistent %dir %{_localstatedir}/log/ctdb @@ -2158,6 +2165,7 @@ fi %{_mandir}/man1/ctdb.1.gz %{_mandir}/man1/ctdbd.1.gz %{_mandir}/man1/ctdbd_wrapper.1.gz +%{_mandir}/man1/ctdb_diagnostics.1.gz %{_mandir}/man1/ltdbtool.1.gz %{_mandir}/man1/onnode.1.gz %{_mandir}/man1/ping_pong.1.gz @@ -2184,36 +2192,33 @@ fi %files -n ctdb-tests %defattr(-,root,root) -%dir %{_libdir}/ctdb-tests -%{_libdir}/ctdb-tests/comm_client_test -%{_libdir}/ctdb-tests/comm_server_test -%{_libdir}/ctdb-tests/comm_test -%{_libdir}/ctdb-tests/db_hash_test -%{_libdir}/ctdb-tests/ctdb_bench -%{_libdir}/ctdb-tests/ctdb_fetch -%{_libdir}/ctdb-tests/ctdb_fetch_one -%{_libdir}/ctdb-tests/ctdb_fetch_readonly_loop -%{_libdir}/ctdb-tests/ctdb_fetch_readonly_once -%{_libdir}/ctdb-tests/ctdb_functest -%{_libdir}/ctdb-tests/ctdb_lock_tdb -%{_libdir}/ctdb-tests/ctdb_persistent -%{_libdir}/ctdb-tests/ctdb_porting_tests -%{_libdir}/ctdb-tests/ctdb_randrec -%{_libdir}/ctdb-tests/ctdb_store -%{_libdir}/ctdb-tests/ctdb_stubtest -%{_libdir}/ctdb-tests/ctdb_takeover_tests -%{_libdir}/ctdb-tests/ctdb_trackingdb_test -%{_libdir}/ctdb-tests/ctdb_transaction -%{_libdir}/ctdb-tests/ctdb_traverse -%{_libdir}/ctdb-tests/ctdb_update_record -%{_libdir}/ctdb-tests/ctdb_update_record_persistent -%{_libdir}/ctdb-tests/pkt_read_test -%{_libdir}/ctdb-tests/pkt_write_test -%{_libdir}/ctdb-tests/protocol_client_test -%{_libdir}/ctdb-tests/protocol_types_test -%{_libdir}/ctdb-tests/rb_test -%{_libdir}/ctdb-tests/reqid_test -%{_libdir}/ctdb-tests/srvid_test +%dir %{_libdir}/ctdb/tests +%{_libdir}/ctdb/tests/comm_client_test +%{_libdir}/ctdb/tests/comm_server_test +%{_libdir}/ctdb/tests/comm_test +%{_libdir}/ctdb/tests/db_hash_test +%{_libdir}/ctdb/tests/ctdb_takeover_tests +%{_libdir}/ctdb/tests/pkt_read_test +%{_libdir}/ctdb/tests/pkt_write_test +%{_libdir}/ctdb/tests/protocol_client_test +%{_libdir}/ctdb/tests/protocol_types_test +%{_libdir}/ctdb/tests/rb_test +%{_libdir}/ctdb/tests/reqid_test +%{_libdir}/ctdb/tests/srvid_test +%{_libdir}/ctdb/tests/ctdb_packet_parse +%{_libdir}/ctdb/tests/fake_ctdbd +%{_libdir}/ctdb/tests/fetch_loop +%{_libdir}/ctdb/tests/fetch_loop_key +%{_libdir}/ctdb/tests/fetch_readonly +%{_libdir}/ctdb/tests/fetch_readonly_loop +%{_libdir}/ctdb/tests/fetch_ring +%{_libdir}/ctdb/tests/g_lock_loop +%{_libdir}/ctdb/tests//lock_tdb +%{_libdir}/ctdb/tests/message_ring +%{_libdir}/ctdb/tests/porting_tests +%{_libdir}/ctdb/tests/transaction_loop +%{_libdir}/ctdb/tests/update_record +%{_libdir}/ctdb/tests/update_record_persistent %dir %{_datadir}/ctdb-tests %dir %{_datadir}/ctdb-tests/eventscripts %dir %{_datadir}/ctdb-tests/eventscripts/etc-ctdb @@ -2229,6 +2234,7 @@ fi %{_datadir}/ctdb-tests/scripts/integration.bash %{_datadir}/ctdb-tests/scripts/test_wrap %{_datadir}/ctdb-tests/scripts/unit.sh +%{_datadir}/ctdb-tests/scripts/script_install_paths.sh %dir %{_datadir}/ctdb-tests/simple %{_datadir}/ctdb-tests/simple/functions %{_datadir}/ctdb-tests/simple/nodes @@ -2272,6 +2278,7 @@ fi %dir %_includedir/samba-4.0/gen_ndr/ %_includedir/samba-4.0/gen_ndr/krb5pac.h %_includedir/samba-4.0/gen_ndr/ndr_krb5pac.h +%_includedir/samba-4.0/ndr/ndr_krb5pac.h %_libdir/libndr-krb5pac.so %_libdir/pkgconfig/ndr_krb5pac.pc @@ -2456,7 +2463,6 @@ fi %files -n libtevent-util0 %defattr(-,root,root) -%_libdir/libtevent-unix-util.so.0* %_libdir/libtevent-util.so.0* %files -n libtevent-util-devel @@ -2466,7 +2472,6 @@ fi %_includedir/samba-4.0/util/tevent_ntstatus.h %_includedir/samba-4.0/util/tevent_unix.h %_includedir/samba-4.0/util/tevent_werror.h -%_libdir/libtevent-unix-util.so %_libdir/libtevent-util.so %files -n %{libwbclient_name} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index a5e8401..0f53869 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:26050ae25f8e0f6158dc4ca4fbc85f3389725d7761461ff9397ed28bfdfe5696 -size 55575 +oid sha256:5eacea84dabeeaa50ee40ef8493898ffc61fad47118ce03df6748d731458047a +size 55617 From f243773feef826462ffc398c2d341eb7142289262955a8e00b810f6e2a360031 Mon Sep 17 00:00:00 2001 From: James McDonough Date: Tue, 20 Sep 2016 19:41:13 +0000 Subject: [PATCH 3/4] Accepting request 429185 from home:jmcdough:STABLE-next Fix segfault in libnss_wins; (bso#12277); (bso#12269); (bsc#995730). OBS-URL: https://build.opensuse.org/request/show/429185 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=547 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index b792706..eab532f 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf9054b4ff47d3257f82cf0b59e46dcfbdb41b582e62d61a1f74ba8d8d1e8373 -size 41229 +oid sha256:61118ef4aaf6a7884de12391dbd004cd573136a28e410b7d0b1abe1b2846cc46 +size 42717 diff --git a/samba.changes b/samba.changes index 3eec80a..e1f1831 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 20 18:25:21 UTC 2016 - jmcdonough@suse.com + +- Fix segfault in libnss_wins; (bso#12277); (bso#12269); (bsc#995730). + ------------------------------------------------------------------- Wed Sep 14 09:03:18 UTC 2016 - jmcdonough@suse.com diff --git a/samba.spec b/samba.spec index 76d19b2..50b4788 100644 --- a/samba.spec +++ b/samba.spec @@ -150,7 +150,7 @@ BuildRequires: libcephfs-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3696 +%define SOURCE_TIMESTAMP 3697 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 0f53869..b9cd77e 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:5eacea84dabeeaa50ee40ef8493898ffc61fad47118ce03df6748d731458047a -size 55617 +oid sha256:1db19efbc11b3897365877388e5f15d70d68f6b59a02474ae8b8c4344c1f7c44 +size 55702 From a0add68146b9a1ab9f3cfbd6fae1cd10bb6b9885afa21414d43da714eb961203 Mon Sep 17 00:00:00 2001 From: James McDonough Date: Thu, 6 Oct 2016 23:42:10 +0000 Subject: [PATCH 4/4] Accepting request 433664 from home:jmcdough:rhbuildfix Fix RH builds by replacing Prereq with Requires OBS-URL: https://build.opensuse.org/request/show/433664 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=548 --- patches.tar.bz2 | 4 +- samba.changes | 11 +++++ samba.keyring | 99 +++++++++++++------------------------------- samba.spec | 49 +++++++++++----------- vendor-files.tar.bz2 | 4 +- 5 files changed, 69 insertions(+), 98 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index eab532f..f22f22c 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61118ef4aaf6a7884de12391dbd004cd573136a28e410b7d0b1abe1b2846cc46 -size 42717 +oid sha256:e3ddab53613da0d8e042bd61d1cd2f0631646827ec10264e5aaa90857aa39af0 +size 43478 diff --git a/samba.changes b/samba.changes index e1f1831..a9c271c 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Sep 26 17:55:13 UTC 2016 - nopower@suse.com + +- Include vfstest in samba-test; (bsc#1001203). + +------------------------------------------------------------------- +Wed Sep 21 08:55:37 UTC 2016 - nopower@suse.com + +- s3/winbindd: using default domain with user@domain.com format + fails; (bsc#997833). + ------------------------------------------------------------------- Tue Sep 20 18:25:21 UTC 2016 - jmcdonough@suse.com diff --git a/samba.keyring b/samba.keyring index 39488f2..572aa5f 100644 --- a/samba.keyring +++ b/samba.keyring @@ -1,5 +1,8 @@ +pub 1024D/6568B7EA 2007-02-04 [expires: 2014-02-25] +uid Samba Distribution Verification Key +sub 2048g/DA6DFB44 2007-02-04 [expires: 2014-02-25] -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 +Version: GnuPG v1.4.11 (GNU/Linux) mQGiBEXGOUcRBACooMht/2pmNT3bKZn1WEFQa+sXe6nxi3G6lH5bIBUKp85SDM57 4qTcBIJXhwfGABeSvyUdZJbBxJDD5bNiO4k+Y5j3t8t9hb2FKgJ1bXL2aO5BbFnJ @@ -11,73 +14,29 @@ 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 -9X0HBZcWAJoDDzpbIrmOIXfqVtVIygrSB2irjg== -=0Oxl +PohmBBMRAgAmAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AFAk9Ki3oFCQ1GuTMA +CgkQbzORW2Vot+oKMQCgxTZ6Gvo6cJsVdVLzUiJPcHD9tW4AnjiOTF6F0G60oPK0 +IxKOjGvVQ+4riEYEEBECAAYFAkXGOXUACgkQXNXaBxV7yV6oTwCgnSEFCs2pAwW5 +LU22AfVDwh9e5AkAn2k0dRoGj2UL/Js4qvf3sBqEw4rriEYEEBECAAYFAkXGOcYA +CgkQIR7qMdg1EfZyDACgyvRXAmV0XUhH1vbNMEG9+sFXaCwAoOQTsk19i3Luy3Pw ++1gDaUeCzeLdiEYEEBECAAYFAkXIMMUACgkQ3L4Y/6A1U7wMMACgg4+AVtovhtY6 +y1qip9uZ8qwbnkkAni269FhHSPKfGGEnfkrN/Q2/3EY7iEYEEBECAAYFAkYNcugA +CgkQp6cLM3ld2XFzGwCffyD/eMhEKCN6j5FCSbb3rhkyR/kAn0PlFtYrTNkrc1dO +ezhvaZZCPBHWiEYEEBECAAYFAkZQmboACgkQVVCoNUmKuAcl1wCdEzFgS3DIgIhY +y6Id5a9EqUjArLkAnArdjXskM952gLuyJjgictCiHdIeiEYEEBECAAYFAkZdvkMA +CgkQw1Ohknblb7ZN8gCgjD/SWG0qBCBD7w19I5kVTijU9j4AmwbPf4wU7hY942tn +1NxUyKwF+edxuQINBEXGOWEQCADIOV4TpVG6tDXU7YD1VjJ39xduomiWTg94dIOD +g1bZHLvwUa5I1X7zsjYmghZ5Qa6WxNknbRywWnaP0POMXSMspVWnqBQTZknxdApM +bMQEko0pPJSLwdTD3+0y5ht4edf08asWdSBT5yvu5Oak4O/Sa3P5lNIe8Q3SjfqR +YiSX12uWgqeh+2JsQC50Lr9rnz9AMjKqZEx2v7XKnCkxoaFy1XwOpPjJtIuPFaSI +5OunNsuhXYeGQv7MqqA2RNuulonoHgl9J6YzRBjdmDB28Lm+JKXyJpnHDrUkK6c5 +04EuxVXXQKOvLNPwod3U89OCZ3gFZU/zeESQdpWxXMiQvUqPAAQLCACnbn0cYaXh +l3UnnQgyPYVUJV12/sAjhlgAQq08SPgTJp4GE/Jx9C2KMS7dlWYH4tjDSbeO+RLL +d26npdhiy8Cn9UvsJvDs71/+5S2PTpV16eH5QzQZkvJ/PXkkRXQ1Ilovkvt5rKie +HCx4n6QZb5td9AuAeRZp75UXERO7pXKG/57o/SzswrD/tSEKRpBKQED4eHsPohLw +3dMKDWG6hLRf4GR8v+xKLFivqXr3ttELb9xS7ZyZqz6FSFucQAp6XY/xjnR3CFzf +Kq9pHO4PwvhU53uQeI9suAHSPecxfUIcQfrCaN6K6ktEMY+KxeTJUgqB7Fnskqyn +Cof0MN2OA40+iE8EGBECAA8CGwwFAk9Ki+YFCQ1GuYUACgkQbzORW2Vot+poJACe +Mx7cSix0y3zIgTvAIty06thlOMUAn1hZdeMtAkWjaKfu8LWk/umBetPI +=49fm -----END PGP PUBLIC KEY BLOCK----- diff --git a/samba.spec b/samba.spec index 50b4788..a284037 100644 --- a/samba.spec +++ b/samba.spec @@ -150,7 +150,7 @@ BuildRequires: libcephfs-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3697 +%define SOURCE_TIMESTAMP 3712 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -173,14 +173,14 @@ Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 Source4: baselibs.conf Source100: samba-client-rpmlintrc -PreReq: /usr/bin/getent -PreReq: /usr/sbin/groupadd -PreReq: coreutils -PreReq: grep +Requires: /usr/bin/getent +Requires: /usr/sbin/groupadd +Requires: coreutils +Requires: grep %if 0%{?suse_version} > 1220 -PreReq: %{fillup_prereq} +Requires: %{fillup_prereq} %endif -PreReq: samba-client >= %{version} +Requires: samba-client >= %{version} # Choose some features / extra packages here ############################################ %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 @@ -263,11 +263,11 @@ Provides: smbfs Obsoletes: samba-gplv3-client < %{version} Obsoletes: samba-client-gplv2 < %{version} %if 0%{?suse_version} > 0 -PreReq: %{?insserv_prereq} +Requires: %{?insserv_prereq} %endif -PreReq: /sbin/chkconfig -PreReq: /sbin/ldconfig -PreReq: coreutils +Requires: /sbin/chkconfig +Requires: /sbin/ldconfig +Requires: coreutils %{?systemd_requires} Requires: cifs-utils @@ -313,8 +313,8 @@ Branch: %{BRANCH} Summary: Samba Documentation License: GPL-3.0+ Group: Documentation/Other -PreReq: coreutils -PreReq: findutils +Requires: coreutils +Requires: findutils Obsoletes: samba-gplv3-doc < %{version} Obsoletes: samba-doc-gplv2 < %{version} %if 0%{?suse_version} > 1110 @@ -336,7 +336,7 @@ Summary: Samba libraries License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: krb5 -PreReq: /sbin/ldconfig +Requires: /sbin/ldconfig %if 0%{?suse_version} > 1210 && 0%{?suse_version} < 1315 Requires: libfam0-gamin %endif @@ -391,7 +391,7 @@ License: GPL-3.0+ Group: Applications/System Requires: samba = %{version} Requires: samba-winbind = %{version} -PreReq: /sbin/ldconfig +Requires: /sbin/ldconfig %description test samba-test provides testing tools for both the server and client @@ -417,12 +417,12 @@ Recommends: logrotate Recommends: /usr/sbin/nscd %endif %if 0%{?suse_version} > 0 -PreReq: %{?insserv_prereq} +Requires: %{?insserv_prereq} %endif -PreReq: /sbin/ldconfig -PreReq: /usr/sbin/groupadd -PreReq: coreutils -PreReq: samba-client >= %{version} +Requires: /sbin/ldconfig +Requires: /usr/sbin/groupadd +Requires: coreutils +Requires: samba-client >= %{version} %description winbind This is the winbind-daemon and the wbinfo-tool. @@ -950,7 +950,7 @@ Obsoletes: libsmbclient < %{version} Summary: Samba Client Library License: GPL-3.0+ Group: System/Libraries -PreReq: /sbin/ldconfig +Requires: /sbin/ldconfig %description -n %{libsmbclient_name} This package includes the libsmbclient library. @@ -981,7 +981,7 @@ Branch: %{BRANCH} Summary: Samba netapi Library License: GPL-3.0+ Group: System/Libraries -PreReq: /sbin/ldconfig +Requires: /sbin/ldconfig %description -n %{libnetapi_name} This package includes the netapi library. @@ -1009,7 +1009,7 @@ Branch: %{BRANCH} Summary: Samba libwbclient Library License: LGPL-3.0+ Group: System/Libraries -PreReq: /sbin/ldconfig +Requires: /sbin/ldconfig %if 0%{?suse_version} > 1030 Recommends: samba-winbind = %{version}-%{release} %endif @@ -1201,7 +1201,7 @@ rm \ %if 0%{?suse_version} install -m 0644 vendor-files/config/sysconfig.ctdb %{buildroot}/%{_var}/adm/fillup-templates %else -install -m 0644 ctdb/config/ctdb.sysconfig ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/ctdb +install -m 0644 vendor-files/config/sysconfig.ctdb ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/ctdb %endif %if 0%{?suse_version} > 1220 install -m 0755 ctdb/config/ctdb.service %{buildroot}%{_unitdir}/ctdb.service @@ -2018,6 +2018,7 @@ fi %{_bindir}/masktest %{_bindir}/ndrdump %{_bindir}/smbtorture +%{_bindir}/vfstest %{_mandir}/man1/gentest.1.* %{_mandir}/man1/locktest.1.* %{_mandir}/man1/masktest.1.* diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index b9cd77e..77e4cef 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:1db19efbc11b3897365877388e5f15d70d68f6b59a02474ae8b8c4344c1f7c44 -size 55702 +oid sha256:52b7e876143a50cbb75dc0b69447da1f40ba3730d1481cd2543154b75c70d279 +size 55809