diff --git a/patches.tar.bz2 b/patches.tar.bz2 index e149b7a..f681789 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:737b49ddce985a38831576325e1cff02f058f01c3bccc674dfad4b133a67cdb0 -size 71125 +oid sha256:1dd3ab475ebb5408b757d7d91d462c8bedca2f65c59b8013a4aa791a327b966b +size 167077 diff --git a/samba-4.1.4.tar.asc b/samba-4.1.4.tar.asc deleted file mode 100644 index 023ee1b..0000000 --- a/samba-4.1.4.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iD8DBQBSz6uYbzORW2Vot+oRAgdAAJ9n0GQ8ZwsizWM6CIr5lmJXxo7zpwCfTMpg -1eF2oc0zDz1/27DkBouoLvk= -=tpG3 ------END PGP SIGNATURE----- diff --git a/samba-4.1.4.tar.gz b/samba-4.1.4.tar.gz deleted file mode 100644 index 74f78a1..0000000 --- a/samba-4.1.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1733e1aaa37b4fcb0fc781b07fc6f20831023ce971d8bcd97940c3fbe35766a7 -size 23169480 diff --git a/samba-4.1.5.tar.asc b/samba-4.1.5.tar.asc new file mode 100644 index 0000000..6aa442c --- /dev/null +++ b/samba-4.1.5.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlMHHEcACgkQbzORW2Vot+pNiwCePohuvj4WvbYp0AmHW7HXkTD0 +ExgAn0Qq3LcJ2KBjX+s8gHk23yGtWA27 +=K+he +-----END PGP SIGNATURE----- diff --git a/samba-4.1.5.tar.gz b/samba-4.1.5.tar.gz new file mode 100644 index 0000000..e149019 --- /dev/null +++ b/samba-4.1.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d98c1554d6f857053557ff024c243df5d15dd9ca436d5804be4b0546ede94cc8 +size 23177512 diff --git a/samba.changes b/samba.changes index c62d4b6..b9d323e 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,134 @@ +------------------------------------------------------------------- +Fri Feb 21 17:57:57 UTC 2014 - ddiss@suse.com + +- Use libarchive to provide improved smbclient tarmode functionality; + (bso#9667); (bnc#861135). + +------------------------------------------------------------------- +Fri Feb 21 16:02:12 UTC 2014 - lmuelle@suse.com + +- Depend on %version-%release with all manual Provides and Requires; + (bnc#844307). + +------------------------------------------------------------------- +Fri Feb 21 13:16:01 UTC 2014 - lmuelle@suse.com + +- Update to 4.1.5. + + Fix 100% CPU utilization in winbindd when trying to free memory in + winbindd_reinit_after_fork; (bso#10358); (bnc#786677). + + smbd: Fix memory overwrites; (bso#10415). + + + s3-winbind: Improve performance of wb_fill_pwent_sid2uid_done(); + (bso#2191). + + ntlm_auth sometimes returns the wrong username to mod_ntlm_auth_winbind; + (bso#10087). + + s3: smbpasswd: Fix crashes on invalid input; (bso#10320). + + s3: vfs_dirsort module: Allow dirsort to work when multiple simultaneous + directories are open; (bso#10406). + + Add support for Heimdal's unified krb5 and hdb plugin system, cope with + first element in hdb_method having a different name in different heimdal + versions and fix INTERNAL ERROR: Signal 11 in the kdc pid; (bso#10418). + + vfs_btrfs: Fix incorrect zero length server-side copy request handling; + (bso#10424). + + s3: modules: streaminfo: As we have no VFS function SMB_VFS_LLISTXATTR we + can't cope with a symlink when lp_posix_pathnames() is true; (bso#10429). + + smbd: Fix an ancient oplock bug; (bso#10436). + + Fix crash bug in smb2_notify code; (bso#10442). + +------------------------------------------------------------------- +Tue Feb 18 13:04:37 UTC 2014 - lmuelle@suse.com + +- Remove superfluous obsoletes *-64bit in the ifarch ppc64 case; (bnc#437293). + +------------------------------------------------------------------- +Fri Feb 14 00:31:35 UTC 2014 - ddiss@suse.com + +- Migrate @GMT token parsing functionality into vfs_snapper; (bnc#863079). + + Improve vfs_snapper documentation. + +------------------------------------------------------------------- +Wed Feb 12 17:50:02 UTC 2014 - ddiss@suse.com + +- Fix Winbind 100% CPU utilization caused by domain list corruption; + (bso#10358); (bnc#786677). + +------------------------------------------------------------------- +Sat Feb 8 10:39:25 UTC 2014 - ddiss@suse.com + +- Fix memory overwrite in FSCTL_VALIDATE_NEGOTIATE_INFO handler; (bso#10415); + (bnc#862370). + +------------------------------------------------------------------- +Fri Feb 7 16:48:52 UTC 2014 - lmuelle@suse.com + +- Streamline the vendor suffix handling and add support for SLE 12. + +------------------------------------------------------------------- +Fri Feb 7 16:07:50 UTC 2014 - ddiss@suse.com + +- Fix zero length server-side copy request handling; (bso#10424); + (bnc#862558). + +------------------------------------------------------------------- +Tue Feb 4 17:22:52 UTC 2014 - lmuelle@suse.com + +- Set the PID directory to /run/samba on post-12.2 systems. + +------------------------------------------------------------------- +Tue Feb 4 16:02:45 UTC 2014 - lmuelle@suse.com + +- Make use of the tmpfilesdir macro while calling systemd-tmpfiles. + +------------------------------------------------------------------- +Tue Jan 28 20:05:30 CET 2014 - nopower@suse.de + +- Make winbindd print the interface version when it gets an INTERFACE_VERSION + request; (bnc#726937). + +------------------------------------------------------------------- +Tue Jan 28 15:16:30 UTC 2014 - ddiss@suse.com + +- Fix vfs_btrfs build on older platforms with duplicate WRITE_FLUSH + definitions; (bnc#860832). + +------------------------------------------------------------------- +Tue Jan 28 14:34:57 UTC 2014 - ddiss@suse.com + +- Check for NULL gensec_security in gensec_security_by_auth_type(); + (bnc#860809). + +------------------------------------------------------------------- +Tue Jan 28 01:57:08 UTC 2014 - ddiss@suse.com + +- Ensure ndr table initialization; (bnc#860648). + +------------------------------------------------------------------- +Fri Jan 24 19:41:59 UTC 2014 - ddiss@suse.com + +- Add File Server Remote VSS Protocol (FSRVP) server for SMB share + shadow-copies; (fate#313346). + +------------------------------------------------------------------- +Fri Jan 24 15:17:53 UTC 2014 - lmuelle@suse.com + +- s3-dir: Fix the DOS clients against 64-bit smbd's; (bso#2662). +- shadow_copy2: module "Previous Version" not working in Windows 7; + (bso#10259). +- s3-passdb: Fix string duplication to pointers; (bso#10367). +- vfs/glusterfs: in case atime is not passed, set it to the current atime; + (bso#10384) + +------------------------------------------------------------------- +Fri Jan 24 14:30:45 UTC 2014 - lmuelle@suse.com + +- s3: winbindd: Move calling setup_domain_child() into add_trusted_domain(); + (bso#10358); (bnc#786677). + +------------------------------------------------------------------- +Mon Jan 20 10:47:54 UTC 2014 - lmuelle@suse.com + +- Default sysconfig daemon options to -D; (bso#10388); (bnc#857454). + ------------------------------------------------------------------- Thu Jan 16 19:19:58 UTC 2014 - lmuelle@suse.com @@ -161,6 +292,13 @@ Thu Nov 21 14:13:37 UTC 2013 - lmuelle@suse.com - Add systemd support for post-12.2 systems. +------------------------------------------------------------------- +Tue Nov 19 19:17:40 CET 2013 - nopower@suse.de + +- Allow smbcacls to take a '--propagate-inheritance' flag to indicate that + the add, delete, modify and set operations now support automatic + propagation of inheritable ACE(s); (FATE#316474). + ------------------------------------------------------------------- Fri Nov 15 18:04:50 UTC 2013 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index b8c510b..b63f724 100644 --- a/samba.spec +++ b/samba.spec @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} + Name: samba %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 BuildRequires: autoconf @@ -25,6 +27,9 @@ BuildRequires: patch BuildRequires: cups-devel BuildRequires: cyrus-sasl-devel BuildRequires: e2fsprogs-devel +%if 0%{?suse_version} > 1300 +BuildRequires: libarchive-devel +%endif %if 0%{?suse_version} > 1210 BuildRequires: gamin-devel %else @@ -112,7 +117,7 @@ BuildRequires: dbus-1-devel BuildRequires: gpg-offline BuildRequires: systemd %endif -%define samba_ver 4.1.4 +%define samba_ver 4.1.5 %define samba_ver_suffix %nil %if "%{samba_ver_suffix}" == "" %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz @@ -139,21 +144,18 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3149 +%define SOURCE_TIMESTAMP 3186 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 %global with_get_printing_ticket 0 -Version: 4.1.4 +Version: 4.1.5 Release: 0 License: GPL-3.0+ Url: http://www.samba.org/ Group: Productivity/Networking/Samba -Provides: samba-gplv3 = %{version} +Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} -%ifarch ppc64 -Obsoletes: samba-64bit -%endif Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 Recommends: cron @@ -198,7 +200,11 @@ PreReq: %{fillup_prereq} %define LOCKDIR %{_localstatedir}/lib/samba %define CONFIGDIR %{_sysconfdir}/samba %define INITDIR %{_sysconfdir}/init.d +%if 0%{?suse_version} > 1220 +%define PIDDIR /run/samba +%else %define PIDDIR %{_localstatedir}/run/samba +%endif %if "%{_vendor}" == "suse" %define NET_CFGDIR network %else @@ -248,14 +254,11 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Samba Client Utilities Group: Productivity/Networking/Samba -Provides: samba-gplv3-client = %{version} +Provides: samba-gplv3-client = %{version}-%{release} Provides: smbfs Obsoletes: samba-gplv3-client < %{version} -Provides: samba-client-gplv2 = %{version} +Provides: samba-client-gplv2 = %{version}-%{release} Obsoletes: samba-client-gplv2 < %{version} -%ifarch ppc64 -Obsoletes: samba-client-64bit -%endif %if 0%{?suse_version} > 0 PreReq: %{?fillup_prereq} PreReq: %{?insserv_prereq} @@ -310,9 +313,9 @@ Summary: Samba Documentation Group: Documentation/Other PreReq: coreutils PreReq: findutils -Provides: samba-gplv3-doc = %{version} +Provides: samba-gplv3-doc = %{version}-%{release} Obsoletes: samba-gplv3-doc < %{version} -Provides: samba-doc-gplv2 = %{version} +Provides: samba-doc-gplv2 = %{version}-%{release} Obsoletes: samba-doc-gplv2 < %{version} %if 0%{?suse_version} > 1110 BuildArch: noarch @@ -334,7 +337,7 @@ License: GPL-3.0+ Summary: Wrapper binary for kerberized printing Group: Productivity/Networking/Samba PreReq: coreutils -Provides: samba-gplv3-krb-printing = %{version} +Provides: samba-gplv3-krb-printing = %{version}-%{release} Obsoletes: samba-gplv3-krb-printing < %{version} %if 0%{?suse_version} > 1000 PreReq: permissions @@ -385,7 +388,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Samba Python libraries Group: Applications/System -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: python-tevent Requires: python-tdb Requires: pyldb @@ -403,8 +406,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Testing tools for Samba servers and clients Group: Applications/System -Requires: samba = %{version} -Requires: samba-winbind = %{version} +Requires: samba = %{version}-%{release} +Requires: samba-winbind = %{version}-%{release} PreReq: /sbin/ldconfig %description test @@ -432,12 +435,9 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Winbind Daemon and Tool Group: Productivity/Networking/Samba -Provides: samba-gplv3-winbind = %{version} +Provides: samba-gplv3-winbind = %{version}-%{release} Obsoletes: samba-gplv3-winbind < %{version} Provides: samba-client:/usr/sbin/winbindd -%ifarch ppc64 -Obsoletes: samba-winbind-64bit -%endif Requires: samba-client >= %{version} %if 0%{?suse_version} Requires: pam-config @@ -479,7 +479,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the DCE/RPC ATSVC library Group: Development/Libraries/C and C++ -Requires: libdcerpc-atsvc0 = %{version} +Requires: libdcerpc-atsvc0 = %{version}-%{release} %description -n libdcerpc-atsvc-devel ATSVC is a DCE/RPC based protocol used by CIFS hosts to @@ -518,7 +518,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the SAMR protocol library Group: Development/Libraries/C and C++ -Requires: libdcerpc-samr0 = %{version} +Requires: libdcerpc-samr0 = %{version}-%{release} %description -n libdcerpc-samr-devel This subpackage contains libraries and header files for developing @@ -549,9 +549,9 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the DCE/RPC library Group: Development/Libraries/C and C++ -Requires: libdcerpc0 = %{version} -Requires: libdcerpc-binding0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libdcerpc0 = %{version}-%{release} +Requires: libdcerpc-binding0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libdcerpc-devel DCE/RPC, short for "Distributed Computing Environment / Remote @@ -583,8 +583,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for Samba's generic security library Group: Development/Libraries/C and C++ -Requires: libgensec0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libgensec0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libgensec-devel This subpackage contains libraries and header files for developing @@ -609,8 +609,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the ndr-krb5pac library Group: Development/Libraries/C and C++ -Requires: libndr-krb5pac0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libndr-krb5pac0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libndr-krb5pac-devel This subpackage contains libraries and header files for developing @@ -635,8 +635,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the ndr-nbt library Group: Development/Libraries/C and C++ -Requires: libndr-nbt0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libndr-nbt0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libndr-nbt-devel This subpackage contains libraries and header files for developing @@ -661,8 +661,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the libndr-standard library Group: Development/Libraries/C and C++ -Requires: libndr-standard0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libndr-standard0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libndr-standard-devel This subpackage contains libraries and header files for developing @@ -689,8 +689,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Network Data Representation library Group: Development/Libraries/C and C++ -Requires: libndr0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libndr0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libndr-devel Network Data Representation (NDR) is an implementation of the @@ -718,8 +718,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba3 password database library Group: Development/Libraries/C and C++ -Requires: libpdb0 = %{version} -Requires: libndr-standard-devel = %{version} +Requires: libpdb0 = %{version}-%{release} +Requires: libndr-standard-devel = %{version}-%{release} Requires: libtevent-devel %description -n libpdb-devel @@ -745,8 +745,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba Windows-style registry library Group: Development/Libraries/C and C++ -Requires: libregistry0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libregistry0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libregistry-devel This subpackage contains libraries and header files for developing @@ -771,7 +771,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba credential management library Group: Development/Libraries/C and C++ -Requires: libsamba-credentials0 = %{version} +Requires: libsamba-credentials0 = %{version}-%{release} %description -n libsamba-credentials-devel This subpackage contains libraries and header files for developing @@ -796,8 +796,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the host-wide Samba configuration library Group: Development/Libraries/C and C++ -Requires: libsamba-hostconfig0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libsamba-hostconfig0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libsamba-hostconfig-devel This subpackage contains libraries and header files for developing @@ -822,7 +822,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba AD Group Policy library Group: Development/Libraries/C and C++ -Requires: libsamba-policy0 = %{version} +Requires: libsamba-policy0 = %{version}-%{release} %description -n libsamba-policy-devel This subpackage contains libraries and header files for developing @@ -847,8 +847,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba utility function library Group: Development/Libraries/C and C++ -Requires: libsamba-util0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libsamba-util0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libsamba-util-devel This subpackage contains libraries and header files for developing @@ -873,7 +873,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for Samba's SAM database library Group: Development/Libraries/C and C++ -Requires: libsamdb0 = %{version} +Requires: libsamdb0 = %{version}-%{release} %description -n libsamdb-devel This subpackage contains libraries and header files for developing @@ -898,8 +898,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for Samba4's raw SMB client library Group: Development/Libraries/C and C++ -Requires: libsmbclient-raw0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libsmbclient-raw0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libsmbclient-raw-devel This subpackage contains libraries and header files for developing @@ -926,7 +926,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba3 configuration library Group: Development/Libraries/C and C++ -Requires: libsmbconf0 = %{version} +Requires: libsmbconf0 = %{version}-%{release} %description -n libsmbconf-devel libsmbconf is a library to read or, based on the backend, modify the @@ -955,7 +955,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the smbldap library Group: Development/Libraries/C and C++ -Requires: libsmbldap0 = %{version} +Requires: libsmbldap0 = %{version}-%{release} Requires: libtalloc-devel Requires: libtevent-devel Requires: openldap2-devel @@ -988,8 +988,8 @@ License: GPL-3.0+ Summary: Development files for the Samba tevent utility library Group: Development/Libraries/C and C++ Requires: libtevent-devel -Requires: libtevent-util0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libtevent-util0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libtevent-util-devel The libtevent-util library contains functions to convert tevent error @@ -1005,12 +1005,9 @@ Branch: %{BRANCH} %package -n %{libsmbclient_name} License: GPL-3.0+ %if 0%{?suse_version} > 1030 -Provides: libsmbclient = %{version} +Provides: libsmbclient = %{version}-%{release} Obsoletes: libsmbclient %endif -%ifarch ppc64 -Obsoletes: libsmbclient-64bit -%endif Summary: Samba Client Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -1030,7 +1027,7 @@ Summary: Libraries and Header Files to Develop Programs with smbclient Su Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: krb5-devel -Requires: %{libsmbclient_name} = %{version} +Requires: %{libsmbclient_name} = %{version}-%{release} %description -n libsmbclient-devel This package contains the static libraries and header files needed to @@ -1058,7 +1055,7 @@ License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with netapi Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: %{libnetapi_name} = %{version} +Requires: %{libnetapi_name} = %{version}-%{release} %description -n libnetapi-devel This package contains the static libraries and header files needed to @@ -1071,7 +1068,7 @@ Branch: %{BRANCH} %package -n %{libsmbsharemodes_name} License: GPL-3.0+ %if 0%{?suse_version} > 1030 -Provides: libsmbsharemodes = %{version} +Provides: libsmbsharemodes = %{version}-%{release} Obsoletes: libsmbsharemodes %endif Summary: Samba smbsharemodes Library @@ -1090,7 +1087,7 @@ License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: %{libsmbsharemodes_name} = %{version} +Requires: %{libsmbsharemodes_name} = %{version}-%{release} %description -n libsmbsharemodes-devel This package contains the static libraries and header files needed to @@ -1118,7 +1115,7 @@ License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with wbclient Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: %{libwbclient_name} = %{version} +Requires: %{libwbclient_name} = %{version}-%{release} %description -n libwbclient-devel This package contains the static libraries and header files needed to @@ -1172,20 +1169,20 @@ test 0%{?fedora_version} -gt 0 && product_version=%{?fedora_version} test 0%{?mandriva_version} -gt 0 && product_version=%{?mandriva_version} test 0%{?rhel_version} -gt 0 && product_version=%{?rhel_version} test 0%{?suse_version} -gt 0 && product_version=%{?suse_version} +%if 0%{?suse_version} > 0 major_version=$((${product_version}/100)) minor_version=$((${product_version}/10)) minor_version="${minor_version#$major_version}" product_version="${major_version}.${minor_version}" -product_suffix="" -if test "%{VENDOR}" != "UL"; then - if test 0%{?sles_version} -gt 0; then - product_suffix="-SLE_%{sles_version}" - elif test 0%{?suse_version} -gt 0; then - product_suffix="-oS${product_version}" - else - product_suffix="-OBS" - fi -fi +case "%{suse_version}" in + 1010) product_suffix="-SLE_10" ;; + 1110) product_suffix="-SLE_11" ;; + 1315) product_suffix="-SLE_12" ;; + *) product_suffix="-oS${product_version}" ;; +esac +%else +product_suffix="-OBS" +%endif # Add the build architecture test "%{_build_arch}" != "" && \ product_suffix="${product_suffix}-%{_build_arch}" @@ -1364,9 +1361,9 @@ for srv_name in nmb smb winbind; do ../packaging/systemd/${srv_name}.service \ >%{buildroot}/%{_unitdir}/${srv_name}.service echo -en "## Type: string -## Default: \"\" +## Default: \"-D\" ## ServiceRestart:ยท${srv_name} -${srv_name^^}DOPTIONS=\"\"\n" >>SUSE.sysconfig.${srv_name} +${srv_name^^}DOPTIONS=\"-D\"\n" >>SUSE.sysconfig.${srv_name} ln -s ../../%{_sbindir}/service %{buildroot}/%{_sbindir}/rc${srv_name} done head -n 2 ../packaging/systemd/samba.sysconfig > \ @@ -1531,7 +1528,7 @@ getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || : %post %if 0%{?suse_version} > 1220 %service_add_post nmb.service smb.service -%{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf +%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf %fillup_only %endif @@ -1713,7 +1710,7 @@ else fi %if 0%{?suse_version} > 1220 %service_add_post winbind.service -%{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf +%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf %{fillup_only -ans samba winbind} %endif @@ -1764,6 +1761,8 @@ fi %else %{_unitdir}/nmb.service %{_unitdir}/smb.service +%dir %{_tmpfilesdir} +%{_tmpfilesdir}/samba.conf %endif %if 0%{?suse_version} && 0%{?suse_version} < 1111 %attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/smbpasswd @@ -1800,10 +1799,6 @@ fi %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/smb.xml %dir %{_datadir}/samba %{_datadir}/samba/update-apparmor-samba-profile -%if 0%{?suse_version} > 1222 -%dir %{_prefix}/lib/tmpfiles.d -%{_prefix}/lib/tmpfiles.d/samba.conf -%endif %doc %{_mandir}/man1/smbstatus.1.* %doc %{_mandir}/man5/smbpasswd.5.* %doc %{_mandir}/man8/nmbd.8.* diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 2927a30..989b8be 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:f088cb963b4ad40f07f844e699699e3e8e806bcacd0c8c4e9b0eb14c8c65affc -size 53881 +oid sha256:0aff77e09c7329ae8188c64fb7397460b096ebda69bb1a477539f6e1538a9873 +size 54192