diff --git a/baselibs.conf b/baselibs.conf index 34127d9..265b95d 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,8 +1,10 @@ # This line is needed for for pre 11.0 builds +libldb1 libsmbclient libsmbclient0 libtalloc2 libtdb1 +libtevent0 libwbclient0 samba supplements "packageand(samba:pam-)" diff --git a/build-source-timestamp b/build-source-timestamp index e586000..b6dddfd 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2516 -Branch : 3.5.8 +2569 +Branch : trunk diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 13954c5..23c2e63 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bed0d1ac159f12f0c2afcfff9d2304be6ad4d69698f634421904a43291665901 -size 76325 +oid sha256:2e8b7e7c683334250066bd3017c60aea59a9946afaf5dd58a038339cdc06e94e +size 59360 diff --git a/samba-3.5.8.tar.bz2 b/samba-3.5.8.tar.bz2 deleted file mode 100644 index 54c383b..0000000 --- a/samba-3.5.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be836a667a68efeb7ba2f1f7dae8349871d5208bb34ec4af7f25732ddbf1e490 -size 26730147 diff --git a/samba-3.6.0rc2.tar.bz2 b/samba-3.6.0rc2.tar.bz2 new file mode 100644 index 0000000..603a4b8 --- /dev/null +++ b/samba-3.6.0rc2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a82f6f4af5acb40daaaf231f2a64f01fd3aca228410920fbccbb3636bf1f8e6 +size 24491093 diff --git a/samba-doc.spec b/samba-doc.spec index ad05fe1..a419270 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -19,7 +19,7 @@ Name: samba-doc -BuildRequires: cups-devel e2fsprogs-devel fam-devel libacl-devel pam-devel popt-devel python-devel readline-devel +BuildRequires: cups-devel e2fsprogs-devel fam-devel libacl-devel pam-devel popt-devel readline-devel %if 0%{?suse_version} BuildRequires: cracklib-devel openldap2-devel %endif @@ -27,7 +27,7 @@ BuildRequires: cracklib-devel openldap2-devel BuildRequires: gdbm-devel pwdutils %endif %if 0%{?suse_version} > 930 -BuildRequires: krb5-devel libiniparser-devel libnscd-devel +BuildRequires: krb5-devel libiniparser-devel libnscd-devel python-devel %endif %if 0%{?suse_version} > 930 && 0%{?suse_version} < 1031 BuildRequires: dmapi-devel libnscd-devel libxml2-devel mysql-devel postgresql-devel xfsprogs-devel @@ -39,7 +39,7 @@ BuildRequires: heimdal-devel BuildRequires: cracklib-devel %endif %if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} -BuildRequires: krb5-devel openldap-devel +BuildRequires: krb5-devel openldap-devel python-devel %endif %if 0%{?suse_version} > 1000 BuildRequires: keyutils-devel @@ -58,17 +58,17 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -%define samba_ver 3.5.8 -%define samba_ver_suffix %nil +%define samba_ver 3.6.0 +%define samba_ver_suffix rc2 %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 -%define libldb_ver 0.9.7 -%define libtalloc_ver 2.0.1 -%define libtdb_ver 1.2.1 -%define libtevent_ver 0.9.8 +%define libldb_ver 1.0.2 +%define libtalloc_ver 2.0.5 +%define libtdb_ver 1.2.9 +%define libtevent_ver 0.9.11 %else %define libldb_ver %{version} %define libtalloc_ver %{version} @@ -81,8 +81,8 @@ BuildRequires: pkgconfig %define build_make_smp_mflags %{?jobs:-j%jobs} %endif Url: http://www.samba.org/ -Version: 3.5.8 -Release: 2 +Version: 3.6.0 +Release: 1 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -110,11 +110,6 @@ BuildRequires: ccache %define make_utils 0 %define make_vscan 0 %define make_ldapsmb 1 -%if 0%{?suse_version} > 1000 && 0%{?suse_version} < 1121 || 0%{?centos_version} > 500 || 0%{?fedora_version} > 7 || 0%{?rhel_version} > 500 -%define make_cifsupcall 1 -%else -%define make_cifsupcall 0 -%endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 %define cifs_init_script cifs %else @@ -122,6 +117,9 @@ BuildRequires: ccache %endif %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define link_static_libs 1 +# pre-11.2 doesn't know the python_* macros +%define python_sitelib %py_sitedir +%define python_sitearch %py_sitedir %else %define link_static_libs 0 %endif @@ -177,6 +175,7 @@ for file in docs/htmldocs/index.html vendor-files/docu/README.vendor; do mv "${file}.new" "${file}" done %__install -m 0644 vendor-files/tools/get_printing_ticket.c source3/client/get_printing_ticket.c +%__install -m 0644 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/ # Create and add vendor suffix test -f vendor-files/tools/package-data && \ . vendor-files/tools/package-data @@ -255,6 +254,7 @@ CONFIGURE_OPTIONS="\ --with-mandir=%{_mandir} \ --with-modulesdir=%{_libdir}/samba \ --with-rootsbindir=/sbin \ + --with-nmbdsocketdir=%{LOCKDIR} \ --enable-cups \ --enable-debug \ %if %{link_static_libs} @@ -279,16 +279,6 @@ CONFIGURE_OPTIONS="\ --with-utmp \ --with-winbind \ --with-shared-modules=%{vfs_modules},%{idmap_modules} \ -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 - --without-cifsmount \ -%else - --with-cifsumount \ -%endif -%if %{make_cifsupcall} == 0 - --without-cifsupcall \ -%else - --with-cifsupcall \ -%endif %if %{make_devel} --enable-developer \ --enable-krb5developer \ @@ -425,7 +415,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index 9c7bcf8..695dd92 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,286 @@ +------------------------------------------------------------------- +Thu Jul 14 10:26:22 UTC 2011 - lmuelle@suse.de + +- Make use of the actual library version as part of the package name on + post-11.3 systems only. + +------------------------------------------------------------------- +Mon Jul 11 16:21:23 CEST 2011 - ddiss@suse.de + +- Improve ctdb vacuuming performance with use of SCHEDULE_FOR_DELETION; + (bnc#705170). + +------------------------------------------------------------------- +Mon Jun 20 17:28:46 CEST 2011 - ddiss@suse.de + +- Specify nmbdsocketdir at configure time; (bnc#700953). + +------------------------------------------------------------------- +Thu Jun 9 14:58:08 UTC 2011 - lmuelle@suse.de + +- Build the tdb, talloc, and tevent libraries ahead of anything else. + +------------------------------------------------------------------- +Tue Jun 7 21:02:45 UTC 2011 - jmcdonough@suse.de + +- Update to 3.6.0rc2. + + BUG 6911: Fix Kerberos authentication from Vista to Samba. + + BUG 8166: Don't lockout users when offline. + + BUG 8200: Add support for multiple writeable ldap idmap domains. + + BUG 8148: Default to protocol version 2 for SMB Traffic Analyzer. + + + BUG 7054: Fix X account flag when "pwdlastset" is "0". + + BUG 8144: Fix setting timestamp when touching files with CIFS clients. + + BUG 8153: Fix setting up getaddrinfo on IPv6-only machines. + + BUG 8156: Fix 'net ads join' using the user's Kerberos ticket. + + BUG 8157: Fix parsing a cups printcap file. + + BUG 8175: Fix smbd deadlock. + + BUG 8189: Support shadow copy display over SMB2. + + BUG 8197: Winbind does not properly detect when a DC connection is dead. + + BUG 8203: Winbind needs to reset the DC connection if an RPC times out. + +------------------------------------------------------------------- +Mon Jun 06 10:30:00 CEST 2011 - mrsb@novell.com + +- Make cupsaddsmb fill printers location; (bso#8132); (bnc#698209). + +------------------------------------------------------------------- +Fri Jun 03 21:19:00 CEST 2011 - lpechacek@suse.cz + +- Add "winbind max clients" parameter to remove 200-client + limit; (bnc#697461). + +------------------------------------------------------------------- +Fri Jun 03 20:40:00 CEST 2011 - jmcdonough@suse.de + +- Disable logon cache for password lockout consistency when + running in a cluster; (bnc#694836). + +------------------------------------------------------------------- +Fri May 27 04:46:48 CEST 2011 - jmcdonough@suse.de + +- Fix logon of AD users with many group memberships; (bso#6911); + (bnc#657026). + +------------------------------------------------------------------- +Wed May 25 14:23:54 CEST 2011 - jmcdonough@suse.de + +- Don't lockout users while offline; (bso#8166); (bnc#692607). + +------------------------------------------------------------------- +Mon May 23 18:15:17 UTC 2011 - lmuelle@suse.de + +- Update to 3.6.0rc1. + + BUG 8111: CIFS VFS: Fix unexpected error on SMB posix open. + + BUG 8112: POSIX extension opens of a directory are denied with EISDIR. + + BUG 8132: Fix filling printers location field when using cups. + + + Remove fstrings from client struct. + + BUGFIX when converting from safe_strcpy to strlcpy. + + Fix off-by-one calculations with strlcpy. + + Ensure we always write the correct incoming mid into the share mode table + entries. + + Fix the SMB2 oplock showstopper. + + Convert user-specified domain to uppercase in libsmb. + + Fix Coverity CID #2302: FORWARD_NULL. + + Fix cups_pull_comment_location(). + + Fix double free of cups request. + + Make cups_pull_comment_location() work again. + + Fix potential crash bug in display_print_driver3(). + + Properly clean up in pthreadpool_init in case of failure. + + Make plaintext session setup async. + + Reduce fd load in Winbind children. + + Avoid a potential 100% CPU loop in Winbind. + + Tune broadcast namequeries for unique names. + + Properly deal with exited winbind children. + + Fix dup_smb2_vec3. + + Fix return check in nss_wins. + +------------------------------------------------------------------- +Tue May 17 05:17:59 MDT 2011 - shargagan@novell.com + +- Fix to renew the kerberos ticket in samba after expiry; (bnc#669949). + +------------------------------------------------------------------- +Mon May 16 10:23:54 CEST 2011 - ddiss@suse.de + +- Fix a 100% CPU loop when ctdbd dies during a traverse; (bnc#693945). + +------------------------------------------------------------------- +Thu May 5 15:51:22 UTC 2011 - lmuelle@suse.de + +- Make dhcpcd hook BOOTPROTO check cover dhcp6 too; (bnc#691969). + +------------------------------------------------------------------- +Thu May 5 03:00:01 MDT 2011 - shargagan@novell.com + +- Handling of large (> 256 bytes) ntlmv2 blobs in winbind; (bnc#529946). + +------------------------------------------------------------------- +Sat Apr 30 19:38:49 UTC 2011 - lmuelle@suse.de + +- Package static libraries with 0644 permissions. + +------------------------------------------------------------------- +Sat Apr 30 19:15:27 UTC 2011 - lmuelle@suse.de + +- Add Requires libtalloc-devel to libldb-devel and libtevent-devel. + +------------------------------------------------------------------- +Sat Apr 30 18:48:57 UTC 2011 - lmuelle@suse.de + +- Rename libldb0 to libldb1 as 1 is the current major version of the library. +- Add libldb1 and libtevent0 to baselibs.conf. + +------------------------------------------------------------------- +Fri Apr 29 14:36:29 UTC 2011 - lmuelle@suse.de + +- Don't call the suse_update_config macro before building lib ldb and tevent. + +------------------------------------------------------------------- +Thu Apr 29 13:28:42 UTC 2011 - lmuelle@suse.de + +- Update to 3.6.0pre3. + + Listen on IPv6 addresses with IPV6_ONLY; (bso#7383). + + Fix wrong output in 'smbget'; (bso#8066). + + "inherit owner = yes" doesn't interact correctly with vfs_acl_xattr or + vfs_acl_tdb module; (bso#8083). + + rpccli_samr_chng_pswd_auth_crap segfaults if any input blobs are null; + (bso#8088). + + setpwent() actually does endpwent() and vice versa on FreeBSD; (bso#8099). + + Fix the build of 'smbget' on HP NonStop; (bso#8106). + + + Fix build of tdb2. + + Correctly detect and deny symlinks anywhere in a path (not just the last + component) if "follow symlinks = no". + + Fix timeout in rpc_pipe_open_tcp_port(). + + Fix the build of "--with-profiling-data". + + Fix Coverity IDs 986, 1340, 2047, 2299, 2307, 2325, 2335, 2336, 2470, + 2471, 2478. + + nsswitch: Add 'wbinfo --lookup-sids'. + + nsswitch: Add 'wbinfo --sids-to-unix-ids'. + + Fix smbd with the async echo responder. + + Fix the build of vfs_gpfs.c. + + Add a 10-second timeout for the 445 or netbios connection to a DC. + + Many pthreadpool fixes. + + Fix transaction recovery area for converted tdbs. + +------------------------------------------------------------------- +Thu Apr 28 21:43:14 UTC 2011 - lmuelle@suse.de + +- Add PreReq permissions to the krb-printing package. + +------------------------------------------------------------------- +Thu Apr 28 21:39:04 UTC 2011 - lmuelle@suse.de + +- Remove _libdir ldb and tevent from file list. +- Explicitly state not to bundle talloc or tdb while ldb and tevent build. + +------------------------------------------------------------------- +Thu Apr 21 21:12:31 UTC 2011 - lmuelle@suse.de + +- Always use the actual library version as part of the package name. +- Exclude shared python modules. + +------------------------------------------------------------------- +Thu Apr 14 18:21:56 UTC 2011 - lmuelle@suse.de + +- Update to 3.6.0pre2. + + ID Mapping changes. + + Implement SMB2 support. + + Add an Endpoint Mapper daemon. + + + Make "rlimit_max below minimum Windows limit" notification less scary; + (bso#6837). + + Quota only shown when logged as root; (bso#7080). + + Fix printing from Windows 7; (bso#7567). + + Retry DNS updates when connection to one nameserver has failed; (bso#7690). + + Unlink may unlink wrong file when hardlinks are involved; (bso#7863). + + Fix 'nmbd --port'; (bso#7875). + + cmd_spoolss_deletedriver() returned without checking all architectures; + (bso#7880). + + Don't return "-1" on success in 'net rpc vampire keytab'; (bso#7899). + + Fix cups pcap reload with no printers; (bso#7915). + + Fix bug in chain_reply; (bso#7917). + + Fix problems with "kernel oplocks" option set to "no"; (bso#7928). + + Fall back for utimes calls; (bso#7940). + + Catch lookup_names/sids schannel errors over ncacn_ip_tcp; (bso#7944). + + Let winbind try to use samlogon validation level 6; (bso#7945). + + Sgid bit lost on folder rename; (bso#7996). + + Fix getting username in 'net rap session'; (bso#8009). + + Fix inode generation so nautilus can count total dir size correctly; + (bso#8010). + + Use jenkins hash for str_checksum; (bso#8010). + + Add explicit configure option whether or not to enable dmapi support; + (bso#8033). + + Fix smbclient segfault with Cyrillic netbios names; (bso#8040). + + Fix file creation on OS/X; (bso#8042). + + + Add "--option" to 'testparm'. + + Fix crash bug on smbd shutdown when using FOPENDIR(). + + Ensure we don't return an incorrect access mask. + + Fix bug against the new Mac client. + + Fix leak in error path. + + Fix error where Windows client spoolss returns WERR_INVALID_DATA. + + Fix a segfault in the krb5 locator plugin. + + Enable sharesec for registry shares. + + Fix memory leak in "security=share" and "force user". + + Add "net idmap check", a check and repair tool for the + id mapping database. + + Add new 'net idmap delete' command. + + Fix segfault on missing input file in 'net idmap restore'. + + Fix 'net usersidlist' not to skip every other user. + + Fix potential crash bug in spoolss_PrinterEnumValues push path. + + Internal restructuring. + + Don't wipe out all printer drivers when only one should be deleted. + + Fix winbindd_dual_pam_auth_samlogon() for NT4 domains. + + Fix memory leak in print_cups.c. + + Remove duplicate cups response processing code. + + Follow force user/group for driver IO. + + Initiate pcap reload from parent smbd. + + Reload shares after pcap cache fill. + + Fix numerous Coverity IDs (2041 and others). + + Fix a memory leak in check_sam_security_info3. + + Fix a segfault in the nss wrapper when libnss_winbind.so is not loadable. + + Make "net sam list [users|workstations]" list only the right things. + + Fix a potential memleak in secrets_fetch_trusted_domain_password. + + Use the right credentials in check_netlogond_security. + + Add support for AF_NETLINK addr notifications. + + Fork multiple Winbind children per domain. + + Fix a deadlock between smbd and ctdbd. + + Add 'wbinfo --dc-info'. + + Make "nmbd socket dir" configurable. + + Fixed valgrind errors. + + Fix a memleak in receive_getdc_response. + + Don't grant SEC_STD_DELETE always to the owner of a file. + + Fix segfaults on addrchange errors in Winbind. + + Allow machine accounts as members in groupdb. + + Add IPv6 support for the endpoint mapper. + + Free unused memory in the rpc server. + + Fix possible segfaults in svcctl server. + + Fix possible segfault with client_id in rpc server. + + Add a 'svcctl shutdown' function to rpc server. + + Fix a resource leak in net_afs. + + Fix a resource leak in smbta-util. + + Fix possible resource leak in net_usershare. + + Fix possible resource leak in 'smbget'. + + Fix possible resource leak in 'smbfilter'. + + Fix a possible null pointer dereference in smbd. + + Ensure we send the direct levelII oplock break to the correct fid. + + Fix private libdir and codepages paths. +- Add RFC 3454 to the vendor files. + +------------------------------------------------------------------- +Thu Apr 7 21:38:00 CET 2011 - jmcdonough@suse.de + +- Fix idmap_tdb for big-endian systems such as ppc and s390; + (bso#6901); (bnc#675978). + +------------------------------------------------------------------- +Thu Mar 24 16:37:34 CET 2011 - ddiss@suse.de + +- Fix smbclient -M NT_STATUS_PIPE_BROKEN failure; (bso#7635); (bnc#681913). + ------------------------------------------------------------------- Fri Mar 18 15:53:07 UTC 2011 - lmuelle@suse.de @@ -8,6 +291,12 @@ Thu Mar 17 10:24:31 CET 2011 - ddiss@suse.de - Don't crash when publishing a single printer; (bnc#643119). +------------------------------------------------------------------- +Wed Mar 9 19:15:34 CET 2011 - ddiss@suse.de + +- Carry error status in printer list IPC message, do not refresh printers if + cups is unavailable; (bso#7994); (bnc#675478). + ------------------------------------------------------------------- Wed Mar 9 10:46:20 UTC 2011 - lmuelle@suse.de @@ -94,6 +383,11 @@ Fri Mar 4 20:12:24 UTC 2011 - lmuelle@suse.de the package name. Using the same major version does not guarantee forward compatibility. +------------------------------------------------------------------- +Fri Mar 4 16:30:46 CET 2011 - ddiss@suse.de + +- Fix a fd-leak in libwbclient at dlclose-time; (bso#7684); (bnc#668773). + ------------------------------------------------------------------- Mon Feb 28 14:36:49 UTC 2011 - lmuelle@suse.de @@ -290,6 +584,12 @@ Sat Oct 10 13:24:17 CEST 2010 - jmcdonough@suse.de + Fix crash bug in rpcclient; (bso#7688). + Fix file corruption when setting Samba "write wache wize"; (bso#7715). +------------------------------------------------------------------- +Thu Oct 7 16:21:40 UTC 2010 - lmuelle@suse.de + +- Let startproc wait for nmb, smb and winbind pid files getting created on + post-11.1 systems; (bnc#520036). + ------------------------------------------------------------------- Fri Sep 24 01:40:30 CEST 2010 - ddiss@suse.de @@ -351,12 +651,50 @@ Thu Aug 19 19:55:37 CEST 2010 - jmcdonough@suse.de - Fix preexec scripts; (bso#7104); (bnc#632852). +------------------------------------------------------------------- +Thu Aug 19 15:22:28 UTC 2010 - lmuelle@suse.de + +- Add missing netapi, smbclient, smbsharemodes, talloc, tevent, and wbclient + pkgconfig files and BuildRequire pkgconfig; (bnc#632770). + +------------------------------------------------------------------- +Tue Aug 17 21:17:34 UTC 2010 - lmuelle@suse.de + +- BuildRequire python-devel for post-9.3 systems. + +------------------------------------------------------------------- +Tue Aug 17 20:36:10 UTC 2010 - lmuelle@suse.de + +- Only create precompiled headers for post-10.2 systems. +- Remove mkinitrd scriptlets. + +------------------------------------------------------------------- +Tue Aug 17 15:20:00 UTC 2010 - lmuelle@suse.de + +- Add vfs_crossrename man page. +- Call make basic and remove conditional proto target. +- Increase libtevent version to 0.9.9. +- Remove wbc_async header from the file list. +- Remove remaining cifs-mount pieces from the spec file. + ------------------------------------------------------------------- Mon Aug 16 16:58:02 UTC 2010 - jmcdonough@suse.de - Fix printers not auto loading with registry config; (bso#7280); (bnc#617153). +------------------------------------------------------------------- +Sun Aug 15 18:20:41 UTC 2010 - lmuelle@suse.de + +- Update to 3.6.0pre1. + + SMB2 support is fully functional despite managing quota using the + Microsoft management tools. + + Internal Winbind passdb changes to use samr and lsa rpc pipe to get local + user and group information. + + The spoolss and the old RAP printing code have been completely overhauled + and refactored. + + The SMB Traffic Analyzer (SMBTA) VFS module got added. + ------------------------------------------------------------------- Sun Aug 15 12:36:41 UTC 2010 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 9185a12..a7b08f2 100644 --- a/samba.spec +++ b/samba.spec @@ -19,7 +19,7 @@ Name: samba -BuildRequires: cups-devel e2fsprogs-devel fam-devel libacl-devel pam-devel popt-devel python-devel readline-devel +BuildRequires: cups-devel e2fsprogs-devel fam-devel libacl-devel pam-devel popt-devel readline-devel %if 0%{?suse_version} BuildRequires: cracklib-devel openldap2-devel %endif @@ -27,7 +27,7 @@ BuildRequires: cracklib-devel openldap2-devel BuildRequires: gdbm-devel pwdutils %endif %if 0%{?suse_version} > 930 -BuildRequires: krb5-devel libiniparser-devel libnscd-devel +BuildRequires: krb5-devel libiniparser-devel libnscd-devel python-devel %endif %if 0%{?suse_version} > 930 && 0%{?suse_version} < 1031 BuildRequires: dmapi-devel libnscd-devel libxml2-devel mysql-devel postgresql-devel xfsprogs-devel @@ -39,7 +39,7 @@ BuildRequires: heimdal-devel BuildRequires: cracklib-devel %endif %if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} -BuildRequires: krb5-devel openldap-devel +BuildRequires: krb5-devel openldap-devel python-devel %endif %if 0%{?suse_version} > 1000 BuildRequires: keyutils-devel @@ -58,17 +58,17 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -%define samba_ver 3.5.8 -%define samba_ver_suffix %nil +%define samba_ver 3.6.0 +%define samba_ver_suffix rc2 %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 -%define libldb_ver 0.9.7 -%define libtalloc_ver 2.0.1 -%define libtdb_ver 1.2.1 -%define libtevent_ver 0.9.8 +%define libldb_ver 1.0.2 +%define libtalloc_ver 2.0.5 +%define libtdb_ver 1.2.9 +%define libtevent_ver 0.9.11 %else %define libldb_ver %{version} %define libtalloc_ver %{version} @@ -86,8 +86,8 @@ License: GPLv3+ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on -Version: 3.5.8 -Release: 2 +Version: 3.6.0 +Release: 1 Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -118,11 +118,6 @@ BuildRequires: ccache %define make_utils 0 %define make_vscan 0 %define make_ldapsmb 1 -%if 0%{?suse_version} > 1000 && 0%{?suse_version} < 1121 || 0%{?centos_version} > 500 || 0%{?fedora_version} > 7 || 0%{?rhel_version} > 500 -%define make_cifsupcall 1 -%else -%define make_cifsupcall 0 -%endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 %define cifs_init_script cifs %else @@ -130,6 +125,9 @@ BuildRequires: ccache %endif %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define link_static_libs 1 +# pre-11.2 doesn't know the python_* macros +%define python_sitelib %py_sitedir +%define python_sitearch %py_sitedir %else %define link_static_libs 0 %endif @@ -189,8 +187,8 @@ Authors: The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %package client License: GPLv3+ @@ -205,13 +203,7 @@ Obsoletes: samba-client-gplv2 < %{version} Obsoletes: samba-client-64bit %endif PreReq: %{?insserv_prereq} %{?fillup_prereq} coreutils /sbin/chkconfig /sbin/ldconfig -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 Requires: cifs-utils -%else -%if 0%{?suse_version} > 920 -Requires: cifs-mount -%endif -%endif %description client Samba is a suite of programs that allows SMB/CIFS clients to use the @@ -235,8 +227,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -262,8 +254,8 @@ Authors: The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 @@ -292,8 +284,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %endif @@ -306,7 +298,7 @@ Provides: samba-gplv3-krb-printing = %{version}-%{release} Obsoletes: samba-gplv3-krb-printing < %{version} PreReq: coreutils %if 0%{?suse_version} > 1000 -PreReq: /sbin/conf.d/SuSEconfig.permissions +PreReq: /sbin/conf.d/SuSEconfig.permissions permissions %endif Requires: samba-client >= %{version} @@ -319,8 +311,8 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %if %{make_utils} @@ -369,8 +361,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -379,7 +371,7 @@ License: GPLv3+ %else %package -n libsmbclient0 -License: GPL v3 or later +License: GPLv3+ Provides: libsmbclient = %{version}-%{release} Obsoletes: libsmbclient %endif @@ -395,8 +387,8 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %else @@ -420,6 +412,11 @@ License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with smbclient Support Group: Development/Libraries/C and C++ AutoReqProv: on +%if 0%{?suse_version} > 1020 +BuildRequires: pkg-config +%else +BuildRequires: pkgconfig +%endif %if 0%{?suse_version} && 0%{?suse_version} < 921 Requires: libsmbclient = %{version} heimdal-devel %else @@ -440,8 +437,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %package -n libnetapi0 License: GPLv3+ @@ -459,14 +456,19 @@ Authors: -------- The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %package -n libnetapi-devel License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with netapi Support Group: Development/Libraries/C and C++ AutoReqProv: on +%if 0%{?suse_version} > 1020 +BuildRequires: pkg-config +%else +BuildRequires: pkgconfig +%endif Requires: libnetapi0 = %{version} %description -n libnetapi-devel @@ -479,8 +481,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -489,7 +491,7 @@ License: GPLv3+ %else %package -n libsmbsharemodes0 -License: GPL v3 or later +License: GPLv3+ %endif Summary: Samba smbsharemodes Library Group: System/Libraries @@ -500,8 +502,8 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %else @@ -519,6 +521,11 @@ License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support Group: Development/Libraries/C and C++ AutoReqProv: on +%if 0%{?suse_version} > 1020 +BuildRequires: pkg-config +%else +BuildRequires: pkgconfig +%endif %if 0%{?suse_version} && 0%{?suse_version} < 1031 Requires: libsmbsharemodes = %{version} %else @@ -536,8 +543,8 @@ Authors: The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %package -n libwbclient0 License: GPLv3+ @@ -555,14 +562,19 @@ Authors: -------- The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %package -n libwbclient-devel License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with wbclient Support Group: Development/Libraries/C and C++ AutoReqProv: on +%if 0%{?suse_version} > 1020 +BuildRequires: pkg-config +%else +BuildRequires: pkgconfig +%endif Requires: libwbclient0 = %{version} %description -n libwbclient-devel @@ -575,8 +587,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %package -n libtalloc2 License: LGPLv3+ @@ -584,7 +596,7 @@ Summary: Samba talloc Library Group: System/Libraries AutoReqProv: on Version: %{libtalloc_ver} -Release: 6 +Release: 1 PreReq: /sbin/ldconfig %description -n libtalloc2 @@ -596,8 +608,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %package -n libtalloc-devel License: LGPLv3+ @@ -605,7 +617,12 @@ Summary: Libraries and Header Files to Develop Programs with talloc Suppo Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtalloc_ver} -Release: 6 +Release: 1 +%if 0%{?suse_version} > 1020 +BuildRequires: pkg-config +%else +BuildRequires: pkgconfig +%endif Requires: libtalloc2 = %{libtalloc_ver} %description -n libtalloc-devel @@ -618,8 +635,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %package -n libtdb1 License: LGPLv3+ @@ -627,7 +644,7 @@ Summary: Samba tdb Library Group: System/Libraries AutoReqProv: on Version: %{libtdb_ver} -Release: 6 +Release: 1 PreReq: /sbin/ldconfig %description -n libtdb1 @@ -639,8 +656,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %package -n libtdb-devel License: LGPLv3+ @@ -648,7 +665,8 @@ Summary: Libraries and Header Files to Develop Programs with tdb Support Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtdb_ver} -Release: 6 +Release: 1 +#BuildRequires: pkg-config Requires: libtdb1 = %{libtdb_ver} %description -n libtdb-devel @@ -661,8 +679,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %package -n libtevent0 License: LGPLv3+ @@ -670,7 +688,7 @@ Summary: Samba tevent Library Group: System/Libraries AutoReqProv: on Version: %{libtevent_ver} -Release: 6 +Release: 1 PreReq: /sbin/ldconfig %description -n libtevent0 @@ -682,8 +700,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %package -n libtevent-devel License: LGPLv3+ @@ -691,8 +709,13 @@ Summary: Libraries and Header Files to Develop Programs with tevent Suppo Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtevent_ver} -Release: 6 -Requires: libtevent0 = %{libtevent_ver} +Release: 1 +%if 0%{?suse_version} > 1020 +BuildRequires: pkg-config +%else +BuildRequires: pkgconfig +%endif +Requires: libtalloc-devel libtevent0 = %{libtevent_ver} %description -n libtevent-devel This package contains the static libraries and header files needed to @@ -705,19 +728,20 @@ Authors: The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk -%package -n libldb0 +%package -n libldb1 License: LGPLv3+ Summary: Samba ldb Library Group: System/Libraries AutoReqProv: on Version: %{libldb_ver} -Release: 6 +Release: 1 PreReq: /sbin/ldconfig +BuildRequires: popt-devel -%description -n libldb0 +%description -n libldb1 This package includes the ldb library. @@ -727,8 +751,8 @@ Authors: The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %package -n libldb-devel License: LGPLv3+ @@ -736,8 +760,13 @@ Summary: Libraries and Header Files to Develop Programs with ldb Support Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libldb_ver} -Release: 6 -Requires: libldb0 = %{libldb_ver} +Release: 1 +%if 0%{?suse_version} > 1020 +BuildRequires: pkg-config +%else +BuildRequires: pkgconfig +%endif +Requires: libtalloc-devel libldb1 = %{libldb_ver} %description -n libldb-devel This package contains the static libraries and header files needed to @@ -749,8 +778,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %if %{make_ldapsmb} @@ -760,7 +789,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 302 +Release: 303 Requires: perl-ldap %description -n ldapsmb @@ -773,37 +802,14 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2516 -Branch : 3.5.8 - -%endif -%if 0%{?suse_version} > 920 && 0%{?suse_version} < 1121 - -%package -n cifs-mount -License: GPLv3+ -Summary: Mount using the Common Internet File System (CIFS) -Group: System/Filesystems -AutoReqProv: on -Requires: keyutils - -%description -n cifs-mount -mount.cifs mounts a CIFS filesystem. It is usually invoked indirectly -by the mount command when using the "-t cifs" option. - - - -Authors: --------- - Steve French - -Source Timestamp: 2516 -Branch : 3.5.8 +Source Timestamp: 2569 +Branch : trunk %endif %if %{make_vscan} %package vscan -License: GPL v2 or later +License: GPLv2+ Summary: On-Access Virus Scanning with Samba Group: Productivity/Networking/Samba AutoReqProv: on @@ -830,13 +836,13 @@ Authors: %setup -n samba-%{samba_ver_full} -q # check if our library versions from the spec are still current %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 -grep "^AC_INIT(ldb, %{libldb_ver})$" source4/lib/ldb/configure.ac || \ +grep "^VERSION = '%{libldb_ver}'$" source4/lib/ldb/wscript || \ exit 1 -grep "^AC_INIT(talloc, %{libtalloc_ver})$" lib/talloc/configure.ac || \ +grep "^VERSION = '%{libtalloc_ver}'$" lib/talloc/wscript || \ exit 1 -grep "^AC_INIT(tdb, %{libtdb_ver})$" lib/tdb/configure.ac || \ +grep "^VERSION = '%{libtdb_ver}'$" lib/tdb/wscript || \ exit 1 -grep "^AC_INIT(tevent, %{libtevent_ver})$" lib/tevent/configure.ac || \ +grep "^VERSION = '%{libtevent_ver}'$" lib/tevent/wscript || \ exit 1 %endif # ldapsmb @@ -870,6 +876,7 @@ for file in docs/htmldocs/index.html vendor-files/docu/README.vendor; do mv "${file}.new" "${file}" done %__install -m 0644 vendor-files/tools/get_printing_ticket.c source3/client/get_printing_ticket.c +%__install -m 0644 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/ # Create and add vendor suffix test -f vendor-files/tools/package-data && \ . vendor-files/tools/package-data @@ -945,6 +952,7 @@ CONFIGURE_OPTIONS="\ --with-mandir=%{_mandir} \ --with-modulesdir=%{_libdir}/samba \ --with-rootsbindir=/sbin \ + --with-nmbdsocketdir=%{LOCKDIR} \ --enable-cups \ --enable-debug \ %if %{link_static_libs} @@ -969,16 +977,6 @@ CONFIGURE_OPTIONS="\ --with-utmp \ --with-winbind \ --with-shared-modules=%{vfs_modules},%{idmap_modules} \ -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 - --without-cifsmount \ -%else - --with-cifsumount \ -%endif -%if %{make_cifsupcall} == 0 - --without-cifsupcall \ -%else - --with-cifsupcall \ -%endif %if %{make_devel} --enable-developer \ --enable-krb5developer \ @@ -994,14 +992,8 @@ CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer" %endif ./configure ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEVEL} ./script/mkversion.sh -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 930 -%{__make} pch -%else -%{__make} proto -%endif %{__make} %{build_make_smp_mflags} \ - everything -#%{__make} %{build_make_smp_mflags} -C tdb tdbtest tdbtorture + all bin/smbfilter %if %{make_vscan} pushd ../examples/VFS/samba-vscan-%{vscan_ver}/ %{?suse_update_config:%{suse_update_config -f}} @@ -1019,33 +1011,50 @@ popd %endif popd +for lib_dir in tdb talloc; do +pushd lib/${lib_dir} +./configure \ + --disable-symbol-versions \ + --prefix=%{_prefix} \ + --libdir=%{_libdir} +%{__make} +popd +done + pushd lib/tevent -%{?suse_update_config:%{suse_update_config -f}} -./autogen.sh TALLOC_LIBS=../../source3/bin/libtalloc.so.2 TALLOC_CFLAGS=-I../talloc/ ./configure \ + --disable-symbol-versions \ + --bundled-libraries=!talloc,ALL \ --prefix=%{_prefix} \ --localstatedir=%{LOCKDIR} \ --sysconfdir=%{CONFIGDIR} \ --libdir=%{_libdir} \ - --mandir=%{_mandir} + --mandir=%{_mandir} %{__make} popd pushd source4/lib/ldb -%{?suse_update_config:%{suse_update_config -f}} -./autogen.sh 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/ \ +TEVENT_LIBS=../../../lib/tevent/bin/default/lib/tevent/libtevent.so TEVENT_CFLAGS=-I../../../lib/tevent/ \ TDB_LIBS=../../../source3/bin/libtdb.so.1 TDB_CFLAGS=-I../../../lib/tdb/include \ - ./configure --prefix=%{_prefix} \ + ./configure \ + --disable-symbol-versions \ + --bundled-libraries=!popt \ + --prefix=%{_prefix} \ --localstatedir=%{LOCKDIR} \ --sysconfdir=%{CONFIGDIR} \ --libdir=%{_libdir} \ - --mandir=%{_mandir} + --mandir=%{_mandir} \ + --with-modulesdir=%{_libdir} %{__make} popd %check +for lib_dir in tdb talloc tevent; do +pushd lib/${lib_dir} +%{__make} test +popd +done pushd source3 make test_shlibs make test_nss_modules @@ -1074,6 +1083,7 @@ popd ${RPM_BUILD_ROOT}/%{_lib}/security \ ${RPM_BUILD_ROOT}/sbin \ ${RPM_BUILD_ROOT}/%{_includedir} \ + ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig \ ${RPM_BUILD_ROOT}/%{_libdir}/python/lib-dynload \ ${RPM_BUILD_ROOT}/%{_libdir}/samba/{config,vfs,rpc,auth,charset,idmap} \ ${RPM_BUILD_ROOT}/%{_datadir}/omc/svcinfo.d \ @@ -1089,30 +1099,36 @@ popd ${RPM_BUILD_ROOT}/%{DOCBOOKDIR} \ ${RPM_BUILD_ROOT}/%{SWATDIR}/help \ ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System -%{__make} -C source3/ install \ - DESTDIR=${RPM_BUILD_ROOT} \ - CONFIGDIR=%{CONFIGDIR} \ -# libtevent -%{__make} -C lib/tevent/ install \ - DESTDIR=${RPM_BUILD_ROOT} \ - CONFIGDIR=%{CONFIGDIR} -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/tevent.pc -%if %{link_static_libs} == 0 -rm ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.a -%endif +for lib_dir in tdb talloc tevent; do +pushd lib/${lib_dir} +%{__make} install \ + DESTDIR=${RPM_BUILD_ROOT} +popd +done # libldb %{__make} -C source4/lib/ldb/ install \ DESTDIR=${RPM_BUILD_ROOT} \ CONFIGDIR=%{CONFIGDIR} -%__install -d -m 0755 ${RPM_BUILD_ROOT}/%{_libdir}/ldb -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/ldb.pc -rm -f ${RPM_BUILD_ROOT}/%{_bindir}/ldbtest -rm -f ${RPM_BUILD_ROOT}/%{py_libdir}/site-packages/ldb.so -ln -s libldb.so.0.9.7 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so.0 -ln -s libldb.so.0.9.7 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so -%if %{link_static_libs} == 0 -rm ${RPM_BUILD_ROOT}/%{_libdir}/libldb.a -%endif +# we prefer the s3 binaries of the tdbtools +rm ${RPM_BUILD_ROOT}/%{_bindir}/tdb{backup,dump,restore,tool} +%{__make} -C source3/ install \ + DESTDIR=${RPM_BUILD_ROOT} \ + CONFIGDIR=%{CONFIGDIR} +# libtalloc +#rm ${RPM_BUILD_ROOT}/%{_libdir}/*talloc* +%{__make} -C lib/talloc/ install \ + DESTDIR=${RPM_BUILD_ROOT} \ + CONFIGDIR=%{CONFIGDIR} +# libtevent +%{__make} -C lib/talloc/ install \ + DESTDIR=${RPM_BUILD_ROOT} \ + CONFIGDIR=%{CONFIGDIR} +rm -r ${RPM_BUILD_ROOT}/%{python_sitearch} \ + ${RPM_BUILD_ROOT}/%{_libdir}/ldb/lib{t*,p*} \ + ${RPM_BUILD_ROOT}/%{_libdir}/tevent +for file in source3/pkgconfig/*.pc; do + %__install -m 0644 "${file}" ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig +done # utility scripts scripts="creategroup mksmbpasswd.sh" %__install -d -m 0755 examples/scripts @@ -1147,6 +1163,8 @@ if test 0%{?suse_version} -lt 901; then scriptSuffix="-900" elif test 0%{?suse_version} -lt 1011; then scriptSuffix="-1010" +elif test 0%{?suse_version} -lt 1111; then + scriptSuffix="-1110" elif test 0%{?suse_version} -lt 1131; then scriptSuffix="-1130" fi @@ -1212,12 +1230,6 @@ for file in ${LOGROTATE_FILES}; do echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file} done %__install -m 0644 docu/README.vendor ${RPM_BUILD_ROOT}/%{DOCDIR}/README.%{VENDOR} -# Install mkinitrd scripts for boot process -%if 0%{?suse_version} > 1100 && 0%{?suse_version} < 1121 -%__install -d -m 0755 %{buildroot}/lib/mkinitrd/scripts -%__install -m 0755 mkinitrd/mkinitrd-boot.sh %{buildroot}/lib/mkinitrd/scripts/boot-cifs.sh -%__install -m 0755 mkinitrd/mkinitrd-setup.sh %{buildroot}/lib/mkinitrd/scripts/setup-cifs.sh -%endif # SuSEhelp files %__install -m 0644 docu/Samba.desktop ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop %__install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html @@ -1252,9 +1264,6 @@ done %__install -m 0755 source3/bin/locktest ${RPM_BUILD_ROOT}/%{_bindir}/locktest %__install -m 0755 source3/bin/nsstest ${RPM_BUILD_ROOT}/%{_bindir}/nsstest %__install -m 0755 source3/bin/vfstest ${RPM_BUILD_ROOT}/%{_bindir}/vfstest -# install tdb tools -#%__install -m 0755 source3/tdb/tdbtest ${RPM_BUILD_ROOT}/%{_bindir}/tdbtest -#%__install -m 0755 source3/tdb/tdbtorture ${RPM_BUILD_ROOT}/%{_bindir}/tdbtorture %endif %if %{make_vscan} # install VSCAN-vfs-modules @@ -1348,16 +1357,6 @@ for file in $( find . -mindepth 1 -maxdepth 1);do done popd %endif -# Workaround bug 380693 by relocating the CIFS helper apps to /usr -%if 0%{?suse_version} && 0%{?suse_version} < 1030 -mv ${RPM_BUILD_ROOT}/sbin/{,u}mount.cifs ${RPM_BUILD_ROOT}/usr/sbin/ -ln -fs /usr/sbin/mount.cifs ${RPM_BUILD_ROOT}/sbin/ -ln -fs /usr/sbin/umount.cifs ${RPM_BUILD_ROOT}/sbin/ -%endif -# Remove unwanted mount.cifs man pages -%if 0%{?suse_version} && 0%{?suse_version} > 1120 -rm ${RPM_BUILD_ROOT}/%{_mandir}/man8/{,u}mount.cifs.8 -%endif # Hardlink duplicate files %if 0%{?suse_version} > 1110 %fdupes ${RPM_BUILD_ROOT} @@ -1457,10 +1456,10 @@ fi %postun -n libtevent0 /sbin/ldconfig -%post -n libldb0 +%post -n libldb1 /sbin/ldconfig -%postun -n libldb0 +%postun -n libldb1 /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 @@ -1520,17 +1519,7 @@ fi /sbin/ldconfig %{?restart_on_update:%{restart_on_update nscd winbind}} %{?insserv_cleanup:%{insserv_cleanup}} -%if 0%{?suse_version} > 920 && 0%{?suse_version} < 1121 -%post -n cifs-mount -[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup -exit 0 - -%postun -n cifs-mount -[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup -exit 0 - -%endif %if 0%{?suse_version} && 0%{?suse_version} < 1031 %post -n libsmbclient @@ -1632,6 +1621,7 @@ fi %doc %{_mandir}/man8/vfs_cap.8.* %doc %{_mandir}/man8/vfs_catia.8.* %doc %{_mandir}/man8/vfs_commit.8.* +%doc %{_mandir}/man8/vfs_crossrename.8.* %doc %{_mandir}/man8/vfs_default_quota.8.* %doc %{_mandir}/man8/vfs_dirsort.8.* %doc %{_mandir}/man8/vfs_scannedonly.8.* @@ -1652,6 +1642,7 @@ fi %doc %{_mandir}/man8/vfs_shadow_copy2.8.* %doc %{_mandir}/man8/vfs_smb_traffic_analyzer.8.* %doc %{_mandir}/man8/vfs_streams_xattr.8.* +%doc %{_mandir}/man8/vfs_time_audit.8.* %doc %{_mandir}/man8/vfs_xattr_tdb.8.* %doc %{_mandir}/man8/smbta-util.8.* %if 0%{?suse_version} && 0%{?suse_version} < 1021 @@ -1712,6 +1703,7 @@ fi %{_bindir}/smbtree %{_bindir}/tdbbackup %{_bindir}/tdbdump +%{_bindir}/tdbrestore %{_bindir}/tdbtool %{_bindir}/testparm %{_sbindir}/rc%{cifs_init_script} @@ -1773,14 +1765,6 @@ fi %dir %{LOCKDIR} %attr(0750,root,root) %dir %{LOGDIR} %ghost %dir %{PIDDIR} -%if 0%{?suse_version} && 0%{?suse_version} < 921 -/sbin/mount.cifs -/sbin/umount.cifs -%{_sbindir}/mount.cifs -%{_sbindir}/umount.cifs -%doc %{_mandir}/man8/mount.cifs.8.* -%doc %{_mandir}/man8/umount.cifs.8.* -%endif %files winbind -f filelist-samba-winbind %defattr(-,root,root) @@ -1804,6 +1788,7 @@ fi %doc %{_mandir}/man7/winbind_krb5_locator.7.* %doc %{_mandir}/man8/idmap_ad.8.* %doc %{_mandir}/man8/idmap_adex.8.* +%doc %{_mandir}/man8/idmap_autorid.8.* %doc %{_mandir}/man8/idmap_hash.8.* %doc %{_mandir}/man8/idmap_ldap.8.* %doc %{_mandir}/man8/idmap_nss.8.* @@ -1830,8 +1815,6 @@ fi %{_bindir}/nsstest %{_bindir}/smbtorture %{_bindir}/talloctort -#%{_bindir}/tdbtest -#%{_bindir}/tdbtorture %{_bindir}/vfstest %doc %{_mandir}/man1/log2pcap.1.* %doc %{_mandir}/man1/vfstest.1.* @@ -1875,9 +1858,10 @@ fi %defattr(-,root,root) %{_includedir}/netapi.h %if %{link_static_libs} -%{_libdir}/libnetapi.a +%attr(0644,root,root) %{_libdir}/libnetapi.a %endif %{_libdir}/libnetapi.so +%{_libdir}/pkgconfig/netapi.pc %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -1894,9 +1878,10 @@ fi %defattr(-,root,root) %{_includedir}/libsmbclient.h %if %{link_static_libs} -%{_libdir}/libsmbclient.a +%attr(0644,root,root) %{_libdir}/libsmbclient.a %endif %{_libdir}/libsmbclient.so +%{_libdir}/pkgconfig/smbclient.pc %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -1912,21 +1897,27 @@ fi %defattr(-,root,root) %{_includedir}/smb_share_modes.h %if %{link_static_libs} -%{_libdir}/libsmbsharemodes.a +%attr(0644,root,root) %{_libdir}/libsmbsharemodes.a %endif %{_libdir}/libsmbsharemodes.so +%{_libdir}/pkgconfig/smbsharemodes.pc %files -n libtalloc2 %defattr(-,root,root) +%{_libdir}/libpytalloc-util.so.* %{_libdir}/libtalloc.so.* %files -n libtalloc-devel %defattr(-,root,root) +%{_includedir}/pytalloc.h %{_includedir}/talloc.h %if %{link_static_libs} -%{_libdir}/libtalloc.a +%attr(0644,root,root) %{_libdir}/libtalloc.a %endif +%{_libdir}/libpytalloc-util.so %{_libdir}/libtalloc.so +%{_libdir}/pkgconfig/pytalloc-util.pc +%{_libdir}/pkgconfig/talloc.pc %files -n libtdb1 %defattr(-,root,root) @@ -1936,9 +1927,10 @@ fi %defattr(-,root,root) %{_includedir}/tdb.h %if %{link_static_libs} -%{_libdir}/libtdb.a +%attr(0644,root,root) %{_libdir}/libtdb.a %endif %{_libdir}/libtdb.so +%{_libdir}/pkgconfig/tdb.pc %files -n libwbclient0 %defattr(-,root,root) @@ -1946,12 +1938,11 @@ fi %files -n libwbclient-devel %defattr(-,root,root) -%{_includedir}/wbc_async.h %{_includedir}/wbclient.h %if %{link_static_libs} -#%{_libdir}/libwbclient.a %endif %{_libdir}/libwbclient.so +%{_libdir}/pkgconfig/wbclient.pc %files -n libtevent0 %defattr(-,root,root) @@ -1960,23 +1951,24 @@ fi %files -n libtevent-devel %defattr(-,root,root) %{_includedir}/tevent.h -%if %{link_static_libs} -%{_libdir}/libtevent.a -%endif %{_libdir}/libtevent.so +%{_libdir}/pkgconfig/tevent.pc -%files -n libldb0 +%files -n libldb1 %defattr(-,root,root) %{_libdir}/libldb.so.* -%attr(755,root,root) %dir %{_libdir}/ldb +%dir %{_libdir}/ldb +%{_libdir}/ldb/*.so +%{_libdir}/libpyldb-util.so.* %files -n libldb-devel %defattr(-,root,root) %{_includedir}/ldb*.h -%if %{link_static_libs} -%{_libdir}/libldb.a -%endif +%{_includedir}/pyldb.h %{_libdir}/libldb.so +%{_libdir}/libpyldb-util.so +%{_libdir}/pkgconfig/ldb.pc +%{_libdir}/pkgconfig/pyldb-util.pc %if %{make_ldapsmb} %files -n ldapsmb @@ -1984,27 +1976,4 @@ fi %{_sbindir}/ldapsmb %{_mandir}/man5/ldapsmb.5.* %endif -%if 0%{?suse_version} > 920 && 0%{?suse_version} < 1121 - -%files -n cifs-mount -%defattr(-,root,root) -%if 0%{?suse_version} && 0%{?suse_version} < 1030 -%{_sbindir}/mount.cifs -%{_sbindir}/umount.cifs -%endif -/sbin/mount.cifs -/sbin/umount.cifs -%doc %{_mandir}/man8/mount.cifs.8.* -%doc %{_mandir}/man8/umount.cifs.8.* -%if %{make_cifsupcall} -%{_sbindir}/cifs.upcall -%doc %{_mandir}/man8/cifs.upcall.8.* -%endif -%if 0%{?suse_version} > 1100 -%dir /lib/mkinitrd -%dir /lib/mkinitrd/scripts -/lib/mkinitrd/scripts/setup-cifs.sh -/lib/mkinitrd/scripts/boot-cifs.sh -%endif -%endif %changelog diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 5305009..647a4ef 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:3647f1359aa968eb919968fe160093c72aa33fd52f439a6da91bce7a478fe972 -size 24740 +oid sha256:1f0e816b6bd04cb4452ef5a4bc11a77f38243e9f00f9566bd334089adfa668eb +size 51409