From 5a5eca308862be45ef8464936efb77418e756af572e443ee32fc92ba8ac995cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 3 Jun 2014 19:43:23 +0000 Subject: [PATCH 1/5] Update to 4.1.8. See WHATSNEW.txt from the main tar ball or the samba.changes file for more details. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=413 --- patches.tar.bz2 | 4 ++-- samba-4.1.7.tar.asc | 7 ------- samba-4.1.7.tar.gz | 3 --- samba-4.1.8.tar.asc | 7 +++++++ samba-4.1.8.tar.gz | 3 +++ samba.changes | 36 +++++++++++++++++++++++++++++++++++- samba.spec | 6 +++--- vendor-files.tar.bz2 | 4 ++-- 8 files changed, 52 insertions(+), 18 deletions(-) delete mode 100644 samba-4.1.7.tar.asc delete mode 100644 samba-4.1.7.tar.gz create mode 100644 samba-4.1.8.tar.asc create mode 100644 samba-4.1.8.tar.gz diff --git a/patches.tar.bz2 b/patches.tar.bz2 index ae404df..9228905 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:027e048d6802818bb0e695acc1da3b9124c8fb05431f69bf2d1d68deafc7cf4a -size 288101 +oid sha256:53454860e67efc747c8830540796aa69708cb945d9c4b6ccb6d1dd315b2eef2e +size 282760 diff --git a/samba-4.1.7.tar.asc b/samba-4.1.7.tar.asc deleted file mode 100644 index f2aea50..0000000 --- a/samba-4.1.7.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlNPlWYACgkQbzORW2Vot+qcJwCaAr3f56pi9qvBWCqXJJSexcCy -EHgAoLiQByNlsPcvCRlfHmIA4MeKufnh -=px79 ------END PGP SIGNATURE----- diff --git a/samba-4.1.7.tar.gz b/samba-4.1.7.tar.gz deleted file mode 100644 index 5da6e5a..0000000 --- a/samba-4.1.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15a0ccc2fd90166c4231574f4f1a1229769be2cc4da7af9c16304e8659529d89 -size 23187644 diff --git a/samba-4.1.8.tar.asc b/samba-4.1.8.tar.asc new file mode 100644 index 0000000..257d79a --- /dev/null +++ b/samba-4.1.8.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlONgkMACgkQbzORW2Vot+pQ7ACdG+378JopxjU9HHXt2JMiJtxk +pdAAoIuhY45NHY8CYi3B9lSZlye5gvT4 +=2p39 +-----END PGP SIGNATURE----- diff --git a/samba-4.1.8.tar.gz b/samba-4.1.8.tar.gz new file mode 100644 index 0000000..d4b30d4 --- /dev/null +++ b/samba-4.1.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f39757e629f1e866bf402da2fe08fe577b4bb71b0f4d60ca9a61e60ad81c715 +size 23192555 diff --git a/samba.changes b/samba.changes index d65cac0..436592e 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Tue Jun 3 18:36:06 UTC 2014 - lmuelle@suse.com + +- Update to 4.1.8. + + dns: Don't reply to replies; CVE-2014-0239; (bso#10609). + + Malformed FSCTL_SRV_ENUMERATE_SNAPSHOTS response; CVE-2014-0178; + (bso#10549). + + + s3: smb2: Fix 'xcopy /d' with samba shares; (bso#3124). + + Extra ':' in msg for Waf Cross Compile Build System with Cross-answers + command; (bso#10151). + + s3: nmbd: Reset debug settings after reading config file; (bso#10239). + + Fix empty body in if-statement in continue_domain_open_lookup; (bso#10348). + + script/autobuild: Make use of '--with-perl-{arch,lib}-install-dir'; + (bso#10472). + + wafsamba: Fix the installation on FreeBSD; (bso#10472). + + Use exit_daemon() to communicate status of startup to systemd; (bso#10517). + + Fix adding NetApps; (bso#10524). + + s3: lib/util: Fix logic inside set_namearray loops; (bso#10544). + + s3: lib/util: set_namearray reads across end of namelist; (bso#10544). + + idmap_autorid: Fix failure in reverse lookup if ID is from domain range + index #0; (bso#10547). + + build: Fix ordering problems with lib-provided and internal RPATHs; + (bso#10548). + + Fix read of deleted memory in reply_writeclose()'; (bso#10554). + + lib-util: Rename memdup to smb_memdup and fix all callers; (bso#10556). + + Fix lock order violation and file lost; (bso#10564). + + dsdb: Do checks for invalid renames in samldb, before repl_meta_data; + (bso#10569). + + Fix wildcard unlink to fail if we get an error rather than trying to + continue; (bso#10577). + + byteorder: Do not assume PowerPC is big-endian; (bso#10590). + + printing: Fix purge of all print jobs; (bso#10612). + ------------------------------------------------------------------- Fri May 23 10:41:11 UTC 2014 - lmuelle@suse.com @@ -89,7 +123,7 @@ Tue Apr 15 15:03:27 UTC 2014 - ddiss@suse.com ------------------------------------------------------------------- Tue Apr 15 10:41:04 UTC 2014 - nopower@suse.de -- Fix "Invalid read" in method reply_writeclose; (bnc#873658). +- Fix "Invalid read" in method reply_writeclose; (bso#10554); (bnc#873658). ------------------------------------------------------------------- Fri Apr 11 12:37:48 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 6bc7e61..857c0e5 100644 --- a/samba.spec +++ b/samba.spec @@ -117,7 +117,7 @@ BuildRequires: dbus-1-devel BuildRequires: gpg-offline BuildRequires: systemd %endif -%define samba_ver 4.1.7 +%define samba_ver 4.1.8 %define samba_ver_suffix %nil %if "%{samba_ver_suffix}" == "" %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz @@ -144,11 +144,11 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3243 +%define SOURCE_TIMESTAMP 3250 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 -Version: 4.1.7 +Version: 4.1.8 Release: 0 License: GPL-3.0+ Url: http://www.samba.org/ diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 29d34fe..5700fb4 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:4e717beae1b5c7ae669daa7fcacea183b98020eed7cd32c4830714ce06465cd2 -size 54847 +oid sha256:6b97895523051421074df5de662b67a75570945b931b2c7c54b25182d85cb716 +size 54821 From 6e3c53ae7fa193164456aa30eb9a9447e14625c0a0564ea5f29516c13fcb70d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 12 Jun 2014 17:37:49 +0000 Subject: [PATCH 2/5] BuildRequire libxslt and perl-ExtUtils-MakeMaker and BuildIgnore libtevent on CentOS, Fedora, and RHEL systems. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=414 --- patches.tar.bz2 | 4 ++-- samba.changes | 6 ++++++ samba.spec | 8 ++++++-- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 9228905..fe41ed7 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53454860e67efc747c8830540796aa69708cb945d9c4b6ccb6d1dd315b2eef2e -size 282760 +oid sha256:c1d0c7cee3e981183cef364b760158672cc39d4579291b5d57eb158a5ec523cd +size 282735 diff --git a/samba.changes b/samba.changes index 436592e..dde8e77 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 12 17:15:09 UTC 2014 - lmuelle@suse.com + +- BuildRequire libxslt and perl-ExtUtils-MakeMaker and BuildIgnore libtevent + on CentOS, Fedora, and RHEL systems. + ------------------------------------------------------------------- Tue Jun 3 18:36:06 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 857c0e5..5e59ff3 100644 --- a/samba.spec +++ b/samba.spec @@ -41,6 +41,9 @@ BuildRequires: libattr-devel BuildRequires: libuuid-devel %endif BuildRequires: pam-devel +%if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 +BuildRequires: perl-ExtUtils-MakeMaker +%endif BuildRequires: popt-devel BuildRequires: readline-devel %if 0%{?suse_version} @@ -99,11 +102,12 @@ BuildRequires: pytalloc-devel #!BuildIgnore: libtdb BuildRequires: libtdb-devel BuildRequires: python-tdb +#!BuildIgnore: libtevent BuildRequires: libtevent-devel BuildRequires: python-tevent # to generate the man pages BuildRequires: docbook-xsl-stylesheets -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1141 +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1141 || 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 BuildRequires: libxslt %endif %if 0%{?suse_version} > 1140 && 0%{?suse_version} < 1211 @@ -144,7 +148,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3250 +%define SOURCE_TIMESTAMP 3252 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 5700fb4..e3572a9 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:6b97895523051421074df5de662b67a75570945b931b2c7c54b25182d85cb716 -size 54821 +oid sha256:e24d1e6f19e73b3c6ec81e5dd8de0ab9ce0c40f232c677f6dd1d951a8d3ecefb +size 54880 From d6bffe8b4ae5042c24100e05f9d5a05879f338c35c8e776fc53bc691cb8a358a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 12 Jun 2014 18:44:19 +0000 Subject: [PATCH 3/5] BuildRequire krb5-devel, libiniparser-devel, and python-devel in any case. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=415 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 12 +++++------- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index fe41ed7..79bc862 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1d0c7cee3e981183cef364b760158672cc39d4579291b5d57eb158a5ec523cd -size 282735 +oid sha256:d25328e8460eca493aad9cad75fa033158486a5d070807f26d670cae260232dc +size 282593 diff --git a/samba.changes b/samba.changes index dde8e77..bfce611 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 12 18:09:44 UTC 2014 - lmuelle@suse.com + +- BuildRequire krb5-devel, libiniparser-devel, and python-devel in any case. + ------------------------------------------------------------------- Thu Jun 12 17:15:09 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 5e59ff3..fca14ea 100644 --- a/samba.spec +++ b/samba.spec @@ -35,8 +35,10 @@ BuildRequires: gamin-devel %else BuildRequires: fam-devel %endif +BuildRequires: krb5-devel BuildRequires: libacl-devel BuildRequires: libattr-devel +BuildRequires: libiniparser-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 @@ -45,6 +47,7 @@ BuildRequires: pam-devel BuildRequires: perl-ExtUtils-MakeMaker %endif BuildRequires: popt-devel +BuildRequires: python-devel BuildRequires: readline-devel %if 0%{?suse_version} BuildRequires: cracklib-devel @@ -56,10 +59,7 @@ BuildRequires: gdbm-devel BuildRequires: pwdutils %endif %if 0%{?suse_version} > 930 -BuildRequires: krb5-devel -BuildRequires: libiniparser-devel BuildRequires: libnscd-devel -BuildRequires: python-devel %endif %if 0%{?suse_version} > 930 && 0%{?suse_version} < 1031 BuildRequires: dmapi-devel @@ -72,9 +72,7 @@ BuildRequires: xfsprogs-devel BuildRequires: cracklib-devel %endif %if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} -BuildRequires: krb5-devel BuildRequires: openldap-devel -BuildRequires: python-devel %endif %if 0%{?suse_version} > 1000 BuildRequires: keyutils-devel @@ -107,7 +105,7 @@ BuildRequires: libtevent-devel BuildRequires: python-tevent # to generate the man pages BuildRequires: docbook-xsl-stylesheets -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1141 || 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 +%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 && 0%{?suse_version} < 1141 BuildRequires: libxslt %endif %if 0%{?suse_version} > 1140 && 0%{?suse_version} < 1211 @@ -148,7 +146,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3252 +%define SOURCE_TIMESTAMP 3254 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index e3572a9..239dd54 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:e24d1e6f19e73b3c6ec81e5dd8de0ab9ce0c40f232c677f6dd1d951a8d3ecefb -size 54880 +oid sha256:e5251bd67074899b948c1216815286e77b9717fda3e1406ad083ad59d37e3eac +size 54874 From a5cd1e3ae67110a82546ee800c2342bc3416963b84252559ebf0799c06f1ca64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 23 Jun 2014 12:48:18 +0000 Subject: [PATCH 4/5] - Update to 4.1.9. + Fix nmbd denial of service; CVE-2014-0244; (bnc#880962). + Fix segmentation fault in smbd_marshall_dir_entry()'s SMB_FIND_FILE_UNIX handler; CVE-2014-3493; (bnc#883758). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=416 --- patches.tar.bz2 | 4 ++-- samba-4.1.8.tar.asc | 7 ------- samba-4.1.8.tar.gz | 3 --- samba-4.1.9.tar.asc | 7 +++++++ samba-4.1.9.tar.gz | 3 +++ samba.changes | 8 ++++++++ samba.spec | 6 +++--- vendor-files.tar.bz2 | 4 ++-- 8 files changed, 25 insertions(+), 17 deletions(-) delete mode 100644 samba-4.1.8.tar.asc delete mode 100644 samba-4.1.8.tar.gz create mode 100644 samba-4.1.9.tar.asc create mode 100644 samba-4.1.9.tar.gz diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 79bc862..714290d 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d25328e8460eca493aad9cad75fa033158486a5d070807f26d670cae260232dc -size 282593 +oid sha256:6f038746898bb8f43d8865e11a324a155ce551f5d13dbe2e24c8b83f2c5a1fa8 +size 278105 diff --git a/samba-4.1.8.tar.asc b/samba-4.1.8.tar.asc deleted file mode 100644 index 257d79a..0000000 --- a/samba-4.1.8.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlONgkMACgkQbzORW2Vot+pQ7ACdG+378JopxjU9HHXt2JMiJtxk -pdAAoIuhY45NHY8CYi3B9lSZlye5gvT4 -=2p39 ------END PGP SIGNATURE----- diff --git a/samba-4.1.8.tar.gz b/samba-4.1.8.tar.gz deleted file mode 100644 index d4b30d4..0000000 --- a/samba-4.1.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f39757e629f1e866bf402da2fe08fe577b4bb71b0f4d60ca9a61e60ad81c715 -size 23192555 diff --git a/samba-4.1.9.tar.asc b/samba-4.1.9.tar.asc new file mode 100644 index 0000000..84097c6 --- /dev/null +++ b/samba-4.1.9.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlOm7C4ACgkQbzORW2Vot+qCIACfVBTpL0QAePV3/tI+zym4xiL6 +qrYAn36Evj5j6iz2bYb3oo/W/Eo6hi8d +=jGMq +-----END PGP SIGNATURE----- diff --git a/samba-4.1.9.tar.gz b/samba-4.1.9.tar.gz new file mode 100644 index 0000000..e6bfe91 --- /dev/null +++ b/samba-4.1.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1484542db4b462bc562541412a061ad03a0e8af7199a916d74b063dd1881c6bd +size 23192788 diff --git a/samba.changes b/samba.changes index bfce611..7b71fa6 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 23 09:43:53 UTC 2014 - lmuelle@suse.com + +- Update to 4.1.9. + + Fix nmbd denial of service; CVE-2014-0244; (bnc#880962). + + Fix segmentation fault in smbd_marshall_dir_entry()'s SMB_FIND_FILE_UNIX + handler; CVE-2014-3493; (bnc#883758). + ------------------------------------------------------------------- Thu Jun 12 18:09:44 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index fca14ea..3c3b5ed 100644 --- a/samba.spec +++ b/samba.spec @@ -119,7 +119,7 @@ BuildRequires: dbus-1-devel BuildRequires: gpg-offline BuildRequires: systemd %endif -%define samba_ver 4.1.8 +%define samba_ver 4.1.9 %define samba_ver_suffix %nil %if "%{samba_ver_suffix}" == "" %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz @@ -146,11 +146,11 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3254 +%define SOURCE_TIMESTAMP 3256 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 -Version: 4.1.8 +Version: 4.1.9 Release: 0 License: GPL-3.0+ Url: http://www.samba.org/ diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 239dd54..27a2e8b 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:e5251bd67074899b948c1216815286e77b9717fda3e1406ad083ad59d37e3eac -size 54874 +oid sha256:90c740f94c570c3d90f56d08e3510a52f0988df0ea877888846b5bf364f3b5d2 +size 54695 From 6181b885c10be0b5c6b80f86384282f9e6c3408670a390f70733fa1d5f8584db Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Wed, 25 Jun 2014 12:07:17 +0000 Subject: [PATCH 5/5] - Prevent file truncation on an open that fails with share mode violation; (bso#10671); (bnc#884056). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=417 --- patches.tar.bz2 | 4 +- samba.changes | 6 ++ samba.spec | 140 +++++++++++++++++++++---------------------- vendor-files.tar.bz2 | 4 +- 4 files changed, 80 insertions(+), 74 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 714290d..d194a6a 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f038746898bb8f43d8865e11a324a155ce551f5d13dbe2e24c8b83f2c5a1fa8 -size 278105 +oid sha256:78b1326aaf76f0bd983f7a6bbafe62549515d22f3418f8f60af818d8b40e6f4c +size 277716 diff --git a/samba.changes b/samba.changes index 7b71fa6..a45248b 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 25 11:52:17 UTC 2014 - ddiss@suse.com + +- Prevent file truncation on an open that fails with share mode violation; + (bso#10671); (bnc#884056). + ------------------------------------------------------------------- Mon Jun 23 09:43:53 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 3c3b5ed..ec6510d 100644 --- a/samba.spec +++ b/samba.spec @@ -15,18 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} Name: samba %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 BuildRequires: autoconf %endif -BuildRequires: gcc -BuildRequires: make -BuildRequires: patch BuildRequires: cups-devel BuildRequires: cyrus-sasl-devel BuildRequires: e2fsprogs-devel +BuildRequires: gcc +BuildRequires: make +BuildRequires: patch %if 0%{?suse_version} > 1300 BuildRequires: libarchive-devel %endif @@ -51,8 +52,8 @@ BuildRequires: python-devel BuildRequires: readline-devel %if 0%{?suse_version} BuildRequires: cracklib-devel -BuildRequires: openldap2-devel BuildRequires: libopenssl-devel +BuildRequires: openldap2-devel %endif %if 0%{?suse_version} > 1030 BuildRequires: gdbm-devel @@ -112,8 +113,8 @@ BuildRequires: libxslt BuildRequires: libxslt1 %endif %if 0%{?suse_version} > 1210 -BuildRequires: libxslt-tools BuildRequires: dbus-1-devel +BuildRequires: libxslt-tools %endif %if 0%{?suse_version} > 1220 BuildRequires: gpg-offline @@ -146,15 +147,13 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3256 +%define SOURCE_TIMESTAMP 3258 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 Version: 4.1.9 Release: 0 -License: GPL-3.0+ Url: http://www.samba.org/ -Group: Productivity/Networking/Samba Provides: samba-gplv3 = %{version} Obsoletes: samba-gplv3 < %{version} Requires: samba-client >= %{version} @@ -163,6 +162,8 @@ Recommends: cron Recommends: logrotate %endif Summary: A SMB/CIFS File, Print, and Authentication Server +License: GPL-3.0+ +Group: Productivity/Networking/Samba Source: %{samba_source_location} Source5: %{samba_source_signature_location} Source6: http://www.samba.org/samba/ftp/samba-pubkey_6568B7EA.asc @@ -252,8 +253,8 @@ Branch: %{BRANCH} %package client -License: GPL-3.0+ Summary: Samba Client Utilities +License: GPL-3.0+ Group: Productivity/Networking/Samba Provides: samba-gplv3-client = %{version} Provides: smbfs @@ -292,8 +293,8 @@ Branch: %{BRANCH} %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %package core-devel -License: GPL-3.0+ Summary: Development files shared by Samba subpackages +License: GPL-3.0+ Group: Development/Libraries/C and C++ Conflicts: samba-devel @@ -309,8 +310,8 @@ Branch: %{BRANCH} %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %package doc -License: GPL-3.0+ Summary: Samba Documentation +License: GPL-3.0+ Group: Documentation/Other PreReq: coreutils PreReq: findutils @@ -332,10 +333,9 @@ Branch: %{BRANCH} %endif - %package libs -License: GPL-3.0+ Summary: Samba libraries +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: krb5 PreReq: /sbin/ldconfig @@ -349,8 +349,8 @@ Branch: %{BRANCH} %package pidl -License: GPL-3.0+ Summary: Perl IDL compiler +License: GPL-3.0+ Group: Development/Tools %if 0%{?suse_version} > 0 Requires: perl-base @@ -366,14 +366,14 @@ Branch: %{BRANCH} %package python -License: GPL-3.0+ Summary: Samba Python libraries +License: GPL-3.0+ Group: Applications/System Requires: %{name} = %{version} -Requires: python-tevent -Requires: python-tdb Requires: pyldb Requires: pytalloc +Requires: python-tdb +Requires: python-tevent %description python The samba-python package contains the Python libraries needed by programs @@ -384,8 +384,8 @@ Branch: %{BRANCH} %package test -License: GPL-3.0+ Summary: Testing tools for Samba servers and clients +License: GPL-3.0+ Group: Applications/System Requires: samba = %{version} Requires: samba-winbind = %{version} @@ -400,8 +400,8 @@ Branch: %{BRANCH} %package test-devel -License: GPL-3.0+ Summary: Testing devel files for Samba servers and clients +License: GPL-3.0+ Group: Development/Libraries/C and C++ %description test-devel @@ -413,8 +413,8 @@ Branch: %{BRANCH} %package winbind -License: GPL-3.0+ Summary: Winbind Daemon and Tool +License: GPL-3.0+ Group: Productivity/Networking/Samba Provides: samba-gplv3-winbind = %{version} Obsoletes: samba-gplv3-winbind < %{version} @@ -443,8 +443,8 @@ Branch: %{BRANCH} %package -n libdcerpc-atsvc0 -License: GPL-3.0+ Summary: DCE/RPC AT scheduler service library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc-atsvc0 @@ -456,8 +456,8 @@ Branch: %{BRANCH} %package -n libdcerpc-atsvc-devel -License: GPL-3.0+ Summary: Development files for the DCE/RPC ATSVC library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libdcerpc-atsvc0 = %{version} @@ -473,8 +473,8 @@ Branch: %{BRANCH} %package -n libdcerpc-binding0 -License: GPL-3.0+ Summary: Some samba library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc-binding0 @@ -484,8 +484,8 @@ Branch: %{BRANCH} %package -n libdcerpc-samr0 -License: GPL-3.0+ Summary: Security Account Manager (SAM) Remote Protocol library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc-samr0 @@ -495,8 +495,8 @@ Branch: %{BRANCH} %package -n libdcerpc-samr-devel -License: GPL-3.0+ Summary: Development files for the SAMR protocol library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libdcerpc-samr0 = %{version} @@ -509,8 +509,8 @@ Branch: %{BRANCH} %package -n libdcerpc0 -License: GPL-3.0+ Summary: Distributed Computing Environment Remote Procedure Calls library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc0 @@ -526,11 +526,11 @@ Branch: %{BRANCH} %package -n libdcerpc-devel -License: GPL-3.0+ Summary: Development files for the DCE/RPC library +License: GPL-3.0+ Group: Development/Libraries/C and C++ -Requires: libdcerpc0 = %{version} Requires: libdcerpc-binding0 = %{version} +Requires: libdcerpc0 = %{version} Requires: samba-core-devel = %{version} %description -n libdcerpc-devel @@ -549,8 +549,8 @@ Branch: %{BRANCH} %package -n libgensec0 -License: GPL-3.0+ Summary: Samba generic security library +License: GPL-3.0+ Group: System/Libraries %description -n libgensec0 @@ -560,8 +560,8 @@ Branch: %{BRANCH} %package -n libgensec-devel -License: GPL-3.0+ Summary: Development files for Samba's generic security library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libgensec0 = %{version} Requires: samba-core-devel = %{version} @@ -575,8 +575,8 @@ Branch: %{BRANCH} %package -n libndr-krb5pac0 -License: GPL-3.0+ Summary: NDR marshallers for the KRB5 PAC formats +License: GPL-3.0+ Group: System/Libraries %description -n libndr-krb5pac0 @@ -586,8 +586,8 @@ Branch: %{BRANCH} %package -n libndr-krb5pac-devel -License: GPL-3.0+ Summary: Development files for the ndr-krb5pac library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr-krb5pac0 = %{version} Requires: samba-core-devel = %{version} @@ -601,8 +601,8 @@ Branch: %{BRANCH} %package -n libndr-nbt0 -License: GPL-3.0+ Summary: NDR marshallers for NBT formats +License: GPL-3.0+ Group: System/Libraries %description -n libndr-nbt0 @@ -612,8 +612,8 @@ Branch: %{BRANCH} %package -n libndr-nbt-devel -License: GPL-3.0+ Summary: Development files for the ndr-nbt library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr-nbt0 = %{version} Requires: samba-core-devel = %{version} @@ -627,8 +627,8 @@ Branch: %{BRANCH} %package -n libndr-standard0 -License: GPL-3.0+ Summary: NDR marshallers for the standard set of DCE/RPC interfaces +License: GPL-3.0+ Group: System/Libraries %description -n libndr-standard0 @@ -638,8 +638,8 @@ Branch: %{BRANCH} %package -n libndr-standard-devel -License: GPL-3.0+ Summary: Development files for the libndr-standard library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr-standard0 = %{version} Requires: samba-core-devel = %{version} @@ -653,8 +653,8 @@ Branch: %{BRANCH} %package -n libndr0 -License: GPL-3.0+ Summary: Network Data Representation library +License: GPL-3.0+ Group: System/Libraries %description -n libndr0 @@ -666,8 +666,8 @@ Branch: %{BRANCH} %package -n libndr-devel -License: GPL-3.0+ Summary: Development files for the Network Data Representation library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr0 = %{version} Requires: samba-core-devel = %{version} @@ -684,8 +684,8 @@ Branch: %{BRANCH} %package -n libpdb0 -License: GPL-3.0+ Summary: Samba3 password database library +License: GPL-3.0+ Group: System/Libraries %description -n libpdb0 @@ -695,11 +695,11 @@ Branch: %{BRANCH} %package -n libpdb-devel -License: GPL-3.0+ Summary: Development files for the Samba3 password database library +License: GPL-3.0+ Group: Development/Libraries/C and C++ -Requires: libpdb0 = %{version} Requires: libndr-standard-devel = %{version} +Requires: libpdb0 = %{version} Requires: libtevent-devel %description -n libpdb-devel @@ -711,8 +711,8 @@ Branch: %{BRANCH} %package -n libregistry0 -License: GPL-3.0+ Summary: Windows-style registry library +License: GPL-3.0+ Group: System/Libraries %description -n libregistry0 @@ -722,8 +722,8 @@ Branch: %{BRANCH} %package -n libregistry-devel -License: GPL-3.0+ Summary: Development files for the Samba Windows-style registry library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libregistry0 = %{version} Requires: samba-core-devel = %{version} @@ -737,8 +737,8 @@ Branch: %{BRANCH} %package -n libsamba-credentials0 -License: GPL-3.0+ Summary: Samba credential management library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-credentials0 @@ -748,8 +748,8 @@ Branch: %{BRANCH} %package -n libsamba-credentials-devel -License: GPL-3.0+ Summary: Development files for the Samba credential management library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-credentials0 = %{version} @@ -762,8 +762,8 @@ Branch: %{BRANCH} %package -n libsamba-hostconfig0 -License: GPL-3.0+ Summary: Host-wide Samba configuration library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-hostconfig0 @@ -773,8 +773,8 @@ Branch: %{BRANCH} %package -n libsamba-hostconfig-devel -License: GPL-3.0+ Summary: Development files for the host-wide Samba configuration library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-hostconfig0 = %{version} Requires: samba-core-devel = %{version} @@ -788,8 +788,8 @@ Branch: %{BRANCH} %package -n libsamba-policy0 -License: GPL-3.0+ Summary: Active Directory Group Policy library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-policy0 @@ -799,8 +799,8 @@ Branch: %{BRANCH} %package -n libsamba-policy-devel -License: GPL-3.0+ Summary: Development files for the Samba AD Group Policy library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-policy0 = %{version} @@ -813,8 +813,8 @@ Branch: %{BRANCH} %package -n libsamba-util0 -License: GPL-3.0+ Summary: Samba utility function library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-util0 @@ -824,8 +824,8 @@ Branch: %{BRANCH} %package -n libsamba-util-devel -License: GPL-3.0+ Summary: Development files for the Samba utility function library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-util0 = %{version} Requires: samba-core-devel = %{version} @@ -839,8 +839,8 @@ Branch: %{BRANCH} %package -n libsamdb0 -License: GPL-3.0+ Summary: Samba's SAM database library +License: GPL-3.0+ Group: System/Libraries %description -n libsamdb0 @@ -850,8 +850,8 @@ Branch: %{BRANCH} %package -n libsamdb-devel -License: GPL-3.0+ Summary: Development files for Samba's SAM database library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamdb0 = %{version} @@ -864,8 +864,8 @@ Branch: %{BRANCH} %package -n libsmbclient-raw0 -License: GPL-3.0+ Summary: Samba4's raw SMB client library +License: GPL-3.0+ Group: System/Libraries %description -n libsmbclient-raw0 @@ -875,8 +875,8 @@ Branch: %{BRANCH} %package -n libsmbclient-raw-devel -License: GPL-3.0+ Summary: Development files for Samba4's raw SMB client library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsmbclient-raw0 = %{version} Requires: samba-core-devel = %{version} @@ -890,8 +890,8 @@ Branch: %{BRANCH} %package -n libsmbconf0 -License: GPL-3.0+ Summary: Samba3 configuration library +License: GPL-3.0+ Group: System/Libraries %description -n libsmbconf0 @@ -903,8 +903,8 @@ Branch: %{BRANCH} %package -n libsmbconf-devel -License: GPL-3.0+ Summary: Development files for the Samba3 configuration library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsmbconf0 = %{version} @@ -920,8 +920,8 @@ Branch: %{BRANCH} %package -n libsmbldap0 -License: GPL-3.0+ Summary: Samba LDAP protocol helper function library +License: GPL-3.0+ Group: System/Libraries %description -n libsmbldap0 @@ -932,8 +932,8 @@ Branch: %{BRANCH} %package -n libsmbldap-devel -License: GPL-3.0+ Summary: Development files for the smbldap library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsmbldap0 = %{version} Requires: libtalloc-devel @@ -951,8 +951,8 @@ Branch: %{BRANCH} %package -n libtevent-util0 -License: GPL-3.0+ Summary: tevent <-> system status code conversion utility library +License: GPL-3.0+ Group: System/Libraries %description -n libtevent-util0 @@ -964,8 +964,8 @@ Branch: %{BRANCH} %package -n libtevent-util-devel -License: GPL-3.0+ Summary: Development files for the Samba tevent utility library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libtevent-devel Requires: libtevent-util0 = %{version} @@ -983,12 +983,12 @@ Branch: %{BRANCH} %package -n %{libsmbclient_name} -License: GPL-3.0+ %if 0%{?suse_version} > 1030 Provides: libsmbclient = %{version} Obsoletes: libsmbclient %endif Summary: Samba Client Library +License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1002,12 +1002,12 @@ Branch: %{BRANCH} %package -n libsmbclient-devel -License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbclient Support +License: GPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: krb5-devel Requires: %{libsmbclient_name} = %{version} +Requires: krb5-devel %description -n libsmbclient-devel This package contains the static libraries and header files needed to @@ -1018,8 +1018,8 @@ Branch: %{BRANCH} %package -n %{libnetapi_name} -License: GPL-3.0+ Summary: Samba netapi Library +License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1031,8 +1031,8 @@ Branch: %{BRANCH} %package -n libnetapi-devel -License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with netapi Support +License: GPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libnetapi_name} = %{version} @@ -1046,12 +1046,12 @@ Branch: %{BRANCH} %package -n %{libsmbsharemodes_name} -License: GPL-3.0+ %if 0%{?suse_version} > 1030 Provides: libsmbsharemodes = %{version} Obsoletes: libsmbsharemodes %endif Summary: Samba smbsharemodes Library +License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1063,8 +1063,8 @@ Branch: %{BRANCH} %package -n libsmbsharemodes-devel -License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support +License: GPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libsmbsharemodes_name} = %{version} @@ -1078,8 +1078,8 @@ Branch: %{BRANCH} %package -n %{libwbclient_name} -License: LGPL-3.0+ Summary: Samba libwbclient Library +License: LGPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1091,8 +1091,8 @@ Branch: %{BRANCH} %package -n libwbclient-devel -License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with wbclient Support +License: LGPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libwbclient_name} = %{version} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 27a2e8b..c7fb8ee 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:90c740f94c570c3d90f56d08e3510a52f0988df0ea877888846b5bf364f3b5d2 -size 54695 +oid sha256:0382e8fcb71d00cdd2fa19f0708ad1cf6ed467f4c0a1ecab2f89d164979cfad8 +size 54607