Accepting request 487103 from network:samba:STABLE

- Update to 4.6.2
  + remove bso#12721 patches now upstream

- Enable samba-ceph build for openSUSE and SLE12SP3+; (fate#321622).
  + x86-64 and aarch64

- Enable librados CTDB lock helper for samba-ceph package; (fate#321622).

- Build and install the html man pages (bsc#1021907).

- Fix CVE-2017-2619 regression with "follow symlinks = no";
  (bso#12721).

- 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

- Remove chkconfig requirements for systemd systems

 - Don't call insserv if systemd is used

- Fix check if we need to require insserv

OBS-URL: https://build.opensuse.org/request/show/487103
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=210
This commit is contained in:
Yuchen Lin 2017-04-17 08:22:20 +00:00 committed by Git OBS Bridge
commit 6debb252ea
9 changed files with 195 additions and 116 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:56bda5724c21a59d68291f1d78d8b7416af3c0642d3e82662911da723433d68a
size 47430
oid sha256:09e993823d82c27fb3c01c944e8c8a5f34b5d7c1dc40d1608186f17d040a595e
size 41213

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iD8DBQBYSnw4bzORW2Vot+oRAjqGAJ9ieJ+wGww+Iw6aUYBFeF5a0gg4LQCfci+h
ymnYzuj4guVsiSxLpOiJ9go=
=3z3A
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f06dc454a1bb72b21a329e1ad75a14795886401671ec7439d69a6b824c492eca
size 20946015

7
samba-4.6.2.tar.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iD8DBQBY3flHbzORW2Vot+oRAmTlAJ9sFlLebbYX3c7rOh1P9btozLmTPQCghScz
DQw3KuAbWCKIgkHcy1zZr2o=
=bIg5
-----END PGP SIGNATURE-----

3
samba-4.6.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:927afcc16e444718985e3952de92d34e7b776b9ca0238179d866da18a6441c35
size 21097045

View File

@ -1,9 +1,66 @@
-------------------------------------------------------------------
Mon Feb 27 15:30:21 UTC 2017 - dimstar@opensuse.org
Mon Apr 10 13:52:40 UTC 2017 - ddiss@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.2
+ remove bso#12721 patches now upstream
-------------------------------------------------------------------
Fri Apr 7 12:59:26 UTC 2017 - ddiss@suse.com
- Enable samba-ceph build for openSUSE and SLE12SP3+; (fate#321622).
+ x86-64 and aarch64
-------------------------------------------------------------------
Mon Apr 3 14:01:25 UTC 2017 - ddiss@suse.com
- Enable librados CTDB lock helper for samba-ceph package; (fate#321622).
-------------------------------------------------------------------
Thu Mar 30 17:18:54 UTC 2017 - dmulder@suse.com
- Build and install the html man pages (bsc#1021907).
-------------------------------------------------------------------
Thu Mar 30 12:33:39 UTC 2017 - nopower@suse.com
- Fix CVE-2017-2619 regression with "follow symlinks = no";
(bso#12721).
-------------------------------------------------------------------
Wed Mar 22 13:15:12 UTC 2017 - jmcdonough@suse.com
- 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

View File

@ -1,8 +1,5 @@
pub 1024D/6568B7EA 2007-02-04 [expires: 2014-02-25]
uid Samba Distribution Verification Key <samba-bugs@samba.org>
sub 2048g/DA6DFB44 2007-02-04 [expires: 2014-02-25]
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.11 (GNU/Linux)
Version: GnuPG v1
mQGiBEXGOUcRBACooMht/2pmNT3bKZn1WEFQa+sXe6nxi3G6lH5bIBUKp85SDM57
4qTcBIJXhwfGABeSvyUdZJbBxJDD5bNiO4k+Y5j3t8t9hb2FKgJ1bXL2aO5BbFnJ
@ -14,29 +11,75 @@ JMZABACis5ms470DH3OwU7b32lDDLFWlwGEQX+OKQealhYgz3hdIzO+cm6Gz0/z1
YGl8oV0dc1tG2EfsndDx7QRwrBoxahfsgClN4K8HLtbBy1Ox9kZn+hr1yNEaPdko
+W5bC96Wo2RqnSP09qJ5/tp6rXXCLIgF/+PeCJtP31MaMP0Jo7Q6U2FtYmEgRGlz
dHJpYnV0aW9uIFZlcmlmaWNhdGlvbiBLZXkgPHNhbWJhLWJ1Z3NAc2FtYmEub3Jn
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
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
=IqTy
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -21,13 +21,14 @@
%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
%if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120200
%ifarch aarch64 x86_64
%define build_ceph 1
%endif
%endif
Name: samba
BuildRequires: autoconf
BuildRequires: cups-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: e2fsprogs-devel
@ -125,10 +126,11 @@ BuildRequires: systemd-devel
%if 0%{?build_ctdb_pmda}
BuildRequires: libpcp-devel
%endif
%if 0%{?build_vfs_ceph}
%if 0%{?build_ceph}
BuildRequires: libcephfs-devel
BuildRequires: librados-devel
%endif
%define samba_ver 4.5.3
%define samba_ver 4.6.2
%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 +152,11 @@ BuildRequires: libcephfs-devel
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
%define SOURCE_TIMESTAMP 0
%define SOURCE_TIMESTAMP 3760
%define BRANCH %{version}
%global with_mitkrb5 1
%global with_dc 0
Version: 4.5.3
Version: 4.6.2
Release: 0
Url: https://www.samba.org/
Obsoletes: samba-gplv3 < %{version}
@ -262,10 +264,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 +418,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
@ -1035,15 +1037,17 @@ develop programs which make use of the wbclient programming interface.
Source Timestamp: %{SOURCE_TIMESTAMP}
Branch: %{BRANCH}
%if 0%{?build_vfs_ceph}
%if 0%{?build_ceph}
%package ceph
Summary: Ceph VFS Module for Samba
Summary: Ceph specific add-ons for Samba
License: GPL-3.0+
Group: Productivity/Networking/Samba
Requires: samba = %{version}
%description ceph
The Ceph VFS module for Samba allows shares to be backed by the Ceph distributed file system.
The Ceph VFS module for Samba allows shares to be backed by the Ceph
distributed file system. A Ceph CTDB lock helper binary is included so
that RADOS locks can be used for CTDB split-brain avoidance.
%endif
@ -1101,6 +1105,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}}
@ -1126,6 +1134,9 @@ CONFIGURE_OPTIONS="\
%endif
--enable-fhs \
--with-cluster-support \
%if 0%{?build_ceph}
--enable-ceph-reclock \
%endif
--with-pam \
--with-pammodulesdir=%{_lib}/security \
--with-piddir=%{PIDDIR} \
@ -1141,12 +1152,17 @@ CONFIGURE_OPTIONS="\
%if ! %with_dc
--without-ad-dc \
%endif
--bundled-libraries=NONE,socket_wrapper,${bundled_libraries_extra} \
--bundled-libraries=NONE,socket_wrapper,cmocka,${bundled_libraries_extra} \
"
./configure ${CONFIGURE_OPTIONS}
make %{build_make_smp_mflags} \
all
pushd docs-xml
autoconf && ./configure
XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml" make htmlman
popd
pushd pidl
%{__perl} Makefile.PL INSTALLDIRS=vendor
popd
@ -1349,6 +1365,7 @@ install -m 0644 docu/README.SUSE %{buildroot}/%{DOCDIR}/
install -m 0644 docu/Samba.desktop %{buildroot}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop
install -d -m 0755 -p ../docs/htmldocs
install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html
install -m 0644 ../docs-xml/output/htmldocs/manpages/* ../docs/htmldocs/
popd
# winbind stuff
install -m 0644 examples/pam_winbind/pam_winbind.conf %{buildroot}/%{_sysconfdir}/security/pam_winbind.conf
@ -1365,7 +1382,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}
@ -1388,7 +1405,7 @@ done
for file in %{buildroot}%{_mandir}/man8/vfs_*; do
case "${file#%{buildroot}}" in
%{_mandir}/man8/vfs_ceph.8)
%if 0%{?build_vfs_ceph} == 0
%if 0%{?build_ceph} == 0
rm ${file}
%endif
continue
@ -1528,7 +1545,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 +1810,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 +1839,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 +1998,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 +2170,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 +2219,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 +2400,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
@ -2492,11 +2469,13 @@ fi
%{_libdir}/libwbclient.so
%{_libdir}/pkgconfig/wbclient.pc
%if 0%{?build_vfs_ceph}
%if 0%{?build_ceph}
%files ceph
%defattr(-,root,root)
%{_mandir}/man8/vfs_ceph.8.*
%{_libdir}/samba/vfs/ceph.so
%{_mandir}/man7/ctdb_mutex_ceph_rados_helper.7.*
%{_libdir}/ctdb/ctdb_mutex_ceph_rados_helper
%endif
%changelog

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:196fe3dfc870543cb00af6662a38ea785fbe5f4e4f747d4398ef6cb453173d92
size 55266
oid sha256:16a440502ea2c66151c7d08a811ad998d3024afebfdb38fada6f8a6b86f726ad
size 55342