Check-in [c1df996768]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Bump version
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: c1df996768461285f501f8b5cdf9431e31ba50ef
User & Date: bernd 2019-05-16 14:35:56
Context
2019-05-16
15:03
Bump version check-in: 413becb19f user: bernd tags: trunk
14:35
Bump version check-in: c1df996768 user: bernd tags: trunk
2019-05-15
13:34
Fix install instruction check-in: dd22455066 user: bernd tags: trunk, 0.8.8-20190516
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Makefile.in.

46
47
48
49
50
51
52



















53
54
55
56
57
58
59
...
139
140
141
142
143
144
145






146
147
148
149
150
151
152
	  android/net.fs android/notify.fs linux/net.fs linux/notify.fs	      \
	  dhtroot.fs dvcs.fs qrscan.fs android/qrscan-android.fs	      \
	  linux/qrscan-linux.fs doc/net2o-200.png doc/net2o.png		      \
	  json/parser.fs json/g+-schema.fs json/g+-import.fs		      \
	  json/fb-schema.fs json/twitter-schema.fs json/test.fs		      \
	  json/test.json json/diaspora-schema.fs html/parser.fs xml/parser.fs \
	  xml/blogger-atom.fs




















LANGS =	  lang/en lang/de lang/zh

ifeq "$(FAST)" "yes"
FORTHLIB += ed25519-donnafast.fs keccakfast.fs threefishfast.fs
else
SOURCES += ed25519-donnafast.fs keccakfast.fs threefishfast.fs
................................................................................
	@VERDIR@for i in $(SCRIPTS); do \
	@VERDIR@	$(INSTALL_SCRIPT) ./$$i $(bindir)/$$i-@PACKAGE_VERSION@; \
	@VERDIR@	ln -fs $$i-@PACKAGE_VERSION@ $(bindir)/$$i; \
	@VERDIR@done
	@NOVERDIR@for i in $(SCRIPTS); do \
	@NOVERDIR@	$(INSTALL_SCRIPT) ./$$i $(bindir)/$$i; \
	@NOVERDIR@done







%.dirui:
	$(RMDIR) $(datadir)/gforth/$(GFVER)/$(@:%.dirui=%); \

%.scriptui:
	-@VERDIR@$(RM) $(bindir)/$(@:%.scriptui=%)-@PACKAGE_VERSION@; \
	$(RM) $(bindir)/$(@:%.scriptui=%); \







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







 







>
>
>
>
>
>







46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
...
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
	  android/net.fs android/notify.fs linux/net.fs linux/notify.fs	      \
	  dhtroot.fs dvcs.fs qrscan.fs android/qrscan-android.fs	      \
	  linux/qrscan-linux.fs doc/net2o-200.png doc/net2o.png		      \
	  json/parser.fs json/g+-schema.fs json/g+-import.fs		      \
	  json/fb-schema.fs json/twitter-schema.fs json/test.fs		      \
	  json/test.json json/diaspora-schema.fs html/parser.fs xml/parser.fs \
	  xml/blogger-atom.fs

ICONS = icons/hicolor/128x128/apps/net2o.png				      \
	icons/hicolor/16x16/apps/net2o.png				      \
	icons/hicolor/192x192/apps/net2o.png				      \
	icons/hicolor/22x22/apps/net2o.png icons/hicolor/24x24/apps/net2o.png \
	icons/hicolor/256x256/apps/net2o.png				      \
	icons/hicolor/32x32/apps/net2o.png icons/hicolor/36x36/apps/net2o.png \
	icons/hicolor/48x48/apps/net2o.png icons/hicolor/64x64/apps/net2o.png \
	icons/hicolor/72x72/apps/net2o.png				      \
	icons/hicolor/scalable/apps/net2o.svg
ICONDIRS = icons/hicolor/128x128/apps/ icons/hicolor/16x16/apps/	\
	icons/hicolor/192x192/apps/ icons/hicolor/22x22/apps/		\
	icons/hicolor/24x24/apps/ icons/hicolor/256x256/apps/		\
	icons/hicolor/32x32/apps/ icons/hicolor/36x36/apps/		\
	icons/hicolor/48x48/apps/ icons/hicolor/64x64/apps/		\
	icons/hicolor/72x72/apps/ icons/hicolor/scalable/apps/

DESKTOP = applications/net2o.desktop
DESKTOPDIR = applications

LANGS =	  lang/en lang/de lang/zh

ifeq "$(FAST)" "yes"
FORTHLIB += ed25519-donnafast.fs keccakfast.fs threefishfast.fs
else
SOURCES += ed25519-donnafast.fs keccakfast.fs threefishfast.fs
................................................................................
	@VERDIR@for i in $(SCRIPTS); do \
	@VERDIR@	$(INSTALL_SCRIPT) ./$$i $(bindir)/$$i-@PACKAGE_VERSION@; \
	@VERDIR@	ln -fs $$i-@PACKAGE_VERSION@ $(bindir)/$$i; \
	@VERDIR@done
	@NOVERDIR@for i in $(SCRIPTS); do \
	@NOVERDIR@	$(INSTALL_SCRIPT) ./$$i $(bindir)/$$i; \
	@NOVERDIR@done
	for i in $(ICONDIRS) $(DESKTOPDIR); do \
		$(MKDIR) -p $(datadir)/$$i; \
	done
	for i in $(ICONS) $(DESKTOP); do \
		$(INSTALL_DATA) ./$$i $(datadir)/$$i; \
	done

