* 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 addition to authenticated ones. - 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 cuups breaks to push the package to aslo 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 profile - 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 /etc/samba/dhcp. + Dropped: - debian/patches/fix-lpbug-393012.patch: Dropped in favor of debian's patch.