Accepting request 28215 from network:samba:STABLE
Copy from network:samba:STABLE/samba based on submit request 28215 from user lmuelle OBS-URL: https://build.opensuse.org/request/show/28215 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=52
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
d0b1e76bad
commit
ea14363dc9
@ -1,2 +1,2 @@
|
||||
2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
2267
|
||||
Branch : 3.4.4
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:54266f84cb6b1e2335e45c6b8dc80b0f127f270028f00d0558ff09df63123ba0
|
||||
size 60366
|
||||
oid sha256:2b68eec849ad80eb18d734e9c81dac9dc15c1b505b4805c68c090639f3a3aa4d
|
||||
size 62593
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4c67a0a7e88338b32377f8c94dfc2a09aea3281fd0d2f31700424ebd7dffecd9
|
||||
size 31603326
|
||||
3
samba-3.4.4.tar.bz2
Normal file
3
samba-3.4.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8f871d926177be65993a9b0a6e1340893845658da660c1c50c9fa4d9680a0413
|
||||
size 31887290
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package samba-doc (Version 3.4.3)
|
||||
# spec file for package samba-doc (Version 3.4.4)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
|
||||
Name: samba-doc
|
||||
BuildRequires: cups-devel e2fsprogs-devel libacl-devel pam-devel popt-devel python-devel readline-devel
|
||||
BuildRequires: cups-devel e2fsprogs-devel fam-devel libacl-devel pam-devel popt-devel python-devel readline-devel
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: cracklib-devel openldap2-devel
|
||||
%endif
|
||||
@ -50,15 +50,15 @@ BuildRequires: ctdb-devel
|
||||
%if 0%{?suse_version} > 1110
|
||||
BuildRequires: fdupes
|
||||
%endif
|
||||
%define samba_ver 3.4.3
|
||||
%define samba_ver 3.4.4
|
||||
%define samba_ver_suffix %nil
|
||||
%define samba_ver_full %{samba_ver}%{samba_ver_suffix}
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1111
|
||||
%define guards_symbols pre_1111
|
||||
%endif
|
||||
Url: http://www.samba.org/
|
||||
Version: 3.4.3
|
||||
Release: 3
|
||||
Version: 3.4.4
|
||||
Release: 1
|
||||
License: GPLv3+
|
||||
Summary: Samba Documentation
|
||||
Group: Documentation/Other
|
||||
@ -88,6 +88,11 @@ BuildRequires: ccache
|
||||
%else
|
||||
%define make_cifsupcall 0
|
||||
%endif
|
||||
%if 0%{?suse_version} < 1121
|
||||
%define cifs_init_script smbfs
|
||||
%else
|
||||
%define cifs_init_script cifs
|
||||
%endif
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1111
|
||||
%define link_static_libs 1
|
||||
%else
|
||||
@ -364,10 +369,10 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1,3 +1,83 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 7 11:21:35 UTC 2010 - lmuelle@suse.de
|
||||
|
||||
- Update to 3.4.4.
|
||||
+ Fix interdomain trust relationships with Win2008R2 (bug #6697).
|
||||
+ Fix Winbind crashes when queried from nss (bug #6889).
|
||||
+ Fix Winbind crash when retrieving empty group members (bug #7014).
|
||||
+ Fix "UID range full" error in Winbind (bug #6901).
|
||||
+ Fix multiple LDAP servers in "idmap backend" and "idmap alloc
|
||||
backend" (bug #6910).
|
||||
|
||||
+ BUG 4832: Fix iconv checks.
|
||||
+ BUG 6338: Do not always display "none" in 'net rpc trustdom list'.
|
||||
+ BUG 6851: Add pdbedit --kickoff-time/-K to set the user's kickoff time.
|
||||
+ BUG 6828: Fix infinite timeout when byte lock held outside of samba.
|
||||
+ BUG 6837: Fix "Too many open files" message when trying to access a large
|
||||
number of files with Windows 7.
|
||||
+ BUG 6841: Fix "map acl inherit = yes".
|
||||
+ BUG 6850: Fix shadow copy display on Windows 7.
|
||||
+ BUG 6867: Fix listing of directories with a lot of files.
|
||||
+ BUG 6868: Support building with Heimdal we well as with MIT.
|
||||
+ BUG 6875: Fix DOS attributes on OS/2 clients.
|
||||
+ BUG 6880: Fix listing of workgroup servers in libsmbclient.
|
||||
+ BUG 6898: Samba duplicates file content on appending.
|
||||
+ BUG 6918: Fix krb5 build problem on Ubuntu karmic.
|
||||
+ BUG 6929: Fix build with recent heimdal.
|
||||
+ BUG 6939: Fix long filenames with "mangling method = hash".
|
||||
+ BUG 6967: Fix 'net ads join' with OU.
|
||||
+ BUG 6981: Fix paged search with DirX LDAP server.
|
||||
+ BUG 6982: Remove erroneous out of memory error path in lookup_sid.
|
||||
+ BUG 6997: Fix _samr_GetAliasMembership for results with 0 rids.
|
||||
+ BUG 7005: Fix "mangle method = hash" truncates files with dot "."
|
||||
character.
|
||||
|
||||
+ Fix the build of the winbind krb5 locator plugin.
|
||||
+ Fix enumprinter key client and server.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 1 20:04:09 UTC 2010 - lars@samba.org
|
||||
|
||||
- Add BuildRequires to fam-devel; (bnc#564260).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 30 22:04:19 CET 2009 - jmcdonough@suse.de
|
||||
|
||||
- Prevent winbind crash; (bso#7014); (bnc#566119).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 21 20:16:21 CET 2009 - sjayaraman@suse.de
|
||||
|
||||
- Fix processing of open modes in POSIX open; (bnc#530683).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 9 20:44:21 UTC 2009 - lmuelle@suse.de
|
||||
|
||||
- Store the smbfs service state if enabled and restore it for cifs while
|
||||
upgrade on post-11.2 systems.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 9 16:43:45 UTC 2009 - lmuelle@suse.de
|
||||
|
||||
- Prevent cifstab from being overwritten while upgrade on post-11.2 systems.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 9 07:44:59 CET 2009 - boyang@suse.de
|
||||
|
||||
- Give the user a chance to change password when password will expire soon;
|
||||
(FATE#302414).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 8 18:19:33 UTC 2009 - lmuelle@suse.de
|
||||
|
||||
- Rename smbfs init script to cifs for post-11.2 systems.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 4 18:59:22 CET 2009 - jmcdonough@suse.de
|
||||
|
||||
- Error on joining windows domain (invalid pointer); (bso#6967);
|
||||
(bnc#553622).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 3 11:47:02 CET 2009 - lmuelle@suse.de
|
||||
|
||||
|
||||
245
samba.spec
245
samba.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package samba (Version 3.4.3)
|
||||
# spec file for package samba (Version 3.4.4)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
|
||||
Name: samba
|
||||
BuildRequires: cups-devel e2fsprogs-devel libacl-devel pam-devel popt-devel python-devel readline-devel
|
||||
BuildRequires: cups-devel e2fsprogs-devel fam-devel libacl-devel pam-devel popt-devel python-devel readline-devel
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: cracklib-devel openldap2-devel
|
||||
%endif
|
||||
@ -50,7 +50,7 @@ BuildRequires: ctdb-devel
|
||||
%if 0%{?suse_version} > 1110
|
||||
BuildRequires: fdupes
|
||||
%endif
|
||||
%define samba_ver 3.4.3
|
||||
%define samba_ver 3.4.4
|
||||
%define samba_ver_suffix %nil
|
||||
%define samba_ver_full %{samba_ver}%{samba_ver_suffix}
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1111
|
||||
@ -62,8 +62,8 @@ License: GPLv3+
|
||||
Group: Productivity/Networking/Samba
|
||||
Url: http://www.samba.org/
|
||||
AutoReqProv: on
|
||||
Version: 3.4.3
|
||||
Release: 3
|
||||
Version: 3.4.4
|
||||
Release: 1
|
||||
%ifarch ppc64
|
||||
Obsoletes: samba-64bit
|
||||
%endif
|
||||
@ -96,6 +96,11 @@ BuildRequires: ccache
|
||||
%else
|
||||
%define make_cifsupcall 0
|
||||
%endif
|
||||
%if 0%{?suse_version} < 1121
|
||||
%define cifs_init_script smbfs
|
||||
%else
|
||||
%define cifs_init_script cifs
|
||||
%endif
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1111
|
||||
%define link_static_libs 1
|
||||
%else
|
||||
@ -152,11 +157,11 @@ Authors:
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%package client
|
||||
License: GPLv3+
|
||||
@ -168,7 +173,7 @@ Obsoletes: samba3-client < %{version}
|
||||
%ifarch ppc64
|
||||
Obsoletes: samba-client-64bit
|
||||
%endif
|
||||
PreReq: %{?insserv_prereq} %{?fillup_prereq} coreutils /sbin/ldconfig
|
||||
PreReq: %{?insserv_prereq} %{?fillup_prereq} coreutils /sbin/chkconfig /sbin/ldconfig
|
||||
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 920
|
||||
Requires: cifs-mount
|
||||
%endif
|
||||
@ -195,11 +200,11 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
|
||||
|
||||
@ -223,11 +228,11 @@ Authors:
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%endif
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
|
||||
@ -254,11 +259,11 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%endif
|
||||
|
||||
@ -284,11 +289,11 @@ Authors:
|
||||
--------
|
||||
Jeremy Allison <jra at samba dot org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%if %{make_utils}
|
||||
|
||||
@ -336,11 +341,11 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1031
|
||||
|
||||
@ -363,11 +368,11 @@ PreReq: /sbin/ldconfig
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1031
|
||||
|
||||
%description -n libsmbclient
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%else
|
||||
|
||||
@ -408,11 +413,11 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%package -n libnetapi0
|
||||
License: GPLv3+
|
||||
@ -430,11 +435,11 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%package -n libnetapi-devel
|
||||
License: GPLv3+
|
||||
@ -453,11 +458,11 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1031
|
||||
|
||||
@ -475,11 +480,11 @@ PreReq: /sbin/ldconfig
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1031
|
||||
|
||||
%description -n libsmbsharemodes
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%else
|
||||
|
||||
@ -512,11 +517,11 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%if %{make_ldapsmb}
|
||||
|
||||
@ -536,11 +541,11 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%package -n libtalloc-devel
|
||||
License: LGPLv3+
|
||||
@ -559,11 +564,11 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%package -n libtdb1
|
||||
License: LGPLv3+
|
||||
@ -581,11 +586,11 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%package -n libtdb-devel
|
||||
License: LGPLv3+
|
||||
@ -604,11 +609,11 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%package -n libwbclient0
|
||||
License: GPLv3+
|
||||
@ -626,11 +631,11 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%package -n libwbclient-devel
|
||||
License: GPLv3+
|
||||
@ -649,11 +654,11 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%package -n ldapsmb
|
||||
License: GPLv2+
|
||||
@ -661,7 +666,7 @@ Summary: Tool to administer Samba's LDAP backend
|
||||
Group: Productivity/Networking/Samba
|
||||
AutoReqProv: on
|
||||
Version: 1.34b
|
||||
Release: 273
|
||||
Release: 274
|
||||
Requires: perl-ldap
|
||||
|
||||
%description -n ldapsmb
|
||||
@ -674,11 +679,11 @@ Authors:
|
||||
--------
|
||||
Guenther Deschner <guenther at deschner dot de>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%endif
|
||||
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 920
|
||||
@ -700,11 +705,11 @@ Authors:
|
||||
--------
|
||||
Steve French <sfrench at Samba dot org>
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
Source Timestamp: 2248
|
||||
Branch : 3.4.3.SLE11_SP1
|
||||
Source Timestamp: 2267
|
||||
Branch : 3.4.4
|
||||
|
||||
%endif
|
||||
%if %{make_vscan}
|
||||
@ -963,9 +968,12 @@ echo "# samba-doc package is installed." >>config/smb.conf
|
||||
echo "# Date: $( date -I)" >>config/smb.conf
|
||||
grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf
|
||||
%__install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR}
|
||||
for file in smb.conf lmhosts smbusers smbpasswd smbfstab smbusers; do
|
||||
for file in smb.conf lmhosts smbusers smbpasswd cifstab smbusers; do
|
||||
%__install -m 0644 "config/${file}" ${RPM_BUILD_ROOT}/%{CONFIGDIR}/${file}
|
||||
done
|
||||
%if 0%{?suse_version} < 1121
|
||||
mv ${RPM_BUILD_ROOT}/%{CONFIGDIR}/cifstab ${RPM_BUILD_ROOT}/%{CONFIGDIR}/smbfstab
|
||||
%endif
|
||||
section_names=$( sed -ne 's/^\[\(.*\)\]$/\1/p' config/smb.conf)
|
||||
for section in $section_names; do
|
||||
../source3/bin/testparm -s --section-name "${section}" config/smb.conf >"${RPM_BUILD_ROOT}/%{_datadir}/samba/templates/default-${section}" || :
|
||||
@ -982,7 +990,7 @@ elif test 0%{?suse_version} -lt 1011; then
|
||||
scriptSuffix="-1010"
|
||||
fi
|
||||
%endif
|
||||
startScripts="smb nmb smbfs winbind"
|
||||
startScripts="smb nmb winbind %{cifs_init_script}"
|
||||
for script in ${startScripts}; do
|
||||
%__install -m 0755 "init/${script}${scriptSuffix}" \
|
||||
"${RPM_BUILD_ROOT}/%{INITDIR}/${script}"
|
||||
@ -1000,7 +1008,7 @@ done
|
||||
pod2man tools/nmbstatus >${RPM_BUILD_ROOT}/%{_mandir}/man1/nmbstatus.1
|
||||
# PDF generator
|
||||
%__install -p -m 0755 tools/smbprngenpdf ${RPM_BUILD_ROOT}/%{_bindir}/smbprngenpdf
|
||||
touch ${RPM_BUILD_ROOT}/var/lock/subsys/smbfs
|
||||
touch ${RPM_BUILD_ROOT}/var/lock/subsys/%{cifs_init_script}
|
||||
%__install -m 0644 config/swat.xinetd ${RPM_BUILD_ROOT}/%{_sysconfdir}/xinetd.d/swat
|
||||
%__install -m 0644 config/samba.reg ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d/samba.reg
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 921
|
||||
@ -1010,11 +1018,11 @@ touch ${RPM_BUILD_ROOT}/var/lock/subsys/smbfs
|
||||
%endif
|
||||
%__install -m 0644 config/dhcp.conf ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf
|
||||
%__install -m 0644 config/sysconfig.dhcp-samba-client ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client
|
||||
for script in dhcpcd-hook-samba dhcpcd-hook-samba-functions samba-winbindd smbfs; do
|
||||
for script in dhcpcd-hook-samba dhcpcd-hook-samba-functions samba-winbindd %{cifs_init_script}; do
|
||||
%__install -m 0755 "tools/${script}" "${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/${script}"
|
||||
done
|
||||
# Create ghosts for the symlinks
|
||||
for script in 21-dhcpcd-hook-samba 21-smbfs 55-samba-winbindd; do
|
||||
for script in 21-dhcpcd-hook-samba 21-%{cifs_init_script} 55-samba-winbindd; do
|
||||
touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script}
|
||||
done
|
||||
# Install SuSEfirewall2 config files
|
||||
@ -1201,30 +1209,49 @@ ln -fs /usr/sbin/umount.cifs ${RPM_BUILD_ROOT}/sbin/
|
||||
%{?restart_on_update:%{restart_on_update nmb smb}}
|
||||
%{?insserv_cleanup:%{insserv_cleanup}}
|
||||
|
||||
%pre client
|
||||
# non SUSE + 11.3 an newer, update, no cifstab, but smbfstab
|
||||
if [ ! 0%{?suse_version} -lt 1121 -a \
|
||||
${1:-0} -gt 1 -a \
|
||||
! -e /etc/samba/cifstab -a \
|
||||
-f /etc/samba/smbfstab ]; then
|
||||
cp -a /etc/samba/smbfstab /var/adm/backup/etc_samba_smbfstab-move
|
||||
chkconfig -c smbfs && >/var/adm/backup/etc_samba_smbfs-enabled || :
|
||||
fi
|
||||
|
||||
%preun client
|
||||
%{?stop_on_removal:%{stop_on_removal smbfs}}
|
||||
%{?stop_on_removal:%{stop_on_removal %cifs_init_script}}
|
||||
|
||||
%post client
|
||||
/sbin/ldconfig
|
||||
if [ ${1:-0} -eq 1 ]; then
|
||||
# Only insserv smbfs if we're not in update mode.
|
||||
%{?fillup_and_insserv:%{fillup_and_insserv -fy smbfs}}
|
||||
# Only insserv cifs if we're not in update mode.
|
||||
%{?fillup_and_insserv:%{fillup_and_insserv -fy %cifs_init_script}}
|
||||
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-dhcpcd-hook-samba
|
||||
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba
|
||||
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/smbfs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-smbfs
|
||||
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/smbfs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-smbfs
|
||||
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-%{cifs_init_script}
|
||||
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-%{cifs_init_script}
|
||||
else
|
||||
for if_case in if-down.d if-up.d; do
|
||||
test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/dhcpcd-hook-samba || \
|
||||
continue
|
||||
rm -f %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/dhcpcd-hook-samba
|
||||
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/21-dhcpcd-hook-samba
|
||||
test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/smbfs || \
|
||||
test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/%{cifs_init_script} || \
|
||||
continue
|
||||
rm -f %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/smbfs
|
||||
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/smbfs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/21-smbfs
|
||||
rm -f %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/%{cifs_init_script}
|
||||
ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/21-%{cifs_init_script}
|
||||
done
|
||||
fi
|
||||
if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then
|
||||
test -f /etc/samba/cifstab && \
|
||||
mv /etc/samba/cifstab /etc/samba/cifstab.rpmnew
|
||||
mv /var/adm/backup/etc_samba_smbfstab-move /etc/samba/cifstab
|
||||
if [ -f /var/adm/backup/etc_samba_smbfs-enabled ]; then
|
||||
chkconfig -a cifs >/dev/null
|
||||
rm /var/adm/backup/etc_samba_smbfs-enabled
|
||||
fi
|
||||
fi
|
||||
if ! test -e %{_bindir}/get_printing_ticket; then
|
||||
ln -fs %{_bindir}/smbspool %{_libdir}/cups/backend/smb
|
||||
fi
|
||||
@ -1454,11 +1481,11 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf
|
||||
|
||||
%files client
|
||||
%defattr(-,root,root)
|
||||
%attr(0754,root,root) %config %{INITDIR}/smbfs
|
||||
%attr(0754,root,root) %config %{INITDIR}/%{cifs_init_script}
|
||||
%dir %{CONFIGDIR}
|
||||
%config(noreplace) %{CONFIGDIR}/lmhosts
|
||||
%config(noreplace) %{CONFIGDIR}/smb.conf
|
||||
%attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/smbfstab
|
||||
%attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/%{cifs_init_script}tab
|
||||
%dir %{_sysconfdir}/openldap
|
||||
%dir %{_sysconfdir}/openldap/schema
|
||||
%attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/samba3.schema
|
||||
@ -1466,9 +1493,9 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf
|
||||
%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba
|
||||
%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba
|
||||
%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba-functions
|
||||
%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-smbfs
|
||||
%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-smbfs
|
||||
%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/smbfs
|
||||
%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-%{cifs_init_script}
|
||||
%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-%{cifs_init_script}
|
||||
%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script}
|
||||
%if 0%{?suse_version} && 0%{?suse_version} > 1100
|
||||
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-client
|
||||
%endif
|
||||
@ -1502,7 +1529,7 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf
|
||||
%{_bindir}/tdbdump
|
||||
%{_bindir}/tdbtool
|
||||
%{_bindir}/testparm
|
||||
%{_sbindir}/rcsmbfs
|
||||
%{_sbindir}/rc%{cifs_init_script}
|
||||
/%{_lib}/libnss_wins.so.2
|
||||
%dir %{_libdir}/cups
|
||||
%dir %{_libdir}/cups/backend
|
||||
@ -1548,7 +1575,7 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf
|
||||
%dir %{_datadir}/omc
|
||||
%dir %{_datadir}/omc/svcinfo.d
|
||||
%endif
|
||||
%attr(0644,root,root) %{_datadir}/omc/svcinfo.d/smbfs.xml
|
||||
%attr(0644,root,root) %{_datadir}/omc/svcinfo.d/%{cifs_init_script}.xml
|
||||
%dir %{_datadir}/samba
|
||||
%dir %{_datadir}/samba/LDAP
|
||||
%config %{_datadir}/samba/LDAP/samba-nds.schema
|
||||
@ -1557,7 +1584,7 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf
|
||||
%doc %{DOCDIR}/README.%{VENDOR}
|
||||
%{_var}/adm/fillup-templates/samba-client-dhcp.conf
|
||||
%{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client
|
||||
%ghost %{_var}/lock/subsys/smbfs
|
||||
%ghost %{_var}/lock/subsys/%{cifs_init_script}
|
||||
%dir %{LOCKDIR}
|
||||
%attr(0750,root,root) %dir %{LOGDIR}
|
||||
%dir %{PIDDIR}
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:01225dd40262479472fc820ea5bab53c0fbffc8393ca1afd3bb04b8cdaee72ad
|
||||
size 23942
|
||||
oid sha256:fc0fda3ed98a21edeb70c7e70b0cf0fcb17ca3968ca1186fc4cc1380e9d8ed38
|
||||
size 24369
|
||||
|
||||
Loading…
Reference in New Issue
Block a user