From 2f92a69a69523f4c59e6a23d2f4a8d93493cc960 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 31 Aug 2023 14:32:55 -0400 Subject: [PATCH] Renamed Makefile to GNUmakefile to enforce the use of gmake --- citadel/GNUmakefile | 82 ++++++++++++++++++++++++ citadel/Makefile | 84 +------------------------ citadel/server/modules/nntp/serv_nntp.c | 4 +- 3 files changed, 86 insertions(+), 84 deletions(-) create mode 100644 citadel/GNUmakefile diff --git a/citadel/GNUmakefile b/citadel/GNUmakefile new file mode 100644 index 000000000..f3e058be3 --- /dev/null +++ b/citadel/GNUmakefile @@ -0,0 +1,82 @@ +# Makefile for Citadel Server +# Copyright (c) 1987-2023 by Art Cancro and the citadel.org team +# +# No, we are NOT using the obsolete GNU Autotools. This configure script works +# well on the Linux operating system (which uses the Linux kernel) and on BSD. +# +# This program is open source software. Use, duplication, and/or +# disclosure are subject to the GNU General Public License version 3. + +# config.mk is generated by ./configure +include config.mk + +all := ctdldump ctdlload citserver setup sendcommand citmail chkpw chkpwd loadtest dbnothing +all: $(all) + +SERVER_SOURCES := $(wildcard server/*.c server/modules/*/*.c) +SERVER_OBJECTS := $(patsubst %.c,%.o,$(SERVER_SOURCES)) +BACKEND_SOURCES := $(wildcard server/backends/*/*.c) +BACKEND_OBJECTS := $(patsubst %.c,%.o,$(BACKEND_SOURCES)) + +$(SERVER_SOURCES): server/*.h server/modules/*/*.h server/backends/*/*.h + @touch $@ + +$(BACKEND_SOURCES): server/*.h server/modules/*/*.h server/backends/*/*.h + @touch $@ + +%.o: %.c + @echo $< + @${CC} ${CFLAGS} -c $< -o $@ + +citserver: $(SERVER_OBJECTS) $(BACKEND_OBJECTS) + ${CC} ${CFLAGS} \ + $(SERVER_OBJECTS) $(BACKEND_OBJECTS) \ + ${LDFLAGS} \ + -lresolv -lcitadel -lpthread -lz -lical -lldap -lcrypt -lexpat -lcurl ${BACKEND_LDFLAGS} \ + -o citserver + +setup: utils/setup.c server/citadel_dirs.c utils/*.h server/*.h + ${CC} ${CFLAGS} ${LDFLAGS} utils/setup.c -lcitadel -o setup + +ctdlmigrate: utils/ctdlmigrate.c server/citadel_dirs.c utils/*.h server/*.h + ${CC} ${CFLAGS} ${LDFLAGS} utils/ctdlmigrate.c -lcitadel -lreadline -o ctdlmigrate + +sendcommand: utils/sendcommand.c server/citadel_dirs.c utils/*.h server/*.h + ${CC} ${CFLAGS} ${LDFLAGS} utils/sendcommand.c -lcitadel -o sendcommand + +citmail: utils/citmail.c server/citadel_dirs.c utils/*.h server/*.h + ${CC} ${CFLAGS} ${LDFLAGS} utils/citmail.c -lcitadel -o citmail + +chkpw: utils/chkpw.c utils/*.h server/*.h + ${CC} ${CFLAGS} ${LDFLAGS} utils/chkpw.c -o chkpw + +chkpwd: utils/chkpwd.c utils/auth.c utils/*.h server/*.h + ${CC} ${CFLAGS} ${LDFLAGS} utils/chkpwd.c utils/auth.c -lcrypt -o chkpwd + +dbnothing: utils/dbnothing.c utils/*.h server/*.h ${BACKEND_OBJECTS} + ${CC} ${CFLAGS} ${LDFLAGS} utils/dbnothing.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o dbnothing + +ctdldump: utils/ctdldump.c utils/*.h server/*.h ${BACKEND_OBJECTS} + ${CC} ${CFLAGS} ${LDFLAGS} utils/ctdldump.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o ctdldump + +ctdlload: utils/ctdlload.c server/makeuserkey.c utils/*.h server/*.h ${BACKEND_OBJECTS} + ${CC} ${CFLAGS} ${LDFLAGS} utils/ctdlload.c server/makeuserkey.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o ctdlload + +loadtest: utils/loadtest.c server/citadel_dirs.c utils/*.h server/*.h + ${CC} ${CFLAGS} ${LDFLAGS} utils/loadtest.c -lcitadel -lpthread -o loadtest + +config.mk: configure + ./configure + +clean: + rm -vf $(all) + find . -name *.o | xargs rm -vf + +distclean: clean + rm -vf config.mk + +install: $(all) utils/*.sh + @echo Installing to ${CTDLDIR} + @for x in $(all) utils/*.sh ; do \ + install -v -C -D -t ${CTDLDIR} $$x ;\ + done diff --git a/citadel/Makefile b/citadel/Makefile index 4769d54d0..8a9190542 100644 --- a/citadel/Makefile +++ b/citadel/Makefile @@ -1,82 +1,2 @@ -# Makefile for Citadel Server -# Copyright (c) 1987-2023 by Art Cancro and the citadel.org team -# -# No, we are NOT using the obsolete GNU Autotools. This configure script works -# well on the Linux operating system (which uses the Linux kernel) and on BSD. -# -# This program is open source software. Use, duplication, and/or -# disclosure are subject to the GNU General Public License version 3. - -# config.mk is generated by ./configure -include config.mk - -all := dbnothing ctdldump ctdlload citserver setup sendcommand citmail chkpw chkpwd loadtest -all: $(all) - -SERVER_SOURCES := $(wildcard server/*.c server/modules/*/*.c) -SERVER_OBJECTS := $(patsubst %.c,%.o,$(SERVER_SOURCES)) -BACKEND_SOURCES := $(wildcard server/backends/*/*.c) -BACKEND_OBJECTS := $(patsubst %.c,%.o,$(BACKEND_SOURCES)) - -$(SERVER_SOURCES): server/*.h server/modules/*/*.h server/backends/*/*.h - @touch $@ - -$(BACKEND_SOURCES): server/*.h server/modules/*/*.h server/backends/*/*.h - @touch $@ - -%.o: %.c - @echo $< - @${CC} ${CFLAGS} -c $< -o $@ - -citserver: $(SERVER_OBJECTS) $(BACKEND_OBJECTS) - ${CC} ${CFLAGS} \ - $(SERVER_OBJECTS) $(BACKEND_OBJECTS) \ - ${LDFLAGS} \ - -lresolv -lcitadel -lpthread -lz -lical -lldap -lcrypt -lexpat -lcurl ${BACKEND_LDFLAGS} \ - -o citserver - -setup: utils/setup.c server/citadel_dirs.c utils/*.h server/*.h - ${CC} ${CFLAGS} ${LDFLAGS} utils/setup.c -lcitadel -o setup - -ctdlmigrate: utils/ctdlmigrate.c server/citadel_dirs.c utils/*.h server/*.h - ${CC} ${CFLAGS} ${LDFLAGS} utils/ctdlmigrate.c -lcitadel -lreadline -o ctdlmigrate - -sendcommand: utils/sendcommand.c server/citadel_dirs.c utils/*.h server/*.h - ${CC} ${CFLAGS} ${LDFLAGS} utils/sendcommand.c -lcitadel -o sendcommand - -citmail: utils/citmail.c server/citadel_dirs.c utils/*.h server/*.h - ${CC} ${CFLAGS} ${LDFLAGS} utils/citmail.c -lcitadel -o citmail - -chkpw: utils/chkpw.c utils/*.h server/*.h - ${CC} ${CFLAGS} ${LDFLAGS} utils/chkpw.c -o chkpw - -chkpwd: utils/chkpwd.c utils/auth.c utils/*.h server/*.h - ${CC} ${CFLAGS} ${LDFLAGS} utils/chkpwd.c utils/auth.c -lcrypt -o chkpwd - -dbnothing: utils/dbnothing.c utils/*.h server/*.h ${BACKEND_OBJECTS} - ${CC} ${CFLAGS} ${LDFLAGS} utils/dbnothing.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o dbnothing - -ctdldump: utils/ctdldump.c utils/*.h server/*.h ${BACKEND_OBJECTS} - ${CC} ${CFLAGS} ${LDFLAGS} utils/ctdldump.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o ctdldump - -ctdlload: utils/ctdlload.c server/makeuserkey.c utils/*.h server/*.h ${BACKEND_OBJECTS} - ${CC} ${CFLAGS} ${LDFLAGS} utils/ctdlload.c server/makeuserkey.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o ctdlload - -loadtest: utils/loadtest.c server/citadel_dirs.c utils/*.h server/*.h - ${CC} ${CFLAGS} ${LDFLAGS} utils/loadtest.c -lcitadel -lpthread -o loadtest - -config.mk: configure - ./configure - -clean: - rm -vf $(all) - find . -name *.o | xargs rm -vf - -distclean: clean - rm -vf config.mk - -install: $(all) utils/*.sh - @echo Installing to ${CTDLDIR} - @for x in $(all) utils/*.sh ; do \ - install -v -C -D -t ${CTDLDIR} $$x ;\ - done +all: + gmake diff --git a/citadel/server/modules/nntp/serv_nntp.c b/citadel/server/modules/nntp/serv_nntp.c index c8bc6013e..b80087a08 100644 --- a/citadel/server/modules/nntp/serv_nntp.c +++ b/citadel/server/modules/nntp/serv_nntp.c @@ -381,9 +381,9 @@ void nntp_newgroups(const char *cmd) { if (!strcasecmp(stringy_gmt, "GMT")) { tzset(); #ifdef __FreeBSD__ - thetime += &tm.tm_gmtoff; + thetime += (time_t) &tm.tm_gmtoff; #else - thetime += timezone; + thetime += (time_t) timezone; #endif } -- 2.39.2