diff --git a/Makefile.freebsd b/Makefile.freebsd index cd47a6f..ed62b49 100644 --- a/Makefile.freebsd +++ b/Makefile.freebsd @@ -8,7 +8,7 @@ ODOORS = deps/odoors/libs-`uname -s`/libODoors.a JSMN = deps/jsmn/libjsmn.a CDK = deps/cdk-5-20161210/libcdk.a -all: magicka magimail magiedit ticproc mgpost magichat fileapprove +all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd ${LUA}: cd deps/lua && $(MAKE) -f Makefile freebsd MAKEFLAGS= @@ -54,6 +54,9 @@ mgpost: $(JAMLIB) fileapprove: $(CDK) cd utils/fileapprove && $(MAKE) +magiftpd: + cd utils/magiftpd && $(MAKE) + .PHONY: clean clean: @@ -68,4 +71,5 @@ clean: cd utils/mgpost && $(MAKE) clean cd utils/magichat && $(MAKE) clean cd deps/cdk-5.0-20161210 && $(MAKE) clean - cd utils/fileapprove && $(MAKE) clean \ No newline at end of file + cd utils/fileapprove && $(MAKE) clean + cd utils/magiftpd && $(MAKE) clean \ No newline at end of file diff --git a/Makefile.freebsd.WWW b/Makefile.freebsd.WWW index 7b068e0..2907c42 100644 --- a/Makefile.freebsd.WWW +++ b/Makefile.freebsd.WWW @@ -10,7 +10,7 @@ ODOORS = deps/odoors/libs-`uname -s`/libODoors.a JSMN = deps/jsmn/libjsmn.a CDK = deps/cdk-5-20161210/libcdk.a -all: magicka magimail magiedit ticproc mgpost magichat fileapprove +all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd ${LUA}: cd deps/lua && $(MAKE) -f Makefile freebsd MAKEFLAGS= @@ -59,6 +59,9 @@ magichat: $(JSMN) fileapprove: $(CDK) cd utils/fileapprove && $(MAKE) +magiftpd: + cd utils/magiftpd && $(MAKE) + .PHONY: clean clean: @@ -74,4 +77,5 @@ clean: cd utils/mgpost && $(MAKE) clean cd utils/magichat && $(MAKE) clean cd deps/cdk-5.0-20161210 && $(MAKE) clean - cd utils/fileapprove && $(MAKE) clean \ No newline at end of file + cd utils/fileapprove && $(MAKE) clean + cd utils/magiftpd && $(MAKE) clean \ No newline at end of file diff --git a/Makefile.linux b/Makefile.linux index 7a818ce..c35eb28 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -8,7 +8,7 @@ ODOORS = deps/odoors/libs-`uname -s`/libODoors.a JSMN = deps/jsmn/libjsmn.a CDK = deps/cdk-5-20161210/libcdk.a -all: magicka magimail magiedit ticproc mgpost magichat fileapprove +all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd ${LUA}: cd deps/lua && $(MAKE) -f Makefile linux MAKEFLAGS= @@ -55,6 +55,9 @@ magichat: $(JSMN) fileapprove: $(CDK) cd utils/fileapprove && $(MAKE) +magiftpd: + cd utils/magiftpd && $(MAKE) + .PHONY: clean clean: @@ -70,3 +73,4 @@ clean: cd utils/magichat && $(MAKE) clean cd deps/cdk-5.0-20161210 && $(MAKE) clean cd utils/fileapprove && $(MAKE) clean + cd utils/magiftpd && $(MAKE) clean diff --git a/Makefile.linux.WWW b/Makefile.linux.WWW index cd08acf..65c9098 100644 --- a/Makefile.linux.WWW +++ b/Makefile.linux.WWW @@ -10,7 +10,7 @@ ODOORS = deps/odoors/libs-`uname -s`/libODoors.a JSMN = deps/jsmn/libjsmn.a CDK = deps/cdk-5-20161210/libcdk.a -all: magicka magimail magiedit ticproc mgpost magichat fileapprove +all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd ${LUA}: cd deps/lua && $(MAKE) -f Makefile linux MAKEFLAGS= @@ -59,6 +59,9 @@ magichat: $(JSMN) fileapprove: $(CDK) cd utils/fileapprove && $(MAKE) +magiftpd: + cd utils/magiftpd && $(MAKE) + .PHONY: clean clean: @@ -74,4 +77,5 @@ clean: cd utils/mgpost && $(MAKE) clean cd utils/magichat && $(MAKE) clean cd deps/cdk-5.0-20161210 && $(MAKE) clean - cd utils/fileapprove && $(MAKE) clean \ No newline at end of file + cd utils/fileapprove && $(MAKE) clean + cd utils/magiftpd && $(MAKE) clean \ No newline at end of file diff --git a/Makefile.netbsd b/Makefile.netbsd index 96f1e95..789df5e 100644 --- a/Makefile.netbsd +++ b/Makefile.netbsd @@ -8,7 +8,7 @@ ODOORS = deps/odoors/libs-`uname -s`/libODoors.a JSMN = deps/jsmn/libjsmn.a CDK = deps/cdk-5-20161210/libcdk.a -all: magicka magimail magiedit ticproc mgpost magichat fileapprove +all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd ${LUA}: cd deps/lua && $(MAKE) -f Makefile bsd MAKEFLAGS= @@ -54,6 +54,9 @@ magichat: $(JSMN) fileapprove: $(CDK) cd utils/fileapprove && $(MAKE) +magiftpd: + cd utils/magiftpd && $(MAKE) + .PHONY: clean clean: @@ -68,4 +71,5 @@ clean: cd utils/mgpost && $(MAKE) clean cd utils/magichat && $(MAKE) clean cd deps/cdk-5.0-20161210 && $(MAKE) clean - cd utils/fileapprove && $(MAKE) clean \ No newline at end of file + cd utils/fileapprove && $(MAKE) clean + cd utils/magiftpd && $(MAKE) clean \ No newline at end of file diff --git a/Makefile.netbsd.WWW b/Makefile.netbsd.WWW index 3e8e516..0b748ed 100644 --- a/Makefile.netbsd.WWW +++ b/Makefile.netbsd.WWW @@ -10,7 +10,7 @@ ODOORS = deps/odoors/libs-`uname -s`/libODoors.a JSMN = deps/jsmn/libjsmn.a CDK = deps/cdk-5-20161210/libcdk.a -all: magicka magimail magiedit ticproc mgpost magichat fileapprove +all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd ${LUA}: cd deps/lua && $(MAKE) -f Makefile bsd MAKEFLAGS= @@ -59,6 +59,9 @@ magichat: $(JSMN) fileapprove: $(CDK) cd utils/fileapprove && $(MAKE) +magiftpd: + cd utils/magiftpd && $(MAKE) + .PHONY: clean clean: @@ -74,4 +77,5 @@ clean: cd utils/mgpost && $(MAKE) clean cd utils/magichat && $(MAKE) clean cd deps/cdk-5.0-20161210 && $(MAKE) clean - cd utils/fileapprove && $(MAKE) clean \ No newline at end of file + cd utils/fileapprove && $(MAKE) clean + cd utils/magiftpd && $(MAKE) clean \ No newline at end of file diff --git a/Makefile.osx b/Makefile.osx index b293641..9effba2 100644 --- a/Makefile.osx +++ b/Makefile.osx @@ -10,7 +10,7 @@ CDK = deps/cdk-5-20161210/libcdk.a OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o -all: magicka magimail magiedit ticproc mgpost magichat fileapprove +all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd ${LUA}: cd deps/lua && $(MAKE) -f Makefile macosx MAKEFLAGS= @@ -55,6 +55,9 @@ magichat: $(JSMN) fileapprove: $(CDK) cd utils/fileapprove && $(MAKE) +magiftpd: + cd utils/magiftpd && $(MAKE) + .PHONY: clean clean: @@ -69,4 +72,5 @@ clean: cd utils/mgpost && $(MAKE) clean cd utils/magichat && $(MAKE) clean cd deps/cdk-5.0-20161210 && $(MAKE) clean - cd utils/fileapprove && $(MAKE) clean \ No newline at end of file + cd utils/fileapprove && $(MAKE) clean + cd utils/magiftpd && $(MAKE) clean \ No newline at end of file diff --git a/Makefile.osx.WWW b/Makefile.osx.WWW index 430c589..147e1b7 100644 --- a/Makefile.osx.WWW +++ b/Makefile.osx.WWW @@ -10,7 +10,7 @@ ODOORS = deps/odoors/libs-`uname -s`/libODoors.a JSMN = deps/jsmn/libjsmn.a CDK = deps/cdk-5-20161210/libcdk.a -all: magicka magimail magiedit ticproc mgpost magichat fileapprove +all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd ${LUA}: cd deps/lua && $(MAKE) -f Makefile macosx MAKEFLAGS= @@ -59,6 +59,9 @@ magichat: $(JSMN) fileapprove: $(CDK) cd utils/fileapprove && $(MAKE) +magiftpd: + cd utils/magiftpd && $(MAKE) + .PHONY: clean clean: @@ -73,4 +76,5 @@ clean: cd utils/mgpost && $(MAKE) clean cd utils/magichat && $(MAKE) clean cd deps/cdk-5.0-20161210 && $(MAKE) clean - cd utils/fileapprove && $(MAKE) clean \ No newline at end of file + cd utils/fileapprove && $(MAKE) clean + cd utils/magiftpd && $(MAKE) clean \ No newline at end of file diff --git a/ansis_default/bulletin1.ans b/ansis_default/bulletin1.ans index 5e5d75c..ed711c2 100644 Binary files a/ansis_default/bulletin1.ans and b/ansis_default/bulletin1.ans differ diff --git a/bbs.h b/bbs.h index df28619..3c10e27 100644 --- a/bbs.h +++ b/bbs.h @@ -12,7 +12,7 @@ #include "jamlib/jam.h" #define VERSION_MAJOR 0 -#define VERSION_MINOR 5 +#define VERSION_MINOR 6 #define VERSION_STR "alpha" #define NETWORK_FIDO 1 diff --git a/file_id.diz b/file_id.diz index 9709bd4..a414ff2 100644 --- a/file_id.diz +++ b/file_id.diz @@ -1,24 +1,19 @@ -. . . .__ .__ __. -|\/| _. _ * _.;_/ _. [__)[__)(__ -| |(_](_]|(_.| \(_] [__)[__).__) v0.5a --------._|---------------------------------- -Magicka BBS is a Free BBS System for Linux -and FreeBSD. While Still in the early stages -of development, we have most of the features -you find in modern BBS software. - - * FTN Network Support - * Zmodem & Long filename Support - * SSH Server & Telnet Server - * External Editor Support - * Compiles and runs on Raspberry Pi - * LUA Scripting Support - * Optional WWW server. - * Bluewave Support - * TIC file processor - -WWIVnet Support is known not to work, and -will be removed. Don't use it! - -THIS IS ALPHA SOFTWARE! Use at your own -risk! +. . . .__ .__ __. +|\/| _. _ * _.;_/ _. [__)[__)(__ +| |(_](_]|(_.| \(_] [__)[__).__) v0.6a +-------._|---------------------------------- +Magicka BBS is a Free BBS System for Linux, +macOS, FreeBSD and NetBSD. + + * FTN Network Support + * Zmodem & Long filename Support + * SSH Server & Telnet Server + * External Editor Support + * Compiles and runs on Raspberry Pi + * LUA Scripting Support + * Optional WWW & FTP server. + * Bluewave Support + * TIC file processor + +THIS IS ALPHA SOFTWARE! Use at your own +risk! diff --git a/utils/magiftpd/Makefile b/utils/magiftpd/Makefile new file mode 100644 index 0000000..558acde --- /dev/null +++ b/utils/magiftpd/Makefile @@ -0,0 +1,38 @@ +OS := $(shell uname -s) + +ifeq ($(OS), FreeBSD) + CC=cc + CFLAGS=-I/usr/local/include + LDFLAGS=-L/usr/local/lib +endif +ifeq ($(OS), NetBSD) + CC=cc + CFLAGS=-I/usr/pkg/include + LDFLAGS=-L/usr/pkg/lib +endif +ifeq ($(OS), Linux) + CC=gcc + CFLAGS= + LDFLAGS= +endif +ifeq ($(OS), Darwin) + CC=cc + CFLAGS=-I/opt/local/include + LDFLAGS=-L/opt/local/lib +endif + + +DEPS = magiftpd.c + +OBJ = magiftpd.o ../../inih/ini.o +%.o: %.c $(DEPS) + $(CC) -c -o $@ $< $(CFLAGS) + + +ticproc: $(OBJ) + $(CC) -o magiftpd -o $@ $^ $(CFLAGS) $(LDFLAGS) -lsqlite3 -lcrypto + +.PHONY: clean + +clean: + rm -f $(OBJ) magiftpd