Re: [PATCH] cifs-utils: Update to version 6.14

[Michael Tremer <michael.tremer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 4083 bytes --]

Hello,

> On 10 Mar 2022, at 13:43, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> Hi All,
> I just got a patchwork notification that this patch had been rejected.

That was me. I thought it is a good idea to keep Patchwork up to date.

> On 28/02/2022 22:20, Adolf Belka wrote:
>> Hi Peter,
>> 
>> On 28/02/2022 21:39, Peter Müller wrote:
>>> Hello Adolf,
>>> 
>>> thank you for submitting this.
>>> 
>>> While it looks generally good to me, I did not get why the "SUMMARY" line
>>> got deleted in it. If this is by mistake, there is no need to hand in a second
>>> version of this patch - I will just correct that while applying it, but want
>>> to make sure I got your intention right.
> I take it that the correction was not able to be made and that I should re-issue the patch built against the correct, latest, version in next. Should this new patch be a v2 or just create a new one as the old one is rejected?
> 
> I will do the patch rebuild after the weekend.

It was just that the SUMMARY line was being removed. That is all.

You could send another patch on top of this if you prefer that reverts those changes, but it is probably easier to just submit a new clean one.

Best,
-Michael

> Regards,
> Adolf.
>> I did a git pull origin next and then used the lfs file from that as my starting point. So I definitely didn't remove that line although I have no idea how it was not there on what I copied from the lfs directory. Yes please correct it.
>>> 
>>> Also, this patch re-introduces (deliberately?) a trailing whitespace, which
>>> I marked below. Nothing major, just thought I'd mention that... :-)
>> Same as above. I did not deliberately add a trailing whitespace. I didn't touch that line at all so no idea how it happened.
>> 
>> Sorry and thanks for catching.
>> Adolf.
>>> 
>>> Acked-by: Peter Müller <peter.mueller(a)ipfire.org>
>>> 
>>> Thanks, and best regards,
>>> Peter Müller
>>> 
>>>> - Update from 6.13 to 6.14
>>>> - Update of rootfile not required
>>>> - Changelog
>>>>     version 6.14
>>>>      setcifsacl: fix formatting
>>>>      smbinfo: add support for new key dump ioctl
>>>>      mount.cifs: fix crash when mount point does not exist
>>>>      cifs.upcall: fix regression in kerberos mount
>>>>      smbinfo: Add command for displaying alternate data streams
>>>>      Reorder ACEs in preferred order during setcifsacl
>>>> 
>>>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>>> ---
>>>>   lfs/cifs-utils | 12 ++++--------
>>>>   1 file changed, 4 insertions(+), 8 deletions(-)
>>>> 
>>>> diff --git a/lfs/cifs-utils b/lfs/cifs-utils
>>>> index 524c3bcee..08e9b2c28 100644
>>>> --- a/lfs/cifs-utils
>>>> +++ b/lfs/cifs-utils
>>>> @@ -24,9 +24,7 @@
>>>>     include Config
>>>>   -SUMMARY    = Utilities for doing and managing mounts of the Linux CIFS filesystem
>>>> -
>>>> -VER        = 6.13
>>>> +VER        = 6.14
>>>>     THISAPP    = cifs-utils-$(VER)
>>>>   DL_FILE    = $(THISAPP).tar.bz2
>>>> @@ -34,12 +32,10 @@ DL_FROM    = $(URL_IPFIRE)
>>>>   DIR_APP    = $(DIR_SRC)/$(THISAPP)
>>>>   TARGET     = $(DIR_INFO)/$(THISAPP)
>>>>   PROG       = cifs-utils
>>>> -PAK_VER    = 3
>>>> +PAK_VER    = 4
>>>>     DEPS       =
>>>>   -SERVICES   =
>>>> -
>>>> ###############################################################################
>>>>   # Top-level Rules
>>>> ###############################################################################
>>>> @@ -48,7 +44,7 @@ objects = $(DL_FILE)
>>>>     $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>>>   -$(DL_FILE)_MD5 = 4348921483c530826950e9503b08b033
>>>> +$(DL_FILE)_MD5 = e918d1246adb841c61e562538c2cc78e
>>>>     install : $(TARGET)
>>>>   @@ -58,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
>>>>     md5 : $(subst %,%_MD5,$(objects))
>>>>   -dist:
>>>> +dist:
>>> 
>>> Trailing whitespace introduced here again. :-)
>>> 
>>>>       @$(PAK)
>>>> ###############################################################################
> 
> -- 
> Sent from my laptop