%.dirui:
	$(RMDIR) $(datadir)/gforth/$(GFVER)/$(@:%.dirui=%); \

%.scriptui:
	-@VERDIR@$(RM) $(bindir)/$(@:%.scriptui=%)-@PACKAGE_VERSION@; \
	$(RM) $(bindir)/$(@:%.scriptui=%); \

Added applications/net2o.desktop.



























>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
[Desktop Entry]
Categories=Network
Comment=net2o GUI
Exec=n2o gui
GenericName=net2o GUI
Icon=net2o
Name=net2o
StartupNotify=true
StartupWMClass=net2o-gui
Terminal=false
Type=Application
Version=1.0
X-MultipleArgs=false

Changes to configure.ac.

11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU Affero General Public License for more details.

# You should have received a copy of the GNU Affero General Public License
# along with this program.  If not, see <http://www.gnu.org/licenses/>.

AC_INIT([net2o], [0.8.8-20190509], [bernd@net2o.de], [net2o], [https://fossil.net2o.de/net2o/reportlist])
AC_PREREQ([2.59])
AC_CONFIG_MACRO_DIR([m4])
AC_USE_SYSTEM_EXTENSIONS
LT_INIT

AC_MSG_CHECKING([for gforth])








|







11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU Affero General Public License for more details.

# You should have received a copy of the GNU Affero General Public License
# along with this program.  If not, see <http://www.gnu.org/licenses/>.

AC_INIT([net2o], [0.8.8-20190516], [bernd@net2o.de], [net2o], [https://fossil.net2o.de/net2o/reportlist])
AC_PREREQ([2.59])
AC_CONFIG_MACRO_DIR([m4])
AC_USE_SYSTEM_EXTENSIONS
LT_INIT

AC_MSG_CHECKING([for gforth])

Changes to debian/rules.

23
24
25
26
27
28
29


30
31
32
33
34
35
	dh_auto_install -- DESTDIR=$(DL)
	mkdir -p $(D)/usr/share/doc/
	mkdir -p $(DT)/usr/share/gforth/$(GFORTH_VER)/net2o-$(NET2O_VER)/
	mkdir -p $(DG)/usr/share/gforth/$(GFORTH_VER)/net2o-$(NET2O_VER)/
	mv $(DL)/usr/share/gforth/$(GFORTH_VER)/net2o-$(NET2O_VER)/tests $(DT)/usr/share/gforth/$(GFORTH_VER)/net2o-$(NET2O_VER)/
	mv $(DL)/usr/share/gforth $(D)/usr/share/
	mv $(D)/usr/share/gforth/$(GFORTH_VER)/net2o-$(NET2O_VER)/{gui*.fs,qrscan.fs,doc} $(DG)/usr/share/gforth/$(GFORTH_VER)/net2o-$(NET2O_VER)/


	mv $(DL)/usr/bin $(D)/usr/

override_dh_installchangelogs:
	fossil timeline --verbose --limit 200  | gzip >$(D)/usr/share/doc/net2o/changelog.gz
	rm -rf $(DL)/usr/share/doc
	rm -rf $(DT)/usr/share/doc







>
>






23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
	dh_auto_install -- DESTDIR=$(DL)
	mkdir -p $(D)/usr/share/doc/
	mkdir -p $(DT)/usr/share/gforth/$(GFORTH_VER)/net2o-$(NET2O_VER)/
	mkdir -p $(DG)/usr/share/gforth/$(GFORTH_VER)/net2o-$(NET2O_VER)/
	mv $(DL)/usr/share/gforth/$(GFORTH_VER)/net2o-$(NET2O_VER)/tests $(DT)/usr/share/gforth/$(GFORTH_VER)/net2o-$(NET2O_VER)/
	mv $(DL)/usr/share/gforth $(D)/usr/share/
	mv $(D)/usr/share/gforth/$(GFORTH_VER)/net2o-$(NET2O_VER)/{gui*.fs,qrscan.fs,doc} $(DG)/usr/share/gforth/$(GFORTH_VER)/net2o-$(NET2O_VER)/
	mv $(DL)/usr/share/icons $(DG)/usr/share
	mv $(DL)/usr/share/applications $(DG)/usr/share
	mv $(DL)/usr/bin $(D)/usr/

override_dh_installchangelogs:
	fossil timeline --verbose --limit 200  | gzip >$(D)/usr/share/doc/net2o/changelog.gz
	rm -rf $(DL)/usr/share/doc
	rm -rf $(DT)/usr/share/doc

Changes to do.

1
2
3
4
5
6
7
8
9
10
11
12
#!/bin/bash

echo "This script builds net2o from scratch"

GFORTH=gforth-0.7.9_20190509

if [ "$(uname -o)" = "Cygwin" ]
then
    CONFOPT="--prefix=/usr $*"
else
    CONFOPT="$*"
fi




|







1
2
3
4
5
6
7
8
9
10
11
12
#!/bin/bash

echo "This script builds net2o from scratch"

GFORTH=gforth-0.7.9_20190516

if [ "$(uname -o)" = "Cygwin" ]
then
    CONFOPT="--prefix=/usr $*"
else
    CONFOPT="$*"
fi

Changes to gui.fs.

239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
....
1087
1088
1089
1090
1091
1092
1093




1094
1095
1096
1097


1098
1099
1100
1101
1102
1103
1104
	' net2o-logo "doc/net2o.png" 0.666e }}image-file Constant net2o-glue /center
	!i18n l" net2o GUI" /title
	!lit
	\footnote cbl dark-blue net2o-version }}text /center
	{{
	    {{
		glue*ll }}glue
		\large "👤" }}text \normal
		{{
		    glue*l pw-bg-col# font-size# f2/ f2/ }}frame dup .button3
		    {{
			nt
			whitish \bold
			"nick" }}edit 25%b dup to nick-field
			glue*lll }}glue \regular
		    }}h bx-tab nick-field ' nick-done edit[]
		}}z box[] blackish
		{{ \large "👤" }}text \normal }}h /phantom
		glue*ll }}glue
	    }}h box[]
