Mercurial > hg > Members > kono > nitros9-code

changeset 2727:f4870404ccc9 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjusted makefile to populate inetd.conf with port number for telnet
author Boisy Pitre <boisy.pitre@nuance.com>
date Tue, 31 Jul 2012 13:56:20 -0500
parents 3a6484c23f54
children 09c66281e12a
files level1/atari/sys/inetd.conf level1/atari/sys/makefile level1/coco1/sys/makefile level1/coco2/sys/makefile level1/coco2b/sys/makefile level1/sys/inetd.conf level2/coco3/sys/makefile level2/coco3_6309/sys/makefile
diffstat 8 files changed, 100 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/level1/atari/sys/inetd.conf	Tue Jul 31 12:06:34 2012 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# inetd configuration file format:
-# ListenPort <server opts>,Process,Params
-# valid server options are: telnet auth protect banner 
-
-# the follow line causes inetd to listen on port 6809 and spawn 'login' for a new connection
-# the options cause telnet protocol processing on the server, they use the server's IP address and geolocation protection
-# to prevent undesired hosts from connecting, and cause the server to display a banner to the client prior to announcing
-# the connection to the coco. Adding auth would cause the server to use it's own authentication prior to connecting the coco
-# (this feature may be removed in favor of a more secure coco side authentication solution)
-
-6810 telnet protect banner,login,
--- a/level1/atari/sys/makefile	Tue Jul 31 12:06:34 2012 -0500
+++ b/level1/atari/sys/makefile	Tue Jul 31 13:56:20 2012 -0500
@@ -1,5 +1,6 @@
 PORT = atari
 include $(NITROS9DIR)/rules.mak
+TELNET_PORT	= 6802
 
 vpath %.hp	$(LEVEL1)/sys
 
@@ -22,6 +23,9 @@
 ALLOBJS		= $(SYSFILES) $(HELPMSG)
 
 
+inetd.conf:	$(LEVEL1)/sys/inetd.conf
+	@sed 's/%TELNET_PORT%/$(TELNET_PORT)/' $^ > $@
+
 all:	$(ALLOBJS) $(DEPENDS)
 
 alldragon: $(ALLOBJS)
@@ -30,7 +34,7 @@
 	$(MERGE) $^ > $@
 
 clean:
-	$(RM) $(HELPMSG)
+	$(RM) $(HELPMSG) inetd.conf
 
 showobjs:
 	@$(ECHO) $(ALLOBJS)
--- a/level1/coco1/sys/makefile	Tue Jul 31 12:06:34 2012 -0500
+++ b/level1/coco1/sys/makefile	Tue Jul 31 13:56:20 2012 -0500
@@ -2,12 +2,13 @@
         PORT=coco1
 endif
 include $(NITROS9DIR)/rules.mak
+TELNET_PORT	= 6803
 
 vpath %.hp	$(LEVEL1)/sys
 
 DEPENDS		= ./makefile
 
-SYSFILES	= ../../sys/errmsg ../../sys/motd ../../sys/password ../../sys/inetd.conf
+SYSFILES	= ../../sys/errmsg ../../sys/motd ../../sys/password inetd.conf
 HELPFILES	= asm.hp attr.hp backup.hp binex.hp build.hp chd.hp \
 		chx.hp cmp.hp cobbler.hp config.hp copy.hp cputype.hp date.hp \
 		dcheck.hp debug.hp ded.hp deiniz.hp del.hp deldir.hp devs.hp \
@@ -26,13 +27,16 @@
 
 all:	$(ALLOBJS) $(DEPENDS)
 
+inetd.conf:     $(LEVEL1)/sys/inetd.conf
+	@sed 's/%TELNET_PORT%/$(TELNET_PORT)/' $^ > $@
+
 alldragon: $(ALLOBJS)
 
 helpmsg: $(HELPFILES)
 	$(MERGE) $^ > $@
 
 clean:
