commit a221c80d2e9210d507e4f16dc8700b30f78d3989
parent c4a61cf4c2d42869171fb7961d9641b3fcb1227b
Author: vasyahacker <vasya@magicfreedom.com>
Date: Wed, 29 Mar 2023 19:29:16 +0400
fixes and rebranding to openidec
Diffstat:
15 files changed, 172 insertions(+), 166 deletions(-)
diff --git a/www/iigo/Makefile b/www/iigo/Makefile
@@ -1,41 +0,0 @@
-COMMENT = ii/idec node and tools
-
-MODGO_MODNAME = git.openbsd.org.ru/vasyahacker/iigo
-MODGO_VERSION = v0.0.1
-
-DISTNAME = iigo-${MODGO_VERSION}
-#PKGNAME = iigo-v0.0.1
-#DISTFILES = ii-go-v0.0.4.zip
-CATEGORIES = www
-HOMEPAGE = https://github.com/hugeping/ii-go
-MAINTAINER = vasyahacker <vasya@magicfreedom.com>
-
-# MIT
-PERMIT_PACKAGE = Yes
-# If pledge is used, annotate with `uses pledge()' in a comment
-# "make port-lib-depends-check" can help
-WANTLIB = c pthread
-#WRKDIST = ${WRKSRC}
-MODULES = lang/go
-#MODGO_TYPE = bin
-NO_TEST = Yes
-
-do-build:
- cd ${WRKSRC} && make build
-
-do-install:
-# ${MODGO_INSTALL_TARGET}
- ${INSTALL_PROGRAM} ${WRKSRC}/ii-tool ${PREFIX}/bin/ii-tool
- ${INSTALL_PROGRAM} ${WRKSRC}/ii-node ${PREFIX}/bin/ii-node
- ${INSTALL_PROGRAM} ${WRKSRC}/ii-gemini ${PREFIX}/bin/ii-gemini
- ${INSTALL_MAN} ${WRKSRC}/man/iigo.1 ${PREFIX}/man/man1/iigo.1
- ${INSTALL_MAN} ${WRKSRC}/man/ii-tool.1 ${PREFIX}/man/man1/ii-tool.1
- ${INSTALL_MAN} ${WRKSRC}/man/ii-node.1 ${PREFIX}/man/man1/ii-node.1
- ${INSTALL_MAN} ${WRKSRC}/man/ii-gemini.1 ${PREFIX}/man/man1/ii-gemini.1
- ${INSTALL_DATA_DIR} ${PREFIX}/share/iigo/{tpl,style}
- ${INSTALL_DATA} ${WRKSRC}/www/tpl/* ${PREFIX}/share/iigo/tpl/
- ${INSTALL_DATA} ${WRKSRC}/www/style/* ${PREFIX}/share/iigo/style/
-
-.include "modules.inc"
-.include <bsd.port.mk>
-
diff --git a/www/iigo/distinfo b/www/iigo/distinfo
@@ -1,32 +0,0 @@
-SHA256 (go_modules/golang.org/x/crypto/@v/v0.7.0.mod) = yJ/iLnPawmoAplasEf9MbhprbNKrzFftzazew/va2C0=
-SHA256 (go_modules/golang.org/x/crypto/@v/v0.7.0.zip) = d1Snxmt4AP9uR5A8YJqgfQSEUBgmrgR9LuGn1eJP0BI=
-SHA256 (go_modules/golang.org/x/mod/@v/v0.8.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ=
-SHA256 (go_modules/golang.org/x/mod/@v/v0.8.0.zip) = SugXZ5nYzagZ5wcxumhVc1AD5+STBDbjRYTHXJbEluA=
-SHA256 (go_modules/golang.org/x/net/@v/v0.8.0.mod) = 6275vWQFrOPZnkOB0CVs5B+Dxm0aILTigwpMd2JF9xo=
-SHA256 (go_modules/golang.org/x/net/@v/v0.8.0.zip) = wokY3rZokGghxOO12jZDwmL/TMxIsbLgIc4YhpSvnbo=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.5.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.6.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.6.0.zip) = jBWGDjhQ486lpxhrt5uM+Y9RPZrFSYCZ073f1Jxt/D8=
-SHA256 (go_modules/golang.org/x/term/@v/v0.6.0.mod) = ZDWbnGU3CEePAgcpiFBE/z2ABxhtnUQRJf6HSBfnEgE=
-SHA256 (go_modules/golang.org/x/term/@v/v0.6.0.zip) = NpkIStEQSmoKAnoIceZ5hzBNc6arsncMj35c49fB0xQ=
-SHA256 (go_modules/golang.org/x/text/@v/v0.8.0.mod) = Q29ZLne1k7AvvqN04jrTNpyGI/8NKckd594eZnLbmkE=
-SHA256 (go_modules/golang.org/x/text/@v/v0.8.0.zip) = GUuif9enQ9d3jhd4jkNhlJmIWtz2oyLaQJWBSoPnOnc=
-SHA256 (go_modules/golang.org/x/tools/@v/v0.6.0.mod) = gw7Xjc0+mSfEEuJkEjAwhEd0nVE9MQJNJ24kQ7IBZgk=
-SHA256 (go_modules/golang.org/x/tools/@v/v0.6.0.zip) = minIkEwqzUtlgl6RbL2vQXCG81u2jFSvmmKDoOE0HoU=
-SHA256 (iigo-v0.0.1.zip) = yXL407wjoZw++RChub+YYeeen26alwIBvc6+EqDz04c=
-SIZE (go_modules/golang.org/x/crypto/@v/v0.7.0.mod) = 171
-SIZE (go_modules/golang.org/x/crypto/@v/v0.7.0.zip) = 1761498
-SIZE (go_modules/golang.org/x/mod/@v/v0.8.0.mod) = 84
-SIZE (go_modules/golang.org/x/mod/@v/v0.8.0.zip) = 161670
-SIZE (go_modules/golang.org/x/net/@v/v0.8.0.mod) = 123
-SIZE (go_modules/golang.org/x/net/@v/v0.8.0.zip) = 1561602
-SIZE (go_modules/golang.org/x/sys/@v/v0.5.0.mod) = 33
-SIZE (go_modules/golang.org/x/sys/@v/v0.6.0.mod) = 33
-SIZE (go_modules/golang.org/x/sys/@v/v0.6.0.zip) = 1892073
-SIZE (go_modules/golang.org/x/term/@v/v0.6.0.mod) = 67
-SIZE (go_modules/golang.org/x/term/@v/v0.6.0.zip) = 19924
-SIZE (go_modules/golang.org/x/text/@v/v0.8.0.mod) = 215
-SIZE (go_modules/golang.org/x/text/@v/v0.8.0.zip) = 8614767
-SIZE (go_modules/golang.org/x/tools/@v/v0.6.0.mod) = 211
-SIZE (go_modules/golang.org/x/tools/@v/v0.6.0.zip) = 3008760
-SIZE (iigo-v0.0.1.zip) = 56163
diff --git a/www/iigo/pkg/DESCR b/www/iigo/pkg/DESCR
@@ -1,6 +0,0 @@
-II-GO is idec node realization written in golang.
-
-It has no dependencies and very compact.
-You can easy setup it and make your own ii/idec node.
-
-Ported from https://github.com/hugeping/ii-go
-\ No newline at end of file
diff --git a/www/iigo/pkg/MESSAGE b/www/iigo/pkg/MESSAGE
@@ -1 +0,0 @@
-see iigo(1), ii-node(1), ii-tool(1), ii-gemini(1) and /usr/local/share/doc/pkg-readmes/iigo
diff --git a/www/iigo/pkg/PLIST b/www/iigo/pkg/PLIST
@@ -1,32 +0,0 @@
-@rcscript ${RCDIR}/iigod
-@bin bin/ii-gemini
-@bin bin/ii-node
-@bin bin/ii-tool
-@man man/man1/ii-gemini.1
-@man man/man1/ii-node.1
-@man man/man1/ii-tool.1
-@man man/man1/iigo.1
-share/doc/pkg-readmes/${PKGSTEM}
-share/iigo/
-share/iigo/style/
-share/iigo/style/icon.png
-share/iigo/style/style.css
-share/iigo/tpl/
-share/iigo/tpl/blog.tpl
-share/iigo/tpl/edit.tpl
-share/iigo/tpl/error.tpl
-share/iigo/tpl/footer.tpl
-share/iigo/tpl/header.tpl
-share/iigo/tpl/index.tpl
-share/iigo/tpl/links.tpl
-share/iigo/tpl/login.tpl
-share/iigo/tpl/new.tpl
-share/iigo/tpl/pager.tpl
-share/iigo/tpl/preview.tpl
-share/iigo/tpl/profile.tpl
-share/iigo/tpl/query.tpl
-share/iigo/tpl/register.tpl
-share/iigo/tpl/reply.tpl
-share/iigo/tpl/reset.tpl
-share/iigo/tpl/topic.tpl
-share/iigo/tpl/topics.tpl
diff --git a/www/iigo/pkg/README b/www/iigo/pkg/README
@@ -1,35 +0,0 @@
-+-----------------------------------------------------------------------
-| Running ${PKGSTEM} node on OpenBSD
-+-----------------------------------------------------------------------
-
-Running ii-node(1) locally
-==========================================
-
-Prepare croot:
-
-USER_NAME="nobody"
-HD="/var/www/ii-node"
-mkdir -p $HD/usr/{lib,libexec}
-mkdir $HD/etc
-mkdir $HD/tmp
-
-echo "nobody:*:32767:32767:Unprivileged user:/nonexistent:/sbin/nologin" > $HD/etc/passwd
-echo "nogroup:*:32766:" > $HD/etc/group
-
-cp -v /usr/libexec/ld.so ${HD}/usr/libexec
-cp -v /usr/lib/libpthread.so.27.0 ${HD}/usr/lib
-cp -v /usr/lib/libc.so.97.0 ${HD}/usr/lib
-cp -vr /usr/local/share/iigo/* $HD/
-cp -v /usr/local/bin/ii-node ${HD}/
-
-# If need to sync with another node:
-ii-tool -db $HD/db fetch http://hugeping.tk
-ftp -o $HD/list.txt http://hugeping.tk/list.txt
-
-chown -R nobody:nogroup $HD
-
-# Run ii-node:
-rcctl enable iigod
-rcctl start iigod
-
-
diff --git a/www/iigo/pkg/iigod.rc b/www/iigo/pkg/iigod.rc
@@ -1,18 +0,0 @@
-#!/bin/ksh
-
-daemon="/var/www/ii-node/ii-node"
-daemon_execdir="$(dirname $daemon)"
-daemon_flags="-L 127.0.0.1:8080 -sys my.OpenBSD.node"
-daemon_logger="daemon.info"
-
-. /etc/rc.d/rc.subr
-
-rc_bg=YES
-rc_reload=NO
-pexp="./$(basename $daemon) $daemon_flags"
-
-rc_start() {
- rc_exec "/usr/sbin/chroot -u nobody ${daemon_execdir} ./$(basename $daemon) ${daemon_flags} | logger -t ii-node 2>&1"
-}
-
-rc_cmd $1
diff --git a/www/openidec/Makefile b/www/openidec/Makefile
@@ -0,0 +1,36 @@
+COMMENT = ii/idec node and tools
+
+MODGO_MODNAME = git.openbsd.org.ru/vasyahacker/openidec
+MODGO_VERSION = v0.0.0-20230328132727-5c9b00bd7309
+
+DISTNAME = openidec-0.0.1
+CATEGORIES = www
+HOMEPAGE = https://git.openbsd.org.ru/vasyahacker/openidec
+MAINTAINER = vasyahacker <vasya@magicfreedom.com>
+
+# MIT
+PERMIT_PACKAGE = Yes
+# uses unvail()'
+
+WANTLIB = c pthread
+MODULES = lang/go
+NO_TEST = Yes
+
+do-build:
+ cd ${WRKSRC} && make build
+
+do-install:
+# ${MODGO_INSTALL_TARGET}
+ ${INSTALL_PROGRAM} ${WRKSRC}/idecctl ${PREFIX}/bin/idecctl
+ ${INSTALL_PROGRAM} ${WRKSRC}/idecd ${PREFIX}/bin/idecd
+ ${INSTALL_PROGRAM} ${WRKSRC}/idecgmi ${PREFIX}/bin/idecgmi
+ ${INSTALL_MAN} ${WRKSRC}/man/openidec.1 ${PREFIX}/man/man1/openidec.1
+ ${INSTALL_MAN} ${WRKSRC}/man/idecctl.1 ${PREFIX}/man/man1/idecctl.1
+ ${INSTALL_MAN} ${WRKSRC}/man/idecd.1 ${PREFIX}/man/man1/idecd.1
+ ${INSTALL_MAN} ${WRKSRC}/man/idecgmi.1 ${PREFIX}/man/man1/idecgmi.1
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openidec/{tpl,style}
+ ${INSTALL_DATA} ${WRKSRC}/www/tpl/* ${PREFIX}/share/examples/openidec/tpl/
+ ${INSTALL_DATA} ${WRKSRC}/www/style/* ${PREFIX}/share/examples/openidec/style/
+
+.include "modules.inc"
+.include <bsd.port.mk>
+\ No newline at end of file
diff --git a/www/openidec/distinfo b/www/openidec/distinfo
@@ -0,0 +1,32 @@
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.7.0.mod) = yJ/iLnPawmoAplasEf9MbhprbNKrzFftzazew/va2C0=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.7.0.zip) = d1Snxmt4AP9uR5A8YJqgfQSEUBgmrgR9LuGn1eJP0BI=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.8.0.mod) = YkVnRZxumUesSr3gtwNO5h3Ltqk3P1lwCUwLs+gSGWQ=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.8.0.zip) = SugXZ5nYzagZ5wcxumhVc1AD5+STBDbjRYTHXJbEluA=
+SHA256 (go_modules/golang.org/x/net/@v/v0.8.0.mod) = 6275vWQFrOPZnkOB0CVs5B+Dxm0aILTigwpMd2JF9xo=
+SHA256 (go_modules/golang.org/x/net/@v/v0.8.0.zip) = wokY3rZokGghxOO12jZDwmL/TMxIsbLgIc4YhpSvnbo=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.5.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.6.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.6.0.zip) = jBWGDjhQ486lpxhrt5uM+Y9RPZrFSYCZ073f1Jxt/D8=
+SHA256 (go_modules/golang.org/x/term/@v/v0.6.0.mod) = ZDWbnGU3CEePAgcpiFBE/z2ABxhtnUQRJf6HSBfnEgE=
+SHA256 (go_modules/golang.org/x/term/@v/v0.6.0.zip) = NpkIStEQSmoKAnoIceZ5hzBNc6arsncMj35c49fB0xQ=
+SHA256 (go_modules/golang.org/x/text/@v/v0.8.0.mod) = Q29ZLne1k7AvvqN04jrTNpyGI/8NKckd594eZnLbmkE=
+SHA256 (go_modules/golang.org/x/text/@v/v0.8.0.zip) = GUuif9enQ9d3jhd4jkNhlJmIWtz2oyLaQJWBSoPnOnc=
+SHA256 (go_modules/golang.org/x/tools/@v/v0.6.0.mod) = gw7Xjc0+mSfEEuJkEjAwhEd0nVE9MQJNJ24kQ7IBZgk=
+SHA256 (go_modules/golang.org/x/tools/@v/v0.6.0.zip) = minIkEwqzUtlgl6RbL2vQXCG81u2jFSvmmKDoOE0HoU=
+SHA256 (openidec-0.0.1.zip) = LdDpUj+XbB89ntOObMMI0e8YQ14XDUyUvI3eCtV+DE8=
+SIZE (go_modules/golang.org/x/crypto/@v/v0.7.0.mod) = 171
+SIZE (go_modules/golang.org/x/crypto/@v/v0.7.0.zip) = 1761498
+SIZE (go_modules/golang.org/x/mod/@v/v0.8.0.mod) = 84
+SIZE (go_modules/golang.org/x/mod/@v/v0.8.0.zip) = 161670
+SIZE (go_modules/golang.org/x/net/@v/v0.8.0.mod) = 123
+SIZE (go_modules/golang.org/x/net/@v/v0.8.0.zip) = 1561602
+SIZE (go_modules/golang.org/x/sys/@v/v0.5.0.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.6.0.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.6.0.zip) = 1892073
+SIZE (go_modules/golang.org/x/term/@v/v0.6.0.mod) = 67
+SIZE (go_modules/golang.org/x/term/@v/v0.6.0.zip) = 19924
+SIZE (go_modules/golang.org/x/text/@v/v0.8.0.mod) = 215
+SIZE (go_modules/golang.org/x/text/@v/v0.8.0.zip) = 8614767
+SIZE (go_modules/golang.org/x/tools/@v/v0.6.0.mod) = 211
+SIZE (go_modules/golang.org/x/tools/@v/v0.6.0.zip) = 3008760
+SIZE (openidec-0.0.1.zip) = 58853
+\ No newline at end of file
diff --git a/www/iigo/modules.inc b/www/openidec/modules.inc
diff --git a/www/openidec/pkg/DESCR b/www/openidec/pkg/DESCR
@@ -0,0 +1,6 @@
+OpenIDEC is idec node realization written in golang.
+
+It has no dependencies and very compact.
+You can easy setup it and make your own ii/idec node.
+
+Ported from https://github.com/hugeping/ii-go
+\ No newline at end of file
diff --git a/www/openidec/pkg/MESSAGE b/www/openidec/pkg/MESSAGE
@@ -0,0 +1 @@
+ee openidec(1), idecd(1), idecctl(1), idecgmi(1) and /usr/local/share/doc/pkg-readmes/openidec
+\ No newline at end of file
diff --git a/www/openidec/pkg/PLIST b/www/openidec/pkg/PLIST
@@ -0,0 +1,61 @@
+@rcscript ${RCDIR}/idecd
+@bin bin/idecctl
+@bin bin/idecd
+@bin bin/idecgmi
+@man man/man1/idecctl.1
+@man man/man1/idecd.1
+@man man/man1/idecgmi.1
+@man man/man1/openidec.1
+share/doc/pkg-readmes/${PKGSTEM}
+share/examples/openidec/
+@mode 700
+@owner nobody
+@group nogroup
+@sample ${LOCALSTATEDIR}/openidec/
+@mode
+@owner
+@group
+share/examples/openidec/style/
+@sample ${LOCALSTATEDIR}/openidec/style/
+share/examples/openidec/style/icon.png
+@sample ${LOCALSTATEDIR}/openidec/style/icon.png
+share/examples/openidec/style/style.css
+@sample ${LOCALSTATEDIR}/openidec/style/style.css
+share/examples/openidec/tpl/
+@sample ${LOCALSTATEDIR}/openidec/tpl/
+share/examples/openidec/tpl/blog.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/blog.tpl
+share/examples/openidec/tpl/edit.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/edit.tpl
+share/examples/openidec/tpl/error.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/error.tpl
+share/examples/openidec/tpl/footer.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/footer.tpl
+share/examples/openidec/tpl/header.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/header.tpl
+share/examples/openidec/tpl/index.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/index.tpl
+share/examples/openidec/tpl/links.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/links.tpl
+share/examples/openidec/tpl/login.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/login.tpl
+share/examples/openidec/tpl/new.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/new.tpl
+share/examples/openidec/tpl/pager.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/pager.tpl
+share/examples/openidec/tpl/preview.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/preview.tpl
+share/examples/openidec/tpl/profile.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/profile.tpl
+share/examples/openidec/tpl/query.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/query.tpl
+share/examples/openidec/tpl/register.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/register.tpl
+share/examples/openidec/tpl/reply.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/reply.tpl
+share/examples/openidec/tpl/reset.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/reset.tpl
+share/examples/openidec/tpl/topic.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/topic.tpl
+share/examples/openidec/tpl/topics.tpl
+@sample ${LOCALSTATEDIR}/openidec/tpl/topics.tpl
diff --git a/www/openidec/pkg/README b/www/openidec/pkg/README
@@ -0,0 +1,16 @@
++-----------------------------------------------------------------------
+| Running ${PKGSTEM} node on OpenBSD
++-----------------------------------------------------------------------
+
+Running idecd(1) locally from user
+==========================================
+$ mkdir ~/myidecnode
+$ cd ~/myidecnode
+$ cp -r /usr/local/share/examples/openidec/* ./
+$ idecd
+
+Running idecd(1) as system service
+==========================================
+# rcctl enable idecd
+# rcctl set idecd flags -L 127.0.0.1:8080 -sys my.node
+# rcctl start idecd
+\ No newline at end of file
diff --git a/www/openidec/pkg/idecd.rc b/www/openidec/pkg/idecd.rc
@@ -0,0 +1,14 @@
+#!/bin/ksh
+
+daemon="/usr/local/bin/idecd"
+daemon_execdir="/var/openidec"
+daemon_flags="-L 127.0.0.1:8080 -sys my.OpenBSD.node"
+daemon_logger="daemon.info"
+daemon_user="nobody"
+
+. /etc/rc.d/rc.subr
+
+rc_bg=YES
+rc_reload=NO
+
+rc_cmd $1
+\ No newline at end of file
