← Back to branch summary

~ubuntu-branches/ubuntu/lucid/samba/lucid-proposed

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2010-02-16 19:23:34 UTC
  • mfrom: (0.34.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100216192334-6r2co033edmfj0rf
Tags: 2:3.4.5~dfsg-2ubuntu1
https://launchpad.net/bugs/462169
https://launchpad.net/bugs/493565
* Merge from debian unstable.  Remaining changes:
  + debian/patches/VERSION.patch:
    - set SAMBA_VERSION_SUFFIX to Ubuntu.
  + 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 additon to authenticated ones.
    - add map to guest = Bad user, maps bad username to gues access.
  + debian/samba-common.conf:
    - Do not change priority to high if dhclient3 is installed.
    - Use priority medium instead of high for the workgroup question.
  + debian/mksambapasswd.awk:
    - Do not add user with UID less than 1000 to smbpasswd.
  + debian/control: 
    - Make libswbclient0 replace/conflict with hardy's likewise-open.
    - Don't build against ctdb, since its not in main yet.
  + 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
  + Add apport hook:
    - Created debian/source_samba.py.
    - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install
  + debian/rules, debian/samba.if-up: allow "NetworkManager" as a recognized address
    family... it's obviously /not/ an address family, but it's what gets
    sent when using NM, so we'll cope for now.  (LP: #462169). Taken from karmic-proposed.
  + debian/control: Recommend keyutils for smbfs (LP: #493565)
  + debian/patches/security-CVE-2009-3297.patch: add back in as it was
    incorrectly removed in last merge
  + Removed patches:
    - debian/patches/debian-changes-2:3.4.3-2ubuntu1: merge mistake
    - debian/patches/debian-changes-2:3.4.5~dfsg-1ubuntu1: merge mistake
    - debian/patches/net-usershare-list-3.4.0.patch: not used
    - debian/patches/fix-crash-when-loading-interfaces.patch: not used
    - debian/patches/fix-upstream-6680.patch: not used
    - debian/patches/fix-password-expiry-calculation.patch: not used
Filename Latest Rev Last Changed Committer Comment Size
..
.pc 87 14 years ago Bazaar Package Importer * Merge from debian testing. Remaining changes: Diff
codepages 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
debian 57 15 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
docs 4 18 years ago Bazaar Package Importer Resynchronise with Debian, resolving merge conflic Diff
docs-xml 42 15 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
examples 4 18 years ago Bazaar Package Importer Resynchronise with Debian, resolving merge conflic Diff
lib 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
libcli 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
librpc 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
m4 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
nsswitch 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
packaging 4 18 years ago Bazaar Package Importer Resynchronise with Debian, resolving merge conflic Diff
packaging4 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
pcp 4 18 years ago Bazaar Package Importer Resynchronise with Debian, resolving merge conflic Diff
pidl 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
release-scripts 42 15 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
selftest 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
source3 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
source4 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
swat 4 18 years ago Bazaar Package Importer Resynchronise with Debian, resolving merge conflic Diff
swat2 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
testdata 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
testprogs 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
tests 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: Diff
testsuite 4 18 years ago Bazaar Package Importer Resynchronise with Debian, resolving merge conflic Diff
.gitignore 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: 9.5 KB Diff Download File
COPYING 45 15 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: 34.3 KB Diff Download File
howto4.txt 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: 5.2 KB Diff Download File
MAINTAINERS 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: 1.1 KB Diff Download File
Manifest 31 16 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: 2.4 KB Diff Download File
merged-branches.txt 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: 262 bytes Diff Download File
PFIF.txt 45 15 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: 188 bytes Diff Download File
prog_guide4.txt 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: 30.2 KB Diff Download File
Read-Manifest-Now 4 18 years ago Bazaar Package Importer Resynchronise with Debian, resolving merge conflic Empty Diff Download File
README 45 15 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: 8.3 KB Diff Download File
README.Coding 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: 6.3 KB Diff Download File
Roadmap 49 15 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: 1 KB Diff Download File
swat2.txt 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: 2.4 KB Diff Download File
WHATSNEW.txt 91 14 years ago Bazaar Package Importer * Merge from debian testing. Remaining changes: 31.8 KB Diff Download File
WHATSNEW4.txt 77 14 years ago Bazaar Package Importer * Merge from debian unstable, remaining changes: 5.1 KB Diff Download File