diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 644d510..56c2690 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56bda5724c21a59d68291f1d78d8b7416af3c0642d3e82662911da723433d68a -size 47430 +oid sha256:7419a6feec208a90c8d35c6c7004c57932988f1b7487ada100680a3efbd1f325 +size 41563 diff --git a/samba-4.5.3.tar.asc b/samba-4.5.3.tar.asc deleted file mode 100644 index 04cc09e..0000000 --- a/samba-4.5.3.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iD8DBQBYSnw4bzORW2Vot+oRAjqGAJ9ieJ+wGww+Iw6aUYBFeF5a0gg4LQCfci+h -ymnYzuj4guVsiSxLpOiJ9go= -=3z3A ------END PGP SIGNATURE----- diff --git a/samba-4.5.3.tar.gz b/samba-4.5.3.tar.gz deleted file mode 100644 index 8ba683a..0000000 --- a/samba-4.5.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f06dc454a1bb72b21a329e1ad75a14795886401671ec7439d69a6b824c492eca -size 20946015 diff --git a/samba-4.6.1.tar.asc b/samba-4.6.1.tar.asc new file mode 100644 index 0000000..cde9354 --- /dev/null +++ b/samba-4.6.1.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iD8DBQBY04UzbzORW2Vot+oRAtJrAJ9qI815QPVFc1zRiAIgewbHyhtbnACgoVer +r0Ckc5DyY+RmBx5JfaFkxLI= +=aWOn +-----END PGP SIGNATURE----- diff --git a/samba-4.6.1.tar.gz b/samba-4.6.1.tar.gz new file mode 100644 index 0000000..801cda9 --- /dev/null +++ b/samba-4.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d2751faa3cd33affd4f49681f700eff9f6c22d6b08e8858ae0d3cd8e51c535e +size 21097666 diff --git a/samba.changes b/samba.changes index a7fe4b9..52bf5f2 100644 --- a/samba.changes +++ b/samba.changes @@ -1,9 +1,38 @@ ------------------------------------------------------------------- -Mon Feb 27 15:30:21 UTC 2017 - dimstar@opensuse.org +Wed Mar 22 13:15:12 UTC 2017 - jmcdonough@suse.com -- Change insserv_prereq requires to requires(pre): this is - factually seen not a runtime requirement of samba, but of the - rpm scriptlets. +- Update to 4.6.1 + + symlink race permits opening files outside share directory; + CVE-2017-2619; (bso#12496); (bsc#1027147) + + testparm checks for valid idmap parameters + + add new krb client encryption types + + support for printer driver upload from windows 10 + + inherit owner = 'unix only' for improved quota support + + improved CTDB event support + + new primary group support for idmap_ad + + idmap_hash deprecated + + mvxattr added to recursively rename extended attributes + +------------------------------------------------------------------- +Wed Mar 15 11:50:50 UTC 2017 - aaptel@suse.com + +- Remove chkconfig requirements for systemd systems + +------------------------------------------------------------------- +Mon Mar 13 15:14:58 UTC 2017 - kukuk@suse.com + + - Don't call insserv if systemd is used + +------------------------------------------------------------------- +Fri Feb 10 23:00:14 CET 2017 - kukuk@suse.de + +- Fix check if we need to require insserv + +------------------------------------------------------------------- +Mon Feb 6 18:35:29 UTC 2017 - aaptel@suse.com + +- Force usage of ncurses6-config thru NCURSES_CONFIG env var; + (bsc#1023847). ------------------------------------------------------------------- Thu Jan 26 21:23:06 UTC 2017 - dmulder@suse.com diff --git a/samba.spec b/samba.spec index 9ec04a6..8e7407e 100644 --- a/samba.spec +++ b/samba.spec @@ -34,6 +34,7 @@ BuildRequires: e2fsprogs-devel BuildRequires: gcc BuildRequires: make BuildRequires: patch +BuildRequires: libcmocka-devel %if 0%{?suse_version} > 1300 BuildRequires: libarchive-devel %endif @@ -128,7 +129,7 @@ BuildRequires: libpcp-devel %if 0%{?build_vfs_ceph} BuildRequires: libcephfs-devel %endif -%define samba_ver 4.5.3 +%define samba_ver 4.6.1 %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 +151,11 @@ BuildRequires: libcephfs-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 0 +%define SOURCE_TIMESTAMP 3755 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 -Version: 4.5.3 +Version: 4.6.1 Release: 0 Url: https://www.samba.org/ Obsoletes: samba-gplv3 < %{version} @@ -262,10 +263,10 @@ Group: Productivity/Networking/Samba Provides: smbfs Obsoletes: samba-gplv3-client < %{version} Obsoletes: samba-client-gplv2 < %{version} -%if 0%{?suse_version} > 0 -Requires(pre): %{?insserv_prereq} -%endif +%if 0%{?suse_version} < 1221 +Requires: %{?insserv_prereq} Requires: /sbin/chkconfig +%endif Requires: /sbin/ldconfig Requires: coreutils %{?systemd_requires} @@ -416,8 +417,8 @@ Recommends: cron Recommends: logrotate Recommends: /usr/sbin/nscd %endif -%if 0%{?suse_version} > 0 -Requires(pre): %{?insserv_prereq} +%if 0%{?suse_version} < 1221 +Requires: %{?insserv_prereq} %endif Requires: /sbin/ldconfig Requires: /usr/sbin/groupadd @@ -1101,6 +1102,10 @@ mv VERSION VERSION.orig sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=${vendor_tag}%{VENDOR}${product_suffix}/" VERSION.orig >VERSION %build +if command -v ncurses6-config &> /dev/null; then + export NCURSES_CONFIG="$(command -v ncurses6-config)" +fi + export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" %if 0%{?suse_version} && 0%{?suse_version} < 1141 %{?suse_update_config:%{suse_update_config -f}} @@ -1365,7 +1370,7 @@ done # cups SMB support mkdir -p %{buildroot}/%{cups_lib_dir}/backend/ touch %{buildroot}/%{cups_lib_dir}/backend/smb -mv COPYING README Roadmap WHATSNEW.txt %{buildroot}/%{DOCDIR}/ +mv COPYING README WHATSNEW.txt %{buildroot}/%{DOCDIR}/ cp -a docs/* %{buildroot}/%{DOCDIR} rmdir "%{buildroot}/%{DOCBOOKDIR}" cp -a examples/ %{buildroot}/%{DOCDIR} @@ -1528,7 +1533,9 @@ fi %postun client /sbin/ldconfig +%if 0%{?suse_version} < 1221 %{?insserv_cleanup:%{insserv_cleanup}} +%endif %post -n libdcerpc-binding0 -p /sbin/ldconfig %postun -n libdcerpc-binding0 -p /sbin/ldconfig @@ -1791,6 +1798,7 @@ fi %{_bindir}/smbtar %{_bindir}/smbtree %{_bindir}/testparm +%{_bindir}/mvxattr %dir %{cups_lib_dir} %dir %{cups_lib_dir}/backend %ghost %{cups_lib_dir}/backend/smb @@ -1819,6 +1827,7 @@ fi %{_mandir}/man1/smbtar.1.* %{_mandir}/man1/smbtree.1.* %{_mandir}/man1/testparm.1.* +%{_mandir}/man1/mvxattr.1.* %{_mandir}/man5/lmhosts.5.* %{_mandir}/man5/smb.conf.5.* %{_mandir}/man5/smbgetrc.5.* @@ -1977,7 +1986,6 @@ fi %{_libdir}/samba/libsmbd-shim-samba4.so %{_libdir}/samba/libsmbldaphelper-samba4.so %{_libdir}/samba/libsmbpasswdparser-samba4.so -%{_libdir}/samba/libsmbregistry-samba4.so %{_libdir}/samba/libsocket-blocking-samba4.so %{_libdir}/samba/libsys-rw-samba4.so %{_libdir}/samba/libtalloc-report-samba4.so @@ -2150,10 +2158,12 @@ fi %{_bindir}/onnode %{_bindir}/ping_pong %dir %{_libdir}/ctdb -%{_libdir}/ctdb/ctdb_event_helper +%{_libdir}/ctdb/ctdb_event +%{_libdir}/ctdb/ctdb_eventd %{_libdir}/ctdb/ctdb_lock_helper %{_libdir}/ctdb/ctdb_natgw %{_libdir}/ctdb/ctdb_recovery_helper +%{_libdir}/ctdb/ctdb_takeover_helper %{_libdir}/ctdb/smnotify %{_libdir}/ctdb/ctdb_killtcp %{_libdir}/ctdb/ctdb_lvs @@ -2197,54 +2207,10 @@ fi %files -n ctdb-tests %defattr(-,root,root) %dir %{_libdir}/ctdb -%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 -%{_libdir}/ctdb/tests/pidfile_test +%{_libdir}/ctdb/tests/ %dir %{_datadir}/ctdb -%dir %{_datadir}/ctdb/tests -%dir %{_datadir}/ctdb/tests/eventscripts -%dir %{_datadir}/ctdb/tests/eventscripts/etc-ctdb -%{_datadir}/ctdb/tests/eventscripts/etc-ctdb/events.d -%{_datadir}/ctdb/tests/eventscripts/etc-ctdb/functions -%{_datadir}/ctdb/tests/eventscripts/etc-ctdb/nfs-checks.d -%{_datadir}/ctdb/tests/eventscripts/etc-ctdb/nfs-linux-kernel-callout -%{_datadir}/ctdb/tests/eventscripts/etc-ctdb/statd-callout -%dir %{_datadir}/ctdb/tests/onnode -%{_datadir}/ctdb/tests/onnode/functions -%dir %{_datadir}/ctdb/tests/scripts -%{_datadir}/ctdb/tests/scripts/common.sh -%{_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 +%{_datadir}/ctdb/tests + %files -n libdcerpc-binding0 %defattr(-,root,root) @@ -2422,7 +2388,6 @@ fi %_includedir/samba-4.0/util/substitute.h %_includedir/samba-4.0/util/talloc_stack.h %_includedir/samba-4.0/util/time.h -%_includedir/samba-4.0/util/xfile.h %_libdir/libsamba-util.so %_libdir/pkgconfig/samba-util.pc diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 40cc73e..99242bf 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:196fe3dfc870543cb00af6662a38ea785fbe5f4e4f747d4398ef6cb453173d92 -size 55266 +oid sha256:5b89409086ecb36365e9a8abfe769cdffce75760e81b1c1b842669ad7bf56113 +size 55759