[Pkg-samba-maint] Bug#640668: samba: Updated if-up.d script to function under systemd

[Sam Morris]

On Mon, 2011-09-12 at 11:01 +0100, Steve Langasek wrote:
> Hi Sam,
> 
> On Tue, Sep 06, 2011 at 01:40:34PM +0100, Sam Morris wrote:
> > When systemd is installed, the behaviour of '/etc/init.d/samba status'
> > changes (systemd changes the LSB init functions to launch services via
> > systemctl rather than directly) in a way that breaks the if-up.d script.
> 
> > I've modified the script to get it to work again; see below.
> 
> Why should this not be fixed in systemd?  I don't think it's appropriate for
> the status_of_proc() function to give different output under systemd than
> under sysvinit and to require a package that isn't aware of systemd at all
> to cope with such divergence.
> 
> In Ubuntu, the Samba package currently avoids status_of_proc() entirely
> because we know that we will *always* be using upstart on Ubuntu, so we can
> just invoke the 'status' command directly.  But this argument does not apply
> in Debian, and I would not like to see the init script in Debian have to
> account for differing init systems.
> 

I found a patch (attached) in Samba's upstream git repository that fixes
this once and for all, by allowing nmbd to run when no network
interfaces have been assigned an address. It removes the need for the
if-up.d script entirely.

The modified package (also attached) applies this patch and removes the
if-up.d script. Ignore the changes in
debian/patches/debian-changes-2:3.6.0-1sam1 and my disabling of the
build/installation of smbtorture; without it the package fails to build,
complaining about a missing RFC file.

-- 
Sam Morris <https://robots.org.uk/>
3412 EA18 1277 354B 991B  C869 B219 7FDB 5EA0 1078
-------------- next part --------------
A non-text attachment was scrubbed...
Name: libutil_drop_AI_ADDRCONFIG.patch
Type: text/x-patch
Size: 1768 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20110913/72fbf7ce/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: samba_3.6.0-1sam1.debian.tar.gz
Type: application/x-compressed-tar
Size: 418163 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20110913/72fbf7ce/attachment-0003.bin>
-------------- next part --------------
Format: 3.0 (quilt)
Source: samba
Binary: samba, samba-common-bin, samba-common, samba-tools, smbclient, swat, samba-doc, samba-doc-pdf, libpam-smbpass, libsmbclient, libsmbclient-dev, winbind, samba-dbg, libwbclient0, libwbclient-dev
Architecture: any
Version: 2:3.6.0-1sam1
Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Jelmer Vernooij <jelmer at debian.org>
Homepage: http://www.samba.org
Standards-Version: 3.9.2
Vcs-Browser: http://svn.debian.org/wsvn/pkg-samba/trunk/samba/
Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/trunk/samba
Build-Depends: debhelper (>= 6.0.7~), dpkg-dev (>= 1.15.7.2), libpam0g-dev, libreadline-dev, libcups2-dev | libcupsys2-dev, libacl1-dev [linux-any], libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, uuid-dev, libtalloc-dev (>= 2.0.1-1~bpo50+1), libtdb-dev (>= 1.2.1~), libcap-dev [linux-any], libkeyutils-dev [linux-any], libctdb-dev (>= 1.10+git20110412) [linux-any], pkg-config
Build-Conflicts: libfam-dev
Checksums-Sha1: 
 e811921a562c702e18dcf7c696f92103b5de6531 24469040 samba_3.6.0.orig.tar.bz2
 bd1e73260fdb16ddf993a7cc9203438289db751f 418163 samba_3.6.0-1sam1.debian.tar.gz
Checksums-Sha256: 
 2daa16fb01f800db9bf70e27fc1001abd6044d3619efbd2cabe3e63cb96f72f1 24469040 samba_3.6.0.orig.tar.bz2
 401672b9cf485ebee3ac468bef2fd0f9c74c8fd9af2652152b290e64736b3e43 418163 samba_3.6.0-1sam1.debian.tar.gz
Files: 
 5578306264b16a0c4eb15321c6c3ddcc 24469040 samba_3.6.0.orig.tar.bz2
 3eacb97f24347d8adc779044f7efe562 418163 samba_3.6.0-1sam1.debian.tar.gz
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20110913/72fbf7ce/attachment-0001.pgp>