Bug#919712: Uploaded

[Mathieu Parent <math.parent@gmail.com>]

Le vendredi 1 février 2019, Adam D. Barratt <adam@adam-barratt.org.uk> a écrit :
> On 2019-02-01 06:56, Mathieu Parent wrote:
>>
>> I've uploaded the package.
>>
>> I've also added the attached diff.
>
> <quote source="attached">
> --- a/debian/patches/fix-rmdir.patch
> +++ b/debian/patches/fix-rmdir.patch
> @@ -1,3 +1,170 @@
> +From: Stefan Metzmacher <metze@samba.org>
> +Date: Tue, 20 Jun 2017 08:35:13 +0200
> +Subject: s3:libsmb: add cli_smb2_delete_on_close*()
> +
> +Signed-off-by: Stefan Metzmacher <metze@samba.org>
> +Reviewed-by: Jeremy Allison <jra@samba.org>
> +(cherry picked from commit 8d4005b07b08d5673b75d5d79f9b3d6936596fae)
> +
> +diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c
> +--
> +2.20.1
> +
>  From: Anoop C S <anoopcs@redhat.com>
>  Date: Thu, 9 Aug 2018 12:28:41 +0530
>  Subject: s3/libsmb: Explicitly set delete_on_close token for rmdir
> @@ -20,10 +187,10 @@ Bug-Debian: https://bugs.debian.org/915248
>  Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/1795772
>
>  diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c
> </quote>
>
> Is that intentional? There's now two patches for the same file in the same patch file?

Yes. This is how samba patches are handled  (small patches grouped together)

Regards

Mathieu

-- 
Mathieu