pool/samba
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 489610 from network:samba:STABLE

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/489610
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=211
This commit is contained in:
Dominique Leuenberger 2017-04-25 06:56:28 +00:00 committed by Git OBS Bridge
commit cad0e53af8
9 changed files with 94 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
_service Normal file
View File

@ -0,0 +1,22 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="url">https://gitlab.suse.de/samba/suse-samba.git/</param>
<param name="scm">git</param>
<param name="revision">factory</param>
<param name="versionformat">@PARENT_TAG@+git.@TAG_OFFSET@.%h</param>
<param name="versionrewrite-pattern">samba(.*)</param>
<param name="versionrewrite-replacement">\1</param>
<param name="filename">samba</param>
<param name="exclude">.git</param>
</service>
<service name="set_version" mode="disabled">
<param name="basename">samba</param>
<param name="file">samba.spec</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">bz2</param>
</service>
</services>

3
patches.tar.bz2
View File

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

3
samba-4.6.2+git.19.c267455e57b.tar.bz2 Normal file
View File

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

7
samba-4.6.2.tar.asc
View File

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

3
samba-4.6.2.tar.gz
View File

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

49
samba.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Apr 18 13:38:11 UTC 2017 - ddiss@suse.com
- Generate source tarball directly from Git using OBS tar_scm
+ use version string derived from parent Git tag and commit hash
- remove obsolete vendor-files/tools/package-data version ID
+ explicitly generate ctdb manpages, needed without "make dist"
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 10 13:52:40 UTC 2017 - ddiss@suse.com Mon Apr 10 13:52:40 UTC 2017 - ddiss@suse.com
@ -56,6 +64,12 @@ Fri Feb 10 23:00:14 CET 2017 - kukuk@suse.de
- Fix check if we need to require insserv - Fix check if we need to require insserv
-------------------------------------------------------------------
Thu Feb 9 15:23:21 UTC 2017 - nopower@suse.com
- async_req: make async_connect_send() "reentrant";
(bso#12105); (bsc#1024416).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 6 18:35:29 UTC 2017 - aaptel@suse.com Mon Feb 6 18:35:29 UTC 2017 - aaptel@suse.com
@ -72,6 +86,11 @@ Wed Jan 25 17:20:31 UTC 2017 - ddiss@suse.com
- Fix vfs_ceph builds against recent Ceph versions; (bsc#1021933). - Fix vfs_ceph builds against recent Ceph versions; (bsc#1021933).
-------------------------------------------------------------------
Mon Jan 23 21:44:03 UTC 2017 - dmulder@suse.com
- Document "winbind: ignore domains" parameter; (bsc#1019416).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 19 19:19:07 UTC 2017 - ddiss@suse.com Thu Jan 19 19:19:07 UTC 2017 - ddiss@suse.com
@ -94,6 +113,17 @@ Mon Dec 19 19:11:20 UTC 2016 - jmcdonough@suse.com
+ various stability fixes in smbd + various stability fixes in smbd
+ match file compression ReFS behavior + match file compression ReFS behavior
-------------------------------------------------------------------
Fri Dec 2 13:15:50 UTC 2016 - nopower@suse.com
- Add missing ldb module directory; (bnc#1012092).
-------------------------------------------------------------------
Thu Nov 17 08:33:07 UTC 2016 - nopower@suse.com
- s3/client: obey 'disable netbios' smb.conf param, don't
connect via NBT port; (bsc#1009085); (bso#12418).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 26 17:55:13 UTC 2016 - nopower@suse.com Mon Sep 26 17:55:13 UTC 2016 - nopower@suse.com
@ -126,6 +156,12 @@ Tue Aug 30 09:47:01 UTC 2016 - nopower@suse.com
- Fix illegal memory access after memory has been deleted; - Fix illegal memory access after memory has been deleted;
(bso#11836); (bsc#975299). (bso#11836); (bsc#975299).
-------------------------------------------------------------------
Mon Aug 29 10:25:40 UTC 2016 - nopower@suse.com
- Prevent core, make sure response->extra_data.data is always
cleared out; (bsc#993692).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 15 14:54:14 UTC 2016 - ddiss@suse.com Mon Aug 15 14:54:14 UTC 2016 - ddiss@suse.com
@ -163,7 +199,7 @@ Tue Jun 14 17:49:59 UTC 2016 - jmcdonough@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 9 17:12:14 UTC 2016 - jmcdonough@suse.com Thu Jun 9 17:12:14 UTC 2016 - jmcdonough@suse.com
- Don't use htons() with IP_PROTO_RAW; (bso#11705); (bsc#969522). - Don't use htons() with IP_PROTO_RAW; (bso#11705); (bsc#969522).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 9 12:46:18 UTC 2016 - jmcdonough@suse.com Thu Jun 9 12:46:18 UTC 2016 - jmcdonough@suse.com
@ -199,7 +235,7 @@ Thu May 19 10:06:40 UTC 2016 - jmcdonough@suse.com
Tue May 3 13:03:47 UTC 2016 - jmcdonough@suse.com Tue May 3 13:03:47 UTC 2016 - jmcdonough@suse.com
- Fix NTLMSSP regressions caused by previous CVE fixes; (bso#11849); - Fix NTLMSSP regressions caused by previous CVE fixes; (bso#11849);
(bsc#975962). (bsc#975962); (bsc#979268), (bsc#977669).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 28 22:48:17 UTC 2016 - jmcdonough@suse.com Thu Apr 28 22:48:17 UTC 2016 - jmcdonough@suse.com
@ -225,6 +261,12 @@ Sat Apr 9 21:36:02 UTC 2016 - jmcdonough@suse.com
+ DCERPC server and client vulnerable to DOS and MITM attacks; + DCERPC server and client vulnerable to DOS and MITM attacks;
CVE-2015-5370; (bso#11344); (bsc#936862). CVE-2015-5370; (bso#11344); (bsc#936862).
-------------------------------------------------------------------
Fri Apr 8 10:23:22 UTC 2016 - nopower@suse.com
- Fix samba.tests.messaging test and prevent potential tdb corruption
by removing obsolete now invalid tdb_close call; (bsc#974629).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 22 17:36:01 UTC 2016 - lmuelle@suse.com Tue Mar 22 17:36:01 UTC 2016 - lmuelle@suse.com
@ -454,7 +496,8 @@ Tue Dec 1 16:48:13 UTC 2015 - lmuelle@suse.com
+ async_req: Fix non-blocking connect(); (bso#11564). + async_req: Fix non-blocking connect(); (bso#11564).
+ auth: gensec: Fix a memory leak; (bso#11565). + auth: gensec: Fix a memory leak; (bso#11565).
+ lib: util: Make non-critical message a warning; (bso#11566). + lib: util: Make non-critical message a warning; (bso#11566).
+ Fix winbindd crashes with samlogon for trusted domain user; (bso#11569). + Fix winbindd crashes with samlogon for trusted domain user; (bso#11569);
(bnc#949022).
+ smbd: Send SMB2 oplock breaks unencrypted; (bso#11570). + smbd: Send SMB2 oplock breaks unencrypted; (bso#11570).
+ ctdb: Open the RO tracking db with perms 0600 instead of 0000; (bso#11577). + ctdb: Open the RO tracking db with perms 0600 instead of 0000; (bso#11577).
+ s3:smb2_server: Make the logic of SMB2_CANCEL DLIST_REMOVE() clearer; + s3:smb2_server: Make the logic of SMB2_CANCEL DLIST_REMOVE() clearer;

85
samba.keyring
View File

@ -1,85 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1
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
=IqTy
-----END PGP PUBLIC KEY BLOCK-----

60
samba.spec
View File

@ -130,16 +130,6 @@ BuildRequires: libpcp-devel
BuildRequires: libcephfs-devel BuildRequires: libcephfs-devel
BuildRequires: librados-devel BuildRequires: librados-devel
%endif %endif
%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
%define samba_source_signature_location https://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.asc
%else
%define samba_source_location https://ftp.samba.org/pub/samba/rc/samba-%{version}%{samba_ver_suffix}.tar.gz
%define samba_source_signature_location https://ftp.samba.org/pub/samba/rc/samba-%{version}%{samba_ver_suffix}.tar.asc
%endif
%define samba_ver_full %{samba_ver}%{samba_ver_suffix}
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
%define libsmbclient_name libsmbclient %define libsmbclient_name libsmbclient
%else %else
@ -152,11 +142,11 @@ BuildRequires: librados-devel
%else %else
%define build_make_smp_mflags %{?jobs:-j%jobs} %define build_make_smp_mflags %{?jobs:-j%jobs}
%endif %endif
%define SOURCE_TIMESTAMP 3760 %define SOURCE_TIMESTAMP 3761
%define BRANCH %{version} %define BRANCH %{version}
%global with_mitkrb5 1 %global with_mitkrb5 1
%global with_dc 0 %global with_dc 0
Version: 4.6.2 Version: 4.6.2+git.19.c267455e57b
Release: 0 Release: 0
Url: https://www.samba.org/ Url: https://www.samba.org/
Obsoletes: samba-gplv3 < %{version} Obsoletes: samba-gplv3 < %{version}
@ -168,11 +158,8 @@ Recommends: logrotate
Summary: A SMB/CIFS File, Print, and Authentication Server Summary: A SMB/CIFS File, Print, and Authentication Server
License: GPL-3.0+ License: GPL-3.0+
Group: Productivity/Networking/Samba Group: Productivity/Networking/Samba
Source: %{samba_source_location} Source: samba-%{version}.tar.bz2
Source5: %{samba_source_signature_location}
Source6: samba.keyring
Source1: vendor-files.tar.bz2 Source1: vendor-files.tar.bz2
Source2: patches.tar.bz2
Source4: baselibs.conf Source4: baselibs.conf
Source100: samba-client-rpmlintrc Source100: samba-client-rpmlintrc
Requires: /usr/bin/getent Requires: /usr/bin/getent
@ -1052,21 +1039,11 @@ that RADOS locks can be used for CTDB split-brain avoidance.
%prep %prep
%setup -n samba-%{samba_ver_full} -q %setup -n samba-%{version} -q
# patches
%setup -T -D -a 2 -n samba-%{samba_ver_full} -q
for patch in $( patches/tools/guards %{guards_symbols} <patches/series); do
if ! patch -s -E -p0 --no-backup-if-mismatch -i patches/$patch; then
echo "*** Patch $patch failed ***"
exit 1
fi
done
# vendor-files (config, scripts, tools) # vendor-files (config, scripts, tools)
%setup -T -D -a 1 -n samba-%{samba_ver_full} -q %setup -T -D -a 1 -n samba-%{version} -q
install -m 0644 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/ install -m 0644 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/
# Create and add vendor suffix # Create and add vendor suffix
test -f vendor-files/tools/package-data && \
. vendor-files/tools/package-data
if test "%{_project}" != "openSUSE:Factory"; then if test "%{_project}" != "openSUSE:Factory"; then
vendor_tag_release=$( grep -m 1 ^Release: ${RPM_SOURCE_DIR}/samba.spec | \ vendor_tag_release=$( grep -m 1 ^Release: ${RPM_SOURCE_DIR}/samba.spec | \
while read tag release; do \ while read tag release; do \
@ -1075,8 +1052,9 @@ if test "%{_project}" != "openSUSE:Factory"; then
else else
vendor_tag_release="" vendor_tag_release=""
fi fi
vendor_tag=$( echo -n "${vendor_tag_release}"; \ # ensure Git commit portion of version string is retained
echo -n "${SAMBA_PACKAGE_SVN_VERSION:+${SAMBA_PACKAGE_SVN_VERSION}-}" ) vendor_tag=$(echo -n %{version} | sed "s/.*+git/git/"; \
echo -n "${vendor_tag_release}" )
# Create product suffix # Create product suffix
test 0%{?centos_version} -gt 0 && product_version=%{?centos_version} test 0%{?centos_version} -gt 0 && product_version=%{?centos_version}
test 0%{?fedora_version} -gt 0 && product_version=%{?fedora_version} test 0%{?fedora_version} -gt 0 && product_version=%{?fedora_version}
@ -1163,6 +1141,10 @@ autoconf && ./configure
XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml" make htmlman XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml" make htmlman
popd popd
pushd ctdb
XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml" make manpages
popd
pushd pidl pushd pidl
%{__perl} Makefile.PL INSTALLDIRS=vendor %{__perl} Makefile.PL INSTALLDIRS=vendor
popd popd
@ -1349,16 +1331,16 @@ install -m 0644 config/sysconfig.firewall.samba-client \
# Add logrotate settings for nmbd and smbd only on systems newer than 8.1. # Add logrotate settings for nmbd and smbd only on systems newer than 8.1.
%if 0%{?suse_version} && 0%{?suse_version} < 811 %if 0%{?suse_version} && 0%{?suse_version} < 811
LOGROTATE_FILES="samba-winbind" LOGROTATE_FILES="samba-winbind"
rm -f "${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba" rm -f "${RPM_BUILD_DIR}/samba-%{version}/filelist-samba"
touch "${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba" touch "${RPM_BUILD_DIR}/samba-%{version}/filelist-samba"
%else %else
LOGROTATE_FILES="samba samba-winbind" LOGROTATE_FILES="samba samba-winbind"
%endif %endif
for file in ${LOGROTATE_FILES}; do for file in ${LOGROTATE_FILES}; do
install -m 0644 logrotate/${file} %{buildroot}/%{_sysconfdir}/logrotate.d/${file} install -m 0644 logrotate/${file} %{buildroot}/%{_sysconfdir}/logrotate.d/${file}
rm -f "${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file}" rm -f "${RPM_BUILD_DIR}/samba-%{version}/filelist-${file}"
touch "${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file}" touch "${RPM_BUILD_DIR}/samba-%{version}/filelist-${file}"
echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file} echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-${file}
done done
install -m 0644 docu/README.SUSE %{buildroot}/%{DOCDIR}/ install -m 0644 docu/README.SUSE %{buildroot}/%{DOCDIR}/
# SUSEhelp files # SUSEhelp files
@ -1392,14 +1374,14 @@ for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do
case "${file#%{buildroot}}" in case "${file#%{buildroot}}" in
%{DOCDIR}|%{DOCDIR}/README.%{VENDOR}|%{DOCDIR}/docbook) continue ;; %{DOCDIR}|%{DOCDIR}/README.%{VENDOR}|%{DOCDIR}/docbook) continue ;;
esac esac
echo "%doc ${file#%{buildroot}}" >>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" echo "%doc ${file#%{buildroot}}" >>"${RPM_BUILD_DIR}/samba-%{version}/filelist-samba-doc"
done done
for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do
# if built we don't want vfs_ceph in the base package # if built we don't want vfs_ceph in the base package
case "${file#%{buildroot}}" in case "${file#%{buildroot}}" in
%{_libdir}/samba/vfs/ceph.so) continue ;; %{_libdir}/samba/vfs/ceph.so) continue ;;
esac esac
echo "${file#%{buildroot}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba echo "${file#%{buildroot}}" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-samba
done done
# only package Man pages for VFS modules that we ship # only package Man pages for VFS modules that we ship
for file in %{buildroot}%{_mandir}/man8/vfs_*; do for file in %{buildroot}%{_mandir}/man8/vfs_*; do
@ -1424,7 +1406,7 @@ for file in %{buildroot}%{_mandir}/man8/vfs_*; do
;; ;;
esac esac
# wildcard suffix to account for subsequent gzip # wildcard suffix to account for subsequent gzip
echo "${file#%{buildroot}}*" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba echo "${file#%{buildroot}}*" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-samba
done done
# copy the schema # copy the schema
install -m 0644 examples/LDAP/samba.schema %{buildroot}/%{_sysconfdir}/openldap/schema/samba3.schema install -m 0644 examples/LDAP/samba.schema %{buildroot}/%{_sysconfdir}/openldap/schema/samba3.schema
@ -1433,7 +1415,7 @@ install -m 0644 examples/LDAP/samba-nds.schema %{buildroot}/%{_datadir}/samba/LD
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000 && 0%{?suse_version} < 1120 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000 && 0%{?suse_version} < 1120
while read file; do while read file; do
rm -r "%{buildroot}/${file#%* }" rm -r "%{buildroot}/${file#%* }"
done <"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" done <"${RPM_BUILD_DIR}/samba-%{version}/filelist-samba-doc"
for file in %{_datadir}/susehelp; do for file in %{_datadir}/susehelp; do
rm -r "%{buildroot}/${file}" rm -r "%{buildroot}/${file}"
done done

4
vendor-files.tar.bz2
View File

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