diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 264f144..ee20608 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48c72d7a61e3e15e501f0008c844b5f345ea24aab84273dc8fc786bfdf73cb99 -size 39835 +oid sha256:e822e6f9d6ddc1a8b0c3ea9ce851410d425d778bf7efb8c59a11883ef90981a6 +size 37801 diff --git a/samba-3.6.15.tar.bz2 b/samba-3.6.15.tar.bz2 deleted file mode 100644 index ca68f7c..0000000 --- a/samba-3.6.15.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:431029eed2693827d1760efff3fd818b4994e84c3bb07b2bc30104091accdc97 -size 29595023 diff --git a/samba-3.6.16.tar.gz b/samba-3.6.16.tar.gz new file mode 100644 index 0000000..973e61b --- /dev/null +++ b/samba-3.6.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:347c0abe608ad907d04e37948d0f82a2d9dd8daeba13b0b78d7463b8d7b3fef4 +size 34108738 diff --git a/samba-doc.spec b/samba-doc.spec index 4a0b7c9..ca4bec7 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -25,9 +25,11 @@ BuildRequires: gcc BuildRequires: make BuildRequires: patch BuildRequires: cups-devel +BuildRequires: cyrus-sasl-devel BuildRequires: e2fsprogs-devel BuildRequires: fam-devel BuildRequires: libacl-devel +BuildRequires: libattr-devel %if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1100 BuildRequires: libuuid-devel %endif @@ -37,6 +39,7 @@ BuildRequires: readline-devel %if 0%{?suse_version} BuildRequires: cracklib-devel BuildRequires: openldap2-devel +BuildRequires: libopenssl-devel %endif %if 0%{?suse_version} > 1030 BuildRequires: gdbm-devel @@ -89,7 +92,7 @@ BuildRequires: libtalloc-devel BuildRequires: libtdb-devel BuildRequires: libtevent-devel %endif -%define samba_ver 3.6.15 +%define samba_ver 3.6.16 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -126,9 +129,9 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3017 +%define SOURCE_TIMESTAMP 3027 %define BRANCH %{version} -Version: 3.6.15 +Version: 3.6.16 Release: 0 %define ldapsmb_ver 1.34b Url: http://www.samba.org/ @@ -142,7 +145,7 @@ Obsoletes: samba-gplv3-doc < %{version} Provides: samba-doc-gplv2 = %{version} Obsoletes: samba-doc-gplv2 < %{version} BuildArch: noarch -Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.bz2 +Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.gz Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 Source4: baselibs.conf diff --git a/samba.changes b/samba.changes index 9fb0118..85c329d 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Wed Jun 26 13:55:13 UTC 2013 - lmuelle@suse.com + +- Adjust ldapsmb and nmbstatus man page syntax required by a newer pod2man. + +------------------------------------------------------------------- +Tue Jun 25 17:03:49 UTC 2013 - lmuelle@suse.com + +- Don't bzip2 the main tar ball, use the upstream gziped one instead. + +------------------------------------------------------------------- +Sun Jun 23 05:45:26 UTC 2013 - jengelh@inai.de + +- Explicitly BuildRequire cyrus-sasl-devel, libattr-devel, and + libopenssl-devel. + +------------------------------------------------------------------- +Fri Jun 21 13:47:37 UTC 2013 - lmuelle@suse.com + +- Update to 3.6.16. + + Fix crash bug during Win8 sync; (bso#9822). + + Properly handle Oplock breaks in compound requests; (bso#9722). + +------------------------------------------------------------------- +Fri Jun 21 10:30:16 UTC 2013 - lmuelle@suse.com + +- Fix crash bug during Win8 sync; (bso#9822). +- Check for system libtevent and link dbwrap_tool and dbwrap_torture against + it; (bso#9881). +- errno gets overwritten in call to check_parent_exists(); (bso#9927). +- Fix a bug of drvupgrade of smbcontrol; (bso#9941). + +------------------------------------------------------------------- +Tue Jun 18 17:14:00 UTC 2013 - ddiss@suse.com + +- Document idmap_ad rfc2307 attribute requirements; (bso#9880); (bnc#820531). + ------------------------------------------------------------------- Fri Jun 14 09:59:26 UTC 2013 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 8b9bbed..2cbf074 100644 --- a/samba.spec +++ b/samba.spec @@ -25,9 +25,11 @@ BuildRequires: gcc BuildRequires: make BuildRequires: patch BuildRequires: cups-devel +BuildRequires: cyrus-sasl-devel BuildRequires: e2fsprogs-devel BuildRequires: fam-devel BuildRequires: libacl-devel +BuildRequires: libattr-devel %if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1100 BuildRequires: libuuid-devel %endif @@ -37,6 +39,7 @@ BuildRequires: readline-devel %if 0%{?suse_version} BuildRequires: cracklib-devel BuildRequires: openldap2-devel +BuildRequires: libopenssl-devel %endif %if 0%{?suse_version} > 1030 BuildRequires: gdbm-devel @@ -89,7 +92,7 @@ BuildRequires: libtalloc-devel BuildRequires: libtdb-devel BuildRequires: libtevent-devel %endif -%define samba_ver 3.6.15 +%define samba_ver 3.6.16 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -126,9 +129,9 @@ BuildRequires: libtevent-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3017 +%define SOURCE_TIMESTAMP 3027 %define BRANCH %{version} -Version: 3.6.15 +Version: 3.6.16 Release: 0 %define ldapsmb_ver 1.34b License: GPL-3.0+ @@ -145,7 +148,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.bz2 +Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.gz Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 Source4: baselibs.conf @@ -876,6 +879,9 @@ make test_nss_modules make test_pam_modules popd pushd testsuite/libsmbclient/src +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1211 + LD_LIBRARY_PATH=../../../source3/bin/ \ +%endif make popd @@ -1690,6 +1696,7 @@ fi %files -n libtevent-devel %defattr(-,root,root) %{_includedir}/tevent.h +%{_includedir}/tevent_internal.h %{_libdir}/libtevent.so %{_libdir}/pkgconfig/tevent.pc diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index fcea630..05dd7f3 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:23f2fd43101156f9a4fdb34444e016eec7a1a0f4d24e86bd1f02139201f265fc -size 53705 +oid sha256:a8c9f5ec0257aa3ef316b262cd33e8d4e2cf32dac57fcc007656322ea6e0e9a7 +size 53643