[PATCH] Do not install smbclient4 and nmblookup4

[Jelmer Vernooij]

On Tue, Apr 01, 2014 at 01:16:53PM +0200, Jeroen Dekkers wrote:
> At Tue, 1 Apr 2014 12:58:22 +0200,
> Jelmer Vernooij wrote:
> > 
> > On Tue, Apr 01, 2014 at 12:24:48PM +0200, Jeroen Dekkers wrote:
> > > At Sat, 21 Sep 2013 02:04:09 +0200,
> > > Jeroen Dekkers wrote:
> > > > 
> > > > Andrew and Jelmer told me on IRC that we should not ship smbclient4
> > > > and nmblookup4 in the Debian packages and that they actually shouldn't
> > > > be installed upstream either. Attached is the patch that I just added
> > > > to the Debian package that sets install=False for both.
> > > 
> > > Any comments?
> > 
> > The original email is no longer in my archive. Any chance you can attach the
> > patch again?
> 
> Here it is...
Thanks.

Reviewed-By: Jelmer Vernooij <jelmer at samba.org>

Andrew, can you also do a quick review of this?

On another note, I think it might be time to officially rename these binaries
(rather than doing the dynamic naming with + bld.env.suffix4) or remove
them altogether.

Cheers,

Jelmer

> From 58e877bc067cf9f12c81895aa17fa7731c8ff26c Mon Sep 17 00:00:00 2001
> From: Jeroen Dekkers <jeroen at dekkers.ch>
> Date: Sat, 21 Sep 2013 01:43:31 +0200
> Subject: [PATCH] Do not install smbclient4 and nmblookup4
> 
> Signed-off-by: Jeroen Dekkers <jeroen at dekkers.ch>
> ---
>  libcli/nbt/wscript_build | 3 ++-
>  source4/wscript_build    | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
> index c4a9428..090789c 100755
> --- a/libcli/nbt/wscript_build
> +++ b/libcli/nbt/wscript_build
> @@ -20,7 +20,8 @@ bld.SAMBA_LIBRARY('cli-nbt',
>  bld.SAMBA_BINARY('nmblookup' + bld.env.suffix4,
>                   source='tools/nmblookup.c',
>                   manpages='man/nmblookup4.1',
> -                 deps='samba-hostconfig samba-util cli-nbt popt POPT_SAMBA netif LIBCLI_RESOLVE'
> +                 deps='samba-hostconfig samba-util cli-nbt popt POPT_SAMBA netif LIBCLI_RESOLVE',
> +                 install=False
>                   )
>  
>  bld.SAMBA_PYTHON('python_netbios',
> diff --git a/source4/wscript_build b/source4/wscript_build
> index af71e80..1dd1356 100644
> --- a/source4/wscript_build
> +++ b/source4/wscript_build
> @@ -2,7 +2,8 @@
>  
>  bld.SAMBA_BINARY('client/smbclient'  + bld.env.suffix4,
>  	source='client/client.c',
> -	deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS smbclient-raw param_options dcerpc'
> +	deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS smbclient-raw param_options dcerpc',
> +	install=False
>  	)
>  
>  
> -- 
> 1.8.3.2
>