Skip to content
Snippets Groups Projects
Commit a1ff7cd6 authored by m j's avatar m j
Browse files

Revert "Merge branch 'master' of https://gitlab.synchro.net/sbbs/sbbs" 

This reverts commit 9d6b6c2f
parent 9d6b6c2f
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 711 additions and 1212 deletions
.gitattributes
+ 0
− 19
View file @ a1ff7cd6
*.ssjs gitlab-language=javascript *.ssjs gitlab-language=javascript
*.js text
*.ssjs text
*.src text
*.inc text
*.ini text
*.cfg text
*.html text
*.xml text
*.txt text
*.TXT text
*.json text
*.bat text
*.mak text
*.mk text
makefile text
Makefile text
GNUmakefile text
*.bin -text
*.cnf -text
.gitignore
+ 3
− 4
View file @ a1ff7cd6
...@@ -15,8 +15,8 @@ gcc.* ...@@ -15,8 +15,8 @@ gcc.*
*.lib *.lib
*.map *.map
*.dcu *.dcu
*.drc src/sbbs3/ctrl/*.drc
*.tds src/sbbs3/ctrl/*.tds
src/sbbs3/ctrl/sbbsctrl.mak src/sbbs3/ctrl/sbbsctrl.mak
3rdp/src 3rdp/src
localdefs.mk localdefs.mk
...@@ -27,4 +27,3 @@ node4 ...@@ -27,4 +27,3 @@ node4
*.?.cnf *.?.cnf
ctrl/recycle ctrl/recycle
exec/*.bin exec/*.bin
\ No newline at end of file
exec/*.so
.gitlab-ci.yml
+ 39
− 189
View file @ a1ff7cd6
.rules: # This file is a template, and might need editing before it works on your project.
rules: # use the official gcc image, based on debian
- changes: # can use verions as well, like gcc:5.2
- src/**/* # see https://hub.docker.com/_/gcc/
- 3rdp/**/*
- ctrl/text.dat
sbbs-linux:
tags: [Linux]
image: gcc image: gcc
# cache outputs to reduce the build time
cache:
paths:
- "**/*.o"
build-sbbs:
stage: build stage: build
extends: .rules # instead of calling g++ directly you can also use some build toolkit like make
# install the necessary build tools when needed
# before_script:
# - apt update && apt -y install make autoconf
script: script:
- cd src/sbbs3 - cd src/sbbs3
- make all
- make gtkutils
- make RELEASE=1 all - make RELEASE=1 all
- make RELEASE=1 gtkutils - make RELEASE=1 gtkutils
artifacts: artifacts:
name: sbbs-linux-x64 name: sbbs
paths: paths:
- "src/sbbs3/*.exe.release/*" - "src/sbbs3/*.release/*"
- "src/sbbs3/*.lib.release/*" - "src/sbbs3/*/*.release/*"
- "src/sbbs3/*/*.exe.release/*"
sexpots-linux: build-sexpots:
tags: [Linux]
image: gcc
stage: build stage: build
extends: .rules # instead of calling g++ directly you can also use some build toolkit like make
# install the necessary build tools when needed
# before_script:
# - apt update && apt -y install make autoconf
script: script:
- cd src/sexpots - cd src/sexpots
- make RELEASE=1 - make RELEASE=1
artifacts: artifacts:
name: sexpots-linux-x64 name: sexpots
paths: paths:
- "src/sexpots/*.exe.release/*" - "src/sexpots/*.release/*"
syncterm-linux: build-syncterm:
tags: [Linux]
image: gcc
stage: build stage: build
extends: .rules # instead of calling g++ directly you can also use some build toolkit like make
# install the necessary build tools when needed
# before_script:
# - apt update && apt -y install make autoconf
script: script:
- cd src/syncterm - cd src/syncterm
- make RELEASE=1 - make RELEASE=1
artifacts: artifacts:
name: syncterm-linux-x64 name: syncterm
paths:
- "src/syncterm/*.exe.release/*"
sbbs-windows:
tags: [Windows]
stage: build
extends: .rules
script:
- cd src/xpdev
- make
- cd ../../src/sbbs3
- .\release.bat
- cd ctrl
- .\build.bat
- cd ../chat
- .\build.bat
- cd ../useredit
- .\build.bat
- cd ../../../xtrn/sbj
- make
- cd ../tbd
- make
artifacts:
name: sbbs-win32
paths:
- "src/sbbs3/*.exe.release/*.exe"
- "src/sbbs3/*.dll.release/*.dll"
- "src/sbbs3/*/*.exe.release/*.exe"
- "src/sbbs3/*/*.exe"
- "xtrn/*/*.exe"
sexpots-windows:
tags: [Windows]
stage: build
extends: .rules
script:
- cd src/sexpots
- .\release.bat
artifacts:
name: sexpots-win32
paths: paths:
- "src/sexpots/Release/*.exe" - "src/syncterm/*.release/*"
.syncterm-msvc: # run tests using the binary built before
tags: [Windows] #test:
stage: build # stage: test
extends: .rules # script:
script: # - ./runmytests.sh
- cd src/syncterm
- .\release.bat
artifacts:
name: syncterm-msvc
paths:
- "src/syncterm/Release/*.exe"
sbbs-freebsd:
tags: [FreeBSD]
stage: build
extends: .rules
script:
- cd src/sbbs3
- gmake RELEASE=1 all
artifacts:
name: sbbs-freebsd-amd64
paths:
- "src/sbbs3/*.exe.release/*"
- "src/sbbs3/*.lib.release/*"
- "src/sbbs3/*/*.exe.release/*"
syncterm-freebsd:
tags: [FreeBSD]
stage: build
extends: .rules
script:
- cd src/syncterm
- gmake RELEASE=1
artifacts:
name: syncterm-freebsd-amd64
paths:
- "src/syncterm/*.exe.release/*"
syncterm-windows:
tags: [FreeBSD]
stage: build
extends: .rules
script:
- cd src/syncterm
- gmake AR=mingw32-ar CC=mingw32-gcc CXX=mingw32-g++ RANLIB=mingw32-ranlib RELEASE=1 STATIC_CRYPTLIB=yes USE_SDL=1 VERBOSE=please WINDRES=mingw32-windres
artifacts:
name: syncterm-win32
paths:
- "src/syncterm/*.exe.release/*"
syncdraw-freebsd:
tags: [FreeBSD]
stage: build
extends: .rules
script:
- cd src/syncdraw
- gmake RELEASE=1
artifacts:
name: syncdraw-freebsd-amd64
paths:
- "src/syncdraw/*.exe.release/*"
syncdraw-linux:
tags: [Linux]
image: gcc
stage: build
extends: .rules
script:
- cd src/syncdraw
- make RELEASE=1
artifacts:
name: syncdraw-linux-x64
paths:
- "src/syncdraw/*.exe.release/*"
jsdoor-freebsd:
tags: [FreeBSD]
stage: build
extends: .rules
script:
- cd src/sbbs3
- gmake RELEASE=1 jsdoor
artifacts:
name: jsdoor-freebsd-amd64
paths:
- "src/sbbs3/*.exe.release/*"
jsdoor-linux:
tags: [Linux]
image: gcc
stage: build
extends: .rules
script:
- cd src/sbbs3
- make RELEASE=1 jsdoor
artifacts:
name: jsdoor-linux-x64
paths:
- "src/sbbs3/*.exe.release/*"
sexpots-freebsd:
tags: [FreeBSD]
stage: build
extends: .rules
script:
- cd src/sexpots
- gmake RELEASE=1
artifacts:
name: sexpots-freebsd-amd64
paths:
- "src/sexpots/*.exe.release/*"
jsdoor-windows:
tags: [FreeBSD]
stage: build
extends: .rules
script:
- cd src/sbbs3
- gmake AR=mingw32-ar CC=mingw32-gcc CXX=mingw32-g++ JSINCLUDE=../../3rdp/win32.release/mozjs/include/ JSLIB=mozjs JSLIBDIR=../../3rdp/win32.release/mozjs/bin/ RANLIB=mingw32-ranlib RELEASE=1 VERBOSE=please WINDRES=mingw32-windres jsdoor
artifacts:
name: jsdoor-win32
paths:
- "src/sbbs3/*.exe.release/*"
3rdp/build/GNUmakefile
+ 45
− 48
View file @ a1ff7cd6
...@@ -48,15 +48,14 @@ $(JS_SRC): | $(3RDPSRCDIR) ...@@ -48,15 +48,14 @@ $(JS_SRC): | $(3RDPSRCDIR)
$(JS_IDIR): | $(3RDPODIR) $(JS_IDIR): | $(3RDPODIR)
$(QUIET)$(IFNOTEXIST) mkdir $(JS_IDIR) $(QUIET)$(IFNOTEXIST) mkdir $(JS_IDIR)
$(JSLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/libmozjs.tgz $(3RDP_ROOT)$(DIRSEP)build/js_src_jsnativestack_cpp.patch $(3RDP_ROOT)$(DIRSEP)build/js-configure.patch $(3RDP_ROOT)$(DIRSEP)build/js-configure.in.patch $(3RDP_ROOT)$(DIRSEP)build/imacro-asm-fix.patch | $(JS_SRC) $(JS_IDIR) $(JSLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/libmozjs.tgz $(3RDP_ROOT)$(DIRSEP)build/js_src_jsnativestack_cpp.patch $(3RDP_ROOT)$(DIRSEP)build/js-configure.patch $(3RDP_ROOT)$(DIRSEP)build/js-configure.in.patch | $(JS_SRC) $(JS_IDIR)
@echo Creating $@ ... @echo Creating $@ ...
$(QUIET)-rm -rf $(JS_SRC)/* $(QUIET)-rm -rf $(JS_SRC)/*
$(QUIET)tar -xzC $(JS_SRC) -f $(3RDPDISTDIR)$(DIRSEP)libmozjs.tgz $(QUIET)tar -xzC $(JS_SRC) -f $(3RDPDISTDIR)$(DIRSEP)libmozjs.tgz
$(QUIET)echo "pthread_np.h" >> $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src$(DIRSEP)config$(DIRSEP)system-headers $(QUIET)echo "pthread_np.h" >> $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src$(DIRSEP)config$(DIRSEP)system-headers
$(QUIET)patch -b -p0 -d $(JS_SRC)$(DIRSEP)js-1.8.5 < js_src_jsnativestack_cpp.patch $(QUIET)patch -p0 -d $(JS_SRC)$(DIRSEP)js-1.8.5 < js_src_jsnativestack_cpp.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-configure.patch $(QUIET)patch -p0 -d $(JS_SRC) < js-configure.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < js-configure.in.patch $(QUIET)patch -p0 -d $(JS_SRC) < js-configure.in.patch
$(QUIET)patch -b -p0 -d $(JS_SRC) < imacro-asm-fix.patch
-$(QUIET)cd $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src && autoconf-2.13 -$(QUIET)cd $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src && autoconf-2.13
$(QUIET)cd $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src && env $(JS_CONFIGURE_ENV) ./configure $(JS_CONFIGURE_ARGS) $(QUIET)cd $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src && env $(JS_CONFIGURE_ENV) ./configure $(JS_CONFIGURE_ARGS)
$(QUIET)$(MAKE) -C $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src $(QUIET)$(MAKE) -C $(JS_SRC)$(DIRSEP)js-1.8.5$(DIRSEP)js$(DIRSEP)src
...@@ -68,53 +67,51 @@ $(CRYPT_SRC): | $(3RDPSRCDIR) ...@@ -68,53 +67,51 @@ $(CRYPT_SRC): | $(3RDPSRCDIR)
$(CRYPT_IDIR): | $(3RDPODIR) $(CRYPT_IDIR): | $(3RDPODIR)
$(QUIET)$(IFNOTEXIST) mkdir $(CRYPT_IDIR) $(QUIET)$(IFNOTEXIST) mkdir $(CRYPT_IDIR)
$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-noasm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zz-country.patch $(3RDP_ROOT)$(DIRSEP)build/cl-algorithms.patch $(3RDP_ROOT)$(DIRSEP)build/cl-allow-duplicate-ext.patch $(3RDP_ROOT)$(DIRSEP)build/cl-macosx-minver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-endian.patch $(3RDP_ROOT)$(DIRSEP)build/cl-cryptodev.patch $(3RDP_ROOT)$(DIRSEP)build/cl-posix-me-gently.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tpm-linux.patch $(3RDP_ROOT)$(DIRSEP)build/cl-PAM-noprompts.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zlib.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bigger-maxattribute.patch $(3RDP_ROOT)$(DIRSEP)build/cl-vcxproj.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw-vcver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-build-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-gcc-non-const-time-val.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-odbc.patch $(3RDP_ROOT)$(DIRSEP)build/cl-noasm-defines.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bn-noasm64-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-RSA-suites.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ECC-RSA.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC-harder.patch $(3RDP_ROOT)$(DIRSEP)build/cl-more-RSA-ECC-fixes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-DH-key-init.patch $(3RDP_ROOT)$(DIRSEP)build/cl-clear-GCM-flag.patch $(3RDP_ROOT)$(DIRSEP)build/cl-use-ssh-ctr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-list-ctr-modes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-incCtr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssl-suite-blocksizes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-tpm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-via-aes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ssh-ecc-ephemeral.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-just-use-cc.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-learn-numbers.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-no-safe-stack.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-allow-pkcs12.patch | $(CRYPT_SRC) $(CRYPT_IDIR) $(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-noasm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zz-country.patch $(3RDP_ROOT)$(DIRSEP)build/cl-algorithms.patch $(3RDP_ROOT)$(DIRSEP)build/cl-allow-duplicate-ext.patch $(3RDP_ROOT)$(DIRSEP)build/cl-macosx-minver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-endian.patch $(3RDP_ROOT)$(DIRSEP)build/cl-cryptodev.patch $(3RDP_ROOT)$(DIRSEP)build/cl-posix-me-gently.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tpm-linux.patch $(3RDP_ROOT)$(DIRSEP)build/cl-PAM-noprompts.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zlib.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bigger-maxattribute.patch $(3RDP_ROOT)$(DIRSEP)build/cl-vcxproj.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw-vcver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-build-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-gcc-non-const-time-val.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-odbc.patch $(3RDP_ROOT)$(DIRSEP)build/cl-noasm-defines.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bn-noasm64-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-RSA-suites.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ECC-RSA.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC-harder.patch $(3RDP_ROOT)$(DIRSEP)build/cl-more-RSA-ECC-fixes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-DH-key-init.patch $(3RDP_ROOT)$(DIRSEP)build/cl-clear-GCM-flag.patch $(3RDP_ROOT)$(DIRSEP)build/cl-use-ssh-ctr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-list-ctr-modes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-incCtr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssl-suite-blocksizes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-tpm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-via-aes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ssh-ecc-ephemeral.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-just-use-cc.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-learn-numbers.patch | $(CRYPT_SRC) $(CRYPT_IDIR)
@echo Creating $@ ... @echo Creating $@ ...
$(QUIET)-rm -rf $(CRYPT_SRC)/* $(QUIET)-rm -rf $(CRYPT_SRC)/*
$(QUIET)unzip -oa $(3RDPDISTDIR)$(DIRSEP)cryptlib.zip -d $(CRYPT_SRC) $(QUIET)unzip -oa $(3RDPDISTDIR)$(DIRSEP)cryptlib.zip -d $(CRYPT_SRC)
$(QUIET)perl -pi.bak -e 's/\r//' $(CRYPT_SRC)/crypt32.vcxproj $(QUIET)perl -pi.bak -e 's/\r//' $(CRYPT_SRC)/crypt32.vcxproj
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < terminal-params.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < terminal-params.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-mingw32-static.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-mingw32-static.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-ranlib.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-ranlib.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-vcxproj.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-vcxproj.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-endian.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-endian.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-win32-noasm.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-win32-noasm.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-zz-country.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-zz-country.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-algorithms.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-algorithms.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-allow-duplicate-ext.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-allow-duplicate-ext.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-macosx-minver.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-macosx-minver.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-cryptodev.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-cryptodev.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-posix-me-gently.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-posix-me-gently.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-tpm-linux.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-tpm-linux.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-PAM-noprompts.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-PAM-noprompts.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-zlib.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-zlib.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < Dynamic-linked-static-lib.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < Dynamic-linked-static-lib.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < SSL-fix.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < SSL-fix.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-bigger-maxattribute.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-bigger-maxattribute.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-mingw-vcver.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-mingw-vcver.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-win32-build-fix.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-win32-build-fix.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-gcc-non-const-time-val.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-gcc-non-const-time-val.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-no-odbc.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-no-odbc.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-noasm-defines.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-noasm-defines.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-bn-noasm64-fix.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-bn-noasm64-fix.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-no-RSA-suites.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-no-RSA-suites.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-fix-ECC-RSA.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-fix-ECC-RSA.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-prefer-ECC.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-prefer-ECC.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-prefer-ECC-harder.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-prefer-ECC-harder.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-more-RSA-ECC-fixes.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-more-RSA-ECC-fixes.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-DH-key-init.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-DH-key-init.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-clear-GCM-flag.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-clear-GCM-flag.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-use-ssh-ctr.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-use-ssh-ctr.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-ssh-list-ctr-modes.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-ssh-list-ctr-modes.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-ssh-incCtr.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-ssh-incCtr.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-ssl-suite-blocksizes.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-ssl-suite-blocksizes.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-no-tpm.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-no-tpm.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-no-via-aes.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-no-via-aes.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-fix-ssh-ecc-ephemeral.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-fix-ssh-ecc-ephemeral.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-just-use-cc.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-just-use-cc.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-learn-numbers.patch $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-learn-numbers.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-no-safe-stack.patch
$(QUIET)patch -b -p0 -d $(CRYPT_SRC) < cl-allow-pkcs12.patch
ifeq ($(CC),mingw32-gcc) ifeq ($(CC),mingw32-gcc)
$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make directories $(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make directories
$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make toolscripts $(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make toolscripts
......
3rdp/build/cl-allow-pkcs12.patch deleted 100644 → 0
+ 0
− 20
View file @ 9d6b6c2f
--- misc/config.h.orig 2021-01-25 23:06:22.266896000 -0500
+++ misc/config.h 2021-01-25 23:31:45.451504000 -0500
@@ -494,7 +494,7 @@
indirectly as a result of any use of cryptlib with this change made. If
you receive the code with the safety features already disabled, you must
immediately obtain and use an original, unmodified version */
-/* #define USE_PKCS12 */
+#define USE_PKCS12
/* Going beyond the PKCS #12 read capability which exists solely to allow
the import of keys supplied in that format by third parties, cryptlib has
a PKCS #12 write capability. This exists purely to allow the export of
@@ -509,7 +509,7 @@
PKCS #12 read capability, as well as the fact that PKCS #12 write is an
unsupported facility with special-case usage restrictions that doesn't
work like any normal keyset */
-/* #define USE_PKCS12_WRITE */
+#define USE_PKCS12_WRITE
#define USE_PKCS15
#define USE_PGPKEYS
3rdp/build/cl-no-safe-stack.patch deleted 100644 → 0
+ 0
− 31
View file @ 9d6b6c2f
--- tools/getlibs.sh.orig 2021-01-24 07:40:21.569115000 -0500
+++ tools/getlibs.sh 2021-01-24 07:40:42.823333000 -0500
@@ -59,9 +59,9 @@
if hasSubstring "$BUILDOPTS" "sanitize=safe-stack" ; then
CLANG_VER="$(clang -dumpversion | tr -d '.' | cut -c 1-2)" ;
- if [ $CLANG_VER -gt 47 ] ; then
- LDARGS="$LDARGS -fsanitize=safe-stack" ;
- fi ;
+ #if [ $CLANG_VER -gt 47 ] ; then
+ # LDARGS="$LDARGS -fsanitize=safe-stack" ;
+ #fi ;
fi
# Add any libraries needed by optional components. In the case of zlib use
--- tools/ccopts.sh.orig 2020-11-26 02:40:05.222021000 -0500
+++ tools/ccopts.sh 2021-01-24 07:41:02.126230000 -0500
@@ -358,9 +358,9 @@
# tools/getlibs.sh also for clang 4.7 or newer.
if [ $ISCLANG -gt 0 ] && [ $ISSPECIAL -eq 0 ] ; then
CLANG_VER="$($CC -dumpversion | sed -E 's/^([0-9]+)$/\1.0/' | sed -E 's/^([0-9]+)\.([0-9]).*$/\1\2/')" ;
- if [ $CLANG_VER -gt 42 ] ; then
- CCARGS="$CCARGS -fsanitize=safe-stack" ;
- fi ;
+ #if [ $CLANG_VER -gt 42 ] ; then
+ # CCARGS="$CCARGS -fsanitize=safe-stack" ;
+ #fi ;
fi
# The Sun compiler has its own set of problems, the biggest of which is
3rdp/build/imacro-asm-fix.patch deleted 100644 → 0
+ 0
− 11
View file @ 9d6b6c2f
--- js-1.8.5/js/src/imacro_asm.py 2020-12-19 01:15:38.325248687 -0800
+++ js-1.8.5/js/src/imacro_asm.py 2020-12-19 01:15:30.005192001 -0800
@@ -456,7 +456,7 @@
if __name__ == '__main__':
import sys
if len(sys.argv) != 3:
- print "usage: python imacro_asm.py infile.jsasm outfile.c.out"
+ print("usage: python imacro_asm.py infile.jsasm outfile.c.out")
sys.exit(1)
f = open(sys.argv[2], 'w')
3rdp/build/js-configure.patch
+ 2
− 21
View file @ a1ff7cd6
--- js-1.8.5/js/src/configure 2011-03-31 12:08:36.000000000 -0700 --- js-1.8.5/js/src/configure.orig 2011-03-31 12:08:36.000000000 -0700
+++ js-1.8.5/js/src/configure 2020-12-19 01:02:37.189932487 -0800 +++ js-1.8.5/js/src/configure 2014-01-03 01:02:00.000000000 -0800
@@ -6391,12 +6391,12 @@
echo $ac_n "checking for Python version >= $PYTHON_VERSION but not 3.x""... $ac_c" 1>&6
echo "configure:6393: checking for Python version >= $PYTHON_VERSION but not 3.x" >&5
-$PYTHON -c "import sys; sys.exit(sys.version[:3] < sys.argv[1] or sys.version[:2] != '2.')" $PYTHON_VERSION
-_python_res=$?
-
-if test "$_python_res" != 0; then
- { echo "configure: error: Python $PYTHON_VERSION or higher (but not Python 3.x) is required." 1>&2; exit 1; }
-fi
+#$PYTHON -c "import sys; sys.exit(sys.version[:3] < sys.argv[1] or sys.version[:2] != '2.')" $PYTHON_VERSION
+#_python_res=$?
+#
+#if test "$_python_res" != 0; then
+# { echo "configure: error: Python $PYTHON_VERSION or higher (but not Python 3.x) is required." 1>&2; exit 1; }
+#fi
echo "$ac_t""yes" 1>&6
@@ -9446,7 +9446,7 @@ @@ -9446,7 +9446,7 @@
echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6 echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6
if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \ if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
......
3rdp/win32.release/sdl2/BUGS.txt
+ 16
− 16
View file @ a1ff7cd6
3rdp/win32.release/sdl2/COPYING.txt
+ 20
− 20
View file @ a1ff7cd6
3rdp/win32.release/sdl2/README-SDL.txt
+ 13
− 13
View file @ a1ff7cd6
3rdp/win32.release/sdl2/README.txt
+ 21
− 21
View file @ a1ff7cd6
3rdp/win32.release/sdl2/WhatsNew.txt
+ 529
− 529
View file @ a1ff7cd6
CONTRIBUTING.md deleted 100644 → 0
+ 0
− 33
View file @ 9d6b6c2f
## Contributing changes to the Synchronet Source Repository
Merge requests are considered and accepted at [gitlab.synchro.net](https://gitlab.synchro.net).
Do not submit pull/merge requests in the Synchronet *mirror projects* on github.com or gitlab.com; they won't be considered.
When submitting merge requests to existing files, unless you have prior agreement with the maintainers:
* Use the dominant coding style of the file(s) being modified
* Do not perform tab to space conversions (or vice-versa); incidental trimming of trailing whitespace is okay
* Do not include changes that are not relevant to the merge request description/message
* Keep merge requests to a single topical change (e.g. don't combine new features with bug fixes with typo-fixes and style changes)
### Commit content
In general, if it's a large set of changes, your best bet of getting it accepted and merged into the repo would be to discuss the concept of the change with the developers in the [Synchronet Programming conference](http://web.synchro.net/?page=001-forum.ssjs&sub=syncprog) **first**.
When modifying the C/C++ source files:
* Do not call functions from `ctype.h` (e.g. `isprint()`, `isspace()`, `isdigit()`, etc.) - use the `xpdev/gen_defs.h IS_*` macros instead.
* Use safe string handling (e.g. xpdev's `SAFECOPY()` instead of `strcpy()`, `SAFEPRINTF()` or `safe_snprintf()` instead of `sprintf()`).
When modifying JavaScript (`.js`) files:
* Specify `"use strict"` when adding new files and write conforming code
* Don't introduce/use 3rd party libraries unnecessarily
### Branches
Only approved and authenticaed "developers" can create new branches in the `main/sbbs`repo. If, as a developer, you are creating a new branch in the `main/sbbs` repository, use the branch naming scheme: `<your-name>/<topic>`, where *your-name* is your abbreviated name, user-name, or alias and *topic* helps to identify the intended purpose of the branch. Branches created in user repositories (e.g. forks of main/sbbs) need not contain the `<your-name>/` prefix.
### Commit messages
* Try to keep the commit title (first line) to 70 characters or less.
* When a comment is related to an [issue](https://gitlab.synchro.net/main/sbbs/-/issues), use the proper commit message syntax foir automatic issue management as documented [here](https://docs.gitlab.com/ce/user/project/issues/managing_issues.html#closing-issues-automatically).
### Other types of contributions
If you were interested in contributing money, not code, then paypal to rob at synchro dot net.
Thank you for contributing!
ctrl/dosemu.conf deleted 100644 → 0
+ 0
− 20
View file @ 9d6b6c2f
$_cpu = "80486"
$_cpu_emu = "fullsim"
$_floppy_a = ""
$_cdrom = ""
$_xms = (1024)
$_ems = (1024)
$_ems_frame = (0xe000)
$_external_char_set = "cp437"
$_internal_char_set = "cp437"
$_term_updfreq = (8)
$_layout = "us"
$_rawkeyboard = (auto)
$_mouse_internal = (on)
$_mouse_dev = ""
$_joy_device = ""
$_lpt1 = ""
$_lp2 = ""
$_speaker = ""
$_sound = (off)
$_sb_dsp = ""
ctrl/install-json-service.ini
+ 7
− 7
View file @ a1ff7cd6
ctrl/ircd.conf
+ 0
− 8
View file @ a1ff7cd6
...@@ -29,10 +29,6 @@ ...@@ -29,10 +29,6 @@
# hostname, and that host must point to the IP address that the IRCd will be # hostname, and that host must point to the IP address that the IRCd will be
# running on. # running on.
# #
# To control the interfaces the ircd binds on when running as a service, they
# need to be configured in the services.ini file. When running as a stand-alone
# script, the ircd always binds to the wildcard address (ie: all addresses).
#
# M:hostname:ip(Unused):description:port # M:hostname:ip(Unused):description:port
# #
M:SYSTEM_QWKID.synchro.net:*:SYSTEM_NAME:6667 M:SYSTEM_QWKID.synchro.net:*:SYSTEM_NAME:6667
...@@ -265,10 +261,6 @@ H:*:*:rrx.synchro.net ...@@ -265,10 +261,6 @@ H:*:*:rrx.synchro.net
# from jsexec) or inside the Synchronet services configuration. One port per # from jsexec) or inside the Synchronet services configuration. One port per
# line. # line.
# #
# To control the interfaces the ircd binds on when running as a service, they
# need to be configured in the services.ini file. When running as a stand-alone
# script, the ircd always binds to the wildcard address (ie: all addresses).
#
# P:*:*:*:port # P:*:*:*:port
# #
#P:*:*:*:7000 #P:*:*:*:7000
......
ctrl/modopts.d/emailfiles.ini deleted 100644 → 0
+ 0
− 12
View file @ 9d6b6c2f
; Options for "E-mail files as attachments" module
; Uncomment and modify values to over-ride defaults
[emailfiles]
; maxfiles = 10
; maxfilesize = 10485760
; maxpending = 104857600
; prompt: "\x01h\x01yE-mail address: "
; badaddr: "Unsupported e-mail address"
; msgbody: "Your requested file (%u of %u) is attached."
; success: "Successfully attached: %s"
ctrl/modopts.d/xtrnmenu.ini deleted 100644 → 0
+ 0
− 137
View file @ 9d6b6c2f
; Options for Xtrn Menu Mod
; http://wiki.synchro.net/module:xtrnmenu
; Refer to the wiki for instructions on how to customize individual menus
[xtrnmenu]
; Uncomment if you wish to have the mod hand over section menus to xtrn_sec.js
;use_xtrn_sec = true
; Default sort, can be "name", "key", or false (no sort)
sort = false
; Enable multi-column display (when more than 10 external programs in a section)
multicolumn = true
; Clear the (remote) terminal screen before displaying the menu
clear_screen = true
; uncomment and modify any of the below to change the look of the external programs menu
; to remove titles or underline, set to the text ' '
;multicolumn_separator: " "
; set the singlecolumn margin to the number of lines of your footer, if you have one
;singlecolumn_margin=2
;header_fmt: \1n\1c\1h%s \1n\1cExternal Programs:\r\n\r\n
;titles: \1n\1cKey \1h\xb3\1n\1c Name \1n\1c
multicolumn_fmt: \1h\1c%3s \xb3 \1n\1c%-32.32s \1h
singlecolumn_fmt: \1h\1c%3s \xb3 \1n\1c%s \1h
;which: \r\n\1-\1cWhich or \1h~Q\1n\1cuit: \1h
;underline: \1c\1h\xc4\xc4\xc4\xc4\xc5\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4
; used by the lightbar
multicolumn_fmt_inverse: \1h\1c%3s \xb3 \1n\x016\w%-32.32s \1h \1n\1h
singlecolumn_fmt_inverse: \1h\1c%3s \xb3 \1n\x016\w%-32.32s \1h \1n\1h
; to enable cost display, use these instead
; Note: cost not supported in special menus
;titles: \1n\1cInput \1h\xb3\1n\1c Name Cost \1n\1c
;multicolumn_fmt: \1h\1c%3s \xb3 \1n\1c%-26.26s\1h %5u
;singlecolumn_fmt: \1h\1c%3s \xb3 \1n\1c%-26.26s\1h %5u
;multicolumn_fmt_inverse: \1h\1c%3s \xb3 \1n\x016\1w\1h%-26.26s\1n \1c%5u
;singlecolumn_fmt_inverse: \1h\1c%3s \xb3 \1n\x016\1w\1h%-26.26s\1n \1c%5u
; These are used for the special menus (most launched, etc.)
; It adds the "stats" field which is the number of launches, amount of time, etc.
multicolumn_fmt_special: \1h\1c%3s \xb3 \1m%-21.21s\1h \1m%-10s
singlecolumn_fmt_special: \1h\1c%3s \xb3 \1m%-21.21s\1h \1m%-10s
multicolumn_fmt_special: \1h\1c%3s \xb3 \1m%-21.21s\1h \1m%-10s
singlecolumn_fmt_special: \1h\1c%3s \xb3 \1m%-21.21s\1h \1m%-10s
; Override the message when there are no programs available
; (defaults to text.dat NoXtrnPrograms)
;no_programs_msg:
; Override the restricted user msg
; (defaults to text.dat R_ExternalPrograms)
;restricted_user_msg:
; JSON service powers special menus (most popular, recent, etc.)
; Add appropriate entry to json-service.ini and set host/port here
;json_enabled = true
;json_host = localhost
;json_port = 10088
; Exclude external codes or external sections from being tracked
; and showing up in special menus (most popular, recent, etc.)
blacklist_tracking_xtrncodes: bullshit,sbbslist,avatchoo
blacklist_tracking_xtrnsec: operator
; Formatting for the "return to previous menu" option
return_msg: "\xae Return to Previous Menu"
logoff_msg: "Logoff"
quit_msg: "Quit"
; Formatting for the "return to previous menu" option
return_msg: "\xae Return to Previous Menu"
logoff_msg: "Logoff"
quit_msg: "Quit"
return_multicolumn_fmt: \1h\1c%3s \xb3 \1n\1c%-32.32s \1h
return_singlecolumn_fmt: \1h\1c%3s \xb3 \1n\1c%s \1h
return_multicolumn_fmt_inverse: \1h\1c%3s \xb3 \1n\x016\1w\1h%-32.32s \1n\1h
return_singlecolumn_fmt_inverse: \1h\1c%3s \xb3 \1n\x016\1w\1h%s \1n\1h
return_multicolumn_special_fmt: \1h\1c%3s \xb3 \1m%-32.32s\1h
return_singlecolumn_special_fmt: \1h\1c%3s \xb3 \1m%s\1h
return_multicolumn_special_fmt_inverse: \1h\1c%3s \xb3 \x015\1w\1h%-32.32s\1n
return_singlecolumn_special_fmt_inverse: \1h\1c%3s \xb3 \x015\1w\1h%s\1n
; Change display of filearea command menu
;xfer_prompt: "\x01n\x01c\xfe \x01b\x01hFile \x01n\x01c\xfe \x01h"
;xfer_prompt2: " \x01n\x01c@DIR@: \x01n"
;command_prompt: "\r\n\x01gCommand: "
;view_prompt: "\r\n\x01c\x01hView File(s)\r\n"
;searchfname_prompt: "\r\n\x01c\x01hSearch for Filename(s)\r\n"
;remove_prompt: "\r\n\x01c\x01hRemove/Edit File(s)\r\n"
;finddesc_prompt: "\r\n\x01c\x01hFind Text in File Descriptions (no wildcards)\r\n"
;download:prompt: "\r\n\x01c\x01hDownload File(s)\r\n"
; Change display of search menu
entersearchterm: "\x01y\x01hEnter search term: "
searchresultheader: "\x01n\x01cSearch Results for \x01h%s"
searchagainmsg: "\x01n\x01mPress S to Search Again."
; Feedback Module
;feedback_subject: "Game Server Feedback\r\n"
;feedback_msg: Thank you for your Feedback, @SYSOP@ will get back to you ASAP!\r\n\r\n
; Favorites Module
;favorite_add_item: "Add Item"
;favorte_remove_item: "Remove Item"
;add_favorites_msg: "\x01c\x01hAdd Favorite"
;remove_favorites_msg: "\x01c\x01hRemove Favorite"
;favorites_inst: "\x01n\x01w\x01h\x012 [Up/Down/Home/End] to Navigate, [Enter] to Select, [Q] to Quit, [S] to Search "
;favorites_inst_rem: "\x01n\x01w\x01h\x012 [Up/Down/Home/End] to Navigate, [Enter] to Select, [Q] to Quit "
;favorite_add_search_prompt: "\x01c\x01hSearch (ESC to Cancel): \x01n"
; autocomplete (search) box on add favorite
; see cga_defs.js for color codes
; autocomplete input box
;favorite_add_search_fg=LIGHTGRAY
;favorite_add_search_bg=BG_BLACK
; autocomplete result box
;favorite_add_search_sfg=LIGHTGRAY
;favorite_add_search_sbg=BG_BLACK
; autocomplete highlighted row
;favorite_add_search_hsfg=WHITE
;favorite_add_search_hsbg=BG_MAGENTA
; scrolling menu on add favorite
; lightbar non-current item
;favorite_add_fg=LIGHTGRAY
;favorite_add_bg=BG_BLACK
; lightbar current item
;favorite_add_lfg=WHITE
;favorite_add_lbg=BG_MAGENTA
; tree heading
;favorite_add_cfg=WHITE
;favorite_add_cbg=BG_BLACK
\ No newline at end of file
ctrl/modopts.ini
+ 16
− 53
View file @ a1ff7cd6
; Contains simple JS object definitions to enable/control the optional ; $Id: modopts.ini,v 1.36 2020/04/18 06:21:33 rswindell Exp $
; behavior of various Synchronet JS modules (e.g. exec/*.js)
; Example use of this file (or its children) from a JavaScript module: ; This file contains simple JS object defintions to enable/control the optional
; var options = load({}, "modopts.js", "modname"); ; behavior of various Synchronet stock and 3rd party JS modules (e.g. exec/*.js)
!include modopts.d/*.ini ; Modules which use this file should use options=load("modopts.js","modname") first
[login] [login]
; Send password via email to user if they forget it and can't login ; Send password via email to user if they forget it and can't login
...@@ -25,8 +24,6 @@ ...@@ -25,8 +24,6 @@
qwk_settings = QWK_FILES|QWK_ATTACH|QWK_EMAIL|QWK_DELMAIL qwk_settings = QWK_FILES|QWK_ATTACH|QWK_EMAIL|QWK_DELMAIL
; Set ask_sysop to true to enable Synchronet Sysop question (sets FLAG 1S) ; Set ask_sysop to true to enable Synchronet Sysop question (sets FLAG 1S)
ask_sysop = false ask_sysop = false
; Set to false to disable the "Where did you hear about this BBS?" question
survey = true
; Set new user default avatar ; Set new user default avatar
avatar = IH8gfyB/3H/cf9x/3H8gfyB/IH8gfyB/3n/bf9t/23/bf91/IH8gfyB/IH/ef9t/23/bf9t/3X8gfyB/IH8gf9x/23/bf9t/23/cfyB/IH8gf9t/23/bf9t/23/bf9t/238gfyB/23/bf9t/23/bf9t/23/bfyB/ avatar = IH8gfyB/3H/cf9x/3H8gfyB/IH8gfyB/3n/bf9t/23/bf91/IH8gfyB/IH/ef9t/23/bf9t/3X8gfyB/IH8gf9x/23/bf9t/23/cfyB/IH8gf9t/23/bf9t/23/bf9t/238gfyB/23/bf9t/23/bf9t/23/bfyB/
; Or set the new user default avatar from an avatar collection (.bin) file: ; Or set the new user default avatar from an avatar collection (.bin) file:
...@@ -62,51 +59,18 @@ ...@@ -62,51 +59,18 @@
backup_level = 10 backup_level = 10
[xtrn_sec] [xtrn_sec]
; Set to true to disable execution of prextrn.js and postxtrn.js for external programs
; when they are running as a logon event
disable_pre_on_logon_event = false
disable_post_on_logon_event = false
; Enable multi-column display (when more than 10 external programs in a section) ; Enable multi-column display (when more than 10 external programs in a section)
multicolumn = true multicolumn = true
; Sort the list of external programs alphabetically by name ; Sort the list of external programs alphabetically by name
sort = false sort = false
; Clear the (remote) terminal screen before executing a program ; Clear the (remote) terminal screen before executing a program
clear_screen_on_exec = false clear_screen_on_exec = false
; Clear the (remote) terminal screen before displaying the menu
clear_screen = true
; Auto-execute the only available program when entering a program section ; Auto-execute the only available program when entering a program section
autoexec = false autoexec = false
; Execute (evaluate) a JavaScript expression before/after executing any external programs (doors) ; Execute (evaluate) a JavaScript expression before/after executing any external programs (doors)
; eval_before_exec = alert('Running ' + prog.name); ; eval_before_exec = alert('Running ' + prog.name);
; eval_after_exec = load('../xtrn/twitter/tweet.js', user.alias, 'ran', prog.name); ; eval_after_exec = load('../xtrn/twitter/tweet.js', user.alias, 'ran', prog.name);
; uncomment and modify any of the below to change the look of the main external sections menu
; section_fmt: \1g\1h%3d: \1n\1g%s\r\n
; section_header_fmt: \1n\1l\1gSelect \1h%s\1n\1g:\r\n\r\n:
; section_which: \r\nWhich, ~Quit or [%u]: \1h
; section_header_title=External Program Selection
; uncomment and modify any of the below to change the look of the external programs menu
; to remove titles or underline, set to the text ' '
; multicolumn_separator: " "
; singlecolumn_margin=7
; header_fmt: \1n\1c\1h%s \1n\1cExternal Programs:\r\n\r\n
; titles: \1n\1cNum \1h\xb3\1n\1c Name \1n\1c
; multicolumn_fmt: \1h\1c%3u \xb3 \1n\1c%-32.32s \1h
; singlecolumn_fmt: \1h\1c%3u \xb3 \1n\1c%s \1h
; which: \r\n\1-\1cWhich or \1h~Q\1n\1cuit: \1h
; underline: \1c\1h\xc4\xc4\xc4\xc4\xc5\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4\xc4
; to enable cost display, use these instead
; titles: \1n\1cNum \1h\xb3\1n\1c Name Cost \1n\1c
; multicolumn_fmt: \1h\1c%3u \xb3 \1n\1c%-26.26s\1h %5u
; singlecolumn_fmt: \1h\1c%3u \xb3 \1n\1c%-26.26s\1h %5u
; to ask for continuation after showing DOOR intro/message file, enable this
; prompt_on_info = true
; prompt_on_info_fmt: \r\n\x01n\x01cDo you wish to continue
[chat_sec] [chat_sec]
; Over-ride default IRC server/port and channel (if desired) here: ; Over-ride default IRC server/port and channel (if desired) here:
irc_server = irc.synchro.net 6667 irc_server = irc.synchro.net 6667
...@@ -163,6 +127,7 @@ ...@@ -163,6 +127,7 @@
timeout=43200 timeout=43200
inactivity=900 inactivity=900
user_registration=true user_registration=true
minimum_password_length=6
maximum_telegram_length=800 maximum_telegram_length=800
web_directory=../webv4 web_directory=../webv4
ftelnet=true ftelnet=true
...@@ -177,5 +142,3 @@ ...@@ -177,5 +142,3 @@
forum_extended_ascii=false forum_extended_ascii=false
max_messages=0 max_messages=0
nodelist_ibbs = true nodelist_ibbs = true
darkmode_off=false
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment