Thanks sthen for  reviewing and OK :) ... before me :) thanks folks


On Thu, 12 Sept 2024 at 00:01, Tom Smyth <tom.smyth@wirelessconnect.eu>
wrote:

> Folks
> there has not been any changes in the nsh code that would prevent
> compilation and compatibility  on 7.5 or  7.4
> the builds of Nsh have been building on 7.5 stable and 7.5 current / 7.6
> current throughout ...
> Ok, Tom,
>
>
> On Tue, 10 Sept 2024 at 10:47, Stefan Sperling <stsp@stsp.name> wrote:
>
>> On Fri, Sep 06, 2024 at 10:05:12PM +0100, Tom Smyth wrote:
>> > Folks,
>> > thanks for updating current...
>> > would it be possible to update stable also ... as this release squashes
>> > some pretty annoying bugs... which unfortunately took ages to find...
>> and
>> > affects the stable / releases out there in the wild...
>>
>> Here is the diff for -stable. Builds and runs fine for me on 7.5,
>> verified with some manual testing.
>>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/shells/nsh/Makefile,v
>> diff -u -p -r1.49.2.1 Makefile
>> --- Makefile    19 Jun 2024 15:15:09 -0000      1.49.2.1
>> +++ Makefile    10 Sep 2024 09:30:57 -0000
>> @@ -2,7 +2,7 @@ COMMENT =       network switch style shell
>>
>>  CATEGORIES =   shells net
>>  HOMEPAGE =     https://www.nmedia.net/nsh/
>> -V =            1.2.1
>> +V =            1.2.2
>>  DISTNAME =     nsh-${V}
>>  SITES =
>> https://github.com/yellowman/nsh/releases/download/v${V}/
>>
>> @@ -28,10 +28,10 @@ MAKE_ENV =  CC="${CC}" \
>>                 LDFLAGS="-L${LOCALBASE}/lib"
>>  LIB_DEPENDS =  databases/sqlite3
>>
>> -FAKE_FLAGS =   PREFIX=${TRUEPREFIX}
>> +FAKE_FLAGS =   DESTDIR=
>>
>>  .if ${FLAVOR:Mstatic}
>> -MAKE_FLAGS +=  LDFLAGS="-L${LOCALBASE}/lib -ledit -ltermcap -lsqlite3
>> -lm -lpthread -static"
>> +ALL_TARGET =   static
>>  .endif
>>
>>  NO_TEST=       Yes
>> @@ -40,9 +40,20 @@ post-install:
>>  .for i in save-ro.sh save-rw.sh
>>         ${INSTALL_SCRIPT} ${WRKDIST}/${i} ${PREFIX}/bin
>>  .endfor
>> +       rm ${PREFIX}/bin/save.sh
>>         ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nsh
>>  .for i in README.md COPYRIGHT
>>         ${INSTALL_DATA} ${WRKDIST}/${i} ${PREFIX}/share/doc/nsh/
>> +.endfor
>> +       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nsh/shell
>> +.for s in extensive-nsh-openbsd-integrate.sh
>> rc.local-nsh-openbsd-integrate.sh
>> +       ${INSTALL_DATA} ${WRKDIST}/scripts/shell/${s} \
>> +               ${PREFIX}/share/examples/nsh/shell
>> +.endfor
>> +       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nsh/nshrc
>> +.for s in enable-sshd.nshrc write-config.nshrc initial-config.nshrc
>> +       ${INSTALL_DATA} ${WRKDIST}/scripts/nshrc/${s} \
>> +               ${PREFIX}/share/examples/nsh/nshrc
>>  .endfor
>>
>>  .include <bsd.port.mk>
>> Index: distinfo
>> ===================================================================
>> RCS file: /cvs/ports/shells/nsh/distinfo,v
>> diff -u -p -r1.18.4.1 distinfo
>> --- distinfo    19 Jun 2024 15:15:09 -0000      1.18.4.1
>> +++ distinfo    10 Sep 2024 09:31:20 -0000
>> @@ -1,2 +1,2 @@
>> -SHA256 (nsh-1.2.1.tar.gz) = rU/ep0MEA9O7CJacaF3vvMx82MRlUmLc2U/riRgJgTs=
>> -SIZE (nsh-1.2.1.tar.gz) = 221571
>> +SHA256 (nsh-1.2.2.tar.gz) = EfR0Yya3F7Ej6nfPd+WlqLT+Z8A8ZUb6fcWb1pQamw8=
>> +SIZE (nsh-1.2.2.tar.gz) = 228756
>> Index: pkg/PLIST
>> ===================================================================
>> RCS file: /cvs/ports/shells/nsh/pkg/PLIST,v
>> diff -u -p -r1.7 PLIST
>> --- pkg/PLIST   29 Sep 2023 12:17:08 -0000      1.7
>> +++ pkg/PLIST   10 Sep 2024 09:32:11 -0000
>> @@ -16,3 +16,11 @@ bin/save-rw.sh
>>  share/doc/nsh/
>>  share/doc/nsh/COPYRIGHT
>>  share/doc/nsh/README.md
>> +share/examples/nsh/
>> +share/examples/nsh/nshrc/
>> +share/examples/nsh/nshrc/enable-sshd.nshrc
>> +share/examples/nsh/nshrc/initial-config.nshrc
>> +share/examples/nsh/nshrc/write-config.nshrc
>> +share/examples/nsh/shell/
>> +share/examples/nsh/shell/extensive-nsh-openbsd-integrate.sh
>> +share/examples/nsh/shell/rc.local-nsh-openbsd-integrate.sh
>>
>
>
> --
> Kindest regards,
> Tom Smyth.
>


-- 
Kindest regards,
Tom Smyth.