From 039a38362ec2a133b3da7aa3c198b1400ae57ec5c133c383ae6e6dfd5ff13934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 21 Jul 2011 20:14:33 +0000 Subject: [PATCH 01/13] - Make use of the actual library version as part of the package name on post-11.3 systems only. - Improve ctdb vacuuming performance with use of SCHEDULE_FOR_DELETION; (bnc#705170). - Specify nmbdsocketdir at configure time; (bnc#700953). - Build the tdb, talloc, and tevent libraries ahead of anything else. - Update to 3.6.0rc2. - Make cupsaddsmb fill printers location; (bso#8132); (bnc#698209). - Add "winbind max clients" parameter to remove 200-client limit; (bnc#697461). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=165 --- baselibs.conf | 2 + build-source-timestamp | 4 +- patches.tar.bz2 | 4 +- samba-3.5.8.tar.bz2 | 3 - samba-3.6.0rc2.tar.bz2 | 3 + samba-doc.spec | 46 ++--- samba.changes | 338 +++++++++++++++++++++++++++++++ samba.spec | 441 +++++++++++++++++++---------------------- vendor-files.tar.bz2 | 4 +- 9 files changed, 572 insertions(+), 273 deletions(-) delete mode 100644 samba-3.5.8.tar.bz2 create mode 100644 samba-3.6.0rc2.tar.bz2 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 From 327c358aefa8b5fc671d7a39413735aa202b3cc75c3e577335ee48fed239f99b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 27 Jul 2011 01:35:54 +0000 Subject: [PATCH 02/13] - The Samba Web Administration Tool (SWAT) versions 3.0.x to 3.5.9 are affected by a cross-site scripting vulnerability; CVE-2011-2694; (bso#8289); (bnc#708503). - The Samba Web Administration Tool (SWAT) versions 3.0.x to 3.5.9 are affected by a cross-site request forgery; CVE-2011-2522; (bso#8290); (bnc#705241). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=166 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 14 +++++++++++++ samba.spec | 46 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 43 insertions(+), 29 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index b6dddfd..0253ef8 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2569 +2573 Branch : trunk diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 23c2e63..c65e49d 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e8b7e7c683334250066bd3017c60aea59a9946afaf5dd58a038339cdc06e94e -size 59360 +oid sha256:d663dce064f610b0c33347fb28546b1f1be7a1d91fc0b3a408b9ada35bef051d +size 63325 diff --git a/samba-doc.spec b/samba-doc.spec index a419270..4ad82ac 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -415,7 +415,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index 695dd92..fce7719 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jul 26 23:57:01 UTC 2011 - lmuelle@suse.de + +- The Samba Web Administration Tool (SWAT) versions 3.0.x to 3.5.9 are + affected by a cross-site scripting vulnerability; CVE-2011-2694; (bso#8289); + (bnc#708503). + +------------------------------------------------------------------- +Tue Jul 26 20:44:01 UTC 2011 - lmuelle@suse.de + +- The Samba Web Administration Tool (SWAT) versions 3.0.x to 3.5.9 are + affected by a cross-site request forgery; CVE-2011-2522; (bso#8290); + (bnc#705241). + ------------------------------------------------------------------- Thu Jul 14 10:26:22 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index a7b08f2..55f4efa 100644 --- a/samba.spec +++ b/samba.spec @@ -187,7 +187,7 @@ Authors: The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %package client @@ -227,7 +227,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -254,7 +254,7 @@ Authors: The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %endif @@ -284,7 +284,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %endif @@ -311,7 +311,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %if %{make_utils} @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -387,7 +387,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %else @@ -437,7 +437,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %package -n libnetapi0 @@ -456,7 +456,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %package -n libnetapi-devel @@ -481,7 +481,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -502,7 +502,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %else @@ -543,7 +543,7 @@ Authors: The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %package -n libwbclient0 @@ -562,7 +562,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %package -n libwbclient-devel @@ -587,7 +587,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %package -n libtalloc2 @@ -608,7 +608,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %package -n libtalloc-devel @@ -635,7 +635,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %package -n libtdb1 @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %package -n libtdb-devel @@ -679,7 +679,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %package -n libtevent0 @@ -700,7 +700,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %package -n libtevent-devel @@ -728,7 +728,7 @@ Authors: The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %package -n libldb1 @@ -751,7 +751,7 @@ Authors: The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %package -n libldb-devel @@ -778,7 +778,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %if %{make_ldapsmb} @@ -802,7 +802,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2569 +Source Timestamp: 2573 Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 647a4ef..701bb12 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:1f0e816b6bd04cb4452ef5a4bc11a77f38243e9f00f9566bd334089adfa668eb -size 51409 +oid sha256:57b89fe8bd2bdcecce69bdce8d5be91685059769f031af7de7d9d678f43f2ecd +size 51339 From 831b108aa5707aa3bd8829b9e169f15de0d8ea9929114f1b06a00733b0f18296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 27 Jul 2011 01:55:14 +0000 Subject: [PATCH 03/13] - Update to 3.6.0rc3. + BUG 7841: Explicitly pass domain_sid to wbint_LookupRids(). + BUG 7888: Deal with buggy 3.0 based PDCs. + BUG 8083: Fix "inherit owner = yes" with vfs_acl_xattr or vfs_acl_tdb module. + BUG 8102: Do not allow to change file ACLs from normal domusers. + BUG 8102: Do not allow to change file ACLs from normal domusers. + BUG 8193: Add new command 'enumerate_recursive'. + BUG 8195: Make rpc client code working against NT4 servers. + BUG 8211: Fix "inherit owner = yes" when "inherit permissions = yes" is set. + BUG 8213: Fixes in idmap_autorid. + BUG 8214: Fix smbd crash on printer driver upgrade. + BUG 8215: Fix Winbind unix username lookup. + BUG 8216: Make Winbind returning correct results with 'sids2xids'. + BUG 8217: Do not stat-check the share path in 'net conf addshare'. + BUG 8219: Fix SMB Panic from Windows 7 client. + BUG 8224: Fix the build on FreeBSD. + BUG 8226: Use c99 initializers which are supported by old gcc 2.95 compilers. + BUG 8230: Move .nmbd socket directory to non-hidden name PREFIX/var/nmbd. + BUG 8231: Fix crash bug in 'net cache get'. + BUG 8235: Fix smbd crash on startup caused by migrate_printer(). + BUG 8240: Fix Valgrind warnings in winreg/spoolss code. + BUG 8244: Fix copying files larger than 2 GB to a Samba share. + BUG 8247: Fix Coverity ID 2582: FORWARD_NULL. + BUG 8253: Fix Winbind panic if verify_idpool() fails. + BUG 8254: Fix "acl check permissions = no". + BUG 8260: Fix DCERPC responses with fragments larger than 1024 bytes. + BUG 8262: Fix build of vfs_commit. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=167 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-3.6.0rc2.tar.bz2 | 3 --- samba-3.6.0rc3.tar.bz2 | 3 +++ samba-doc.spec | 4 ++-- samba.changes | 50 ++++++++++++++++++++++++++++++++++++++++++ samba.spec | 48 ++++++++++++++++++++-------------------- vendor-files.tar.bz2 | 4 ++-- 8 files changed, 84 insertions(+), 34 deletions(-) delete mode 100644 samba-3.6.0rc2.tar.bz2 create mode 100644 samba-3.6.0rc3.tar.bz2 diff --git a/build-source-timestamp b/build-source-timestamp index 0253ef8..1db86d7 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2573 +2573M Branch : trunk diff --git a/patches.tar.bz2 b/patches.tar.bz2 index c65e49d..171c806 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d663dce064f610b0c33347fb28546b1f1be7a1d91fc0b3a408b9ada35bef051d -size 63325 +oid sha256:23623865336a2cab6f9cc6e48f66063abef0729ec3c02e2d5fff09d3cb16887e +size 59511 diff --git a/samba-3.6.0rc2.tar.bz2 b/samba-3.6.0rc2.tar.bz2 deleted file mode 100644 index 603a4b8..0000000 --- a/samba-3.6.0rc2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a82f6f4af5acb40daaaf231f2a64f01fd3aca228410920fbccbb3636bf1f8e6 -size 24491093 diff --git a/samba-3.6.0rc3.tar.bz2 b/samba-3.6.0rc3.tar.bz2 new file mode 100644 index 0000000..39a7b52 --- /dev/null +++ b/samba-3.6.0rc3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82ec69f2bb90e1f27fe2320b42f8ea7428ef81efbc9f5bb53f7154b3cba82b03 +size 24439714 diff --git a/samba-doc.spec b/samba-doc.spec index 4ad82ac..abf97a7 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -59,7 +59,7 @@ BuildRequires: pkg-config BuildRequires: pkgconfig %endif %define samba_ver 3.6.0 -%define samba_ver_suffix rc2 +%define samba_ver_suffix rc3 %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 @@ -415,7 +415,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index fce7719..9ff3b66 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Wed Jul 27 01:40:00 UTC 2011 - lmuelle@suse.de + +- Update to 3.6.0rc3. + + BUG 7841: Explicitly pass domain_sid to wbint_LookupRids(). + + BUG 7888: Deal with buggy 3.0 based PDCs. + + BUG 8083: Fix "inherit owner = yes" with vfs_acl_xattr or vfs_acl_tdb + module. + + BUG 8102: Do not allow to change file ACLs from normal domusers. + + BUG 8102: Do not allow to change file ACLs from normal domusers. + + BUG 8193: Add new command 'enumerate_recursive'. + + BUG 8195: Make rpc client code working against NT4 servers. + + BUG 8211: Fix "inherit owner = yes" when "inherit permissions = yes" is + set. + + BUG 8213: Fixes in idmap_autorid. + + BUG 8214: Fix smbd crash on printer driver upgrade. + + BUG 8215: Fix Winbind unix username lookup. + + BUG 8216: Make Winbind returning correct results with 'sids2xids'. + + BUG 8217: Do not stat-check the share path in 'net conf addshare'. + + BUG 8219: Fix SMB Panic from Windows 7 client. + + BUG 8224: Fix the build on FreeBSD. + + BUG 8226: Use c99 initializers which are supported by old gcc 2.95 + compilers. + + BUG 8230: Move .nmbd socket directory to non-hidden name PREFIX/var/nmbd. + + BUG 8231: Fix crash bug in 'net cache get'. + + BUG 8235: Fix smbd crash on startup caused by migrate_printer(). + + BUG 8240: Fix Valgrind warnings in winreg/spoolss code. + + BUG 8244: Fix copying files larger than 2 GB to a Samba share. + + BUG 8247: Fix Coverity ID 2582: FORWARD_NULL. + + BUG 8253: Fix Winbind panic if verify_idpool() fails. + + BUG 8254: Fix "acl check permissions = no". + + BUG 8260: Fix DCERPC responses with fragments larger than 1024 bytes. + + BUG 8262: Fix build of vfs_commit. + + BUG 8263: Fix build with --with-fake-kaserver or --with-vfs-afsacl. + + BUG 8264: Fix Valgrind bugs in svcctl. + + BUG 8276: Close all sockets attached to a subnet in close_subnet(). + + BUG 8278: Fix smbd panic when CTDB is unhealthy. + + BUG 8281: Fix build of examples/VFS/*. + + BUG 8286: Fix smbd crash on premature end of smb2 conn. + + BUG 8292: Fix a major architectural flaw in the SMB2 server code. + + BUG 8293: Fix log file rotating in SMB2. + + BUG 8304: Fix uninitialized variable in error path. + + BUG 8305: Fix segfault in nmbd when using 'smbtree ...'.. + + BUG 8307: brl_close_fnum does not call SMB_VFS_BRL_UNLOCK_WINDOWS on all + locks. + + BUG 8310: toupper_ascii() is broken on big-endian systems. + + BUG 8314: Fix smbd crash with unknown user. + + + Mark 'time offset' parameter as deprecated. + ------------------------------------------------------------------- Tue Jul 26 23:57:01 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 55f4efa..d232cde 100644 --- a/samba.spec +++ b/samba.spec @@ -59,7 +59,7 @@ BuildRequires: pkg-config BuildRequires: pkgconfig %endif %define samba_ver 3.6.0 -%define samba_ver_suffix rc2 +%define samba_ver_suffix rc3 %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 @@ -187,7 +187,7 @@ Authors: The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %package client @@ -227,7 +227,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -254,7 +254,7 @@ Authors: The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %endif @@ -284,7 +284,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %endif @@ -311,7 +311,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %if %{make_utils} @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -387,7 +387,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %else @@ -437,7 +437,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %package -n libnetapi0 @@ -456,7 +456,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %package -n libnetapi-devel @@ -481,7 +481,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -502,7 +502,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %else @@ -543,7 +543,7 @@ Authors: The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %package -n libwbclient0 @@ -562,7 +562,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %package -n libwbclient-devel @@ -587,7 +587,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %package -n libtalloc2 @@ -608,7 +608,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %package -n libtalloc-devel @@ -635,7 +635,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %package -n libtdb1 @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %package -n libtdb-devel @@ -679,7 +679,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %package -n libtevent0 @@ -700,7 +700,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %package -n libtevent-devel @@ -728,7 +728,7 @@ Authors: The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %package -n libldb1 @@ -751,7 +751,7 @@ Authors: The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %package -n libldb-devel @@ -778,7 +778,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %if %{make_ldapsmb} @@ -802,7 +802,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2573 +Source Timestamp: 2573M Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 701bb12..3e52832 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:57b89fe8bd2bdcecce69bdce8d5be91685059769f031af7de7d9d678f43f2ecd -size 51339 +oid sha256:d4c8d1eb1383cce55a582d662b340538073c32c76f7cae7623cdcf5bdc6aab01 +size 51397 From d04dff30748741a4da2fa5f7b0eb7c62af27a1f50e0c2f07d9d3130fe16ff2f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 27 Jul 2011 01:58:17 +0000 Subject: [PATCH 04/13] Push the commited version. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=168 --- build-source-timestamp | 2 +- samba-doc.spec | 2 +- samba.spec | 46 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 1db86d7..1104be7 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2573M +2574 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index abf97a7..83cb458 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -415,7 +415,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %changelog diff --git a/samba.spec b/samba.spec index d232cde..8cfc1a6 100644 --- a/samba.spec +++ b/samba.spec @@ -187,7 +187,7 @@ Authors: The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %package client @@ -227,7 +227,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -254,7 +254,7 @@ Authors: The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %endif @@ -284,7 +284,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %endif @@ -311,7 +311,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %if %{make_utils} @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -387,7 +387,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %else @@ -437,7 +437,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %package -n libnetapi0 @@ -456,7 +456,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %package -n libnetapi-devel @@ -481,7 +481,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -502,7 +502,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %else @@ -543,7 +543,7 @@ Authors: The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %package -n libwbclient0 @@ -562,7 +562,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %package -n libwbclient-devel @@ -587,7 +587,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %package -n libtalloc2 @@ -608,7 +608,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %package -n libtalloc-devel @@ -635,7 +635,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %package -n libtdb1 @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %package -n libtdb-devel @@ -679,7 +679,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %package -n libtevent0 @@ -700,7 +700,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %package -n libtevent-devel @@ -728,7 +728,7 @@ Authors: The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %package -n libldb1 @@ -751,7 +751,7 @@ Authors: The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %package -n libldb-devel @@ -778,7 +778,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %if %{make_ldapsmb} @@ -802,7 +802,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2573M +Source Timestamp: 2574 Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 3e52832..3ef82fa 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:d4c8d1eb1383cce55a582d662b340538073c32c76f7cae7623cdcf5bdc6aab01 -size 51397 +oid sha256:6b725d381f8daf912792b32954e3baf2ff3b5c518dcbae43e926d763843546ea +size 51408 From cbb3dd997f25732e0d85d610309796292c901044804535e4d34a25303c742f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 28 Jul 2011 17:54:32 +0000 Subject: [PATCH 05/13] - smbclient cannot list directories from a big-endian machine; (bso#8324). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=169 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 5 +++++ samba.spec | 46 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 34 insertions(+), 29 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 1104be7..1cb366d 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2574 +2575 Branch : trunk diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 171c806..f6bea9e 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23623865336a2cab6f9cc6e48f66063abef0729ec3c02e2d5fff09d3cb16887e -size 59511 +oid sha256:f2a9fd3f990b099524e48355318b2f4b54c58150e825d20eee89c00619d6fa5e +size 59906 diff --git a/samba-doc.spec b/samba-doc.spec index 83cb458..04a197f 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -415,7 +415,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index 9ff3b66..519dde0 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 28 13:09:58 UTC 2011 - lmuelle@suse.de + +- smbclient cannot list directories from a big-endian machine; (bso#8324). + ------------------------------------------------------------------- Wed Jul 27 01:40:00 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 8cfc1a6..12b700c 100644 --- a/samba.spec +++ b/samba.spec @@ -187,7 +187,7 @@ Authors: The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %package client @@ -227,7 +227,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -254,7 +254,7 @@ Authors: The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %endif @@ -284,7 +284,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %endif @@ -311,7 +311,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %if %{make_utils} @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -387,7 +387,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %else @@ -437,7 +437,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %package -n libnetapi0 @@ -456,7 +456,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %package -n libnetapi-devel @@ -481,7 +481,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -502,7 +502,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %else @@ -543,7 +543,7 @@ Authors: The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %package -n libwbclient0 @@ -562,7 +562,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %package -n libwbclient-devel @@ -587,7 +587,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %package -n libtalloc2 @@ -608,7 +608,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %package -n libtalloc-devel @@ -635,7 +635,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %package -n libtdb1 @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %package -n libtdb-devel @@ -679,7 +679,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %package -n libtevent0 @@ -700,7 +700,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %package -n libtevent-devel @@ -728,7 +728,7 @@ Authors: The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %package -n libldb1 @@ -751,7 +751,7 @@ Authors: The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %package -n libldb-devel @@ -778,7 +778,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %if %{make_ldapsmb} @@ -802,7 +802,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2574 +Source Timestamp: 2575 Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 3ef82fa..e477488 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:6b725d381f8daf912792b32954e3baf2ff3b5c518dcbae43e926d763843546ea -size 51408 +oid sha256:95d7c7a85ac1bfac3f5f101c313849ec092f02b0f02034546d591a4ac69c83f5 +size 51357 From 2250ddd949235eb2bdad3518fd77d0c079c9caf4ca30bcef4a7077da5052c009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sun, 31 Jul 2011 14:31:41 +0000 Subject: [PATCH 06/13] - Fix reload of the configuration and also reload activated registry shares; (bso#8327). - WinXP cannot join a Samba3 domain with a 'even' hostname; (bso#8326). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=170 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 11 ++++++++++ samba.spec | 46 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 40 insertions(+), 29 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 1cb366d..8eb9995 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2575 +2577 Branch : trunk diff --git a/patches.tar.bz2 b/patches.tar.bz2 index f6bea9e..a93b7cb 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2a9fd3f990b099524e48355318b2f4b54c58150e825d20eee89c00619d6fa5e -size 59906 +oid sha256:f8ef6d3314c05b45747ae1b154fc765cb71f087c78ca6aec6be33861fd8a812b +size 61004 diff --git a/samba-doc.spec b/samba-doc.spec index 04a197f..c1e343f 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -415,7 +415,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index 519dde0..252ee4b 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Jul 31 14:26:37 UTC 2011 - lmuelle@suse.de + +- Fix reload of the configuration and also reload activated registry shares; + (bso#8327). + +------------------------------------------------------------------- +Sun Jul 31 14:22:21 UTC 2011 - lmuelle@suse.de + +- WinXP cannot join a Samba3 domain with a 'even' hostname; (bso#8326). + ------------------------------------------------------------------- Thu Jul 28 13:09:58 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 12b700c..a25500e 100644 --- a/samba.spec +++ b/samba.spec @@ -187,7 +187,7 @@ Authors: The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %package client @@ -227,7 +227,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -254,7 +254,7 @@ Authors: The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %endif @@ -284,7 +284,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %endif @@ -311,7 +311,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %if %{make_utils} @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -387,7 +387,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %else @@ -437,7 +437,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %package -n libnetapi0 @@ -456,7 +456,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %package -n libnetapi-devel @@ -481,7 +481,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -502,7 +502,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %else @@ -543,7 +543,7 @@ Authors: The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %package -n libwbclient0 @@ -562,7 +562,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %package -n libwbclient-devel @@ -587,7 +587,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %package -n libtalloc2 @@ -608,7 +608,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %package -n libtalloc-devel @@ -635,7 +635,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %package -n libtdb1 @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %package -n libtdb-devel @@ -679,7 +679,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %package -n libtevent0 @@ -700,7 +700,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %package -n libtevent-devel @@ -728,7 +728,7 @@ Authors: The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %package -n libldb1 @@ -751,7 +751,7 @@ Authors: The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %package -n libldb-devel @@ -778,7 +778,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %if %{make_ldapsmb} @@ -802,7 +802,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2575 +Source Timestamp: 2577 Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index e477488..1222efa 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:95d7c7a85ac1bfac3f5f101c313849ec092f02b0f02034546d591a4ac69c83f5 -size 51357 +oid sha256:66a9dc50570474470e4265c9bcc5931c0b3049db1623b5326c115b4f95903c9b +size 51406 From 9be8e2fd8dc216e539656453c19bf3522a96fceee82a919fc51781a16e9206ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 1 Aug 2011 21:33:10 +0000 Subject: [PATCH 07/13] - Fix #ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION issue; (bso#8303). - File copy aborts with smb2_validate_message_id: bad message_id; (bso#8335). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=171 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 10 +++++++++ samba.spec | 46 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 39 insertions(+), 29 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 8eb9995..29607e6 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2577 +2580 Branch : trunk diff --git a/patches.tar.bz2 b/patches.tar.bz2 index a93b7cb..3b174fe 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8ef6d3314c05b45747ae1b154fc765cb71f087c78ca6aec6be33861fd8a812b -size 61004 +oid sha256:61a29677dc4007d7cca6842b7b7c7a45d825ce1cc47f7a60ce7ce35455ebe318 +size 62528 diff --git a/samba-doc.spec b/samba-doc.spec index c1e343f..65e737d 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -415,7 +415,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index 252ee4b..5cb5f00 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Aug 1 21:28:25 UTC 2011 - lmuelle@suse.de + +- Fix #ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION issue; (bso#8303). + +------------------------------------------------------------------- +Mon Aug 1 21:24:37 UTC 2011 - lmuelle@suse.de + +- File copy aborts with smb2_validate_message_id: bad message_id; (bso#8335). + ------------------------------------------------------------------- Sun Jul 31 14:26:37 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index a25500e..de17e31 100644 --- a/samba.spec +++ b/samba.spec @@ -187,7 +187,7 @@ Authors: The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %package client @@ -227,7 +227,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -254,7 +254,7 @@ Authors: The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %endif @@ -284,7 +284,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %endif @@ -311,7 +311,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %if %{make_utils} @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -387,7 +387,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %else @@ -437,7 +437,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %package -n libnetapi0 @@ -456,7 +456,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %package -n libnetapi-devel @@ -481,7 +481,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -502,7 +502,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %else @@ -543,7 +543,7 @@ Authors: The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %package -n libwbclient0 @@ -562,7 +562,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %package -n libwbclient-devel @@ -587,7 +587,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %package -n libtalloc2 @@ -608,7 +608,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %package -n libtalloc-devel @@ -635,7 +635,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %package -n libtdb1 @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %package -n libtdb-devel @@ -679,7 +679,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %package -n libtevent0 @@ -700,7 +700,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %package -n libtevent-devel @@ -728,7 +728,7 @@ Authors: The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %package -n libldb1 @@ -751,7 +751,7 @@ Authors: The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %package -n libldb-devel @@ -778,7 +778,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %if %{make_ldapsmb} @@ -802,7 +802,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2577 +Source Timestamp: 2580 Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 1222efa..18050e0 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:66a9dc50570474470e4265c9bcc5931c0b3049db1623b5326c115b4f95903c9b -size 51406 +oid sha256:67f99c6f77859ab53b0aa258b7a55248ebd2b5e1e60952357f2c034d4fa66e9b +size 51348 From d7483766ebec1b17bb0794618587e61bce73a58083ad8aa6988ac00140c403d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 4 Aug 2011 11:15:00 +0000 Subject: [PATCH 08/13] - Use /var/run for the cifs state file; (bnc#710304). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=172 --- build-source-timestamp | 2 +- samba-doc.spec | 2 +- samba.changes | 5 ++++ samba.spec | 52 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 35 insertions(+), 30 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 29607e6..acd13d5 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2580 +2581 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index 65e737d..0174399 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -415,7 +415,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index 5cb5f00..bbd0cca 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 4 10:40:57 UTC 2011 - lmuelle@suse.de + +- Use /var/run for the cifs state file; (bnc#710304). + ------------------------------------------------------------------- Mon Aug 1 21:28:25 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index de17e31..1f228dd 100644 --- a/samba.spec +++ b/samba.spec @@ -187,7 +187,7 @@ Authors: The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package client @@ -227,7 +227,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -254,7 +254,7 @@ Authors: The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %endif @@ -284,7 +284,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %endif @@ -311,7 +311,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %if %{make_utils} @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -387,7 +387,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %else @@ -437,7 +437,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libnetapi0 @@ -456,7 +456,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libnetapi-devel @@ -481,7 +481,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -502,7 +502,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %else @@ -543,7 +543,7 @@ Authors: The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libwbclient0 @@ -562,7 +562,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libwbclient-devel @@ -587,7 +587,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libtalloc2 @@ -608,7 +608,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libtalloc-devel @@ -635,7 +635,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libtdb1 @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libtdb-devel @@ -679,7 +679,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libtevent0 @@ -700,7 +700,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libtevent-devel @@ -728,7 +728,7 @@ Authors: The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libldb1 @@ -751,7 +751,7 @@ Authors: The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %package -n libldb-devel @@ -778,7 +778,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %if %{make_ldapsmb} @@ -802,7 +802,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2580 +Source Timestamp: 2581 Branch : trunk %endif @@ -1093,7 +1093,7 @@ popd ${RPM_BUILD_ROOT}/%{LOGDIR} \ ${RPM_BUILD_ROOT}/%{PIDDIR} \ ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates \ - ${RPM_BUILD_ROOT}/%{_var}/lock/subsys \ + ${RPM_BUILD_ROOT}/%{_var}/run \ ${RPM_BUILD_ROOT}/%{DOCDIR}-vscan \ ${RPM_BUILD_ROOT}/%{DOCDIR} \ ${RPM_BUILD_ROOT}/%{DOCBOOKDIR} \ @@ -1187,7 +1187,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/%{cifs_init_script} +touch ${RPM_BUILD_ROOT}/var/run/%{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 @@ -1761,7 +1761,7 @@ fi %doc %{DOCDIR}/README.%{VENDOR} %{_var}/adm/fillup-templates/samba-client-dhcp.conf %{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client -%ghost %{_var}/lock/subsys/%{cifs_init_script} +%ghost %{_var}/run/%{cifs_init_script} %dir %{LOCKDIR} %attr(0750,root,root) %dir %{LOGDIR} %ghost %dir %{PIDDIR} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 18050e0..03cd7ff 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:67f99c6f77859ab53b0aa258b7a55248ebd2b5e1e60952357f2c034d4fa66e9b -size 51348 +oid sha256:dae04225d8f29da03a9bf33c0bcce7acdebc661d118e7996b4376764a545e99d +size 51394 From b4ded83beb1b2d9bf9229387ba2d7945085b6081731affa2b2410b3d1c19916b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 4 Aug 2011 17:33:26 +0000 Subject: [PATCH 09/13] - Add missing define, includes, and initialization to get_printing_ticket. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=173 --- build-source-timestamp | 2 +- samba-doc.spec | 2 +- samba.changes | 5 +++++ samba.spec | 46 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 32 insertions(+), 27 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index acd13d5..d8a2f41 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2581 +2582 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index 0174399..6ca8774 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -415,7 +415,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index bbd0cca..f220543 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 4 17:12:25 UTC 2011 - lmuelle@suse.de + +- Add missing define, includes, and initialization to get_printing_ticket. + ------------------------------------------------------------------- Thu Aug 4 10:40:57 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 1f228dd..c2f8eb1 100644 --- a/samba.spec +++ b/samba.spec @@ -187,7 +187,7 @@ Authors: The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %package client @@ -227,7 +227,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -254,7 +254,7 @@ Authors: The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %endif @@ -284,7 +284,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %endif @@ -311,7 +311,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %if %{make_utils} @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -387,7 +387,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %else @@ -437,7 +437,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %package -n libnetapi0 @@ -456,7 +456,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %package -n libnetapi-devel @@ -481,7 +481,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -502,7 +502,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %else @@ -543,7 +543,7 @@ Authors: The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %package -n libwbclient0 @@ -562,7 +562,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %package -n libwbclient-devel @@ -587,7 +587,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %package -n libtalloc2 @@ -608,7 +608,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %package -n libtalloc-devel @@ -635,7 +635,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %package -n libtdb1 @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %package -n libtdb-devel @@ -679,7 +679,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %package -n libtevent0 @@ -700,7 +700,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %package -n libtevent-devel @@ -728,7 +728,7 @@ Authors: The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %package -n libldb1 @@ -751,7 +751,7 @@ Authors: The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %package -n libldb-devel @@ -778,7 +778,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %if %{make_ldapsmb} @@ -802,7 +802,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2581 +Source Timestamp: 2582 Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 03cd7ff..ee303f2 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:dae04225d8f29da03a9bf33c0bcce7acdebc661d118e7996b4376764a545e99d -size 51394 +oid sha256:fe494221fffe97c0528ce970f0bf615ae26ad3788365c83c82ebff775a52cb71 +size 51456 From bf002b649268ba72ecd0e49e9ae307fe0973195809213dfb2584a55be21f8269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 8 Aug 2011 15:30:18 +0000 Subject: [PATCH 10/13] - Remove references to disabled vscan build. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=174 --- build-source-timestamp | 2 +- samba-doc.spec | 3 +- samba-vscan-0.3.6b.tar.bz2 | 3 - samba.changes | 5 ++ samba.spec | 129 ++++++++++--------------------------- vendor-files.tar.bz2 | 4 +- 6 files changed, 43 insertions(+), 103 deletions(-) delete mode 100644 samba-vscan-0.3.6b.tar.bz2 diff --git a/build-source-timestamp b/build-source-timestamp index d8a2f41..076d05a 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2582 +2583 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index 6ca8774..149a5c1 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -108,7 +108,6 @@ BuildRequires: ccache # requires: docbook-utils docbook-xsl-stylesheets docbook_4 freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 libxslt sgml-skel te_etex te_latex te_pdf tetex xmlcharent %define make_doc 0 %define make_utils 0 -%define make_vscan 0 %define make_ldapsmb 1 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 %define cifs_init_script cifs @@ -415,7 +414,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %changelog diff --git a/samba-vscan-0.3.6b.tar.bz2 b/samba-vscan-0.3.6b.tar.bz2 deleted file mode 100644 index 1ec5950..0000000 --- a/samba-vscan-0.3.6b.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4 -size 164471 diff --git a/samba.changes b/samba.changes index f220543..0b04811 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 8 15:03:53 UTC 2011 - lmuelle@suse.de + +- Remove references to disabled vscan build. + ------------------------------------------------------------------- Thu Aug 4 17:12:25 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index c2f8eb1..e51a12c 100644 --- a/samba.spec +++ b/samba.spec @@ -80,7 +80,6 @@ BuildRequires: pkgconfig %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define vscan_ver 0.3.6b %define ldapsmb_ver 1.34b License: GPLv3+ Group: Productivity/Networking/Samba @@ -104,7 +103,6 @@ Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 Source3: build-source-timestamp Source4: baselibs.conf -Source10: http://prdownloads.sourceforge.net/openantivirus/samba-vscan-%{vscan_ver}.tar.bz2 Source11: http://www.hhrm.de/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2 # Choose some features / extra packages here ############################################ @@ -116,7 +114,6 @@ BuildRequires: ccache # requires: docbook-utils docbook-xsl-stylesheets docbook_4 freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 libxslt sgml-skel te_etex te_latex te_pdf tetex xmlcharent %define make_doc 0 %define make_utils 0 -%define make_vscan 0 %define make_ldapsmb 1 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 %define cifs_init_script cifs @@ -187,7 +184,7 @@ Authors: The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package client @@ -227,7 +224,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -254,7 +251,7 @@ Authors: The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %endif @@ -284,7 +281,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %endif @@ -311,7 +308,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %if %{make_utils} @@ -333,6 +330,9 @@ Authors: -------- The Samba Team +Source Timestamp: 2583 +Branch : trunk + %endif %package winbind @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -371,6 +371,7 @@ License: GPLv3+ %else %package -n libsmbclient0 + License: GPLv3+ Provides: libsmbclient = %{version}-%{release} Obsoletes: libsmbclient @@ -387,13 +388,16 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %else %description -n libsmbclient0 +Source Timestamp: 2583 +Branch : trunk + %endif This package includes the libsmbclient library. @@ -437,7 +441,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libnetapi0 @@ -456,7 +460,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libnetapi-devel @@ -481,7 +485,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -491,6 +495,7 @@ License: GPLv3+ %else %package -n libsmbsharemodes0 + License: GPLv3+ %endif Summary: Samba smbsharemodes Library @@ -502,13 +507,16 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %else %description -n libsmbsharemodes0 +Source Timestamp: 2583 +Branch : trunk + %endif This package includes the smbsharemodes library. @@ -543,7 +551,7 @@ Authors: The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libwbclient0 @@ -562,7 +570,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libwbclient-devel @@ -587,7 +595,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libtalloc2 @@ -608,7 +616,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libtalloc-devel @@ -635,7 +643,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libtdb1 @@ -656,7 +664,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libtdb-devel @@ -679,7 +687,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libtevent0 @@ -700,7 +708,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libtevent-devel @@ -728,7 +736,7 @@ Authors: The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libldb1 @@ -751,7 +759,7 @@ Authors: The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %package -n libldb-devel @@ -778,7 +786,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk %if %{make_ldapsmb} @@ -802,34 +810,9 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2582 +Source Timestamp: 2583 Branch : trunk -%endif -%if %{make_vscan} - -%package vscan -License: GPLv2+ -Summary: On-Access Virus Scanning with Samba -Group: Productivity/Networking/Samba -AutoReqProv: on -Version: 0.3.6b -Release: 268 -Requires: samba = %{samba_ver} -Url: http://www.openantivirus.org/ - -%description vscan -samba-vscan provides on-access scanning of Samba shares with ClamAV, -FRISK F-Prot, F-Secure AV, Kaspersky Anti-Virus, mks32, OAV -ScannerDaemon, Sophos Sweep, Symantec AntiVirus Engine (via ICAP) and -Trend Micro. - - - -Authors: --------- - Rainer Link - %endif %prep @@ -857,18 +840,6 @@ for patch in $( patches/tools/guards %{guards_symbols} > ${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 -done # copy the schema %__install -m 0644 examples/LDAP/samba.schema ${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema/samba3.schema %__install -m 0644 examples/LDAP/samba-nds.schema ${RPM_BUILD_ROOT}/%{_datadir}/samba/LDAP/samba-nds.schema @@ -1840,15 +1788,6 @@ fi %dir %{cups_lib_dir} %dir %{cups_lib_dir}/backend %ghost %{cups_lib_dir}/backend/smb -%if %{make_vscan} - -%files vscan -%defattr(-,root,root) -%{_libdir}/samba/vfs/vscan* -%doc samba-vscan-%{vscan_ver}/{AUTHORS,COPYING,ChangeLog,FAQ,INSTALL,NEWS,README,TODO} -%doc samba-vscan-%{vscan_ver}/*/vscan-*.conf -%dir %{_libdir}/samba/vfs -%endif %files -n libnetapi0 %defattr(-,root,root) diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index ee303f2..7cec4e3 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:fe494221fffe97c0528ce970f0bf615ae26ad3788365c83c82ebff775a52cb71 -size 51456 +oid sha256:e82e3795b9ebf485ababf332b34d3e589879eceeb47a0793950b4d2c20b37749 +size 51454 From a51ed5418dae9aa2f72ce50b680d11d4dd3aed1b4e279d5984b9e10fa4eff404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 8 Aug 2011 16:19:05 +0000 Subject: [PATCH 11/13] - Remove no longer required vscan patches. - (Re)add installed files from %{_libdir}/samba/vfs/ to the filelist. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=175 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 +-- samba-doc.spec | 2 +- samba.spec | 55 ++++++++++++++++++++++-------------------- vendor-files.tar.bz2 | 4 +-- 5 files changed, 35 insertions(+), 32 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 076d05a..d9080cb 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2583 +2584 Branch : trunk diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 3b174fe..7d4293d 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61a29677dc4007d7cca6842b7b7c7a45d825ce1cc47f7a60ce7ce35455ebe318 -size 62528 +oid sha256:b74f3213dcca8ce7f6fb6f8c44b6edac782e7942a9aa2ea91957a42e415381cb +size 34822 diff --git a/samba-doc.spec b/samba-doc.spec index 149a5c1..86265c9 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -414,7 +414,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %changelog diff --git a/samba.spec b/samba.spec index e51a12c..8d30148 100644 --- a/samba.spec +++ b/samba.spec @@ -184,7 +184,7 @@ Authors: The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package client @@ -224,7 +224,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -251,7 +251,7 @@ Authors: The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %endif @@ -281,7 +281,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %endif @@ -308,7 +308,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %if %{make_utils} @@ -330,7 +330,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %endif @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -388,14 +388,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %endif @@ -441,7 +441,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libnetapi0 @@ -460,7 +460,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libnetapi-devel @@ -485,7 +485,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -507,14 +507,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %endif @@ -551,7 +551,7 @@ Authors: The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libwbclient0 @@ -570,7 +570,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libwbclient-devel @@ -595,7 +595,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libtalloc2 @@ -616,7 +616,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libtalloc-devel @@ -643,7 +643,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libtdb1 @@ -664,7 +664,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libtdb-devel @@ -687,7 +687,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libtevent0 @@ -708,7 +708,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libtevent-devel @@ -736,7 +736,7 @@ Authors: The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libldb1 @@ -759,7 +759,7 @@ Authors: The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %package -n libldb-devel @@ -786,7 +786,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %if %{make_ldapsmb} @@ -810,7 +810,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2583 +Source Timestamp: 2584 Branch : trunk %endif @@ -1287,6 +1287,9 @@ rm -f \ %find_lang pam_winbind cat pam_winbind.lang >> ${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-winbind %find_lang net +for file in $( find ${RPM_BUILD_ROOT}%{_libdir}/samba/vfs/ -mindepth 1 ); do + echo "${file#${RPM_BUILD_ROOT}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba +done # copy the schema %__install -m 0644 examples/LDAP/samba.schema ${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema/samba3.schema %__install -m 0644 examples/LDAP/samba-nds.schema ${RPM_BUILD_ROOT}/%{_datadir}/samba/LDAP/samba-nds.schema diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 7cec4e3..e1fcb2f 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:e82e3795b9ebf485ababf332b34d3e589879eceeb47a0793950b4d2c20b37749 -size 51454 +oid sha256:09c1019ac1ab2f16d1df56fb8145c2d72a75778f9fdf72435b49f073cd51bf17 +size 51440 From e9205cb84ebad1834427926f0f009d505c0a557eb0d417a0eae9fd03e1bc1abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 8 Aug 2011 16:31:08 +0000 Subject: [PATCH 12/13] A tab is a tab is a tab. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=176 --- build-source-timestamp | 2 +- samba-doc.spec | 2 +- samba.spec | 54 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index d9080cb..e70a0ea 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2584 +2585 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index 86265c9..d4e980e 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -414,7 +414,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %changelog diff --git a/samba.spec b/samba.spec index 8d30148..caf14e3 100644 --- a/samba.spec +++ b/samba.spec @@ -184,7 +184,7 @@ Authors: The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %package client @@ -224,7 +224,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -251,7 +251,7 @@ Authors: The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %endif @@ -281,7 +281,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %endif @@ -308,7 +308,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %if %{make_utils} @@ -330,7 +330,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %endif @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -388,14 +388,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %endif @@ -441,7 +441,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %package -n libnetapi0 @@ -460,7 +460,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %package -n libnetapi-devel @@ -485,7 +485,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -507,14 +507,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %endif @@ -551,7 +551,7 @@ Authors: The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %package -n libwbclient0 @@ -570,7 +570,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %package -n libwbclient-devel @@ -595,7 +595,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %package -n libtalloc2 @@ -616,7 +616,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %package -n libtalloc-devel @@ -643,7 +643,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %package -n libtdb1 @@ -664,7 +664,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %package -n libtdb-devel @@ -687,7 +687,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %package -n libtevent0 @@ -708,7 +708,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %package -n libtevent-devel @@ -736,7 +736,7 @@ Authors: The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %package -n libldb1 @@ -759,7 +759,7 @@ Authors: The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %package -n libldb-devel @@ -786,7 +786,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %if %{make_ldapsmb} @@ -810,7 +810,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2584 +Source Timestamp: 2585 Branch : trunk %endif @@ -1288,7 +1288,7 @@ rm -f \ cat pam_winbind.lang >> ${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-winbind %find_lang net for file in $( find ${RPM_BUILD_ROOT}%{_libdir}/samba/vfs/ -mindepth 1 ); do - echo "${file#${RPM_BUILD_ROOT}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba + echo "${file#${RPM_BUILD_ROOT}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba done # copy the schema %__install -m 0644 examples/LDAP/samba.schema ${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema/samba3.schema diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index e1fcb2f..6f1c64d 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:09c1019ac1ab2f16d1df56fb8145c2d72a75778f9fdf72435b49f073cd51bf17 -size 51440 +oid sha256:a47ab8c03aff55fcadbfc6ef0b4396edce7280e27df810ea1777a72fddcaf19e +size 51453 From 691cd6daf713521c0f02b65c4166578ec4cfcec881f66e1cea18dea7bed2ba18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 9 Aug 2011 12:45:29 +0000 Subject: [PATCH 13/13] - Update to 3.6.0. + BUG 7462: Make SA_RESETHAND conditional on its existance. + BUG 8303: db_ctdb_send_schedule_for_deletion() is not defined. + BUG 8324: smbclient cannot list directories from a big-endian machine. + BUG 8326: WinXP cannot join a Samba3 domain with a 'even' hostname. + BUG 8327: Fix the reload of the configuration, also reload activated registry shares. + BUG 8328: Cleanup of idmap_tdb2 code. + BUG 8330: Fix NFSv4 ACL merging logic. + BUG 8335: File copy aborts with smb2_validate_message_id: bad message_id. + BUG 8341: Fix segfault in libsmbclient. + BUG 8343: Fix SMB2 crash reading with aio_fork beyond the end of file. + BUG 8347: Fix regression for HP-UX, AIX and OSF. + BUG 8357: Make sure we grant credits on async read/write operations. + BUG 8358: Fix a bug in run_poll_events(). + BUG 8362: Fix build issue on old glibc systems. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=177 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-3.6.0.tar.bz2 | 3 +++ samba-3.6.0rc3.tar.bz2 | 3 --- samba-doc.spec | 4 ++-- samba.changes | 20 ++++++++++++++++ samba.spec | 54 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 8 files changed, 57 insertions(+), 37 deletions(-) create mode 100644 samba-3.6.0.tar.bz2 delete mode 100644 samba-3.6.0rc3.tar.bz2 diff --git a/build-source-timestamp b/build-source-timestamp index e70a0ea..45ae3a2 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2585 +2588 Branch : trunk diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 7d4293d..fa52906 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b74f3213dcca8ce7f6fb6f8c44b6edac782e7942a9aa2ea91957a42e415381cb -size 34822 +oid sha256:d99666cd8a7970bb63ed4e95b2827e961fe5e23ccdb609ea701317db53e70c72 +size 31801 diff --git a/samba-3.6.0.tar.bz2 b/samba-3.6.0.tar.bz2 new file mode 100644 index 0000000..869aa0e --- /dev/null +++ b/samba-3.6.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47ea7a238c2247fd8f84b904b19e581b1bf636088cc050e2de79b3739734b3d1 +size 24446097 diff --git a/samba-3.6.0rc3.tar.bz2 b/samba-3.6.0rc3.tar.bz2 deleted file mode 100644 index 39a7b52..0000000 --- a/samba-3.6.0rc3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82ec69f2bb90e1f27fe2320b42f8ea7428ef81efbc9f5bb53f7154b3cba82b03 -size 24439714 diff --git a/samba-doc.spec b/samba-doc.spec index d4e980e..723774e 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -59,7 +59,7 @@ BuildRequires: pkg-config BuildRequires: pkgconfig %endif %define samba_ver 3.6.0 -%define samba_ver_suffix rc3 +%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 @@ -414,7 +414,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index 0b04811..bf195c8 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Aug 9 12:29:16 UTC 2011 - lmuelle@suse.de + +- Update to 3.6.0. + + BUG 7462: Make SA_RESETHAND conditional on its existance. + + BUG 8303: db_ctdb_send_schedule_for_deletion() is not defined. + + BUG 8324: smbclient cannot list directories from a big-endian machine. + + BUG 8326: WinXP cannot join a Samba3 domain with a 'even' hostname. + + BUG 8327: Fix the reload of the configuration, also reload activated + registry shares. + + BUG 8328: Cleanup of idmap_tdb2 code. + + BUG 8330: Fix NFSv4 ACL merging logic. + + BUG 8335: File copy aborts with smb2_validate_message_id: bad message_id. + + BUG 8341: Fix segfault in libsmbclient. + + BUG 8343: Fix SMB2 crash reading with aio_fork beyond the end of file. + + BUG 8347: Fix regression for HP-UX, AIX and OSF. + + BUG 8357: Make sure we grant credits on async read/write operations. + + BUG 8358: Fix a bug in run_poll_events(). + + BUG 8362: Fix build issue on old glibc systems. + ------------------------------------------------------------------- Mon Aug 8 15:03:53 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index caf14e3..e8c8fc6 100644 --- a/samba.spec +++ b/samba.spec @@ -59,7 +59,7 @@ BuildRequires: pkg-config BuildRequires: pkgconfig %endif %define samba_ver 3.6.0 -%define samba_ver_suffix rc3 +%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 @@ -184,7 +184,7 @@ Authors: The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %package client @@ -224,7 +224,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -251,7 +251,7 @@ Authors: The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %endif @@ -281,7 +281,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %endif @@ -308,7 +308,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %if %{make_utils} @@ -330,7 +330,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %endif @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -388,14 +388,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %endif @@ -441,7 +441,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %package -n libnetapi0 @@ -460,7 +460,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %package -n libnetapi-devel @@ -485,7 +485,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -507,14 +507,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %endif @@ -551,7 +551,7 @@ Authors: The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %package -n libwbclient0 @@ -570,7 +570,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %package -n libwbclient-devel @@ -595,7 +595,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %package -n libtalloc2 @@ -616,7 +616,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %package -n libtalloc-devel @@ -643,7 +643,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %package -n libtdb1 @@ -664,7 +664,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %package -n libtdb-devel @@ -687,7 +687,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %package -n libtevent0 @@ -708,7 +708,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %package -n libtevent-devel @@ -736,7 +736,7 @@ Authors: The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %package -n libldb1 @@ -759,7 +759,7 @@ Authors: The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %package -n libldb-devel @@ -786,7 +786,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %if %{make_ldapsmb} @@ -810,7 +810,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2585 +Source Timestamp: 2588 Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 6f1c64d..e22bbd3 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:a47ab8c03aff55fcadbfc6ef0b4396edce7280e27df810ea1777a72fddcaf19e -size 51453 +oid sha256:56ea0e6ce598002b396ac9f2513142f44436e7db9030e67c0671431c9f95f8aa +size 51463