Last commit made on 2011-10-25
Get this branch:
git clone -b ubuntu/oneiric-proposed https://git.launchpad.net/ubuntu/+source/samba
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

e40f173... by Steve Langasek on 2011-10-21

Import patches-unapplied version 2:3.5.11~dfsg-1ubuntu2.1 to ubuntu/oneiric-proposed

Imported using git-ubuntu import.

Changelog parent: 90b78c5e34165d7fac1c57bf9322ff0d84ab9203

New changelog entries:
  * debian/patches/initialize_password_db-null-deref: Avoid null
    dereference in initialize_password_db(). Closes LP: #829221.

90b78c5... by Chuck Short on 2011-09-30

Import patches-unapplied version 2:3.5.11~dfsg-1ubuntu2 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: dc147e89a53d13926bdce48eeb6a80a908e93cc6

New changelog entries:
  * debian/patches/fix-debuglevel-name-conflict.patch:
    Re-add patch that was mistakenly dropped. (LP: #529714)

dc147e8... by Marc Deslauriers on 2011-08-11

Import patches-unapplied version 2:3.5.11~dfsg-1ubuntu1 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: bd7f96922850a25476fdc4012ca01623d2374f31

New changelog entries:
  * Merge from debian unstable. Remaining changes:
    + debian/patches/VERSION.patch:
      - set SAMBA_VERSION_SUFFIX to Ubuntu.
    + debian/patches/error-trans.fix-276472:
      - Add the translation of Unix Error code -ENOTSUP to NT Error Code
      - NT_STATUS_NOT_SUPPORTED to prevent the Permission denied error.
    + debian/smb.conf:
      - add "(Samba, Ubuntu)" to server string.
      - comment out the default [homes] share, and add a comment about
        "valid users = %S" to show users how to restrict access to
        \\server\username to only username.
      - Set 'usershare allow guests', so that usershare admins are
        allowed to create public shares in addition to authenticated
      - add map to guest = Bad user, maps bad username to guest access.
    + debian/samba-common.config:
      - Do not change priority to high if dhclient3 is installed.
      - Use priority medium instead of high for the workgroup question.
    + debian/mksmbpasswd.awk:
      - Do not add user with UID less than 1000 to smbpasswd
    + debian/control:
      - Make libwbclient0 replace/conflict with hardy's likewise-open.
      - Don't build against or suggest ctdb.
      - Add dependency on samba-common-bin to samba.
      - Add cups breaks to push the package to also upgrade cups (LP: #639768)
    + debian/rules:
      - enable "native" PIE hardening.
      - Add BIND_NOW to maximize benefit of RELRO hardening.
    + Add ufw integration:
      - Created debian/samba.ufw.profile
      - debian/rules, debian/samba.dirs, debian/samba.files: install
      - debian/control: have samba suggest ufw
    + Add apport hook:
      - Created debian/source_samba.py.
      - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install
    + Switch to upstart:
      - Add debian/samba.{nmbd,smbd}.upstart.
      - Don't ship the /etc/network/if-up.d file.
    + debian/samba.postinst:
      - Fixed bashism.
      - Avoid scary pdbedit warnings on first import.
    + debian/samba-common.postinst: Add more informative error message for
      the case where smb.conf was manually deleted
    + debian/samba.logrotate: Make it upstart compatible
    + debian/samba-common.dhcp: Fix typo to get a proper parsing in

bd7f969... by Christian Perrier on 2011-08-05

Import patches-unapplied version 2:3.5.11~dfsg-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 87a0204424c6f884e93ae2713b9e1cbdabd0baad

New changelog entries:
  * New upstream release

87a0204... by Christian Perrier on 2011-07-28

Import patches-unapplied version 2:3.5.10~dfsg-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: d9827817f7c589ca458d4717150791f1d8f3c7a4

New changelog entries:
  * New upstream release
  * Security update, fixing the following issues:
    - CVE-2011-2694: possible XSS attack in SWAT
    - CVE-2011-2522: Cross-Site Request Forgery vulnerability in SWAT

d982781... by Christian Perrier on 2011-06-18

Import patches-unapplied version 2:3.5.9~dfsg-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 14c84a2ff0a4c2be43f3ce21c4adab42156d3003

New changelog entries:
  * New upstream release
  * Add "--quiet" to start-stop-daemon call in reload target in init
    script. Closes: #572483
  * Add examples/LDAP in examples for the samba package. With this,
    samba.schema will be provided in some way in the package.
    This very partially addresses #190162
  * patches/bug_221618_precise-64bit-prototype.patch: precise
    64bits prototype in libsmbclient-dev. Closes: #221618
  * patches/no-unnecessary-cups.patch: dropped after upstream
    changes to printing code
  * Update Standards to 3.9.2 (checked, no change)
  * Add build-arch and build-indep targets in debian/rules

14c84a2... by Christian Perrier on 2011-06-04

Import patches-unapplied version 2:3.5.8~dfsg-5 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 9269b0130e8183d7fa9db1df7cda12e98818377a

New changelog entries:
  * Fix "tdb2.so undefined symbol: dyn_get_STATEDIR" by fixing a typo
    in fhs-filespath.patch. Closes: #629183, LP: #789097

9269b01... by Christian Perrier on 2011-05-27

Import patches-unapplied version 2:3.5.8~dfsg-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: d1e5db03a4e52016c457ec9d02b85199bbe8047f

New changelog entries:
  [ Debconf translations ]
  * Spanish (Omar Campagne). Closes: #627813
  * Swedish (Martin Bagge / brother). Closes: #627849
  * Brazilian Portuguese (Adriano Rafael Gomes). Closes: #627866
  [ Christian Perrier ]
  * bug_601406_fix-perl-path-in-example.patch: fix path to perl
    binary in example file. Closes: #601406
  [ Debconf translations ]
  * Italian (Luca Monducci). Closes: #626674
  * Dutch (Vincent Zweije). Closes: #627519
  * Czech (Miroslav Kure). Closes: #627442

d1e5db0... by Christian Perrier <email address hidden> on 2011-05-22

Import patches-unapplied version 2:3.5.8~dfsg-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 40a7006140b6004c42762fa4cfe7467158731d61

New changelog entries:
  [ Jelmer Vernooij ]
  * Add libwbclient-dev package.
  * Build against external libtdb.
  * Bump standards version to 3.9.1 (no changes).
  [ Mathieu Parent ]
  * Builddep on libctdb-dev or ctdb < 1.10
  [ Christian Perrier ]
  * Use db_settitle in debconf questions and make these
    titles translatable. Closes: #560318
  * Test the presence of testparm before trying to use it in init script
    Closes: #606320
  * Add cups to Should-{Start,Stop} in LSB headers of
    samba init script to guarantee that CUPS is started
    before samba. Closes: #619132
  * Drop libsmbclient-dev useless dependency on samba-common
    Closes: #597987
  [ Debconf translations ]
  * French (Christian Perrier)
  * Japanese (Kenshi Muto). Closes: #626474
  * Galician (Miguel Anxo Bouzada). Closes: #626477
  * Thai (Theppitak Karoonboonyanan). Closes: #626487
  * Russian (Yuri Kozlov). Closes: #626523
  * Danish (Joe Hansen). Closes: #626531
  * Esperanto (Felipe Castro). Closes: #626558
  * Hebrew (Eran Cohen). Closes: #626638
  * Bokmål, (Bjørn Steensrud).
  * Italian (Luca Monducci). Closes: #626674
  * Finnish (Tapio Lehtonen). Closes: #626890
  * Portuguese (Miguel Figueiredo). Closes: #627224
  * German (Holger Wansing). Closes: #627354

40a7006... by Christian Perrier on 2011-03-08

Import patches-unapplied version 2:3.5.8~dfsg-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: cb36eb95c9ac789e0a7390cf93317e8eea7f934e

New changelog entries:
  * New upstream release. This fixes the following bugs:
    - Winbind leaks gids with idmap ldap backend (upstrem #7777)
      Closes: #613624
    - printing from Windows 7 fails with 0x000003e6
      Closes: #617429
  * smb.conf(5) restored from samba 3.5.6 as a workaround to upstream