Hello community,
here is the log from the commit of package samba for openSUSE:Factory checked
in at 2015-03-30 19:09:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/samba (Old)
and /work/SRC/openSUSE:Factory/.samba.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba"
Changes:
--------
--- /work/SRC/openSUSE:Factory/samba/samba.changes 2015-03-16
09:41:06.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2015-03-30
19:09:59.000000000 +0200
@@ -1,0 +2,17 @@
+Fri Mar 20 13:21:43 UTC 2015 - dd...@suse.com
+
+- Correctly retain errno from Btrfs snapshot ioctls; (bnc#923374).
+
+-------------------------------------------------------------------
+Wed Mar 18 17:57:50 UTC 2015 - lmue...@suse.com
+
+- Simplify libxslt build requirement and README.SUSE install.
+- Remove no longer required cleanup steps while populating the build root.
+
+-------------------------------------------------------------------
+Tue Mar 17 15:21:58 UTC 2015 - dd...@suse.com
+
+- Remove deprecated base_rid example from idmap_rid manpage; (bso#11169);
+ (bnc#913304).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.GL2CXb/_old 2015-03-30 19:10:00.000000000 +0200
+++ /var/tmp/diff_new_pack.GL2CXb/_new 2015-03-30 19:10:00.000000000 +0200
@@ -110,12 +110,7 @@
BuildRequires: python-tevent
# to generate the man pages
BuildRequires: docbook-xsl-stylesheets
-%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
-BuildRequires: libxslt1
-%endif
%if 0%{?suse_version} > 1210
BuildRequires: dbus-1-devel
BuildRequires: libxslt-tools
@@ -148,7 +143,7 @@
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
-%define SOURCE_TIMESTAMP 3382
+%define SOURCE_TIMESTAMP 3386
%define BRANCH %{version}
%global with_mitkrb5 1
%global with_dc 0
@@ -1090,10 +1085,6 @@
done
# vendor-files (config, scripts, tools)
%setup -T -D -a 1 -n samba-%{samba_ver_full} -q
-for file in docs/htmldocs/index.html vendor-files/docu/README.vendor; do
- sed -e "s/VENDOR/%{VENDOR}/g" "${file}" >"${file}.new" && \
- mv "${file}.new" "${file}"
-done
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 && \
@@ -1373,8 +1364,8 @@
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}
done
-install -m 0644 docu/README.vendor %{buildroot}/%{DOCDIR}/README.%{VENDOR}
-# SuSEhelp files
+install -m 0644 docu/README.SUSE %{buildroot}/%{DOCDIR}/
+# SUSEhelp files
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
@@ -1401,12 +1392,8 @@
install -m 0644 source3/pam_smbpass/README examples/pam_smbpass/README
install -m 0644 source3/pam_smbpass/TODO examples/pam_smbpass/TODO
mv COPYING README Roadmap WHATSNEW.txt %{buildroot}/%{DOCDIR}/
-# this is empty
-rm -rf docs/yodldocs
-rm -rf docs/manpages
cp -a docs/* %{buildroot}/%{DOCDIR}
-rm -rf "%{buildroot}/%{DOCBOOKDIR}"
-rm -f examples/VFS/*~
+rmdir "%{buildroot}/%{DOCBOOKDIR}"
cp -a examples/ %{buildroot}/%{DOCDIR}
# finally build filelist-samba-doc
for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do
++++++ patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/samba.org/8466587c589f01d59294be36ad0b347f5d82a11f
new/patches/samba.org/8466587c589f01d59294be36ad0b347f5d82a11f
--- old/patches/samba.org/8466587c589f01d59294be36ad0b347f5d82a11f
1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/8466587c589f01d59294be36ad0b347f5d82a11f
2015-03-17 17:23:24.000000000 +0100
@@ -0,0 +1,43 @@
+From 8466587c589f01d59294be36ad0b347f5d82a11f Mon Sep 17 00:00:00 2001
+From: David Disseldorp <dd...@samba.org>
+Date: Fri, 16 Jan 2015 16:21:24 +0100
+Subject: [PATCH] docs/idmap_rid: remove deprecated base_rid from example
+
+The base_rid option has been deprecated for some time. Specifying a
+value of 1000 (as recommended in the parameter description and example
+section) can result in failed mapping of group SIDs, where RIDs do not
+start at 1000.
+
+Signed-off-by: David Disseldorp <dd...@samba.org>
+Reviewed-by: Jeremy Allison <j...@samba.org>
+
+Autobuild-User(master): Michael Adam <ob...@samba.org>
+Autobuild-Date(master): Mon Jan 19 09:09:22 CET 2015 on sn-devel-104
+---
+ docs-xml/manpages/idmap_rid.8.xml | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git docs-xml/manpages/idmap_rid.8.xml docs-xml/manpages/idmap_rid.8.xml
+index 2db15e2..520d605 100644
+--- docs-xml/manpages/idmap_rid.8.xml
++++ docs-xml/manpages/idmap_rid.8.xml
+@@ -65,8 +65,6 @@
+ This means SIDs with a RID less than the base rid are
filtered.
+ The default is not to restrict the allowed rids at all,
+ i.e. a base_rid value of 0.
+- A good value for the base_rid can be 1000, since user
+- RIDs by default start at 1000 (512 hexadecimal).
+ </para>
+ <para>
+ Use of this parameter is deprecated.
+@@ -114,7 +112,6 @@
+
+ idmap config TRUSTED : backend = rid
+ idmap config TRUSTED : range = 50000 - 99999
+- idmap config TRUSTED : base_rid = 1000
+ </programlisting>
+ </refsect1>
+
+--
+2.1.4
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches/series new/patches/series
--- old/patches/series 2015-03-05 13:16:40.000000000 +0100
+++ new/patches/series 2015-03-17 17:33:24.000000000 +0100
@@ -13,6 +13,7 @@
samba.org/35e27c352df6180a12459be104ecf328c6997bc5 -p0 # bnc 899558
samba.org/c283bbfa03d4fe1f62f0bf62a10f145b196816ea -p0 # bnc 899558
samba.org/6d2c8f54e5e87485783b5173aa9f903a79d25443 -p0 # bnc 919309
+samba.org/8466587c589f01d59294be36ad0b347f5d82a11f -p0 # bso 11169, bnc 913304
samba.org/fix_pc_dependencies.diff -p0
# SuSE specific changes
@@ -62,6 +63,7 @@
suse/0002-vfs_snapper-encode-and-decode-FSRVP-Snapper-DBus-str.patch -p0 # bso
11055, bnc 913238
suse/0001-allow-net-ads-join-accept-new-osServicePack-paramete.patch -p0 # bnc
873922
suse/0001-ntdb-always-return-int-from-tdb_store_flag_to_ntdb.patch -p0 # gcc5
build fix
+suse/rebuild_idmap_rid_manpage.patch -p0 # bso 11169, bnc 913304
# this one should always live at the end and should be redone
# diabled cf. 280452
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches/suse/0008-vfs-add-snapshot-create-delete-calls-to-vfs_btrfs.patch
new/patches/suse/0008-vfs-add-snapshot-create-delete-calls-to-vfs_btrfs.patch
---
old/patches/suse/0008-vfs-add-snapshot-create-delete-calls-to-vfs_btrfs.patch
2014-12-10 13:54:26.000000000 +0100
+++
new/patches/suse/0008-vfs-add-snapshot-create-delete-calls-to-vfs_btrfs.patch
2015-03-20 14:19:14.000000000 +0100
@@ -61,7 +61,7 @@
struct btrfs_cc_state {
struct vfs_handle_struct *handle;
-@@ -347,6 +371,366 @@ err_out:
+@@ -347,6 +371,370 @@ err_out:
return status;
}
@@ -156,6 +156,7 @@
+ char *dest_subvolume = NULL;
+ int ret;
+ NTSTATUS status;
++ int saved_errno;
+
+ req = tevent_req_create(mem_ctx, &create_state,
+ struct btrfs_snap_create_state);
@@ -235,12 +236,13 @@
+
+ become_root();
+ ret = ioctl(dest_fd, BTRFS_IOC_SNAP_CREATE_V2, &ioctl_arg);
++ saved_errno = errno;
+ unbecome_root();
+ if (ret < 0) {
+ DEBUG(0, ("%s -> %s(%s) BTRFS_IOC_SNAP_CREATE_V2 failed: %s\n",
+ base_volume, dest_path, dest_subvolume,
-+ strerror(errno)));
-+ tevent_req_nterror(req, map_nt_error_from_unix(errno));
++ strerror(saved_errno)));
++ tevent_req_nterror(req, map_nt_error_from_unix(saved_errno));
+ closedir(src_dir);
+ closedir(dest_dir);
+ return tevent_req_post(req, ev);
@@ -315,6 +317,7 @@
+ int dest_fd;
+ struct btrfs_ioctl_vol_args ioctl_arg;
+ int ret;
++ int saved_errno;
+
+ req = tevent_req_create(mem_ctx, &delete_state,
+ struct btrfs_snap_delete_state);
@@ -379,12 +382,13 @@
+
+ become_root();
+ ret = ioctl(dest_fd, BTRFS_IOC_SNAP_DESTROY, &ioctl_arg);
++ saved_errno = errno;
+ unbecome_root();
+ if (ret < 0) {
+ DEBUG(0, ("%s(%s) BTRFS_IOC_SNAP_DESTROY failed: %s\n",
+ delete_state->dest_path, delete_state->subvolume,
-+ strerror(errno)));
-+ tevent_req_nterror(req, map_nt_error_from_unix(errno));
++ strerror(saved_errno)));
++ tevent_req_nterror(req, map_nt_error_from_unix(saved_errno));
+ closedir(dest_dir);
+ return tevent_req_post(req, ev);
+ }
@@ -428,7 +432,7 @@
static struct vfs_fn_pointers btrfs_fns = {
.fs_capabilities_fn = btrfs_fs_capabilities,
-@@ -354,6 +738,11 @@ static struct vfs_fn_pointers btrfs_fns
+@@ -354,6 +742,11 @@ static struct vfs_fn_pointers btrfs_fns
.copy_chunk_recv_fn = btrfs_copy_chunk_recv,
.get_compression_fn = btrfs_get_compression,
.set_compression_fn = btrfs_set_compression,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches/suse/rebuild_idmap_rid_manpage.patch
new/patches/suse/rebuild_idmap_rid_manpage.patch
--- old/patches/suse/rebuild_idmap_rid_manpage.patch 1970-01-01
01:00:00.000000000 +0100
+++ new/patches/suse/rebuild_idmap_rid_manpage.patch 2015-03-17
17:32:45.000000000 +0100
@@ -0,0 +1,36 @@
+Index: docs/manpages/idmap_rid.8
+===================================================================
+--- docs/manpages/idmap_rid.8.orig
++++ docs/manpages/idmap_rid.8
+@@ -2,12 +2,12 @@
+ .\" Title: idmap_rid
+ .\" Author: [see the "AUTHOR" section]
+ .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+-.\" Date: 03/04/2015
++.\" Date: 03/17/2015
+ .\" Manual: System Administration tools
+ .\" Source: Samba 4.2
+ .\" Language: English
+ .\"
+-.TH "IDMAP_RID" "8" "03/04/2015" "Samba 4\&.2" "System Administration tools"
++.TH "IDMAP_RID" "8" "03/17/2015" "Samba 4\&.2" "System Administration tools"
+ .\" -----------------------------------------------------------------
+ .\" * Define some portability stuff
+ .\" -----------------------------------------------------------------
+@@ -51,7 +51,7 @@ Defines the available matching uid and g
+ .PP
+ base_rid = INTEGER
+ .RS 4
+-Defines the base integer used to build SIDs out of a UID or a GID, and to
rebase the UID or GID to be obtained from a SID\&. This means SIDs with a RID
less than the base rid are filtered\&. The default is not to restrict the
allowed rids at all, i\&.e\&. a base_rid value of 0\&. A good value for the
base_rid can be 1000, since user RIDs by default start at 1000 (512
hexadecimal)\&.
++Defines the base integer used to build SIDs out of a UID or a GID, and to
rebase the UID or GID to be obtained from a SID\&. This means SIDs with a RID
less than the base rid are filtered\&. The default is not to restrict the
allowed rids at all, i\&.e\&. a base_rid value of 0\&.
+ .sp
+ Use of this parameter is deprecated\&.
+ .RE
+@@ -103,7 +103,6 @@ This example shows how to configure two
+
+ idmap config TRUSTED : backend = rid
+ idmap config TRUSTED : range = 50000 \- 99999
+- idmap config TRUSTED : base_rid = 1000
+
+ .fi
+ .if n \{\
++++++ vendor-files.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor-files/docu/README.SUSE
new/vendor-files/docu/README.SUSE
--- old/vendor-files/docu/README.SUSE 1970-01-01 01:00:00.000000000 +0100
+++ new/vendor-files/docu/README.SUSE 2015-03-20 14:02:31.000000000 +0100
@@ -0,0 +1,84 @@
+Binary packages and bug reporting
+---------------------------------
+Please check http://en.openSUSE.org/Samba for general information on Samba as
+part of SUSE Linux Enterprise or openSUSE products, links to binary packages
+of the most current Samba version, and a bug reporting how to.
+
+Documented example configuration
+--------------------------------
+The installed sample configuration at /etc/samba/smb.conf is a stripped down
+version of the full commented and with deactivates examples enriched file as
+from /usr/share/doc/packages/samba/examples/smb.conf.VENDOR While building
+the package all comments are removed like running testparm on this file.
+
+Samba packaging organisation
+----------------------------
+The packaging split Samba in several components. This allows you to install
+only the components you need. The most common package is samba-client which
+also includes the main configuration file /etc/samba/smb.conf.
+
+As a result you can't install samba-winbind or the main Samba package, samba
+without also installing samba-client.
+
+Package name Content
+samba smb and nmb daemon and utilities, SWAT
+samba-client smb.conf, client utilities
+samba-doc Documentation (noarch)
+samba-python Python bindings
+samba-winbind Name Service Switch resolving names from NT servers
+
+Printing
+--------
+To access printers, these samba packages use CUPS by default. If you want
+to use a different printing subsystem, like LPRNG, set
+"printing = LPRNG" and
+"print name = /etc/printcap" in /etc/smb.conf.
+
+Setup a particular environment for a Samba daemon
+-------------------------------------------------
+It's possible to pass extra environment settings to nmbd, smbd, and winbindd.
+Therefore set SAMBA_NMBD_ENV, SAMBA_SMBD_ENV, or SAMBA_WINBINDD_ENV in
+/etc/sysconfig/samba
+
+For example SAMBA_WINBINDD_ENV="/usr/local/ldap:LDAPCONF=/usr/local/ldap/etc"
+will only export LDAPCONF with the mentioned path if /usr/local/ldap exists.
+It's possible to set a variable without a check by omitting the first path and
+the colon.
+
+umount.cifs permissions
+-----------------------
+By default umount.cifs isn't installed setuid root. If you would like to
+allow users a umount of CIFS filesystems please adjust the permissions via one
+of the /etc/permissions* files.
+
+usershares
+----------
+The usershare default directory /var/lib/samba/usershares is not packaged with
+any Samba RPM. The main reason is not to bother the users with changed
+permissions after any package update.
+
+To activate usershares you have to set 'usershare max shares' to something not
+equal zero in smb.conf, create the directory, and set appropriate permissions.
+
+In the following example any member of the group named 'users' will be able to
+create usershares:
+
+mkdir /var/lib/samba/usershares
+chown root:users /var/lib/samba/usershares
+chmod 1770 /var/lib/samba/usershares
+
+/var/spool/samba no longer part of any Samba RPM package
+--------------------------------------------------------
+/var/spool/samba is no longer part of any Samba RPM package. As the directory
+never was shipped with the permissions required for a spool dir we had
+recurrent complains about changed permissions after any update. As the dir is
+no longer in any package file list RPM will remove it while an update if it is
+empty. Therefore you have to recreate the dir by hand, set the appropriate
+permissions one time and we'll never bother you with any changes.
+
+You might even consider to use /var/tmp as the spool dir for Samba instead.
+
+How to view the Samba package detailed changelog?
+-------------------------------------------------
+If the package is installed type: rpm -q --changelog samba | less
+If not type: rpm -qp --changelog /path/to/the/samba*.rpm | less
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor-files/docu/README.vendor
new/vendor-files/docu/README.vendor
--- old/vendor-files/docu/README.vendor 2008-01-25 16:46:44.000000000 +0100
+++ new/vendor-files/docu/README.vendor 1970-01-01 01:00:00.000000000 +0100
@@ -1,105 +0,0 @@
-Binary packages and bug reporting
----------------------------------
-Please check http://en.openSUSE.org/Samba for general information on Samba as
-part of SUSE Linux Enterprise or openSUSE products, links to binary packages
-of the most current Samba version, and a bug reporting how to.
-
-Documented example configuration
---------------------------------
-The installed sample configuration at /etc/samba/smb.conf is a stripped down
-version of the full commented and with deactivates examples enriched file as
-from /usr/share/doc/packages/samba/examples/smb.conf.VENDOR While building
-the package all comments are removed like running testparm on this file.
-
-Samba packaging organisation
-----------------------------
-The packaging split Samba in several components. This allows you to install
-only the components you need. The most common package is samba-client which
-also includes the main configuration file /etc/samba/smb.conf.
-
-As a result you can't install samba-winbind or the main Samba package, samba
-without also installing samba-client.
-
-Package name Content
-samba smb and nmb daemon and utilities, SWAT
-samba-client smb.conf, client utilities
-samba-doc Documentation (noarch)
-samba-pdb Password Database plugins
-samba-python Python bindings
-samba-vscan On-access virus scanning VFS modules
-samba-winbind Name Service Switch resolving names from NT servers
-ldapsmb Tool to simplify Samba LDAP administration
-libmsrpc Msrpc library
-libmsrpc-devel Development files of the msrpc library
-libsmbclient Smb client library
-libsmbclient-devel Development files of the smb client library
-
-Printing
---------
-To access printers, these samba packages use CUPS by default. If you want
-to use a different printing subsystem, like LPRNG, set
-"printing = LPRNG" and
-"print name = /etc/printcap" in /etc/smb.conf.
-
-smbfs and nmb service
----------------------
-If your Linux system should mount a remote SMB/ CIFS share and the remote
-system is not in the broadcast domain of the Linux system, it might be useful
-to also activate, configure and start the nmb service. Especially if you use
-NetBIOS names and not IP addresses of the target.
-
-For activation of the nmb service use insserv or the YaST runlevel editor. By
-this the nmb service is started automatically while the system startup.
-
-To configure edit /etc/samba/smb.conf.
-
-To start the nmb service by hand call rcnmb start.
-
-Setup a particular environment for a Samba daemon
--------------------------------------------------
-It's possible to pass extra environment settings to nmbd, smbd, and winbindd.
-Therefore set SAMBA_NMBD_ENV, SAMBA_SMBD_ENV, or SAMBA_WINBINDD_ENV in
-/etc/sysconfig/samba
-
-For example SAMBA_WINBINDD_ENV="/usr/local/ldap:LDAPCONF=/usr/local/ldap/etc"
-will only export LDAPCONF with the mentioned path if /usr/local/ldap exists.
-It's possible to set a variable without a check by omitting the first path and
-the colon.
-
-umount.cifs permissions
------------------------
-By default umount.cifs isn't installed setuid root. If you would like to
-allow users a umount of CIFS filesystems please adjust the permissions via one
-of the /etc/permissions* files.
-
-usershares
-----------
-The usershare default directory /var/lib/samba/usershares is not packaged with
-any Samba RPM. The main reason is not to bother the users with changed
-permissions after any package update.
-
-To activate usershares you have to set 'usershare max shares' to something not
-equal zero in smb.conf, create the directory, and set appropriate permissions.
-
-In the following example any member of the group named 'users' will be able to
-create usershares:
-
-mkdir /var/lib/samba/usershares
-chown root:users /var/lib/samba/usershares
-chmod 1770 /var/lib/samba/usershares
-
-/var/spool/samba no longer part of any Samba RPM package
---------------------------------------------------------
-/var/spool/samba is no longer part of any Samba RPM package. As the directory
-never was shipped with the permissions required for a spool dir we had
-recurrent complains about changed permissions after any update. As the dir is
-no longer in any package file list RPM will remove it while an update if it is
-empty. Therefore you have to recreate the dir by hand, set the appropriate
-permissions one time and we'll never bother you with any changes.
-
-You might even consider to use /var/tmp as the spool dir for Samba instead.
-
-How to view the Samba package detailed changelog?
--------------------------------------------------
-If the package is installed type: rpm -q --changelog samba | less
-If not type: rpm -qp --changelog /path/to/the/samba*.rpm | less
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 2015-03-05 14:22:40.000000000 +0100
+++ new/vendor-files/tools/package-data 2015-03-20 15:43:27.000000000 +0100
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="3382"
+SAMBA_PACKAGE_SVN_VERSION="3386"