................................................................................

\ top widgets

: !widgets ( -- )
    top-widget .htop-resize
    pw-field engage
    1e ambient% sf! set-uniforms ;





: net2o-gui ( -- )
    [IFDEF] x11
	dpy win l" net2o GUI" locale@ x11:XStoreName drop


    [THEN]
    n2o-frame to top-widget
    "PASSPHRASE" getenv 2dup d0= IF  2drop
    ELSE
	>passphrase +key  read-keys
	"PASSPHRASE" getenv erase \ erase passphrase after use!
    THEN







|




|







 







>
>
>
>




>
>







239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
....
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
	' net2o-logo "doc/net2o.png" 0.666e }}image-file Constant net2o-glue /center
	!i18n l" net2o GUI" /title
	!lit
	\footnote cbl dark-blue net2o-version }}text /center
	{{
	    {{
		glue*ll }}glue
		blackish \large "👤" }}text \normal
		{{
		    glue*l pw-bg-col# font-size# f2/ f2/ }}frame dup .button3
		    {{
			nt
			blackish \bold
			"nick" }}edit 25%b dup to nick-field
			glue*lll }}glue \regular
		    }}h bx-tab nick-field ' nick-done edit[]
		}}z box[] blackish
		{{ \large "👤" }}text \normal }}h /phantom
		glue*ll }}glue
	    }}h box[]
................................................................................

\ top widgets

: !widgets ( -- )
    top-widget .htop-resize
    pw-field engage
    1e ambient% sf! set-uniforms ;

[IFDEF] x11
    x11:XClassHint buffer: net2o-wm-class
[THEN]

: net2o-gui ( -- )
    [IFDEF] x11
	dpy win l" net2o GUI" locale@ x11:XStoreName drop
	"net2o-gui\0" drop dup net2o-wm-class 2!
	dpy win net2o-wm-class x11:XSetClassHint drop
    [THEN]
    n2o-frame to top-widget
    "PASSPHRASE" getenv 2dup d0= IF  2drop
    ELSE
	>passphrase +key  read-keys
	"PASSPHRASE" getenv erase \ erase passphrase after use!
    THEN

