Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2017-04-25 08:56:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba" Tue Apr 25 08:56:28 2017 rev:211 rq:489610 version:4.6.2+git.19.c267455e57b Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2017-04-17 10:22:22.155710220 +0200 +++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2017-04-25 08:56:31.101256722 +0200 @@ -1,0 +2,8 @@ +Tue Apr 18 13:38:11 UTC 2017 - [email protected] + +- 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" + +------------------------------------------------------------------- @@ -59,0 +68,6 @@ +Thu Feb 9 15:23:21 UTC 2017 - [email protected] + +- async_req: make async_connect_send() "reentrant"; + (bso#12105); (bsc#1024416). + +------------------------------------------------------------------- @@ -75,0 +90,5 @@ +Mon Jan 23 21:44:03 UTC 2017 - [email protected] + +- Document "winbind: ignore domains" parameter; (bsc#1019416). + +------------------------------------------------------------------- @@ -97,0 +117,11 @@ +Fri Dec 2 13:15:50 UTC 2016 - [email protected] + +- Add missing ldb module directory; (bnc#1012092). + +------------------------------------------------------------------- +Thu Nov 17 08:33:07 UTC 2016 - [email protected] + +- s3/client: obey 'disable netbios' smb.conf param, don't + connect via NBT port; (bsc#1009085); (bso#12418). + +------------------------------------------------------------------- @@ -129,0 +160,6 @@ +Mon Aug 29 10:25:40 UTC 2016 - [email protected] + +- Prevent core, make sure response->extra_data.data is always + cleared out; (bsc#993692). + +------------------------------------------------------------------- @@ -202 +238 @@ - (bsc#975962). + (bsc#975962); (bsc#979268), (bsc#977669). @@ -228,0 +265,6 @@ +Fri Apr 8 10:23:22 UTC 2016 - [email protected] + +- Fix samba.tests.messaging test and prevent potential tdb corruption + by removing obsolete now invalid tdb_close call; (bsc#974629). + +------------------------------------------------------------------- @@ -457 +499,2 @@ - + Fix winbindd crashes with samlogon for trusted domain user; (bso#11569). + + Fix winbindd crashes with samlogon for trusted domain user; (bso#11569); + (bnc#949022). Old: ---- patches.tar.bz2 samba-4.6.2.tar.asc samba-4.6.2.tar.gz samba.keyring New: ---- _service samba-4.6.2+git.19.c267455e57b.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.2fEUQT/_old 2017-04-25 08:56:32.996988664 +0200 +++ /var/tmp/diff_new_pack.2fEUQT/_new 2017-04-25 08:56:33.016985836 +0200 @@ -130,16 +130,6 @@ BuildRequires: libcephfs-devel BuildRequires: librados-devel %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 %define libsmbclient_name libsmbclient %else @@ -152,11 +142,11 @@ %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3760 +%define SOURCE_TIMESTAMP 3761 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 -Version: 4.6.2 +Version: 4.6.2+git.19.c267455e57b Release: 0 Url: https://www.samba.org/ Obsoletes: samba-gplv3 < %{version} @@ -168,11 +158,8 @@ 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: samba.keyring +Source: samba-%{version}.tar.bz2 Source1: vendor-files.tar.bz2 -Source2: patches.tar.bz2 Source4: baselibs.conf Source100: samba-client-rpmlintrc Requires: /usr/bin/getent @@ -1052,21 +1039,11 @@ %prep -%setup -n samba-%{samba_ver_full} -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 +%setup -n samba-%{version} -q # 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/ # Create and add vendor suffix -test -f vendor-files/tools/package-data && \ - . vendor-files/tools/package-data if test "%{_project}" != "openSUSE:Factory"; then vendor_tag_release=$( grep -m 1 ^Release: ${RPM_SOURCE_DIR}/samba.spec | \ while read tag release; do \ @@ -1075,8 +1052,9 @@ else vendor_tag_release="" fi -vendor_tag=$( echo -n "${vendor_tag_release}"; \ - echo -n "${SAMBA_PACKAGE_SVN_VERSION:+${SAMBA_PACKAGE_SVN_VERSION}-}" ) +# ensure Git commit portion of version string is retained +vendor_tag=$(echo -n %{version} | sed "s/.*+git/git/"; \ + echo -n "${vendor_tag_release}" ) # Create product suffix test 0%{?centos_version} -gt 0 && product_version=%{?centos_version} test 0%{?fedora_version} -gt 0 && product_version=%{?fedora_version} @@ -1163,6 +1141,10 @@ XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml" make htmlman popd +pushd ctdb +XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml" make manpages +popd + pushd pidl %{__perl} Makefile.PL INSTALLDIRS=vendor popd @@ -1349,16 +1331,16 @@ # Add logrotate settings for nmbd and smbd only on systems newer than 8.1. %if 0%{?suse_version} && 0%{?suse_version} < 811 LOGROTATE_FILES="samba-winbind" - rm -f "${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba" - touch "${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba" + rm -f "${RPM_BUILD_DIR}/samba-%{version}/filelist-samba" + touch "${RPM_BUILD_DIR}/samba-%{version}/filelist-samba" %else LOGROTATE_FILES="samba samba-winbind" %endif for file in ${LOGROTATE_FILES}; do install -m 0644 logrotate/${file} %{buildroot}/%{_sysconfdir}/logrotate.d/${file} - rm -f "${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file}" - touch "${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file}" - echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file} + rm -f "${RPM_BUILD_DIR}/samba-%{version}/filelist-${file}" + touch "${RPM_BUILD_DIR}/samba-%{version}/filelist-${file}" + echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-${file} done install -m 0644 docu/README.SUSE %{buildroot}/%{DOCDIR}/ # SUSEhelp files @@ -1392,14 +1374,14 @@ case "${file#%{buildroot}}" in %{DOCDIR}|%{DOCDIR}/README.%{VENDOR}|%{DOCDIR}/docbook) continue ;; 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 for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do # if built we don't want vfs_ceph in the base package case "${file#%{buildroot}}" in %{_libdir}/samba/vfs/ceph.so) continue ;; esac - echo "${file#%{buildroot}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba + echo "${file#%{buildroot}}" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-samba done # only package Man pages for VFS modules that we ship for file in %{buildroot}%{_mandir}/man8/vfs_*; do @@ -1424,7 +1406,7 @@ ;; esac # 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 # copy the schema install -m 0644 examples/LDAP/samba.schema %{buildroot}/%{_sysconfdir}/openldap/schema/samba3.schema @@ -1433,7 +1415,7 @@ %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000 && 0%{?suse_version} < 1120 while read file; do 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 rm -r "%{buildroot}/${file}" done ++++++ _service ++++++ <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> ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2017-04-10 15:55:14.002480219 +0200 +++ new/vendor-files/tools/package-data 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="3760"
