Accepting request 33710 from network:samba:STABLE

Copy from network:samba:STABLE/samba based on submit request 33710 from user lmuelle

OBS-URL: https://build.opensuse.org/request/show/33710
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=58
This commit is contained in:
OBS User autobuild 2010-03-05 01:13:04 +00:00 committed by Git OBS Bridge
parent 2a5f02160a
commit 0de76c1475
8 changed files with 373 additions and 297 deletions

View File

@ -1,2 +1,2 @@
2314
Branch : 3.4.6
2315
Branch : trunk

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6949ea38e9ba358fe9e51ce83887dd6c01d7a3c8ca8f3781961e61276ac4af2b
size 68414
oid sha256:0a524935611d558c166b0840c45681dce0ecba0b3d08746e084be57e2740b022
size 62616

View File

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

3
samba-3.5.0.tar.bz2 Normal file
View File

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

View File

@ -1,5 +1,5 @@
#
# spec file for package samba-doc (Version 3.4.6)
# spec file for package samba-doc (Version 3.5.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -55,14 +55,14 @@ BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
%define samba_ver 3.4.6
%define samba_ver 3.5.0
%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.6
Version: 3.5.0
Release: 1
License: GPLv3+
Summary: Samba Documentation
@ -244,6 +244,7 @@ CONFIGURE_OPTIONS="\
%if %{make_cifsupcall}
--with-cifsupcall \
%endif
--with-cifsumount \
%if %{make_devel}
--enable-developer \
--enable-krb5developer \
@ -277,8 +278,6 @@ done
DESTDIR=${RPM_BUILD_ROOT} \
CONFIGDIR=%{CONFIGDIR}
rm -f ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/tevent.pc
ln -s libtevent.so.0.9.8 ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.so.0
ln -s libtevent.so.0.9.8 ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.so
%if %{link_static_libs} == 0
rm ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.a
%endif
@ -317,15 +316,13 @@ cp -a source3/pam_smbpass/samples examples/pam_smbpass
%__install -m 0644 source3/pam_smbpass/INSTALL examples/pam_smbpass/INSTALL
%__install -m 0644 source3/pam_smbpass/README examples/pam_smbpass/README
%__install -m 0644 source3/pam_smbpass/TODO examples/pam_smbpass/TODO
mv COPYING Manifest README Read-Manifest-Now Roadmap WHATSNEW.txt ${RPM_BUILD_ROOT}/%{DOCDIR}/
mv COPYING Manifest README Roadmap WHATSNEW.txt ${RPM_BUILD_ROOT}/%{DOCDIR}/
# this is empty
rm -rf docs/yodldocs
rm -rf docs/manpages
cp -a docs/* ${RPM_BUILD_ROOT}/%{DOCDIR}
rm -rf "${RPM_BUILD_ROOT}/%{DOCBOOKDIR}"
cp -a examples/ ${RPM_BUILD_ROOT}/%{DOCDIR}
rm -rf "${RPM_BUILD_ROOT}/%{SWATDIR}/using_samba"
ln -s "%{DOCDIR}/htmldocs/using_samba" "${RPM_BUILD_ROOT}/%{SWATDIR}"
test -e "${RPM_BUILD_ROOT}/%{SWATDIR}/help/manpages" || \
ln -s "%{DOCDIR}/htmldocs/manpages" "${RPM_BUILD_ROOT}/%{SWATDIR}/help"
# Install HTML pages only in the samba-doc package
@ -385,7 +382,6 @@ fi
%dir %{_datadir}/samba
%dir %{SWATDIR}
%dir %{SWATDIR}/help
%{SWATDIR}/using_samba
%doc %{_datadir}/susehelp
%description
@ -398,16 +394,13 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%changelog

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Mar 1 16:22:52 CET 2010 - lmuelle@suse.de
- Update to 3.5.0.
+ Fix duplicate sam and unix accounts; (bso#7145).
+ Keep the the correct negotiate_flags on the cli->dc structure; (bso#7160).
+ Avoid calling cli_alloc_mid twice in cli_smb_req_iov_send; (bso#7166).
+ Fix 'net ads dns' usage calls; (bso#7181).
+ Fix uninitialized variable in wkssvc_enumerateusers; (bso#7182).
-------------------------------------------------------------------
Wed Feb 24 14:55:27 CET 2010 - lmuelle@suse.de
@ -41,6 +51,51 @@ Wed Feb 24 14:55:27 CET 2010 - lmuelle@suse.de
+ Try to build the full unix_pw structure with ldapsam:trusted support.
+ Optimize ldapsam_alias_memberships() and cache ldap searches.
-------------------------------------------------------------------
Fri Feb 19 16:27:03 CET 2010 - lmuelle@suse.de
- Update to 3.5.0rc3.
+ Change parameter "wide links" to default to "no"; it's also incompatible
with "unix extensions"; (bso#7104); (bnc#577868).
+ Fix vfs_full_audit; (bso#6557).
+ Fix crash bug in 'cifs.upcall'; (bso#6868).
+ Fix duplicate initializer in the rmdir module; (bso#6876).
+ Fix printing with 64 bit clients; (bso#6888).
+ Add cross option to samba_cv_linux_getgrouplist_ok; (bso#7047).
+ Fix core dump on Ubuntu 8.04 64 bit; (bso#7063).
+ Fix failing of smbd to respond to a read or a write caused by Linux
asynchronous IO (aio); (bso#7067).
+ Fix 'smbget' error status; (bso#7069).
+ Fix build of 'smbfilter'; (bso#7071).
+ Fix unlocking of accounts from ldap; (bso#7072).
+ Cliconnect gets realm wrong with trusted domains; (bso#7079).
+ Fix vfs_expand_msdfs; (bso#7081).
+ Fix storing of create time on directories in an EA in new create time
code; (bso#7084).
+ Fix an early release of the global lock that can cause data corruption in
libtdb; (bso#7085).
+ Fix string buffer overflow causing heap corruption in smbd; (bso#7096).
+ Fix results of 'smbclient -L' with a large browse list; (bso#7098).
+ Normalize "Changing password for" msg IDs and STRs; (bso#7102).
+ Fix malformed require_membership_of_sid; (bso#7106).
+ Add pdb_ldap performance fixes; (bso#7116).
+ Change ldap filter to what really was intended; (bso#7116).
+ Add new "nmbd bind explicit broadcast" parameter; (bso#7118).
+ Fix nmbd problems with socket address; (bso#7118).
+ Support large browselist; (bso#7119).
+ Fix reading of large browselist; (bso#7122).
+ Fix listing of printjobs in Windows 7; (bso#7130).
+ Owner of file not available with Kerberos; (bso#7139).
+ Fix IPv4/IPv6 problems; (bso#7140).
+ Fix get_acl_blob in the acl_tdb VFS module; (bso#7148).
+ "mangling method = hash" can crash storing a name containing a '.';
(bso#7154).
+ Valgrind Conditional jump or move depends on uninitialised value(s) error
when "mangling method = hash"; (bso#7155).
+ Fix some wrong newlines in de translation strings.
-------------------------------------------------------------------
Tue Feb 9 22:10:44 UTC 2010 - lmuelle@suse.de
@ -85,6 +140,38 @@ Thu Feb 4 16:58:53 UTC 2010 - rhafer@novell.com
- Build libtevent and libldb and put them into separate subpackages.
-------------------------------------------------------------------
Tue Jan 26 17:12:50 CET 2010 - lmuelle@suse.de
- Update to 3.5.0rc2.
+ The Using Samba HTML book has been removed.
+ 'net', 'smbclient' and libsmbclient can use logon credentials cached by
Winbind; (bso#7062).
+ New vfs_scannedonly module has been added; (bso#7028).
+ Check password history before increasing "badPasswordCount"; (bso#4347).
+ Fix changing of ACLs on writable file with "dos filemode=yes"; (bso#5202).
+ Restore Samba 3.0.x behavior and use the first "uid" value in pdb_ldap;
(bso#6157).
+ Fix deletion of an object whose parent folder does not have delete rights
fails even if the delete right is set on the object in vfs_acl_xattr and
vfs_acl_tdb; (bso#6876).
+ Fix large paged search with DirX LDAP servers; (bso#6981).
+ Fix a segfault in winbindd_dual_ccache_ntlm_auth(); (bso#7027).
+ Disable sanity check in NetShareEnum for better compatibility with
Windows; (bso#7029).
+ Fix SMBrmdir error message when deleting a directory fails; (bso#7033).
+ Fix segfault in vfs_cap; (bso#7034).
+ Fix 'net rpc getsid' in hardened Windows environments; (bso#7036).
+ Fix a Winbind segfault in "trusted_domains"; (bso#7037).
+ Complete and improve some German translation of 'net'; (bso#7039).
+ Fix compile error with WITH_DNS_UPDATE. Update .po files; (bso#7039).
+ Fix crash bug in libsmbclient; (bso#7043).
+ Fix bad (non memory copying) interfaces in smbc_setXXXX calls; (bso#7045).
+ Fix libsmbclient crash against OpenSolaris CIFS server; (bso#7046).
+ Lock down some srvsvc calls according to what w2k3 seems to do.
-------------------------------------------------------------------
Tue Jan 19 12:05:43 CET 2010 - lmuelle@suse.de
@ -108,41 +195,53 @@ Tue Jan 12 22:55:44 UTC 2010 - lmuelle@suse.de
- Free unused memory after a packet got processed; (bso#7020).
-------------------------------------------------------------------
Thu Jan 7 11:21:35 UTC 2010 - lmuelle@suse.de
Thu Jan 7 12:14:19 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).
- Update to 3.5.0rc1.
+ BUG 6837: Fix "Too many open files" when trying to access large number of
files with Windows 7.
+ BUG 6939: Fix long filenames when "mangling method" is set to "hash".
+ BUG 6991: Create symbol links to shared libraries.
+ BUG 6992: make test for getgrouplist cacheable.
+ BUG 7014: Fix Winbind crash when retrieving empty group members.
+ BUG 7020: Fix smbd using 2G memory.
+ 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.
+ Ensure dos_mode can return FILE_ATTRIBUTE_NORMAL, then filter the returned
attributes by protocol level.
+ Vector correctly through reply_openerror() (which uses the same logic).
+ Fix bugs with the full Windows ACL support.
+ Add a few missing gettext calls to the 'net' command.
+ Fix up a share type translation and translate some more strings in 'net'.
+ Allow to call "pdbedit -N description -u user" without specifiyng "-r".
+ Add spoolss_DriverInfo7.
+ Fix rpcclient after setprinter IDL fixes.
+ Use generated krb5.conf in 'net ads testjoin'.
+ Add some German translations for the 'net' command.
+ Update mount.cifs man page with nounix option.
+ Fix _samr_GetAliasMembership for results with 0 rids.
+ Fix an error case in cli_negprot.
+ Add a lower-cost alternative to wbinfo -t: wbinfo --ping-dc.
+ Restore correct timeouts for SMB requests.
+ Fix a 64-bit error in libsmb.
+ Replace IS_DOMAIN_OFFLINE by a function in Winbind.
+ Simplify/cleanup Winbind code.
+ Fix write behind memory block in libtalloc.
+ Fix result check for getaddrinfo().
+ Add tsocket_address_bsd_sockaddr() and tsocket_address_bsd_from_sockaddr()
to tsocket.
+ Always set tdb->tracefd to -1 to be safe on goto fail in libtdb.
+ Add TDB_DISALLOW_NESTING and make TDB_ALLOW_NESTING the default behavior.
+ Fix standalone 'make installdocs'.
+ Output %p as unsigned in snprintf replacement.
+ New attempt at TDB transaction nesting allow/disallow.
+ Remove swig stuff from libtdb.
+ Reset tdb->fd to -1 in tdb_close() in libtdb.
+ Change the way mksysms work in libtalloc.
+ Also build and install tdb manpages from standalone tdb.
+ Fix infinite loop in NCACN_IP_TCP as there is no timeout.
+ Make winbindd_cache.c aware of domain offline to avoid unnecessary backend
query.
+ List trusted domains from wcache when domain is offline.
-------------------------------------------------------------------
Wed Jan 6 17:17:58 UTC 2010 - lmuelle@suse.de
@ -170,6 +269,52 @@ Thu Dec 17 22:26:17 CET 2009 - jengelh@medozas.de
- Add baselibs.conf as a source.
-------------------------------------------------------------------
Tue Dec 15 16:47:48 UTC 2009 - lmuelle@suse.de
- Update to 3.5.0pre2.
+ BUG 2350: Add LDAP Alias Dereferencing support.
+ BUG 6288: SWAT adds a second share when changing parameters of an existing
share.
+ BUG 6435: Fix minor memory corruption.
+ BUG 6710: Only install the cifs.upcall man page if CIFSUPCALL_PROGS was
set while configure.
+ BUG 6802: A created folder does not properly inherit permissions from
parent in vfs_acl_xattr.
+ BUG 6837: "Too many open files" when trying to access large number of
files from Windows 7.
+ BUG 6860: Fix shared library build on QNX.
+ BUG 6879: Fix crash in Winbind.
+ BUG 6929: Fix build with recent heimdal.
+ BUG 6938 : No hook exists to check creation rights when using acl_xattr
module.
+ BUG 6967: Prevent glibc error on 'net ads join'.
+ Fix vfs_acl_xattr which was failing to call the NEXT connect function.
+ Restructure the ACL code.
+ Refactor reply_rmdir to use handle based code.
+ Fix the build when no external talloc and tdb are installed.
+ Fix detection of CTDB headers on systems without system-libtalloc.
+ Fix several printing issues.
+ Fix the build on Mac OS X 10.6.2.
+ Fix net and rpcclient after setprinterdataex changes.
+ Add full support for level 8 printer drivers.
+ Add more spoolss architectures to IDL.
+ Fix enumprinter key client and server.
+ Fix crash in EnumPrinterDataEx.
+ Prefer posix_fallocate for doing "strict allocate".
+ Restore "fake directory create times" as a share parameter.
+ Fix explicit stat64 support.
+ Add support for NetWkstaGetInfo 101 and 102.
+ Add rpcclient wkssvc_enumerateusers.
+ De-deprecate "write cache size" to prevent its removal without a proper
alternative.
+ Allow more than 1000 users in BUILTIN\Users.
+ Complete support for NetWkstaGetInfo/NetWkstaEnumUsers.
+ Fix the build of the example VFS modules.
+ Fix crash in free_file_list().
+ Give the user a chance to change password when password will expire soon.
-------------------------------------------------------------------
Wed Dec 9 20:44:21 UTC 2009 - lmuelle@suse.de
@ -210,6 +355,17 @@ Thu Dec 3 11:47:02 CET 2009 - lmuelle@suse.de
- Add PreReq /usr/sbin/groupadd to the winbind package; (bnc#559165).
- Simplify the winbind package %pre script and suppress stdout only.
-------------------------------------------------------------------
Thu Nov 26 19:53:13 CET 2009 - lmuelle@suse.de
- Update to 3.5.0pre1
+ Add support for full Windows timestamp resolution.
+ Experimental implementation of SMB2.
+ Add encryption support for connections to a CUPS server.
+ Major windbind asynchronous refactoring.
- Remove using_samba from the doc package.
- Increase major version of libtalloc to 2.
-------------------------------------------------------------------
Thu Nov 19 03:57:41 CET 2009 - boyang@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package samba (Version 3.4.6)
# spec file for package samba (Version 3.5.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -55,7 +55,7 @@ BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
%define samba_ver 3.4.6
%define samba_ver 3.5.0
%define samba_ver_suffix %nil
%define samba_ver_full %{samba_ver}%{samba_ver_suffix}
%if 0%{?suse_version} && 0%{?suse_version} < 1111
@ -67,7 +67,7 @@ License: GPLv3+
Group: Productivity/Networking/Samba
Url: http://www.samba.org/
AutoReqProv: on
Version: 3.4.6
Version: 3.5.0
Release: 1
%ifarch ppc64
Obsoletes: samba-64bit
@ -163,17 +163,14 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%package client
License: GPLv3+
@ -212,17 +209,14 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@ -246,17 +240,14 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%endif
%if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
@ -283,17 +274,14 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%endif
@ -319,17 +307,14 @@ Authors:
--------
Jeremy Allison <jra at samba dot org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%if %{make_utils}
@ -378,17 +363,14 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -412,17 +394,14 @@ PreReq: /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbclient
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%else
@ -466,17 +445,14 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%package -n libnetapi0
License: GPLv3+
@ -494,17 +470,14 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%package -n libnetapi-devel
License: GPLv3+
@ -523,17 +496,14 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -552,17 +522,14 @@ PreReq: /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbsharemodes
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%else
@ -596,28 +563,25 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%if %{make_ldapsmb}
%package -n libtalloc1
%package -n libtalloc2
License: LGPLv3+
Summary: Samba talloc Library
Group: System/Libraries
AutoReqProv: on
PreReq: /sbin/ldconfig
%description -n libtalloc1
%description -n libtalloc2
This package includes the talloc library.
@ -626,24 +590,21 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%package -n libtalloc-devel
License: LGPLv3+
Summary: Libraries and Header Files to Develop Programs with talloc Support
Group: Development/Libraries/C and C++
AutoReqProv: on
Requires: libtalloc1 = %{version}
Requires: libtalloc2 = %{version}
%description -n libtalloc-devel
This package contains the static libraries and header files needed to
@ -655,17 +616,14 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%package -n libtdb1
License: LGPLv3+
@ -683,17 +641,14 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%package -n libtdb-devel
License: LGPLv3+
@ -712,17 +667,14 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%package -n libwbclient0
License: GPLv3+
@ -740,17 +692,14 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%package -n libwbclient-devel
License: GPLv3+
@ -769,17 +718,14 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%package -n libtevent0
License: LGPLv3+
@ -797,17 +743,14 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%package -n libtevent-devel
License: LGPLv3+
@ -827,17 +770,14 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%package -n libldb0
License: LGPLv3+
@ -856,17 +796,14 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%package -n libldb-devel
License: LGPLv3+
@ -886,17 +823,14 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%package -n ldapsmb
License: GPLv2+
@ -904,7 +838,7 @@ Summary: Tool to administer Samba's LDAP backend
Group: Productivity/Networking/Samba
AutoReqProv: on
Version: 1.34b
Release: 279
Release: 280
Requires: perl-ldap
%description -n ldapsmb
@ -917,17 +851,14 @@ Authors:
--------
Guenther Deschner <guenther at deschner dot de>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 920
@ -949,17 +880,14 @@ Authors:
--------
Steve French <sfrench at Samba dot org>
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2314
Branch : 3.4.6
Source Timestamp: 2315
Branch : trunk
%endif
%if %{make_vscan}
@ -1118,6 +1046,7 @@ CONFIGURE_OPTIONS="\
%if %{make_cifsupcall}
--with-cifsupcall \
%endif
--with-cifsumount \
%if %{make_devel}
--enable-developer \
--enable-krb5developer \
@ -1160,9 +1089,8 @@ popd
pushd lib/tevent
%{?suse_update_config:%{suse_update_config -f}}
#aclocal
./autogen.sh
TALLOC_LIBS=../../source3/bin/libtalloc.so.1 TALLOC_CFLAGS=-I../talloc/ ./configure \
TALLOC_LIBS=../../source3/bin/libtalloc.so.2 TALLOC_CFLAGS=-I../talloc/ ./configure \
--prefix=%{_prefix} \
--localstatedir=%{LOCKDIR} \
--sysconfdir=%{CONFIGDIR} \
@ -1174,7 +1102,7 @@ popd
pushd source4/lib/ldb
%{?suse_update_config:%{suse_update_config -f}}
./autogen.sh
TALLOC_LIBS=../../../source3/bin/libtalloc.so.1 TALLOC_CFLAGS=-I../../../lib/talloc/ \
TALLOC_LIBS=../../../source3/bin/libtalloc.so.2 TALLOC_CFLAGS=-I../../../lib/talloc/ \
TEVENT_LIBS=../../../lib/tevent/libtevent.so.0.9.8 TEVENT_CFLAGS=-I../../../lib/tevent/ \
TDB_LIBS=../../../source3/bin/libtdb.so.1 TDB_CFLAGS=-I../../../lib/tdb/include \
./configure --prefix=%{_prefix} \
@ -1243,8 +1171,6 @@ done
DESTDIR=${RPM_BUILD_ROOT} \
CONFIGDIR=%{CONFIGDIR}
rm -f ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/tevent.pc
ln -s libtevent.so.0.9.8 ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.so.0
ln -s libtevent.so.0.9.8 ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.so
%if %{link_static_libs} == 0
rm ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.a
%endif
@ -1419,15 +1345,13 @@ cp -a source3/pam_smbpass/samples examples/pam_smbpass
%__install -m 0644 source3/pam_smbpass/INSTALL examples/pam_smbpass/INSTALL
%__install -m 0644 source3/pam_smbpass/README examples/pam_smbpass/README
%__install -m 0644 source3/pam_smbpass/TODO examples/pam_smbpass/TODO
mv COPYING Manifest README Read-Manifest-Now Roadmap WHATSNEW.txt ${RPM_BUILD_ROOT}/%{DOCDIR}/
mv COPYING Manifest README Roadmap WHATSNEW.txt ${RPM_BUILD_ROOT}/%{DOCDIR}/
# this is empty
rm -rf docs/yodldocs
rm -rf docs/manpages
cp -a docs/* ${RPM_BUILD_ROOT}/%{DOCDIR}
rm -rf "${RPM_BUILD_ROOT}/%{DOCBOOKDIR}"
cp -a examples/ ${RPM_BUILD_ROOT}/%{DOCDIR}
rm -rf "${RPM_BUILD_ROOT}/%{SWATDIR}/using_samba"
ln -s "%{DOCDIR}/htmldocs/using_samba" "${RPM_BUILD_ROOT}/%{SWATDIR}"
test -e "${RPM_BUILD_ROOT}/%{SWATDIR}/help/manpages" || \
ln -s "%{DOCDIR}/htmldocs/manpages" "${RPM_BUILD_ROOT}/%{SWATDIR}/help"
# Install HTML pages only in the samba-doc package
@ -1467,6 +1391,7 @@ rm -f \
# find pam_winbind language files
%find_lang pam_winbind
cat pam_winbind.lang >> ${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-winbind
%find_lang net
# sort out vscan-modules from the main filelist
for file in $( find ${RPM_BUILD_ROOT}%{_libdir}/samba/vfs/ -mindepth 1 ! -iname '*vscan*' ); do
echo "${file#${RPM_BUILD_ROOT}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba
@ -1479,7 +1404,7 @@ done
while read file; do
rm -r "${RPM_BUILD_ROOT}/${file#%* }"
done <"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc"
for file in %{SWATDIR}/using_samba %{_datadir}/susehelp; do
for file in %{_datadir}/susehelp; do
rm -r "${RPM_BUILD_ROOT}/${file}"
done
pushd "${RPM_BUILD_ROOT}/%{DOCDIR}"
@ -1568,10 +1493,10 @@ fi
%postun -n libnetapi0
/sbin/ldconfig
%post -n libtalloc1
%post -n libtalloc2
/sbin/ldconfig
%postun -n libtalloc1
%postun -n libtalloc2
/sbin/ldconfig
%post -n libwbclient0
@ -1768,6 +1693,7 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf
%doc %{_mandir}/man8/vfs_commit.8.*
%doc %{_mandir}/man8/vfs_default_quota.8.*
%doc %{_mandir}/man8/vfs_dirsort.8.*
%doc %{_mandir}/man8/vfs_scannedonly.8.*
%doc %{_mandir}/man8/vfs_streams_depot.8.*
%doc %{_mandir}/man8/vfs_extd_audit.8.*
%doc %{_mandir}/man8/vfs_fake_perms.8.*
@ -1796,7 +1722,7 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf
%{_includedir}/samba
%endif
%files client
%files client -f net.lang
%defattr(-,root,root)
%attr(0754,root,root) %config %{INITDIR}/%{cifs_init_script}
%dir %{CONFIGDIR}
@ -1923,6 +1849,7 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf
%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/samba-winbindd
%doc %{_mandir}/man1/ntlm_auth.1.*
%doc %{_mandir}/man1/wbinfo.1.*
%doc %{_mandir}/man5/pam_winbind.conf.5.*
%doc %{_mandir}/man8/winbindd.8.*
%{_bindir}/ntlm_auth
%{_bindir}/wbinfo
@ -1975,7 +1902,6 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf
%dir %{_datadir}/samba
%dir %{SWATDIR}
%dir %{SWATDIR}/help
%{SWATDIR}/using_samba
%doc %{_datadir}/susehelp
%endif
@ -2049,7 +1975,7 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf
%{_libdir}/libsmbsharemodes.so
%if %{make_ldapsmb}
%files -n libtalloc1
%files -n libtalloc2
%defattr(-,root,root)
%{_libdir}/libtalloc.so.*
@ -2079,6 +2005,7 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf
%files -n libwbclient-devel
%defattr(-,root,root)
%{_includedir}/wbc_async.h
%{_includedir}/wbclient.h
%if %{link_static_libs}
#%{_libdir}/libwbclient.a

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e92ba46d6646a2a2e11165ab90ff0042b89f2f7e98332c6551f5332397100b7
size 24400
oid sha256:e22150ccffb67b76a5e5d7ea7a8c0f678d4eaa2f0fbabb750a5bcff6470684c2
size 24548