← Back to branch summary

~ubuntu-branches/ubuntu/lucid/samba/lucid-security

« back to all changes in this revision

Viewing changes to debian/patches/debian-changes-2:3.4.6~dfsg-1ubuntu1

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2010-03-08 17:50:57 UTC
  • Revision ID: james.westby@ubuntu.com-20100308175057-z5ao2e65nqgiovbn
Tags: 2:3.4.6~dfsg-1ubuntu2
* SECURITY UPDATE: permission bypass via incorrect CAP_DAC_OVERRIDE
  handling.
  - debian/patches/security-CVE-2010-0728.patch: fix capability handling
    in source3/{include/smb.h,lib/system.c,smbd/server.c}.
  - CVE-2010-0728
* Removed patches:
  - debian/patches/debian-changes-2:3.4.5~dfsg-2ubuntu2: merge error
  - debian/patches/debian-changes-2:3.4.6~dfsg-1ubuntu1: merge error

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/debian-changes-2:3.4.6~dfsg-1ubuntu1
1
 
Description: Upstream changes introduced in version 2:3.4.6~dfsg-1ubuntu1
2
 
 This patch has been created by dpkg-source during the package build.
3
 
 Here's the last changelog entry, hopefully it gives details on why
4
 
 those changes were made:
5
 
 .
6
 
 samba (2:3.4.6~dfsg-1ubuntu1) lucid; urgency=low
7
 
 .
8
 
     * Merge from debian unstable.  Remaining changes:
9
 
     + debian/patches/VERSION.patch:
10
 
       - set SAMBA_VERSION_SUFFIX to Ubuntu.
11
 
     + debian/smb.conf:
12
 
       - Add "(Samba, Ubuntu)" to server string.
13
 
       - Comment out the default [homes] share, and add a comment about "valid users = %s"
14
 
         to show users how to restrict access to \\server\username to only username.
15
 
       - Set 'usershare allow guests', so that usershare admins are allowed to create
16
 
         public shares in additon to authenticated ones.
17
 
       - add map to guest = Bad user, maps bad username to gues access.
18
 
     + debian/samba-common.conf:
19
 
       - Do not change priority to high if dhclient3 is installed.
20
 
       - Use priority medium instead of high for the workgroup question.
21
 
     + debian/mksambapasswd.awk:
22
 
       - Do not add user with UID less than 1000 to smbpasswd.
23
 
     + debian/control:
24
 
       - Make libswbclient0 replace/conflict with hardy's likewise-open.
25
 
       - Don't build against ctdb, since its not in main yet.
26
 
     + debian/rules:
27
 
       - Enable "native" PIE hardening.
28
 
       - Add BIND_NOW to maximize benefit of RELRO hardening.
29
 
     + Add ufw integration:
30
 
       - Created debian/samba.ufw.profile.
31
 
       - debian/rules, debian/samba.dirs, debian/samba.files: install
32
 
     + Add apport hook:
33
 
       - Created debian/source_samba.py.
34
 
       - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install
35
 
     + debian/control: Recommend keyutils for smbfs (LP: #493565)
36
 
     + Switch to upstart:
37
 
       - Switch smbd and nmbd over to upstart jobs, to ensure nmbd starts reliably
38
 
         after the network is up.  LP: #523868.
39
 
     + debian/patches/ubuntu-gecos-fix.patch: Fix gecos parsing backported
40
 
       from Samba 3.5.x. (LP: #182572)
41
 
     + debian/patches/security-CVE-2009-3297.patch: validate mount point and perform mount in "."
42
 
       to prevent race in source3/client/mount.cifs.c (CVE-2009-3297)
43
 
 .
44
 
 The person named in the Author field signed this changelog entry.
45
 
Author: Chuck Short <zulcss@ubuntu.com>
46
 
Bug-Ubuntu: https://bugs.launchpad.net/bugs/182572
47
 
Bug-Ubuntu: https://bugs.launchpad.net/bugs/493565
48
 
Bug-Ubuntu: https://bugs.launchpad.net/bugs/523868
49
 
 
50
 
---
51
 
The information above should follow the Patch Tagging Guidelines, please
52
 
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
53
 
are templates for supplementary fields that you might want to add:
54
 
 
55
 
Origin: <vendor|upstream|other>, <url of original patch>
56
 
Bug: <url in upstream bugtracker>
57
 
Bug-Debian: http://bugs.debian.org/<bugnumber>
58
 
Forwarded: <no|not-needed|url proving that it has been forwarded>
59
 
Reviewed-By: <name and email of someone who approved the patch>
60
 
Last-Update: <YYYY-MM-DD>
61
 
 
62
 
--- samba-3.4.6~dfsg.orig/source3/VERSION
63
 
+++ samba-3.4.6~dfsg/source3/VERSION
64
 
@@ -84,7 +84,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=
65
 
 #       SAMBA_VERSION_VENDOR_FUNCTION                  #
66
 
 #                                                      #
67
 
 ########################################################
68
 
-SAMBA_VERSION_VENDOR_SUFFIX="Ubuntu"
69
 
+SAMBA_VERSION_VENDOR_SUFFIX="Debian"
70
 
 SAMBA_VERSION_VENDOR_PATCH=
71
 
 
72
 
 ########################################################