Added icons/hicolor/scalable/apps/net2o.svg.

















































































































































































































































































































































































































































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="128"
   height="128"
   id="svg2"
   version="1.1"
   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
   sodipodi:docname="net2o.svg"
   inkscape:export-filename="/home/bernd/proj/net2o/doc/net2o-logo.png"
   inkscape:export-xdpi="9.9513416"
   inkscape:export-ydpi="9.9513416">
  <defs
     id="defs4">
    <inkscape:path-effect
       effect="spiro"
       id="path-effect2991"
       is_visible="true" />
    <filter
       inkscape:collect="always"
       id="filter3848">
      <feGaussianBlur
         inkscape:collect="always"
         stdDeviation="3.3128697"
         id="feGaussianBlur3850" />
    </filter>
    <filter
       inkscape:collect="always"
       id="filter3852">
      <feGaussianBlur
         inkscape:collect="always"
         stdDeviation="2.479818"
         id="feGaussianBlur3854" />
    </filter>
    <filter
       inkscape:collect="always"
       id="filter3856">
      <feGaussianBlur
         inkscape:collect="always"
         stdDeviation="2.7469831"
         id="feGaussianBlur3858" />
    </filter>
    <filter
       inkscape:collect="always"
       id="filter3864">
      <feGaussianBlur
         inkscape:collect="always"
         stdDeviation="3.5555928"
         id="feGaussianBlur3866" />
    </filter>
    <filter
       inkscape:collect="always"
       id="filter3876">
      <feGaussianBlur
         inkscape:collect="always"
         stdDeviation="4.833946"
         id="feGaussianBlur3878" />
    </filter>
  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="5.7142119"
     inkscape:cx="63.667368"
     inkscape:cy="67.700362"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
     showgrid="false"
     inkscape:object-paths="true"
     inkscape:snap-smooth-nodes="false"
     inkscape:window-width="1920"
     inkscape:window-height="1064"
     inkscape:window-x="0"
     inkscape:window-y="0"
     inkscape:window-maximized="1"
     fit-margin-top="0"
     fit-margin-left="0"
     fit-margin-right="0"
     fit-margin-bottom="0"
     inkscape:snap-global="true" />
  <metadata
     id="metadata7">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     inkscape:label="Ebene 1"
     inkscape:groupmode="layer"
     id="layer1"
     transform="translate(-98.912421,-725.36643)">
    <g
       id="g60"
       transform="matrix(0.20973634,0,0,0.20973634,82.704662,667.22801)">
      <path
         inkscape:connector-curvature="0"
         id="path3034"
         d="m 202.6715,823.24836 c -57.71776,-7.6426 -85.2904,-23.11311 -96.25224,-54.00541 -4.27325,-12.04274 -4.81723,-16.41579 -4.77494,-38.38579 0.0353,-18.35454 0.33798,-22.39981 2.24596,-30.0186 7.02611,-28.05626 22.31009,-46.42473 48.8984,-58.76673 14.97152,-6.94961 28.2808,-10.73745 58.92144,-16.76915 25.30891,-4.98213 31.75742,-7.28982 36.64724,-13.11472 0.829,-0.98754 1.17766,-3.74044 0.97306,-7.68307 l -0.31884,-6.14412 14.17791,4.49501 c 7.96547,2.5254 19.71133,7.26424 26.80614,10.81488 16.10301,8.05885 32.67104,14.57329 47.75201,18.77579 6.53965,1.82235 11.53991,3.62154 11.11168,3.99819 -0.42824,0.37665 -6.25656,5.66665 -12.95183,11.75556 -10.5585,9.60225 -13.30854,11.54599 -20.73231,14.65364 -11.78984,4.93533 -22.47874,7.87558 -52.45236,14.42837 -14.16739,3.09725 -30.30458,7.013 -35.86042,8.70167 -27.7741,8.4418 -44.8131,22.51526 -49.43688,40.83267 -4.44409,17.60558 -5.84398,40.78561 -3.09946,51.32251 3.61907,13.89457 9.93843,21.48247 30.81806,37.00446 6.9448,5.16279 12.81632,9.56149 13.04781,9.77489 0.51735,0.47693 1.45933,0.57829 -15.52043,-1.67005 z"
         style="fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3864)" />
      <path
         inkscape:connector-curvature="0"
         id="path3040"
         d="m 591.52747,850.96384 c -13.99933,-1.92086 -23.61232,-4.81474 -34.15193,-10.28103 -7.6368,-3.96076 -7.48992,-5.23352 0.60695,-5.2594 7.89278,-0.0253 19.89156,-2.9442 27.96545,-6.80323 14.59565,-6.97623 24.44423,-20.44437 27.80873,-38.02902 1.90269,-9.94446 1.8909,-13.02034 -0.0866,-22.59378 -3.16564,-15.32597 -11.78301,-27.54362 -28.64752,-40.61631 -7.94446,-6.15823 -20.78931,-13.46429 -46.02304,-26.17761 -25.24181,-12.71739 -36.40699,-19.07371 -39.54812,-22.51468 -2.29107,-2.50978 -30.56849,-46.83765 -30.94383,-48.50776 -0.1203,-0.53529 4.4691,-2.74989 10.19867,-4.92132 5.72957,-2.17143 14.06427,-5.59465 18.52154,-7.60717 6.66026,-3.00719 11.01338,-4.08962 24.43287,-6.07541 8.98079,-1.32896 17.53383,-2.6293 19.00675,-2.88966 l 2.67802,-0.47337 -0.52965,5.84115 c -0.40565,4.47356 -0.0649,6.88717 1.45535,10.30883 4.67321,10.51804 11.82648,15.61118 47.21678,33.61841 38.74024,19.71174 57.05962,33.16578 66.57884,48.89651 8.29188,13.70253 10.25994,24.26845 8.80527,47.2728 -3.86035,61.04816 -26.26955,94.03136 -65.74811,96.77204 -3.61129,0.2507 -7.92969,0.2687 -9.59645,0.04 v 10e-6 z"
         style="fill:#ff00ff;fill-opacity:1;stroke:#ff00ff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3848)" />
      <path
         inkscape:connector-curvature="0"
         id="path3038"
         d="m 441.51982,847.33709 c 21.65257,-11.21571 27.20206,-18.37672 28.06696,-36.21733 0.25706,-5.30255 -0.0786,-15.07577 -0.74596,-21.71828 -0.66735,-6.64252 -1.61057,-16.39571 -2.09606,-21.67375 -1.58185,-17.19733 -6.11625,-26.43512 -23.76329,-48.41229 -13.47285,-16.77874 -20.98072,-27.92932 -23.70139,-35.20097 -2.33526,-6.24155 -3.56866,-15.05282 -4.59228,-32.80683 l -0.68433,-11.86929 3.90919,-0.0176 c 6.92896,-0.0313 29.87626,-4.30442 40.27468,-7.4998 2.77792,-0.85364 5.57767,-1.55699 6.22167,-1.56301 1.2394,-0.0116 26.64499,39.64515 38.49794,60.09315 17.42012,30.05216 20.07192,38.56331 21.1129,67.76353 0.63959,17.94072 0.26063,21.23369 -3.94295,34.26187 -10.78642,33.43043 -39.95735,55.57618 -76.0317,57.72115 l -9.09137,0.54056 6.56599,-3.40108 v 0 z"
         style="fill:#00ffff;fill-opacity:1;stroke:#00ffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3852)" />
      <path
         inkscape:connector-curvature="0"
         id="path3036"
         d="m 363.233,848.97202 c -56.69814,-8.6845 -90.87668,-31.10168 -99.99772,-65.58693 -4.70654,-17.79473 1.66795,-52.53639 13.80824,-75.25636 10.15358,-19.00193 28.12344,-36.95277 46.79353,-46.74399 1.66675,-0.8741 5.53058,-3.95632 8.5863,-6.84939 3.05571,-2.89306 8.83172,-8.19332 12.83558,-11.77835 l 7.27976,-6.51823 9.38777,1.69209 c 5.61884,1.01276 17.56346,1.91184 29.75211,2.23946 l 20.36434,0.54737 0.76678,11.7347 c 1.40146,21.44805 1.41515,21.3237 -2.98283,27.09352 -2.15257,2.82402 -7.34518,7.79666 -11.53912,11.05032 -19.29899,14.97212 -29.98314,24.23136 -35.15596,30.46733 -21.48062,25.89546 -27.30013,60.50964 -15.31804,91.11088 5.09716,13.01771 18.45329,28.51304 30.57155,35.46806 l 5.05076,2.89877 -5.55584,-0.0884 c -3.05571,-0.0486 -9.64696,-0.715 -14.64721,-1.4809 v 3e-5 z"
         style="fill:#00ff00;fill-opacity:1;stroke:#00ff00;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3856)" />
      <path
         transform="translate(98.912421,319.77677)"
         inkscape:connector-curvature="0"
         id="path4023"
         d="m 203.36109,194.67051 c -8.05532,-28.26701 -5.6506,-58.14556 6.61403,-82.17901 7.75757,-15.201531 23.92716,-28.422544 38.6135,-31.5722 7.40868,-1.588877 19.46727,-0.71484 26.14386,1.894971 11.79169,4.609259 22.32527,17.484749 25.97311,31.747649 4.73515,18.51426 1.48477,36.15162 -11.72713,63.63431 l -6.58835,13.70473 -1.60127,-3.18439 c -2.16284,-4.30121 -10.20801,-10.17033 -16.77062,-12.23452 -6.4137,-2.01736 -20.00808,-2.23894 -27.57956,-0.44954 -12.93743,3.05757 -23.56572,10.3713 -28.53787,19.638 l -2.77885,5.17902 z"
         style="fill:#ffffff;fill-opacity:1;stroke:none" />
      <path
         inkscape:connector-curvature="0"
         id="path3030"
         d="m 335.95728,572.63138 c -8.94073,-7.85007 -21.85364,-26.82213 -27.99777,-41.13521 -3.55046,-8.27097 -3.59367,-8.53099 -2.13109,-12.82341 6.59656,-19.35986 39.65573,-30.25617 61.4811,-20.26418 5.57917,2.55423 12.32296,8.79536 13.17592,12.19384 0.90478,3.60492 -18.60593,35.82717 -34.25925,56.5797 l -6.56397,8.70224 z"
         style="fill:#003c43;fill-opacity:1;stroke:none" />
      <path
         inkscape:connector-curvature="0"
         id="path3032"
         d="m 465.65978,588.94399 c -12.1679,-2.1967 -24.44354,-15.96305 -30.75416,-34.48885 -2.73842,-8.03907 -6.52013,-27.27198 -6.51401,-33.12876 0.0106,-10.13357 13.54673,-20.72342 29.90427,-23.39531 8.49239,-1.38718 19.00786,0.30449 28.28032,4.54956 12.53432,5.7384 23.14508,20.52772 26.20609,36.52616 2.31754,12.11272 2.10276,13.34762 -3.78009,21.73378 -13.91212,19.83211 -30.37471,30.54451 -43.34242,28.20342 z"
         style="fill:#003c43;fill-opacity:1;stroke:none" />
      <path
         transform="translate(98.912421,319.77677)"
         inkscape:connector-curvature="0"
         id="path4025"
         d="m 415.68226,228.4915 c -0.0537,-5.47286 -2.91824,-16.74003 -5.8253,-22.91244 -8.43436,-17.90822 -23.62345,-27.73348 -43.16938,-27.92466 -14.02861,-0.13722 -26.96805,5.30004 -33.70907,14.16484 l -3.29093,4.32774 0.0198,-9.32774 c 0.024,-11.31642 1.22703,-20.11464 4.55699,-33.32774 7.69804,-30.54542 19.08726,-48.7655 35.20513,-56.319947 5.19185,-2.433419 6.77638,-2.675437 17.21807,-2.629863 10.05738,0.04389 12.36091,0.388576 18.36283,2.747654 22.55902,8.866916 31.63717,26.987376 31.63717,63.149486 0,15.56122 -0.84079,21.80659 -4.64047,34.4695 -2.68826,8.95895 -9.39795,24.64976 -13.71936,32.08317 -2.58216,4.44166 -2.61646,4.46111 -2.64549,1.5 v 0 z"
         style="fill:#ffffff;fill-opacity:1;stroke:none" />
      <path
         sodipodi:nodetypes="sscsssssssssssscssssssscsssssccssssssss"
         inkscape:connector-curvature="0"
         id="path3024"
         d="m 383.70758,623.2486 c -40.06798,-2.07849 -78.06244,-9.16658 -119.12889,-22.2242 l -15.8218,-5.03074 -0.59422,-3.784 c -1.01783,-6.48159 -5.51457,-44.64446 -6.63525,-56.31194 -1.55084,-16.14594 -1.31323,-47.94692 0.45222,-60.52356 5.29333,-37.7085 20.24991,-66.2693 49.2705,-94.086 29.3892,-28.17002 64.64662,-48.04469 99.58948,-56.13879 12.95606,-3.00111 37.21381,-3.68036 50.82204,-1.42308 34.59073,5.73779 68.86702,25.296 98.01974,55.93052 47.87853,50.31214 56.18408,105.94556 26.86925,179.97949 -5.14632,12.99693 -18.64274,41.56766 -21.11064,44.68937 -1.06214,1.34355 -6.03262,2.45313 -21.08768,4.70753 -10.83389,1.62229 -24.69823,4.10784 -30.80965,5.52343 -32.94993,7.63219 -71.48219,10.68149 -109.8351,8.69197 z m -56.94674,-27.24681 c -0.27481,0 2.62974,-3.75019 6.45454,-8.33376 20.28549,-24.30969 42.03701,-57.84884 56.50458,-87.12565 6.69205,-13.54216 8.91524,-19.36808 11.90285,-31.19172 9.82459,-38.88151 -10.39482,-72.27455 -43.79985,-72.33693 -14.74027,-0.0275 -27.27533,5.61079 -39.15742,17.61316 -9.8585,9.95828 -16.15264,21.64344 -20.16047,37.42817 -4.84631,19.08706 -4.16999,45.96658 1.62136,64.43895 1.08145,3.44945 1.97214,7.2945 1.97931,8.54457 0.007,1.25006 0.36645,2.27284 0.7984,2.27284 0.43195,0 2.10655,3.06834 3.72133,6.81853 5.47986,12.72652 17.73092,30.56003 27.1999,39.59411 2.00681,1.91463 3.64874,3.90707 3.64874,4.42764 0,0.52057 -4.3184,6.06453 -9.59645,12.31992 -5.27805,6.25539 -9.59645,11.7027 -9.59645,12.10515 42.84513,-33.01775 107.04952,-54.57899 8.47963,-6.57498 z m 157.16959,-8.37102 c 17.3914,-8.1507 37.94084,-37.44413 48.43606,-69.04607 4.64971,-14.00064 6.13485,-23.49903 6.10985,-39.07608 -0.0625,-38.99951 -12.09443,-59.4957 -38.95906,-66.36651 -26.07506,-6.66888 -45.50166,3.23457 -58.49795,29.82157 -9.51479,19.46478 -14.67492,42.87233 -14.71734,66.76124 -0.065,36.58656 11.00477,66.86495 28.11071,76.8897 10.09112,5.91379 18.45326,6.20166 29.51773,1.01615 z"
         style="fill:#ffff00;fill-opacity:1;stroke:#ffff00;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3876)" />
      <path
         inkscape:connector-curvature="0"
         id="path3042"
         d="m 554.39609,798.91706 c 6.87134,-7.04708 9.82204,-11.4802 11.9291,-17.92215 4.57409,-13.98446 -3.97144,-26.1648 -31.40824,-44.76766 -9.74479,-6.60721 -12.51379,-8.9975 -12.97083,-11.19687 -1.0954,-5.27121 -6.76551,-17.65 -13.28986,-29.01397 -3.59001,-6.25299 -6.52729,-11.49637 -6.52729,-11.65195 0,-0.15558 3.52291,1.74123 7.82869,4.21515 4.30577,2.47391 17.34023,9.27446 28.96546,15.11233 22.93129,11.51545 32.64877,16.90541 40.48252,22.45428 15.55867,11.02066 28.41012,26.00371 27.45561,32.00953 -0.96241,6.05549 -7.0407,19.94265 -11.92508,27.24541 -8.76146,13.09947 -17.40935,17.69637 -34.72343,18.45773 l -11.11167,0.48862 z"
         style="fill:#800000;fill-opacity:1;stroke:none" />
      <path
         inkscape:connector-curvature="0"
         id="path3044"
         d="m 436.59355,794.39759 c 0.2173,-0.50104 1.90015,-3.80043 3.73967,-7.33198 5.91992,-11.36523 7.39217,-19.38995 7.347,-40.04601 l -0.0398,-18.18275 2.02005,2.52538 c 4.06138,5.07735 10.0365,15.82939 12.07467,21.728 2.9966,8.67238 4.52723,25.90364 2.62455,29.54621 -2.03477,3.89545 -6.54653,7.95194 -10.83844,9.74476 -4.28628,1.79047 -17.51309,3.36601 -16.92775,2.01639 v 0 z"
         style="fill:#008000;fill-opacity:1;stroke:none" />
      <path
         inkscape:connector-curvature="0"
         id="path3046"
         d="m 358.88193,794.64786 c -3.95035,-1.43124 -9.56989,-6.66865 -13.06722,-12.17864 -2.22692,-3.50848 -2.42986,-4.62925 -1.82915,-10.10152 1.99508,-18.17429 9.19794,-36.31339 18.6896,-47.06638 l 3.12082,-3.53554 -0.77641,9.59645 c -1.37268,16.96622 -0.83558,36.16507 1.20103,42.93149 1.93075,6.41471 5.05828,13.41483 7.95185,17.79802 l 1.74659,2.64574 -3.18629,0.63726 c -4.66491,0.93298 -10.04938,0.65041 -13.85082,-0.72688 z"
         style="fill:#0000ff;fill-opacity:1;stroke:none" />
      <path
         inkscape:connector-curvature="0"
         id="path3048"
         d="m 228.39474,799.4332 c -10.84552,-3.20483 -17.68945,-7.12446 -26.05452,-14.92186 -10.78115,-10.04951 -18.49213,-23.55202 -23.71819,-41.53235 -2.95308,-10.16011 2.30557,-24.70219 12.77239,-35.32031 12.25982,-12.43705 27.57489,-18.47741 71.81116,-28.32279 16.4595,-3.66329 32.90146,-7.57944 36.53769,-8.70256 3.63624,-1.12312 6.77432,-1.87906 6.97351,-1.67987 0.19918,0.19919 -2.35854,2.70941 -5.68384,5.57828 -8.72857,7.53047 -16.7828,17.15166 -23.27783,27.80655 -5.27891,8.65989 -5.95,9.35796 -9.59644,9.98219 -6.07981,1.0408 -13.67909,4.22866 -19.85941,8.33093 -18.12439,12.03028 -25.11981,33.55077 -17.92944,55.15754 2.22547,6.68744 7.99575,17.06012 12.78421,22.98097 l 2.65512,3.28299 -4.42261,-0.0537 c -2.43244,-0.0296 -8.27875,-1.19324 -12.9918,-2.58594 v -3e-5 z"
         style="fill:#800080;fill-opacity:1;stroke:none" />
      <path
         sodipodi:nodetypes="ccczzccccccccccccccc"
         inkscape:connector-curvature="0"
         id="path2985"
         d="M 222.85714,826.6479 C 145.27264,819.2617 97.585145,804.03289 100,729.50504 98.805037,599.73865 257.04509,640.83584 248.57143,603.79075 c -9.14846,-81.96732 -32.54011,-166.54454 57.14285,-237.14286 89.68296,-70.59831 168.30253,-52.5459 228.57143,5.71429 60.2689,58.26019 69.69893,127.34346 11.42858,234.28572 -22.37058,49.83435 123.8359,49.18876 122.85714,134.28571 -1.71055,132.84332 -84.62147,121.149 -122.85714,94.28572 40.40862,0.25836 64.81141,-14.96724 68.57142,-54.28572 0.84315,-58.82914 -83.75367,-75.55284 -116.47932,-101.5301 18.56728,33.26194 28.85213,40.96377 27.9079,95.81582 -10.78045,60.74294 -54.31854,77.45484 -97.14286,77.14285 44.90365,-20.65854 43.6863,-26.4874 37.14286,-82.85714 0.52711,-38.90586 -45.91634,-60.13457 -50.59173,-96.96954 -7.05474,24.88168 -66.47637,35.19186 -72.26542,99.82668 -1.83294,33.49508 9.53497,61.70982 45.71429,80 C 314.45458,848.79852 260.33012,820.09809 260,766.6479 c 3.17139,-37.14286 15.91042,-82.39667 67.24438,-108.42785 -46.87728,28.15576 -140.07001,15.28448 -150.10152,74.14213 -11.56054,59.31155 5.2265,64.78509 45.71428,94.28572 z"
         style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
      <path
         sodipodi:nodetypes="czzzcc"
         inkscape:connector-curvature="0"
         inkscape:original-d="m 339.89349,577.63921 c 0,0 -57.92487,-60.07268 -42.86733,-113.52216 15.05754,-53.44948 46.72423,-77.49075 82.97384,-60.3263 36.2496,17.16445 20.41015,65.52908 5.71429,102.85714 -14.69587,37.32806 -66.61414,96.02339 -66.61414,96.02339 42.61648,-4.42594 77.71475,-7.80389 93.27627,-11.01087"
         inkscape:path-effect="#path-effect2991"
         id="path2989"
         d="m 339.89349,577.63921 c -31.98365,-27.50116 -48.69054,-71.74468 -42.86733,-113.52216 2.79572,-20.05733 10.99214,-40.1155 26.47262,-53.17181 7.74024,-6.52816 17.1926,-11.13331 27.21072,-12.60484 10.01812,-1.47153 20.57952,0.28828 29.2905,5.45035 8.17958,4.84717 14.51146,12.5378 18.36368,21.23037 3.85222,8.69258 5.30037,18.34585 4.90049,27.84536 -0.79976,18.99901 -8.73302,36.93312 -17.54988,53.78141 -18.10883,34.60446 -40.54281,66.94274 -66.61414,96.02339 l 93.27627,-11.01087"
         style="fill:none;stroke:#000000;stroke-width:20;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
      <path
         sodipodi:nodetypes="zzzzz"
         inkscape:connector-curvature="0"
         id="path2993"
         d="M 462.85714,589.50504 C 429.1357,578.73933 422.98712,516.79929 428.57143,486.6479 c 5.58431,-30.15139 19.32543,-80.17197 62.85714,-74.28571 43.53171,5.88626 47.67818,43.47914 45.71428,80 -1.9639,36.52085 -40.56426,107.90855 -74.28571,97.14285 z"
         style="fill:none;stroke:#000000;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
      <path
         sodipodi:nodetypes="cczc"
         inkscape:connector-curvature="0"
         id="path2996"
         d="m 175.76654,737.19459 c 11.55419,46.82838 37.97244,65.5802 73.74114,66.67007 0,0 -28.70154,-26.09117 -19.1929,-57.5787 9.50864,-31.48753 43.21196,-33.91857 43.21196,-33.91857"
         style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
      <path
         sodipodi:nodetypes="ccc"
         inkscape:connector-curvature="0"
         id="path3000"
         d="m 342.67133,779.61988 c 11.70857,21.40056 22.52077,17.64794 35.12572,16.16356 -17.62469,-24.54367 -13.5722,-45.71651 -10.17197,-78.14453"
         style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
      <path
         sodipodi:nodetypes="ccc"
         inkscape:connector-curvature="0"
         id="path3002"
         d="m 466.99328,780.59698 c -7.29462,15.80598 -20.10398,15.06775 -32.62769,15.18646 16.87925,-26.38257 12.60575,-42.37246 11.41956,-71.33581"
         style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
      <path
         sodipodi:nodetypes="ccc"
         inkscape:connector-curvature="0"
         id="path3004"
         d="m 608.8426,756.02001 c -13.84623,50.97059 -37.96087,50.5991 -62.35007,48.8548 43.15025,-35.45052 8.11886,-53.80031 -24.51103,-76.18529"
         style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
      <path
         inkscape:connector-curvature="0"
         id="path3050"
         d="m 375.85991,637.72586 c -24.9043,-2.66979 -59.45387,-12.79553 -78.34534,-22.96134 -5.73607,-3.08668 -5.81073,-3.09292 14.70572,1.23051 32.15719,6.77649 59.93455,9.53833 96.46957,9.59175 25.35341,0.0371 45.48155,-1.47766 64.31624,-4.84007 4.62811,-0.82622 10.23302,-1.75538 12.45536,-2.06479 3.92527,-0.54651 3.96852,-0.52075 1.51523,0.90258 -1.38896,0.80584 -9.34392,3.74024 -17.67767,6.52091 -16.40643,5.47421 -34.69361,9.57427 -50.21528,11.25845 -9.16986,0.99497 -35.27954,1.21364 -43.22383,0.362 z"
         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    </g>
  </g>
