package/slang: fix patch fuzz

From: "Yann E. MORIN" <yann.morin@orange.com>

Since commit 8f88a644ed7d (support/scripts/apply-patches.sh: set the
maximum fuzz factor to 0), we no longer accept fuzz in patches. Before
8f88a644ed7d was applied, alot of patches were fixed in preparatory
commits, but slang was missed (although the patch has been present since
2017.

Fix the fuzz:
  - leading TABs in Makefile commands
  - fix context

Fixes: 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016
Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
Cc: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 package/slang/0001-slsh-libs.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

*Dario Binacchi*

Senior Embedded Linux Developer

dario.binacchi@amarulasolutions.com

Dario, All,

On 2024-06-25 13:56 +0200, Dario Binacchi spake thusly:
> Il giorno mar 25 giu 2024 alle 13:46 < [4]yann.morin@orange.com> ha scritto:
>   From: "Yann E. MORIN" < [5]yann.morin@orange.com>
>   Since commit 8f88a644ed7d (support/scripts/apply-patches.sh: set the
>   maximum fuzz factor to 0), we no longer accept fuzz in patches. Before
>   8f88a644ed7d was applied, alot of patches were fixed in preparatory
>   commits, but slang was missed (although the patch has been present since
>   2017.
> what configuration does contain this package?

    $ make defconfig
    $ make allyespackageconfig

> I'm on holiday and I don't have my PC with me, so I am not able to check it.

No worries! Enjoy your break!

Regards,
Yann E. MORIN.

Yann, All,

On 2024-06-25 13:46 +0200, yann.morin@orange.com spake thusly:
> From: "Yann E. MORIN" <yann.morin@orange.com>
> 
> Since commit 8f88a644ed7d (support/scripts/apply-patches.sh: set the
> maximum fuzz factor to 0), we no longer accept fuzz in patches. Before
> 8f88a644ed7d was applied, alot of patches were fixed in preparatory
> commits, but slang was missed (although the patch has been present since
> 2017.
> 
> Fix the fuzz:
>   - leading TABs in Makefile commands
>   - fix context
> 
> Fixes: 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016
> Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
> Cc: Dario Binacchi <dario.binacchi@amarulasolutions.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/slang/0001-slsh-libs.patch | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/slang/0001-slsh-libs.patch b/package/slang/0001-slsh-libs.patch
> index fad16d1b2f..100399e818 100644
> --- a/package/slang/0001-slsh-libs.patch
> +++ b/package/slang/0001-slsh-libs.patch
> @@ -12,10 +12,10 @@ Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>  +++ b/slsh/Makefile.in
>  @@ -92,7 +92,7 @@
>   $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
> -    $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
> + 	$(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
>   $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
>  -	$(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(INST_LIBS)
>  +	$(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
>   $(OBJDIR)/slsh.o: $(OBJDIR_TSTAMP) slsh.c slsh.h config.h Makefile
> -    cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c
> + 	cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c
>   $(OBJDIR)/readline.o: $(OBJDIR_TSTAMP) readline.c slsh.h config.h Makefile
> -- 
> 2.34.1
> 
> ____________________________________________________________________________________________________________
> Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
> pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
> a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
> Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.
> 
> This message and its attachments may contain confidential or privileged information that may be protected by law;
> they should not be distributed, used or copied without authorisation.
> If you have received this email in error, please notify the sender and delete this message and its attachments.
> As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
> Thank you.
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

Dario, All,

On 2024-06-25 13:56 +0200, Dario Binacchi spake thusly:
> From: "Yann E. MORIN" <[5]yann.morin@orange.com>
> > Since commit 8f88a644ed7d (support/scripts/apply-patches.sh: set the
> > maximum fuzz factor to 0), we no longer accept fuzz in patches. Before
> > 8f88a644ed7d was applied, alot of patches were fixed in preparatory
> > commits, but slang was missed (although the patch has been present since
> > 2017.
> what configuration does contain this package?

I've devised a little script that finds almost all packages that have
patches, and test they can be downloaded and patched:

    #!/usr/bin/env bash
    export BR2_DL_DIR=$(pwd)/meh-dl
    make defconfig
    ./utils/config --set-str BR2_BACKUP_SITE ""
    # Ignore boot/ and linux/ as they are too special...
    find package/ -type f -name '*.mk' -printf '%h\n' \
    |sort -u \
    |while read dir; do
        [ -e "${dir}/Config.in" ] || continue
        ( find "${dir}" -type f -name '*.patch' -print -quit |grep -q . ) || continue
        pkg="$( basename "${dir}" )"
        [ -e "${dir}/${pkg}.mk" ] || continue
        sed -r -e '/^\$\(eval \$\((host-)?[^-]+-package\)\)$/!d; s//\1'"${pkg}"'/' "${dir}/${pkg}.mk"
    done \
    |while read pkg; do
        if ! make "${pkg}-patch"; then
            echo "${pkg}" >> fuzz.lst
        fi
    done

Them we've a bit of hand-guessing and the build log, here's what I could
conclude:

Fuzz errors:
  - cpulimit                    - crda                        - dahdi-tools
  - eigen                       - empty                       - exim
  - ficl                        - flite                       - freeradius-server
  - freerdp                     - imx-kobs                    - imx-vpu-hantro
  - gpm                         - grpc                        - haserl
  - janus-gateway               - leveldb                     - libblockdev
  - libfcgi                     - libcrypt                    - libgdiplus
  - libglfw                     - libhid                      - liblinear
  - libmad                      - libnfs                      - libsoup
  - libssh2                     - libsvg                      - libsvgtiny
  - libtheora                   - libtorrent                  - libyuv
  - clang                       - lxc                         - mediastreamer
  - memstat                     - mongrel                     - monit
  - ncmpc                       - nmap                        - nushell
  - nvidia-driver               - oatpp                       - openvmtools
  - paxtest                     - poke                        - pulseview
  - python-pybind               - qt5webkit                   - rdesktop
  - redis                       - rrdtool                     - rt-tests
  - rygel                       - sane-backends               - sdl_mixer
  - shairport-sync              - snort                       - sox
  - sunxi-mali-utgard-driver    - sylpheed                    - udpcast
  - vtun                        - wlroots                     - xdriver_xf86-video-mach64
  - xdriver_xf86-video-tdfx     - xfsprogs                    - yajl
  - ympd

Hash errors:
  - am335x-pru-package          - cgic                        - daq
  - dvb-apps                    - latencytop                  - linknx
  - linux-fusion                - lite                        - mimic
  - resiprocate                 - w_scan

Download errors:
  - aumix: 403 forbidden        - bsdiff: 403 forbidden       - dillo: 404
  - fbset: 410 Gone             - gamin: 404                  - giblib: 404
  - httping: 404                - libtorrent: 404             - live5: 404
  - lugaru: 404                 - matchbox-lib: 400 ???       - mpir: upstream DNS gone
  - qt5enginio: 404             - quagga: 404                 - racehound: 404
  - rp-pppoe: 404               - rtorrent: 404               - sysprof: 404
  - taskd: 404                  - trinity: TCP timeout        - zabbix: 404
  - xenomai: 404

Config issues:
  - aufs-util: needs a kernel

Of course, the hash, download, and config issues are not caused by the
fuzz restriction, which I still believe was a very good thing to do! :-)
Still, they may hide a few fuzz issues.

Anyway, the list is up for all to pick a package and help fix that as a
collective effort.

Bonus points for anyone that confirms the corner cases: binutils, gcc,
gdb, and a few others, which have a version choice... Or linux, which
has a conditional patch (Aha!) and a version with a patch... Of any of
the bootloaders, some of whioch have a version coice as well...

I think I'll be having a look at all the hash errors, but anyone is free
to look at them and post a patch that fixes the hash and explains the
issue...

Thanks!

Regards,
Yann E. MORIN.

*Dario Binacchi*

Senior Embedded Linux Developer

dario.binacchi@amarulasolutions.com