-	$(RM) $(HELPMSG)
+	$(RM) $(HELPMSG) inetd.conf
 
 showobjs:
 	@$(ECHO) $(ALLOBJS)
--- a/level1/coco2/sys/makefile	Tue Jul 31 12:06:34 2012 -0500
+++ b/level1/coco2/sys/makefile	Tue Jul 31 13:56:20 2012 -0500
@@ -1,2 +1,40 @@
-PORT=coco2
-include ../../coco1/sys/makefile
+ifeq ($(PORT),)
+        PORT=coco1
+endif
+include $(NITROS9DIR)/rules.mak
+TELNET_PORT	= 6804
+
+vpath %.hp	$(LEVEL1)/sys
+
+DEPENDS		= ./makefile
+
+SYSFILES	= ../../sys/errmsg ../../sys/motd ../../sys/password inetd.conf
+HELPFILES	= asm.hp attr.hp backup.hp binex.hp build.hp chd.hp \
+		chx.hp cmp.hp cobbler.hp config.hp copy.hp cputype.hp date.hp \
+		dcheck.hp debug.hp ded.hp deiniz.hp del.hp deldir.hp devs.hp \
+		dir.hp dirsort.hp disasm.hp display.hp dmode.hp dsave.hp dump.hp echo.hp \
+		edit.hp error.hp ex.hp exbin.hp format.hp free.hp gfx.hp \
+		help.hp ident.hp iniz.hp inkey.hp irqs.hp kill.hp link.hp \
+		list.hp load.hp login.hp makdir.hp \
+		mdir.hp megaread.hp merge.hp mpi.hp mfree.hp os9gen.hp \
+		padrom.hp park.hp procs.hp prompt.hp pwd.hp pxd.hp \
+	 	rename.hp save.hp setime.hp \
+		setpr.hp shell.hp sleep.hp tee.hp tmode.hp touch.hp tsmon.hp \
+		tuneport.hp unlink.hp verify.hp xmode.hp
+HELPMSG		= helpmsg
+ALLOBJS		= $(SYSFILES) $(HELPMSG)
+
+
+all:	$(ALLOBJS) $(DEPENDS)
+
+inetd.conf:     $(LEVEL1)/sys/inetd.conf
+	@sed 's/%TELNET_PORT%/$(TELNET_PORT)/' $^ > $@
+
+helpmsg: $(HELPFILES)
+	$(MERGE) $^ > $@
+
+clean:
+	$(RM) $(HELPMSG) inetd.conf
+
+showobjs:
+	@$(ECHO) $(ALLOBJS)
--- a/level1/coco2b/sys/makefile	Tue Jul 31 12:06:34 2012 -0500
+++ b/level1/coco2b/sys/makefile	Tue Jul 31 13:56:20 2012 -0500
@@ -1,2 +1,40 @@
-PORT=coco2b
-include ../../coco1/sys/makefile
+ifeq ($(PORT),)
+        PORT=coco1
+endif
+include $(NITROS9DIR)/rules.mak
+TELNET_PORT	= 6805
+
+vpath %.hp	$(LEVEL1)/sys
+
+DEPENDS		= ./makefile
+
+SYSFILES	= ../../sys/errmsg ../../sys/motd ../../sys/password inetd.conf
+HELPFILES	= asm.hp attr.hp backup.hp binex.hp build.hp chd.hp \
+		chx.hp cmp.hp cobbler.hp config.hp copy.hp cputype.hp date.hp \
+		dcheck.hp debug.hp ded.hp deiniz.hp del.hp deldir.hp devs.hp \
+		dir.hp dirsort.hp disasm.hp display.hp dmode.hp dsave.hp dump.hp echo.hp \
+		edit.hp error.hp ex.hp exbin.hp format.hp free.hp gfx.hp \
+		help.hp ident.hp iniz.hp inkey.hp irqs.hp kill.hp link.hp \
+		list.hp load.hp login.hp makdir.hp \
+		mdir.hp megaread.hp merge.hp mpi.hp mfree.hp os9gen.hp \
+		padrom.hp park.hp procs.hp prompt.hp pwd.hp pxd.hp \
+	 	rename.hp save.hp setime.hp \
+		setpr.hp shell.hp sleep.hp tee.hp tmode.hp touch.hp tsmon.hp \
+		tuneport.hp unlink.hp verify.hp xmode.hp
+HELPMSG		= helpmsg
+ALLOBJS		= $(SYSFILES) $(HELPMSG)
+
+
+all:	$(ALLOBJS) $(DEPENDS)
+
+inetd.conf:     $(LEVEL1)/sys/inetd.conf
+	@sed 's/%TELNET_PORT%/$(TELNET_PORT)/' $^ > $@
+
+helpmsg: $(HELPFILES)
+	$(MERGE) $^ > $@
+
+clean:
+	$(RM) $(HELPMSG) inetd.conf
+
+showobjs:
+	@$(ECHO) $(ALLOBJS)
--- a/level1/sys/inetd.conf	Tue Jul 31 12:06:34 2012 -0500
+++ b/level1/sys/inetd.conf	Tue Jul 31 13:56:20 2012 -0500
@@ -8,4 +8,4 @@
 # the connection to the coco. Adding auth would cause the server to use it's own authentication prior to connecting the coco
 # (this feature may be removed in favor of a more secure coco side authentication solution)
 