</svg>

Changes to rng.fs.

96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
...
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145

: read-initrng ( fd -- flag )  { fd }
    #0. fd reposition-file throw
    rng-key c:key# fd read-file throw c:key# =
    ['] c:diffuse rng-exec  fd close-file throw ;

: write-initrng ( -- )
    init-rng$ $@ dirname $1FF init-dir drop
    init-rng$ $@ r/w create-file throw >r
    rng-buffer c:key# r@ write-file throw
    r> close-file throw  rng-step ;

\ Sanity check

$Variable check-rng$
................................................................................
    rng-key $20 \ check only first 256 bits
    check-rng$ $@ file-status nip no-file# <> IF
	check-rng$ $@ check-old$ $slurp-file
	check-old$ $@ 2over search nip nip !!bad-rng!!
	check-rng$ $@ w/o open-file throw >r
	r@ file-size throw r@ reposition-file throw
    ELSE
	check-rng$ $@ dirname $1FF init-dir drop
	check-rng$ $@ w/o create-file throw >r
    THEN
    2dup check-old$ $+!
    r@ write-file throw  r> close-file throw
    check-old$ $@ rngstat fdup .9e f>
    IF    f. cr check-old$ $@ dump true !!bad-rng!!
    ELSE  health( ." RNG seeded, health check passed " f. cr )else( fdrop )







|







 







|







96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
...
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145

: read-initrng ( fd -- flag )  { fd }
    #0. fd reposition-file throw
    rng-key c:key# fd read-file throw c:key# =
    ['] c:diffuse rng-exec  fd close-file throw ;

: write-initrng ( -- )
    init-rng$ $@ dirname '/' -skip $1FF init-dir drop
    init-rng$ $@ r/w create-file throw >r
    rng-buffer c:key# r@ write-file throw
    r> close-file throw  rng-step ;

\ Sanity check

$Variable check-rng$
................................................................................
    rng-key $20 \ check only first 256 bits
    check-rng$ $@ file-status nip no-file# <> IF
	check-rng$ $@ check-old$ $slurp-file
	check-old$ $@ 2over search nip nip !!bad-rng!!
	check-rng$ $@ w/o open-file throw >r
	r@ file-size throw r@ reposition-file throw
    ELSE
	check-rng$ $@ dirname '/' -skip $1FF init-dir drop
	check-rng$ $@ w/o create-file throw >r
    THEN
    2dup check-old$ $+!
    r@ write-file throw  r> close-file throw
    check-old$ $@ rngstat fdup .9e f>
    IF    f. cr check-old$ $@ dump true !!bad-rng!!
    ELSE  health( ." RNG seeded, health check passed " f. cr )else( fdrop )

Changes to wiki/commands.md.

1
2
3
4
5
6
7
8
9
10
# Commands #

Version 0.8.8-20190509.

net2o separates data and commands.  Data is passed through to higher
layers, commands are interpreted when they arrive.  For connection
requests, a special bit is set, and the address then isn't used as
address, but as IV for the opportunistic encoding.

The command interpreter is a stack machine with two data types: 64


|







1
2
3
4
5
6
7
8
9
10
# Commands #

Version 0.8.8-20190516.

net2o separates data and commands.  Data is passed through to higher
layers, commands are interpreted when they arrive.  For connection
requests, a special bit is set, and the address then isn't used as
address, but as IV for the opportunistic encoding.

The command interpreter is a stack machine with two data types: 64