Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2012-02-01 13:17:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2012-01-06 11:46:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2012-02-01 13:17:22.000000000 +0100 @@ -1,0 +2,202 @@ +Sun Jan 29 21:06:24 UTC 2012 - [email protected] + +- Fix memory leak in parent smbd on connection; CVE-2012-0817; (bso#8724); + (bnc#743986). + +------------------------------------------------------------------- +Thu Jan 26 14:15:38 UTC 2012 - [email protected] + +- Use spdx.org compliant license names for all packages. + +------------------------------------------------------------------- +Wed Jan 25 20:16:10 UTC 2012 - [email protected] + +- Update to 3.6.2. + + Make Winbind receive user/group information (bug #8371). + + Several SMB2 fixes. + + Fix a crash bug in the spoolss code. + + Add new contributing FAQ announcing acceptance of corporate (C). + + + DeletePrinterDriverEx deletes files in use; (bso#4942); (bnc#742504). + + Fix cli_write_and_x() against OS/2 print shares; (bso#5326). + + Fix 'smbclient tar' for files greater than 8GB on BE machines; (bso#563); + (bnc#726145). + + Remove pointless use_memory_krb5_ccache; (bso#7465). + + Fix perl path; (bso#8176). + + Grant credits in async interim responses (SMB2); (bso#8357). + + Make Winbind receive user/group information; (bso#8371). + + Fix Windows XP clients crashing smbd process every once in a while; + (bso#8384); (bnc#731571). + + Make VFS op "streaminfo" stackable; (bso#8419). + + Add an allocation pool to idmap_autorid; (bso#8444). + + Fix SEGFAULT from net registry export on not zero terminated REG_SZ + values; (bso#8528). + + Make DSO_EXPORTS_CMD more portable; (bso#8531). + + readlink() on Linux clients fails if the symlink target is outside of the + share; (bso#8541). + + smbclient posix_open command fails to return correct info on open file; + (bso#8542). + + winbind_samlogon_retry_loop ignores logon_parameters flags; (bso#8548). + + Fix setting the machine account password; (bso#8550). + + Make SMB2 handle compound request headers in the same way as Windows; + (bso#8560). + + Password change settings not fully observed; (bso#8561). + + Fix double free error in talloc; (bso#8562). + + Fix alignment in the non-extended-security negprot; (bso#8573). + + Add systemd service files; (bso#8575). + + Add systemd service files; (bso#8575). + + smb2_flush: Don't send uninitialized memory; (bso#8579). + + Enable inotify if sys or kernel inotify is available; (bso#8580). + + Increase a debug level; (bso#8585). + + libsmb: Only align unicode pipe_name; (bso#8586). + + Fix marshalling of samr_ChangePasswordUser3; (bso#8591). + + Don't limit the number of open dptrs for SMB2; (bso#8592). + + Fix a crash bug in cldap_socket_recv_dgram(); (bso#8593). + + Make cldap work over IPv6; (bso#8600). + + Fix intermittent print job failures caused by character conversion errors; + (bso#8606). + + Improve configure.in so it can be used outside the Samba source tree; + (bso#8607). + + Winbind: Don't fail on users without a uid; (bso#8608). + + Ensure we correctly calculate reply credits over all returned SMB2 + replies; (bso#8614). + + Fix migrate printer code; (bso#8618). + + Fix crash bug when trying to browse Samba printers; (bso#8623). + + libsmb: Don't duplicate Kerberos service tickets; (bso#8628). + + POSIX ACE x permission becomes rx following mapping to and from a DACL; + (bso#8631). + + When returning an ACL without SECINFO_DACL requested, we still set + SEC_DESC_DACL_PRESENT in the type field; (bso#8636). + + Fix the vfs_commit module; (bso#8639). + + Add an update function for Winbind cache; (bso#8643). + + vfs_acl_xattr and vfs_acl_tdb modules can fail to add inheritable entries + on a directory with no stored ACL; (bso#8644). + + Document the "ignore system acls" option of vfs_acl_xattr and vfs_acl_tdb + vfs modules; (bso#8652). + + Fix deleting a symlink if the symlink target is outside of the share; + (bso#8663). + + Fix renaming a symlink if the symlink target is outside of the share; + (bso#8664). + + Fix NT ACL issue; (bso#8673). + + Fix buffer overflow issue with AES encryption in samba traffic analyzer; + (bso#8674). + + Fix Winbind segfault if we can't map the last user; (bso#8678). + + recvfile code path using splice() on Linux leaves data in the pipe on + short write; (bso#8679). + + Try ctdbd_init_connection() as root; (bso#8684). + + Packet validation checks can be done before length validation causing + uninitialized memory read; (bso#8686). + + Fix typo in 'net memberships' usage; (bso#8687). + + libads: Fix malloc/talloc mismatch in ads_keytab_verify_ticket(); + (bso#8692). + + Make DeletePrinterDriverEx remove printer driver files; (bso#8697) + (bnc#740810). + + Fix major leak with SMB2 in connections.tdb; (bso#8710). + +------------------------------------------------------------------- +Wed Jan 25 19:55:25 UTC 2012 - [email protected] + +- s3-spoolss: Pass the right pointer type; (bso#4942); (bnc#742504). + +------------------------------------------------------------------- +Wed Jan 25 12:56:23 UTC 2012 - [email protected] + +- Use correct license, LGPLv3+ for libwbclient packages. + +------------------------------------------------------------------- +Tue Jan 24 19:46:46 UTC 2012 - [email protected] + +- When returning an ACL without SECINFO_DACL requested, we still set + SEC_DESC_DACL_PRESENT in the type field; (bso#8636). + +------------------------------------------------------------------- +Sun Jan 22 01:38:35 CET 2012 - [email protected] + +- Prefix print$ path on driver file deletion; (bso#8697); (bnc#740810). +- Fix printer_driver_files_in_use() call ordering; (bso#4942); (bnc#742504). + +------------------------------------------------------------------- +Sat Jan 21 21:23:08 UTC 2012 - [email protected] + +- Buffer overflow issue with AES encryption in samba traffic analyzer; + (bso#8674). +- NT ACL issue; (bso#8673). +- Deleting a symlink fails if the symlink target is outside of the share; + (bso#8663). +- connections.tdb - major leak with SMB2; (bso#8710). + +------------------------------------------------------------------- +Wed Jan 18 20:55:14 UTC 2012 - [email protected] + +- Renaming a symlink fails if the symlink target is outside of the share; + (bso#8664). + +------------------------------------------------------------------- +Tue Jan 17 12:04:12 UTC 2012 - [email protected] + +- Intermittent print job failures caused by character conversion errors; + (bso#8606). +- ads_keytab_verify_ticket mixes talloc allocation with malloc free; + (bso#8692). +- libcli/cldap: fix a crash bug in cldap_socket_recv_dgram(); (bso#8593). +- s3:lib/ctdbd_conn: try ctdbd_init_connection() as root; (bso#8684). +- s3-printing: fix migrate printer code; (bso#8618). +- Packet validation checks can be done before length validation causing + uninitialized memory read; (bso#8686). + +------------------------------------------------------------------- +Mon Jan 16 16:41:18 UTC 2012 - [email protected] + +- net memberships usage info was wrong; (bso#8687). +- s3-libsmb: Don't duplicate kerberos service tickets; (bso#8628). +- Recvfile code path using splice() on Linux leaves data in the pipe on short + write; (bso#8679). +- s3-winbind: Fix segfault if we can't map the last user; (bso#8678). +- vfs_acl_xattr and vfs_acl_tdb modules can fail to add inheritable entries on + a directory with no stored ACL; (bso#8644). +- s3/doc: document the ignore system acls option of vfs_acl_xattr and + vfs_acl_tdb; (bso#8652). +- Winbind can't receive any user/group information; (bso#8371). +- s3-winbind: Add an update function for winbind cache; (bso#8643). +- s3: Attempt to fix the vfs_commit module. +- POSIX ACE x permission becomes rx following mapping to and from a DACL; + (#bso#8631). +- s3:libsmb: only align unicode pipe_name; (bso#8586). +- s3-winbind: Don't fail on users without a uid; (bso#8608). +- Crash when trying to browse samba printers; (bso#8623). +- talloc: double free error; (bso#8562). +- cldap doesn't work over ipv6; (bso#8600). +- s3:libsmb: fix cli_write_and_x() against OS/2 print shares; (bso#5326). +- SMB2: not granting credits for all requests in a compound request; + (bso#8614). +- smb2_flush sends uninitialized memory; (bso#8579). +- Password change settings not fully observed; (bso#8561). +- s3:smb2_server: grant credits in async interim responses; (bso#8357). +- s3:smbd: don't limit the number of open dptrs for smb2; (bso#8592). +- samr_ChangePasswordUser3 IDL incorrect; (bso#8591). +- idmap_autorid does not have allocation pool; (bso#8444). +- Add systemd service files. +- s3:libsmb: the workgroup in the non-extended-security negprot is not + aligned; (bso#8573). +- s3-build: Fix inotify detection; (bso#8580). +- SMB2 doesn't handle compound request headers in the same way as Windows; + (#bso8560). +- Disconnecting clients swamp the logs; (bso#8585). +- s3-netlogon: Fix setting the machinge account password; (bso#8550). +- winbind_samlogon_retry_loop ignores logon_parameters flags; (#bso8548). +- smbclient posix_open command fails to return correct info on open file; + (bso#8542). +- readlink() on Linux clients fails if the symlink target is outside of the + share; (bso#8541). +- s3-netapi: remove pointless use_memory_krb5_ccache; (bso#7465). +- s3:Makefile: make DSO_EXPORTS_CMD more portable; (bso#8531). +- s3:registry: fix the test for a REG_SZ blob possibly being a zero terminated + ucs2 string; (bso#8528). +- Make VFS op "streaminfo" stackable; (bso#8419). + +------------------------------------------------------------------- ++++ 5 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/samba/samba.changes ++++ and /work/SRC/openSUSE:Factory/.samba.new/samba.changes Old: ---- samba-3.6.1.tar.bz2 New: ---- samba-3.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.KzRVCu/_old 2012-02-01 13:17:25.000000000 +0100 +++ /var/tmp/diff_new_pack.KzRVCu/_new 2012-02-01 13:17:25.000000000 +0100 @@ -79,7 +79,7 @@ %else BuildRequires: pkgconfig %endif -%define samba_ver 3.6.1 +%define samba_ver 3.6.3 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -101,10 +101,10 @@ %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 3.6.1 +Version: 3.6.3 Release: 1 Url: http://www.samba.org/ -License: GPLv3+ +License: GPL-3.0+ Summary: Samba Documentation Group: Documentation/Other PreReq: coreutils @@ -437,7 +437,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.KzRVCu/_old 2012-02-01 13:17:25.000000000 +0100 +++ /var/tmp/diff_new_pack.KzRVCu/_new 2012-02-01 13:17:25.000000000 +0100 @@ -79,7 +79,7 @@ %else BuildRequires: pkgconfig %endif -%define samba_ver 3.6.1 +%define samba_ver 3.6.3 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -101,10 +101,10 @@ %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 3.6.1 +Version: 3.6.3 Release: 1 %define ldapsmb_ver 1.34b -License: GPLv3+ +License: GPL-3.0+ Url: http://www.samba.org/ Group: Productivity/Networking/Samba Provides: samba-gplv3 = %{version} @@ -208,11 +208,11 @@ The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %package client -License: GPLv3+ +License: GPL-3.0+ Summary: Samba Client Utilities Group: Productivity/Networking/Samba Provides: samba-gplv3-client = %{version} @@ -252,13 +252,13 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %package devel -License: GPLv3+ +License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with Samba Support Group: Development/Libraries/C and C++ Provides: samba-gplv3-devel = %{version} @@ -278,14 +278,14 @@ The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %package doc -License: GPLv3+ +License: GPL-3.0+ Summary: Samba Documentation Group: Documentation/Other PreReq: coreutils @@ -308,13 +308,13 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %endif %package krb-printing -License: GPLv3+ +License: GPL-3.0+ Summary: Wrapper binary for kerberized printing Group: Productivity/Networking/Samba PreReq: coreutils @@ -335,7 +335,7 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %if %{make_utils} @@ -356,13 +356,13 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %endif %package winbind -License: GPLv3+ +License: GPL-3.0+ Summary: Winbind Daemon and Tool Group: Productivity/Networking/Samba Provides: samba-gplv3-winbind = %{version} @@ -391,18 +391,18 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 %package -n libsmbclient -License: GPLv3+ +License: GPL-3.0+ %else %package -n libsmbclient0 -License: GPLv3+ +License: GPL-3.0+ Provides: libsmbclient = %{version} Obsoletes: libsmbclient %endif @@ -417,14 +417,14 @@ %description -n libsmbclient -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %endif @@ -441,7 +441,7 @@ The Samba Team <[email protected]> %package -n libsmbclient-devel -License: GPLv3+ +License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbclient Support Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1020 @@ -472,11 +472,11 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %package -n libnetapi0 -License: GPLv3+ +License: GPL-3.0+ Summary: Samba netapi Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -490,11 +490,11 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %package -n libnetapi-devel -License: GPLv3+ +License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with netapi Support Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1020 @@ -514,18 +514,18 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 %package -n libsmbsharemodes -License: GPLv3+ +License: GPL-3.0+ %else %package -n libsmbsharemodes0 -License: GPLv3+ +License: GPL-3.0+ %endif Summary: Samba smbsharemodes Library Group: System/Libraries @@ -535,14 +535,14 @@ %description -n libsmbsharemodes -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %endif @@ -553,7 +553,7 @@ The Samba Team <[email protected]> %package -n libsmbsharemodes-devel -License: GPLv3+ +License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1020 @@ -578,11 +578,11 @@ The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %package -n libwbclient0 -License: GPLv3+ +License: LGPL-3.0+ Summary: Samba libwbclient Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -596,11 +596,11 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %package -n libwbclient-devel -License: GPLv3+ +License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with wbclient Support Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1020 @@ -620,13 +620,13 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %package -n libtalloc2 Version: %{libtalloc_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Samba talloc Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -640,13 +640,13 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %package -n libtalloc-devel Version: %{libtalloc_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with talloc Support Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1020 @@ -666,13 +666,13 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %package -n libtdb1 Version: %{libtdb_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Samba tdb Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -686,13 +686,13 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %package -n libtdb-devel Version: %{libtdb_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with tdb Support Group: Development/Libraries/C and C++ #BuildRequires: pkg-config @@ -708,13 +708,13 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %package -n libtevent0 Version: %{libtevent_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Samba tevent Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -728,13 +728,13 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %package -n libtevent-devel Version: %{libtevent_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with tevent Support Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1020 @@ -756,13 +756,13 @@ The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %package -n libldb1 Version: %{libldb_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Samba ldb Library Group: System/Libraries BuildRequires: popt-devel @@ -778,13 +778,13 @@ The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %package -n libldb-devel Version: %{libldb_ver} Release: 5 -License: LGPLv3+ +License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with ldb Support Group: Development/Libraries/C and C++ %if 0%{?suse_version} > 1020 @@ -805,7 +805,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %if %{make_ldapsmb} @@ -813,7 +813,7 @@ %package -n ldapsmb Version: 1.34b Release: 307 -License: GPLv2+ +License: GPL-2.0+ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba Requires: perl-ldap @@ -828,7 +828,7 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 2722 +Source Timestamp: 2740 Branch : trunk %endif ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.KzRVCu/_old 2012-02-01 13:17:25.000000000 +0100 +++ /var/tmp/diff_new_pack.KzRVCu/_new 2012-02-01 13:17:25.000000000 +0100 @@ -1,2 +1,2 @@ -2722 +2740 Branch : trunk ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/cb6795bea659e884e23173960e68a2f970fc5dd3 new/patches/samba.org/cb6795bea659e884e23173960e68a2f970fc5dd3 --- old/patches/samba.org/cb6795bea659e884e23173960e68a2f970fc5dd3 2011-11-25 12:26:46.000000000 +0100 +++ new/patches/samba.org/cb6795bea659e884e23173960e68a2f970fc5dd3 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -commit cb6795bea659e884e23173960e68a2f970fc5dd3 -Author: Henry Wong <[email protected]> -Date: Fri Nov 4 11:20:10 2011 -0700 - - Properly fix bug #8384 - Windows XP clients seem to crash smbd process every once in a while. - - Ensure we correctly null out the referenced pointer when we decrease the ref. count. - - Autobuild-User: Jeremy Allison <[email protected]> - Autobuild-Date: Fri Nov 4 21:12:13 CET 2011 on sn-devel-104 - (cherry picked from commit 51c86c8e67c3b026f49136f5b6743c279cc206d2) - -Index: source3/rpc_server/spoolss/srv_spoolss_nt.c -=================================================================== ---- source3/rpc_server/spoolss/srv_spoolss_nt.c.orig -+++ source3/rpc_server/spoolss/srv_spoolss_nt.c -@@ -295,6 +295,7 @@ static void srv_spoolss_replycloseprinte - - if (prn_hnd->notify.cli_chan) { - prn_hnd->notify.cli_chan->active_connections--; -+ prn_hnd->notify.cli_chan = NULL; - } - } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2011-12-20 01:26:35.000000000 +0100 +++ new/patches/series 2012-01-25 21:43:51.000000000 +0100 @@ -6,7 +6,6 @@ # Samba patches from upstream, git.samba.org samba.org/3eb26f3cf877cc279cb9218654d0d6c39897ded4 -p0 # bnc 713135 -samba.org/cb6795bea659e884e23173960e68a2f970fc5dd3 -p0 # bso 8384, bnc 731571 # SuSE specific changes # disabled -> WIP lmuelle @@ -19,8 +18,9 @@ suse/net-kdc-lookup.diff -p0 # perform dns-only lookup for kdcs suse/missing-pkgconfig.diff -p0 # bnc 632770 suse/disable_login_cache_on_clusters.diff -p0 # bnc 694836, bnc 723261 -suse/fix_clitar_8g_be.diff -p0 # bso 563, bnc 726145 suse/fix-pam_sm_authenticate-segv.diff -p0 # bso 8564 +suse/fix-build-for-example-perfcount-daemon.diff -p0 # bnc 739258 +suse/fix-incorrect-array-length-calculations.diff -p0 # bnc 739258 # this one should always live at the end and should be redone # diabled cf. 280452 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/fix-build-for-example-perfcount-daemon.diff new/patches/suse/fix-build-for-example-perfcount-daemon.diff --- old/patches/suse/fix-build-for-example-perfcount-daemon.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/suse/fix-build-for-example-perfcount-daemon.diff 2012-01-04 22:12:43.000000000 +0100 @@ -0,0 +1,22 @@ +From 84af203af27d4625f8a9563f8a5fbb8367cb15c1 Mon Sep 17 00:00:00 2001 +From: David Disseldorp <[email protected]> +Date: Tue, 3 Jan 2012 10:13:02 +0100 +Subject: [PATCH 1/2] s3-perfcount: fix build for example perfcount daemon + +--- + examples/perfcounter/Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +Index: examples/perfcounter/Makefile +=================================================================== +--- examples/perfcounter/Makefile.orig ++++ examples/perfcounter/Makefile +@@ -26,7 +26,7 @@ TDB_OBJ = $(TDB_SRC_DIR)/common/tdb.o $( + $(TDB_SRC_DIR)/common/error.o $(TDB_SRC_DIR)/common/freelist.o \ + $(TDB_SRC_DIR)/common/io.o $(TDB_SRC_DIR)/common/lock.o \ + $(TDB_SRC_DIR)/common/open.o $(TDB_SRC_DIR)/common/transaction.o \ +- $(TDB_SRC_DIR)/common/traverse.o ++ $(TDB_SRC_DIR)/common/traverse.o $(TDB_SRC_DIR)/common/hash.o + PERF_WRITER_OBJ = perf_writer.o perf_writer_mem.o perf_writer_util.o perf_writer_cpu.o perf_writer_process.o perf_writer_disk.o + + default: $(PROGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/fix-incorrect-array-length-calculations.diff new/patches/suse/fix-incorrect-array-length-calculations.diff --- old/patches/suse/fix-incorrect-array-length-calculations.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/suse/fix-incorrect-array-length-calculations.diff 2012-01-04 22:12:43.000000000 +0100 @@ -0,0 +1,69 @@ +From 23f9408d7461d4351ac91093003634a948ae3ed0 Mon Sep 17 00:00:00 2001 +From: David Disseldorp <[email protected]> +Date: Tue, 3 Jan 2012 10:14:23 +0100 +Subject: [PATCH 2/2] s3-perfcount: fix incorrect array length calculations + +As reported by Ismail Doenmez ([email protected]), sizeof() is used by +_reg_perfcount_init_data_block() in an attempt to determine the length +of a talloced array. +--- + source3/registry/reg_perfcount.c | 28 ++++++++++++++++++---------- + 1 files changed, 18 insertions(+), 10 deletions(-) + +Index: source3/registry/reg_perfcount.c +=================================================================== +--- source3/registry/reg_perfcount.c.orig ++++ source3/registry/reg_perfcount.c +@@ -919,13 +919,13 @@ static bool _reg_perfcount_init_data_blo + bool bigendian_data) + { + smb_ucs2_t *temp = NULL; ++ TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx); + time_t tm; ++ size_t sz; + +- if (rpcstr_push_talloc(mem_ctx, &temp, "PERF")==(size_t)-1) { +- return false; +- } +- if (!temp) { +- return false; ++ sz = rpcstr_push_talloc(tmp_ctx, &temp, "PERF"); ++ if ((sz == -1) || (temp == NULL)) { ++ goto err_out; + } + memcpy(block->Signature, temp, strlen_w(temp) *2); + +@@ -942,12 +942,15 @@ static bool _reg_perfcount_init_data_blo + tm = time(NULL); + make_systemtime(&(block->SystemTime), gmtime(&tm)); + _reg_perfcount_init_data_block_perf(block, names); +- memset(temp, 0, sizeof(temp)); +- rpcstr_push((void *)temp, global_myname(), sizeof(temp), STR_TERMINATE); ++ ++ sz = rpcstr_push_talloc(tmp_ctx, &temp, global_myname()); ++ if ((sz == -1) || (temp == NULL)) { ++ goto err_out; ++ } + block->SystemNameLength = (strlen_w(temp) * 2) + 2; + block->data = TALLOC_ZERO_ARRAY(mem_ctx, uint8, block->SystemNameLength + (8 - (block->SystemNameLength % 8))); + if (block->data == NULL) { +- return False; ++ goto err_out; + } + memcpy(block->data, temp, block->SystemNameLength); + block->SystemNameOffset = sizeof(struct PERF_DATA_BLOCK) - sizeof(block->objects) - sizeof(block->data); +@@ -955,8 +958,13 @@ static bool _reg_perfcount_init_data_blo + /* Make sure to adjust for 64-bit alignment for when we finish writing the system name, + so that the PERF_OBJECT_TYPE struct comes out 64-bit aligned */ + block->HeaderLength += 8 - (block->HeaderLength % 8); ++ talloc_free(tmp_ctx); ++ ++ return true; + +- return True; ++err_out: ++ talloc_free(tmp_ctx); ++ return false; + } + + /********************************************************************* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/fix_clitar_8g_be.diff new/patches/suse/fix_clitar_8g_be.diff --- old/patches/suse/fix_clitar_8g_be.diff 2011-12-19 22:03:48.000000000 +0100 +++ new/patches/suse/fix_clitar_8g_be.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -From f6ed0c4a5229d7b27a6be37761f32a864412032a Mon Sep 17 00:00:00 2001 -From: Masafumi Nakayama <[email protected]> -Date: Wed, 2 Nov 2011 10:35:19 +0100 -Subject: [PATCH] s3-cli: fix bug 563, >8GB tar on BE machines - -Borrows on existing patches proposed by Craig Barratt and Brad Ellis. - -Signed-off-by: David Disseldorp <[email protected]> - -Index: source3/client/clitar.c -=================================================================== ---- source3/client/clitar.c.orig -+++ source3/client/clitar.c -@@ -208,8 +208,10 @@ static void writetarheader(int f, const - - memset(hb.dbuf.size, 0, 4); - hb.dbuf.size[0]=128; -- for (i = 8, jp=(char*)&size; i; i--) -- hb.dbuf.size[i+3] = *(jp++); -+ for (i = 8; i; i--) { -+ hb.dbuf.size[i+3] = size & 0xff; -+ size >>= 8; -+ } - } - oct_it((uint64_t) mtime, 13, hb.dbuf.mtime); - memcpy(hb.dbuf.chksum, " ", sizeof(hb.dbuf.chksum)); -@@ -311,7 +313,17 @@ of link other than a GNUtar Longlink - i - finfo->mtime_ts = finfo->ctime_ts = - convert_time_t_to_timespec((time_t)strtol(hb->dbuf.mtime, NULL, 8)); - finfo->atime_ts = convert_time_t_to_timespec(time(NULL)); -- finfo->size = unoct(hb->dbuf.size, sizeof(hb->dbuf.size)); -+ if ((hb->dbuf.size[0] & 0xff) == 0x80) { -+ /* This is a non-POSIX compatible extention to extract files -+ greater than 8GB. */ -+ finfo->size = 0; -+ for (i = 0; i < 8; i++) { -+ finfo->size <<= 8; -+ finfo->size |= hb->dbuf.size[i+4] & 0xff; -+ } -+ } else { -+ finfo->size = unoct(hb->dbuf.size, sizeof(hb->dbuf.size)); -+ } - - return True; - } -@@ -1018,8 +1030,8 @@ static int skip_file(int skipsize) - static int get_file(file_info2 finfo) - { - uint16_t fnum = (uint16_t) -1; -- int pos = 0, dsize = 0, bpos = 0; -- uint64_t rsize = 0; -+ int dsize = 0, bpos = 0; -+ uint64_t rsize = 0, pos = 0; - NTSTATUS status; - - DEBUG(5, ("get_file: file: %s, size %.0f\n", finfo.name, (double)finfo.size)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/missing-pkgconfig.diff new/patches/suse/missing-pkgconfig.diff --- old/patches/suse/missing-pkgconfig.diff 2011-08-27 20:49:37.000000000 +0200 +++ new/patches/suse/missing-pkgconfig.diff 2012-01-16 17:34:35.000000000 +0100 @@ -26,7 +26,7 @@ =================================================================== --- source3/configure.in.orig +++ source3/configure.in -@@ -7119,6 +7119,7 @@ AC_OUTPUT(Makefile +@@ -7121,6 +7121,7 @@ AC_OUTPUT(Makefile pkgconfig/wbclient.pc pkgconfig/netapi.pc pkgconfig/smbsharemodes.pc ++++++ samba-3.6.1.tar.bz2 -> samba-3.6.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/samba/samba-3.6.1.tar.bz2 /work/SRC/openSUSE:Factory/.samba.new/samba-3.6.3.tar.bz2 differ: char 11, line 1 ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2012-01-02 14:43:13.000000000 +0100 +++ new/vendor-files/tools/package-data 2012-01-29 22:16:26.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2722" +SAMBA_PACKAGE_SVN_VERSION="2740" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