-6809 telnet protect banner,login,
+%TELNET_PORT% telnet protect banner,login,
--- a/level2/coco3/sys/makefile	Tue Jul 31 12:06:34 2012 -0500
+++ b/level2/coco3/sys/makefile	Tue Jul 31 13:56:20 2012 -0500
@@ -1,12 +1,13 @@
 PORT = coco3
 include $(NITROS9DIR)/rules.mak
+TELNET_PORT	= 6806
 
 vpath %.hp $(LEVEL2)/sys:$(LEVEL1)/sys
 vpath %.asm $(LEVEL2)/sys
 
 DEPENDS		= ./makefile
 
-L1TXTFILES	= errmsg password inetd.conf
+L1TXTFILES	= errmsg password
 L2TXTFILES	= $(NITROS9DIR)/level2/sys/motd
 BINFILES	= stdfonts stdpats_2 stdpats_4 stdpats_16 stdptrs \
 		ibmedcfont isolatin1font
@@ -38,7 +39,7 @@
 HELPMSG		= helpmsg
 
 TEXTFILES	= $(L2TXTFILES) $(HELPMSG) $(L1TXTFILES)
-ALLOBJS		= $(TEXTFILES) $(BINFILES)
+ALLOBJS		= $(TEXTFILES) $(BINFILES) inetd.conf
 
 all:	$(ALLOBJS) $(DEPENDS)
 
@@ -48,8 +49,11 @@
 $(L1TXTFILES): $(LEVEL1)/sys/$@
 	-$(SOFTLINK) $(LEVEL1)/sys/$@
 
+inetd.conf:     $(LEVEL1)/sys/inetd.conf
+	@sed 's/%TELNET_PORT%/$(TELNET_PORT)/' $^ > $@
+
 clean:
-	$(RM) $(HELPMSG) $(L1TXTFILES) $(BINFILES)
+	$(RM) $(HELPMSG) $(L1TXTFILES) $(BINFILES) inetd.conf
 
 showbinobjs:
 	@$(ECHO) $(BINFILES)
--- a/level2/coco3_6309/sys/makefile	Tue Jul 31 12:06:34 2012 -0500
+++ b/level2/coco3_6309/sys/makefile	Tue Jul 31 13:56:20 2012 -0500
@@ -1,1 +1,2 @@
+TELNET_PORT	= 6807
 include ../../coco3/sys/makefile