hello, Reuqest import of the attached diff 20210416
Compiled on AMD64 No errors no warnings Changes: 1) pulls in latest code from github (with all fixes discussed in the past 2 months 2) Chris has added in support for llprio on interfaces 3) (all previous fixes by naddy@ , tom smyth and Chris have been included 4) added Tom Smyth as MAINTAINER for nsh port No Patches necessary for the software to build. please remove any patches that might linger Thanks to Chris, Kurtm@ and Stuart for their help and feedback. Thanks again, Tom Smyth On Fri, 16 Apr 2021 at 21:38, Tom Smyth <[email protected]> wrote: > > Hi Stuart, Chris, all, > > I'm happy help out on the port and do testing & I really like the software, > answer questions on list (ports and misc ) regarding nsh and try to > implement & test fixes... > > and track improvements in the network stack in base.... (as my > understanding of nsh code improves ) > > that said any of my (humble) contributions need supervision and > careful review, > > I want to see nsh more widely deployed in openBSD community and I > would like to use it as a tool > to help cisco heads use OpenBSD, > > > Thanks again, > > Tom Smyth > > > > > > > > > > > > > On Fri, 16 Apr 2021 at 20:56, Stuart Henderson <[email protected]> wrote: > > > > This fixes build but the other part of the problem is the lack of > > maintainer, if it is reenabled I would *really* like someone who is > > willing to look at fixing it next time it needs syncing up with -current > > to take MAINTAINER please. > > > > Doesn't require catching problems as they happen (though that would be > > nice!) but at least someone that we can mail about breakages when we run > > into them in ports builds. > > > > It doesn't break all that frequently (not usually more than 1 or 2 times > > in a year, and often less than that) but it is inevitable. > > > > > > > > On 2021/04/16 02:20, Tom Smyth wrote: > > > Hello, all, > > > > > > Chris has incorporated and improved the diffs and merged them upstream, > > > > > > below is a diff for pulling the latest commit from git > > > > > > it is compiling cleanly on amd64 6.9 current (20210414 ) without > > > errors or warnings > > > > > > all the patch files in the current port can be removed also as they > > > have been included or improved upon upstream > > > > > > Thanks Chris, Kurt and everyone who helped. > > > > > > > > > > > > -- > > > Kindest regards, > > > Tom Smyth. > > > > > Index: Makefile > > > =================================================================== > > > RCS file: /cvs/ports/shells/nsh/Makefile,v > > > retrieving revision 1.41 > > > diff -u -p -r1.41 Makefile > > > --- Makefile 22 Mar 2021 17:23:22 -0000 1.41 > > > +++ Makefile 16 Apr 2021 00:59:39 -0000 > > > @@ -1,16 +1,15 @@ > > > # $OpenBSD: Makefile,v 1.41 2021/03/22 17:23:22 sthen Exp $ > > > > > > -BROKEN = needs adapting to changes in base\n > > > -BROKEN += (again); this port is closely tied to interfaces in the > > > base OS and really\n > > > -BROKEN += needs an active maintainer! > > > > > > COMMENT = network switch style shell > > > > > > -DISTNAME = nsh-1.0.20201006 > > > +DISTNAME = nsh-1.0.20210415 > > > +#REVISION = 0 > > > > > > GH_ACCOUNT = yellowman > > > GH_PROJECT = nsh > > > -GH_COMMIT = 4b92f9124641caddcce238293919b1ec45b5a20d > > > +GH_COMMIT = 8573767444bed331376e6d8edc9bd93bc091789d > > > + > > > > > > CATEGORIES = shells net > > > HOMEPAGE = http://www.nmedia.net/nsh/ > > > Index: distinfo > > > =================================================================== > > > RCS file: /cvs/ports/shells/nsh/distinfo,v > > > retrieving revision 1.13 > > > diff -u -p -r1.13 distinfo > > > --- distinfo 4 Feb 2021 22:13:09 -0000 1.13 > > > +++ distinfo 16 Apr 2021 00:59:39 -0000 > > > @@ -1,2 +1,2 @@ > > > -SHA256 (nsh-1.0.20201006-4b92f912.tar.gz) = > > > 4iz3xcEdK8E4I9sG51JPASuviji2O9ooO+6AI1rqQIs= > > > -SIZE (nsh-1.0.20201006-4b92f912.tar.gz) = 130053 > > > +SHA256 (nsh-1.0.20210415-85737674.tar.gz) = > > > vcNGznniC4rWLD6ULyBbGKJUvUEsNg1ylenjZBvmX4A= > > > +SIZE (nsh-1.0.20210415-85737674.tar.gz) = 130190 > > > > > > > > -- > Kindest regards, > Tom Smyth. -- Kindest regards, Tom Smyth.
Index: Makefile =================================================================== RCS file: /cvs/ports/shells/nsh/Makefile,v retrieving revision 1.41 diff -u -p -r1.41 Makefile --- Makefile 22 Mar 2021 17:23:22 -0000 1.41 +++ Makefile 17 Apr 2021 00:38:03 -0000 @@ -1,20 +1,19 @@ # $OpenBSD: Makefile,v 1.41 2021/03/22 17:23:22 sthen Exp $ -BROKEN = needs adapting to changes in base\n -BROKEN += (again); this port is closely tied to interfaces in the base OS and really\n -BROKEN += needs an active maintainer! COMMENT = network switch style shell -DISTNAME = nsh-1.0.20201006 +DISTNAME = nsh-1.0.20210416 +#REVISION = 0 GH_ACCOUNT = yellowman GH_PROJECT = nsh -GH_COMMIT = 4b92f9124641caddcce238293919b1ec45b5a20d +GH_COMMIT = 5a237b068794446a016e5a394a802922b9c668cf CATEGORIES = shells net HOMEPAGE = http://www.nmedia.net/nsh/ +MAINTAINER = Tom Smyth <[email protected]> # 3 & 2 clause BSD PERMIT_PACKAGE = Yes Index: distinfo =================================================================== RCS file: /cvs/ports/shells/nsh/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo 4 Feb 2021 22:13:09 -0000 1.13 +++ distinfo 17 Apr 2021 00:38:03 -0000 @@ -1,2 +1,2 @@ -SHA256 (nsh-1.0.20201006-4b92f912.tar.gz) = 4iz3xcEdK8E4I9sG51JPASuviji2O9ooO+6AI1rqQIs= -SIZE (nsh-1.0.20201006-4b92f912.tar.gz) = 130053 +SHA256 (nsh-1.0.20210416-5a237b06.tar.gz) = 4LlJND5E4TIYX8h41MQOITVuDznuS0bKQGToKHvhnls= +SIZE (nsh-1.0.20210416-5a237b06.tar.gz) = 130285 Index: patches/patch-MANUAL =================================================================== RCS file: patches/patch-MANUAL diff -N patches/patch-MANUAL --- patches/patch-MANUAL 4 Feb 2021 22:13:09 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-MANUAL,v 1.3 2021/02/04 22:13:09 naddy Exp $ - -Index: MANUAL ---- MANUAL.orig -+++ MANUAL -@@ -149,6 +149,9 @@ You may even want verbose output to see how nsh parses - - /usr/local/bin/nsh -vi /etc/nshrc | tee /var/run/nsh.out - -+In case you miss it during boot, system console output is also logged in the -+kernel message buffer and can be seen with "dmesg -s". -+ - You are done. When NSH starts from /etc/rc.local, it will automatically load up - the network configuration into the kernel. At this point, you are free to - view and manipulate the configuration from nsh. Index: patches/patch-externs_h =================================================================== RCS file: patches/patch-externs_h diff -N patches/patch-externs_h --- patches/patch-externs_h 4 Feb 2021 22:13:10 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-externs_h,v 1.3 2021/02/04 22:13:10 naddy Exp $ - -Index: externs.h ---- externs.h.orig -+++ externs.h -@@ -87,10 +87,11 @@ char *any_ntoa(const struct sockaddr *); - - /* routesys.c */ - #ifdef _NET_ROUTE_H_ --struct { -+struct rtmsg { - struct rt_msghdr m_rtm; - char m_space[512]; --} m_rtmsg; -+}; -+extern struct rtmsg m_rtmsg; - #endif - #ifdef _WANT_SO_ - union sockunion { Index: patches/patch-kroute_c =================================================================== RCS file: patches/patch-kroute_c diff -N patches/patch-kroute_c --- patches/patch-kroute_c 4 Feb 2021 22:13:10 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-kroute_c,v 1.7 2021/02/04 22:13:10 naddy Exp $ - -Index: kroute.c ---- kroute.c.orig -+++ kroute.c -@@ -62,7 +62,7 @@ static struct rt_metrics rt_metrics; - - /* declared in externs.h */ - union sockunion so_dst, so_gate, so_mask, so_ifp; --struct m_rtmsg; -+struct rtmsg m_rtmsg; - - int rtm_addrs; - u_long rtm_inits;
