diff -Nru axmail-2.9/config.h axmail-2.11.1/config.h --- axmail-2.9/config.h 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/config.h 2020-02-21 22:42:29.000000000 +0000 @@ -2,6 +2,8 @@ #include #include "defines.h" +//#define CLAMSMTP + extern char callsign[20]; extern char username[20]; extern char fullname[31]; diff -Nru axmail-2.9/debian/axmail.install axmail-2.11.1/debian/axmail.install --- axmail-2.9/debian/axmail.install 1970-01-01 00:00:00.000000000 +0000 +++ axmail-2.11.1/debian/axmail.install 2020-08-03 19:46:54.000000000 +0000 @@ -0,0 +1,3 @@ +axmail usr/sbin +etc/*.* etc/ax25 +etc/help usr/share/axmail diff -Nru axmail-2.9/debian/changelog axmail-2.11.1/debian/changelog --- axmail-2.9/debian/changelog 2019-01-05 22:27:18.000000000 +0000 +++ axmail-2.11.1/debian/changelog 2020-08-03 19:46:54.000000000 +0000 @@ -1,3 +1,26 @@ +axmail (2.11.1-1) unstable; urgency=medium + + * Team upload. + + [ Dave Hibberd ] + * Bump to new standards + * Bump to dh12 + * Added debian/gitlab-ci.yml + * Added patch by Helmut Grohne (Closes: #949988) + - Makes axmail cross build from source + + [ Christoph Berg ] + * New upstream version. + * Use dh_install to install files instead of rewriting most of the upstream + Makefile. + * Install full README file as upstream changelog instead of sed'ing a + random part from it as such. + * Fix build failure with gcc 10. (Closes: #957028) + * Move /var/lib/ax25/axmail/help to /usr/share/axmail/help. + (Closes: #933867) + + -- Christoph Berg Mon, 03 Aug 2020 21:46:54 +0200 + axmail (2.9-2) unstable; urgency=medium * Fixed the makefile edit that removed the binary (Closes: #918336) diff -Nru axmail-2.9/debian/compat axmail-2.11.1/debian/compat --- axmail-2.9/debian/compat 2018-12-27 17:02:50.000000000 +0000 +++ axmail-2.11.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru axmail-2.9/debian/control axmail-2.11.1/debian/control --- axmail-2.9/debian/control 2019-01-05 22:27:18.000000000 +0000 +++ axmail-2.11.1/debian/control 2020-08-03 19:46:54.000000000 +0000 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Debian Hamradio Maintainers Uploaders: Dave Hibberd -Build-Depends: debhelper (>= 11) -Standards-Version: 4.3.0.1 +Build-Depends: debhelper-compat (=12) +Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/debian-hamradio-team/axmail Vcs-Git: https://salsa.debian.org/debian-hamradio-team/axmail.git Homepage: https://axmail.sourceforge.net diff -Nru axmail-2.9/debian/gitlab-ci.yml axmail-2.11.1/debian/gitlab-ci.yml --- axmail-2.9/debian/gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ axmail-2.11.1/debian/gitlab-ci.yml 2020-08-03 19:46:54.000000000 +0000 @@ -0,0 +1,6 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + +reprotest: + extends: .test-reprotest-diffoscope diff -Nru axmail-2.9/debian/patches/cross-build axmail-2.11.1/debian/patches/cross-build --- axmail-2.9/debian/patches/cross-build 1970-01-01 00:00:00.000000000 +0000 +++ axmail-2.11.1/debian/patches/cross-build 2020-08-03 19:46:54.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Automatically Substitute LD and INSTALL with dh's help to cross +build from source +Author: Helmut Grohne +Last-Update: 2020-01-28 + +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ all: axmail + + MAN_DIR = /usr/local/share/man + CC = gcc +-LD = gcc ++LD = $(CC) + # CFLAGS = -O2 -Wstrict-prototypes -g -I../lib + LIBS = -lcrypt + MODULES = utils.o config.o adduser.o command.o mailcmd.o mbox.o head.o lock.o axmail.o quit.o diff -Nru axmail-2.9/debian/patches/file-locations axmail-2.11.1/debian/patches/file-locations --- axmail-2.9/debian/patches/file-locations 1970-01-01 00:00:00.000000000 +0000 +++ axmail-2.11.1/debian/patches/file-locations 2020-08-03 19:46:54.000000000 +0000 @@ -0,0 +1,27 @@ +--- a/defines.h ++++ b/defines.h +@@ -7,11 +7,11 @@ + #define COPYRIGHT "(c) 1996-1998 Heikki Hannikainen (OH7LZB) \nMailbox save support (c) 2003 Marius Petrescu (YO2LOJ) \nOther modifications (c) 2005-2020 by Brian Rogers (N1URO) " + #define PROMPT "=> " + +-#define CONF_AXMAIL_FILE "/usr/local/etc/ax25/axmail.conf" +-#define CONF_AXMAIL_PROF_FILE "/usr/local/etc/ax25/ax25.profile" ++#define CONF_AXMAIL_FILE "/etc/ax25/axmail.conf" ++#define CONF_AXMAIL_PROF_FILE "/etc/ax25/ax25.profile" + // #define CONF_AXMAIL_USER_FILE ".axmailrc" +-#define DATA_AXMAIL_HELP_DIR "/usr/local/var/ax25/axmail/help/" +-#define DATA_AXMAIL_MAIL_DIR "/usr/local/var/spool/mail/" ++#define DATA_AXMAIL_HELP_DIR "/usr/share/axmail/help/" ++#define DATA_AXMAIL_MAIL_DIR "/var/spool/mail/" + #define LOCK_AXMAIL_FILE "/var/lock/axmail" + #define BIN_AXMAIL_SENDMAIL "/usr/sbin/sendmail" + +@@ -21,7 +21,7 @@ + #define USERPROFILE ".profile" + #define PASSWDFILE "/etc/passwd" + +-#define WELCOME "/usr/local/etc/ax25/welcome.txt" ++#define WELCOME "/etc/ax25/welcome.txt" + + #define PATHSIZE 1024 + #define LINESIZE 1024 /* Maximum length of a line in a message */ diff -Nru axmail-2.9/debian/patches/gcc10 axmail-2.11.1/debian/patches/gcc10 --- axmail-2.9/debian/patches/gcc10 1970-01-01 00:00:00.000000000 +0000 +++ axmail-2.11.1/debian/patches/gcc10 2020-08-03 19:46:54.000000000 +0000 @@ -0,0 +1,8 @@ +--- a/utils.h ++++ b/utils.h +@@ -12,4 +12,4 @@ extern int anycntrls(char *s1); + extern void panic(const char *fmt, ...); + extern void syserr(const char *fmt, ...); + /* n1uro */ +-char callsign[20]; ++extern char callsign[20]; diff -Nru axmail-2.9/debian/patches/hardening axmail-2.11.1/debian/patches/hardening --- axmail-2.9/debian/patches/hardening 2018-12-27 16:48:37.000000000 +0000 +++ axmail-2.11.1/debian/patches/hardening 2020-08-03 19:46:54.000000000 +0000 @@ -4,7 +4,7 @@ --- a/Makefile +++ b/Makefile -@@ -3,12 +3,12 @@ +@@ -3,12 +3,12 @@ all: axmail MAN_DIR = /usr/local/share/man CC = gcc LD = gcc @@ -17,5 +17,5 @@ - $(CC) $(CFLAGS) -c $< + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $< - upgrade: installbin installhelp installman installconf + upgrade: installbin installhelp installman diff -Nru axmail-2.9/debian/patches/install_dir_creation axmail-2.11.1/debian/patches/install_dir_creation --- axmail-2.9/debian/patches/install_dir_creation 2019-01-05 22:27:18.000000000 +0000 +++ axmail-2.11.1/debian/patches/install_dir_creation 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Description: Create folders for axmail install -Author: Dave Hibberd -Last-Update: 2018-12-27 - ---- a/Makefile -+++ b/Makefile -@@ -13,14 +13,17 @@ - install: installbin installconf installhelp - - installbin: all -+ install -m 0755 -D -d debian/axmail/usr/sbin - install -m 0755 -s -o root -g root axmail debian/axmail/usr/sbin - - installconf: -+ install -m 755 -D -d debian/axmail/etc/ax25 - install -m 755 -o root -g root -d debian/axmail/etc/ax25 - install -b -m 644 -o root -g root etc/axmail.conf debian/axmail/etc/ax25 - install -m 644 -o root -g root etc/welcome.txt debian/axmail/etc/ax25 - - installhelp: -+ install -m 755 -D -d debian/axmail/var/lib/ax25/axmail/help - install -m 755 -o root -g root -d debian/axmail/var/lib/ax25/axmail/help - install -m 644 -o root -g root etc/help/*.hlp debian/axmail/var/lib/ax25/axmail/help - diff -Nru axmail-2.9/debian/patches/install_locations axmail-2.11.1/debian/patches/install_locations --- axmail-2.9/debian/patches/install_locations 2019-01-05 22:27:18.000000000 +0000 +++ axmail-2.11.1/debian/patches/install_locations 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -Description: Update the folders in which axmail is installed -Author: Dave Hibberd -Last-Update: 2019-01-05 - ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ - all: axmail - --MAN_DIR = /usr/local/share/man -+MAN_DIR = debian/axmail/usr/share/man - CC = gcc - LD = gcc - # CFLAGS = -O2 -Wstrict-prototypes -g -I../lib -@@ -10,25 +10,20 @@ - .c.o: - $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $< - --upgrade: installbin installhelp installman installconf -- --install: installbin installconf installhelp installman -+install: installbin installconf installhelp - - installbin: all -- install -m 0755 -s -o root -g root axmail /usr/local/sbin -+ install -m 0755 -s -o root -g root axmail debian/axmail/usr/sbin - - installconf: -- install -m 755 -o root -g root -d /usr/local/etc/ax25 -- install -b -m 644 -o root -g root etc/axmail.conf /usr/local/etc/ax25 -- install -m 644 -o root -g root etc/welcome.txt /usr/local/etc/ax25 -+ install -m 755 -o root -g root -d debian/axmail/etc/ax25 -+ install -b -m 644 -o root -g root etc/axmail.conf debian/axmail/etc/ax25 -+ install -m 644 -o root -g root etc/welcome.txt debian/axmail/etc/ax25 - - installhelp: -- install -m 755 -o root -g root -d /usr/local/var/ax25/axmail/help -- install -m 644 -o root -g root etc/help/*.hlp /usr/local/var/ax25/axmail/help -+ install -m 755 -o root -g root -d debian/axmail/var/lib/ax25/axmail/help -+ install -m 644 -o root -g root etc/help/*.hlp debian/axmail/var/lib/ax25/axmail/help - --installman: -- install -m 644 -p man/axmail.8 $(MAN_DIR)/man8 -- install -m 644 -p man/axmail.conf.5 $(MAN_DIR)/man5 - back: - rm -f ../mail.tar.gz - tar cvf ../mail.tar * diff -Nru axmail-2.9/debian/patches/series axmail-2.11.1/debian/patches/series --- axmail-2.9/debian/patches/series 2018-12-27 17:11:06.000000000 +0000 +++ axmail-2.11.1/debian/patches/series 2020-08-03 19:46:54.000000000 +0000 @@ -1,5 +1,6 @@ correct-manpages.patch spelling hardening -install_locations -install_dir_creation +cross-build +gcc10 +file-locations diff -Nru axmail-2.9/debian/rules axmail-2.11.1/debian/rules --- axmail-2.9/debian/rules 2018-12-27 16:35:00.000000000 +0000 +++ axmail-2.11.1/debian/rules 2020-08-03 19:46:54.000000000 +0000 @@ -5,9 +5,9 @@ %: dh $@ -# Cut changelog from README and place in a changelog file +override_dh_auto_install: + # let dh_install do the work -override_dh_auto_build: - cat README | sed '27,338!d' > changelog - rm INSTALL - dh_auto_build +override_dh_installchangelogs: + # README is mostly upstream changelog, install it as such + dh_installchangelogs README diff -Nru axmail-2.9/defines.h axmail-2.11.1/defines.h --- axmail-2.9/defines.h 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/defines.h 2020-02-21 23:00:45.000000000 +0000 @@ -3,8 +3,8 @@ * defines.h - Compile-time configuration */ -#define VERSION "axMail-Fax v2.9" -#define COPYRIGHT "(c) 1996-1998 Heikki Hannikainen (OH7LZB) \nMailbox save support (c) 2003 Marius Petrescu (YO2LOJ) \nOther modifications (c) 2005-2018 by Brian Rogers (N1URO) " +#define VERSION "axMail-Fax v2.11.1" +#define COPYRIGHT "(c) 1996-1998 Heikki Hannikainen (OH7LZB) \nMailbox save support (c) 2003 Marius Petrescu (YO2LOJ) \nOther modifications (c) 2005-2020 by Brian Rogers (N1URO) " #define PROMPT "=> " #define CONF_AXMAIL_FILE "/usr/local/etc/ax25/axmail.conf" diff -Nru axmail-2.9/etc/help/.svn/entries axmail-2.11.1/etc/help/.svn/entries --- axmail-2.9/etc/help/.svn/entries 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,708 +0,0 @@ -10 - -dir -62 -svn://n1uro.ampr.org/axmail/etc/help -svn://n1uro.ampr.org/axmail - - - -2017-08-19T16:07:08.123679Z -53 -n1uro - - - - - - - - - - - - - - -64cb5372-df00-46e0-9426-e62cb31c67dc - -sreply.hlp -file - - - - -2016-09-24T05:17:23.173333Z -2c939fd6be7e7974ca879779554c956f -2016-09-24T05:17:23.173333Z -37 -n1uro - - - - - - - - - - - - - - - - - - - - - -205 - -bye.hlp -file - - - - -2016-09-24T05:17:23.173333Z -0a01bd961361f77d6bd41c4f292bbbe9 -2016-09-24T05:17:23.173333Z -37 -n1uro - - - - - - - - - - - - - - - - - - - - - -156 - -name.hlp -file - - - - -2016-09-24T05:17:23.173333Z -3ad42bcb2ffeb2c9f63a499699ea6ed2 -2016-09-24T05:17:23.173333Z -37 -n1uro - - - - - - - - - - - - - - - - - - - - - -194 - -sig.hlp -file - - - - -2017-08-19T16:07:08.123679Z -b2b24eae7fd1bf80d60a10f6939f5971 -2017-08-19T16:07:08.123679Z -53 -n1uro - - - - - - - - - - - - - - - - - - - - - -336 - -quit.hlp -file - - - - -2016-09-24T05:17:23.173333Z -0a01bd961361f77d6bd41c4f292bbbe9 -2016-09-24T05:17:23.173333Z -37 -n1uro - - - - - - - - - - - - - - - - - - - - - -156 - -status.hlp -file - - - - -2016-09-24T05:17:23.173333Z -1d898652be797e191f2b5facc9fe3533 -2016-09-24T05:17:23.173333Z -37 -n1uro - - - - - - - - - - - - - - - - - - - - - -202 - -cancel.hlp -file - - - - -2016-09-24T05:17:23.173333Z -aa09144a0c86e0472d17f49ec69ce4f6 -2016-09-24T05:17:23.173333Z -37 -n1uro - - - - - - - - - - - - - - - - - - - - - -216 - -help.hlp -file - - - - -2014-10-21T23:49:40.572418Z -2c0038a3afb0f63b56167933706717bf -2014-10-21T23:49:40.572418Z -1 -n1uro - - - - - - - - - - - - - - - - - - - - - -241 - -send.hlp -file - - - - -2017-08-01T04:19:37.501468Z -baee3ebd58ea34cf24db2b438a9f6760 -2017-08-01T04:19:37.501468Z -46 -n1uro - - - - - - - - - - - - - - - - - - - - - -498 - -kill.hlp -file - - - - -2014-10-21T23:49:40.572418Z -ea9be920e38ed0d3a66e711c02f7ecce -2014-10-21T23:49:40.572418Z -1 -n1uro - - - - - - - - - - - - - - - - - - - - - -255 - -info.hlp -file - - - - -2014-10-21T23:49:40.572418Z -bb39a89019d5f95fb13c1643070becee -2014-10-21T23:49:40.572418Z -1 -n1uro - - - - - - - - - - - - - - - - - - - - - -93 - -spers.hlp -file - - - - -2017-08-14T04:33:19.451976Z -fe3773561ead63d15602de2c2b3c962f -2017-08-14T04:33:19.451976Z -48 -n1uro - - - - - - - - - - - - - - - - - - - - - -607 - -unkill.hlp -file - - - - -2016-09-24T05:17:23.173333Z -088d82cf90b807c35766440e38cb8535 -2016-09-24T05:17:23.173333Z -37 -n1uro - - - - - - - - - - - - - - - - - - - - - -372 - -sfax.hlp -file - - - - -2014-10-21T23:49:40.572418Z -c8a365e8357d2842092752979dea9853 -2014-10-21T23:49:40.572418Z -1 -n1uro - - - - - - - - - - - - - - - - - - - - - -679 - -delete.hlp -file - - - - -2014-10-21T23:49:40.572418Z -ea9be920e38ed0d3a66e711c02f7ecce -2014-10-21T23:49:40.572418Z -1 -n1uro - - - - - - - - - - - - - - - - - - - - - -255 - -verbose.hlp -file - - - - -2016-09-24T05:17:23.173333Z -100c20c9dc439718cf9825c78892a933 -2016-09-24T05:17:23.173333Z -37 -n1uro - - - - - - - - - - - - - - - - - - - - - -457 - -exit.hlp -file - - - - -2016-09-24T05:17:23.173333Z -0a01bd961361f77d6bd41c4f292bbbe9 -2016-09-24T05:17:23.173333Z -37 -n1uro - - - - - - - - - - - - - - - - - - - - - -156 - -autofwd.hlp -file - - - - -2015-04-25T19:56:25.326022Z -03ac3ddfd2ab30523de019a71cb99898 -2015-04-25T19:56:25.326022Z -21 -n1uro - - - - - - - - - - - - - - - - - - - - - -410 - -read.hlp -file - - - - -2016-09-24T05:17:23.173333Z -71ac76f112edb9343f1c290888deaf29 -2016-09-24T05:17:23.173333Z -37 -n1uro - - - - - - - - - - - - - - - - - - - - - -196 - -list.hlp -file - - - - -2016-09-24T05:17:23.173333Z -d51048d904f2799476c2789e96257b65 -2016-09-24T05:17:23.173333Z -37 -n1uro - - - - - - - - - - - - - - - - - - - - - -193 - diff -Nru axmail-2.9/etc/help/.svn/text-base/autofwd.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/autofwd.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/autofwd.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/autofwd.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -USAGE - Autofwd - -DESCRIPTION - This command will set the system to auto-forward any incoming - mail to this address to a "home" axMail-FAX system you would - usually use, OR you could set it to forward any mails from - this system to any SMTP based system ie: xNOS, internet, etc. - Just hitting the enter key will clear your mail forwarding - and your incoming mail to this system will be held here for you. - diff -Nru axmail-2.9/etc/help/.svn/text-base/bye.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/bye.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/bye.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/bye.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -USAGE - bye | exit | quit - -DESCRIPTION - Any of these commands will exit axMail-FAX and preserve any - mail that you haven't killed or deleted. diff -Nru axmail-2.9/etc/help/.svn/text-base/cancel.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/cancel.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/cancel.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/cancel.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -USAGE - Cancel - -DESCRIPTION - When you choose to Cancel out of the mailbox, any changes you - have done to your axMail-FAX mail file will NOT be saved and - you will be logged out of the axMail-FAX system. diff -Nru axmail-2.9/etc/help/.svn/text-base/delete.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/delete.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/delete.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/delete.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -USAGE - kill [] - delete [] - -DESCRIPTION - This command removes specified message from mailbox. - If no message number is entered, then command removes - last viewed message. - - diff -Nru axmail-2.9/etc/help/.svn/text-base/exit.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/exit.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/exit.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/exit.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -USAGE - bye | exit | quit - -DESCRIPTION - Any of these commands will exit axMail-FAX and preserve any - mail that you haven't killed or deleted. diff -Nru axmail-2.9/etc/help/.svn/text-base/help.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/help.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/help.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/help.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -USAGE - help [] - -DESCRIPTION - Gives help for the specified command or this text if no - command is specified. Commands can not be abbreviated. - Use the "?" command to retrieve a list of available commands. diff -Nru axmail-2.9/etc/help/.svn/text-base/info.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/info.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/info.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/info.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -This is an SMTP mail agent node plug-in for packet radio systems -using linuxnode or URONode. diff -Nru axmail-2.9/etc/help/.svn/text-base/kill.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/kill.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/kill.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/kill.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -USAGE - kill [] - delete [] - -DESCRIPTION - This command removes specified message from mailbox. - If no message number is entered, then command removes - last viewed message. - - diff -Nru axmail-2.9/etc/help/.svn/text-base/list.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/list.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/list.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/list.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -USAGE - list - -DESCRIPTION - Use this command to list your mail messages. Each message will - be flagged as N(ew), U(nread), or blank for read. Use the "read" - command to read each message. diff -Nru axmail-2.9/etc/help/.svn/text-base/name.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/name.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/name.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/name.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -USAGE - name - -DESCRIPTION - Use the Name command to change your "Real name" within the mail - server system. It will automatically be appended to your email - address when you send mail out. diff -Nru axmail-2.9/etc/help/.svn/text-base/quit.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/quit.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/quit.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/quit.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -USAGE - bye | exit | quit - -DESCRIPTION - Any of these commands will exit axMail-FAX and preserve any - mail that you haven't killed or deleted. diff -Nru axmail-2.9/etc/help/.svn/text-base/read.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/read.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/read.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/read.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -USAGE - read - -DESCRIPTION - Use this command to read your mail. This command requires a - parameter of a message number to read. Ex: to read your mail - message 3 you would enter: R 3. diff -Nru axmail-2.9/etc/help/.svn/text-base/send.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/send.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/send.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/send.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -USAGE - send [] - -DESCRIPTION - This command sends message. If no mail recipient is specified, - then you will be asked. You will also be prompted for a cc: and - also for a bcc: entry if desired. Hitting enter disables these - features. You may enter multiple addresses on each line if you - desire too. Separate them with a comma (,). Ex: - - s n1uro@email.com, user@foo.net, noone@bar.org - cc: ripoff@arrl.org, commish@fcc.gov - bcc: ghost@noth.ing, not@listed.info diff -Nru axmail-2.9/etc/help/.svn/text-base/sfax.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/sfax.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/sfax.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/sfax.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -USAGE - sfax - -DESCRIPTION - This command sends a facsimile. The To: field will be preset for - you. You can specify a user but you *must* specify a full phone - number to fax to. Ex: n1uro@14132416644 - - Notes: Faxes will send only! You will get a confirmation that your - fax was received into the system and another message after the - fax was either sent successfully or had issues sending. Faxes - will only work within the United States. Sending of faxes - elsewhere is a violation of this program. - - IMPORTANT: you *must* include the beginning country code. For - the U.S it's 1, for the U.K. it's 011. An example of a properly - entered number would be: 12125551212 - - - diff -Nru axmail-2.9/etc/help/.svn/text-base/sig.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/sig.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/sig.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/sig.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -USAGE - SI - -DESCRIPTION - - This creates a signature file which would get appended to your - outgoing mail so you don't have to keep typing your closings - when you send mail. If you don't have a signature file it will - inform you of such but it will not prevent mail from being sent. - This is limited to just 1 line (79 characters). diff -Nru axmail-2.9/etc/help/.svn/text-base/spers.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/spers.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/spers.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/spers.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -USAGE - spers - -DESCRIPTION - This command sends message. If no mail recipient is specified, - then you will be asked. This is a clone of the "Send" command, - with initial flags, cc, and bcc prompts disabled. You will still - be asked if you wish to receive a delivery receipt since the - remote reader isn't given an option to ignore it. Mail will also - default as highest priority since it's coming from amateur radio. - - You may enter multiple addresses on each line if you desire too. - Separate them with a comma (,). Ex: - To: n1uro@email.com, user@foo.net, noone@bar.org diff -Nru axmail-2.9/etc/help/.svn/text-base/sreply.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/sreply.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/sreply.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/sreply.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -USAGE - SReply (short for "send reply") - -DESCRIPTION - This command allows you to send a reply to the message number - the prompt tells you that you're on. Subject and destination - will be preserved. diff -Nru axmail-2.9/etc/help/.svn/text-base/status.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/status.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/status.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/status.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -USAGE - status - -DESCRIPTION - The STatus command shows you a very shortened list by only - informing you just how many total messages you have by a - grand total number. Ex: - status - Messages: 4 - diff -Nru axmail-2.9/etc/help/.svn/text-base/unkill.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/unkill.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/unkill.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/unkill.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -USAGE - unkill - -DESCRIPTION - The Unkill commmand allows you to reflag a killed message as - valid so that it may be retrieved later if you wish to reread - it. This comes in very handy in the event you accidentally kill - or delete a mail message. Mail does NOT get fully killed until - you exit the axMail-FAX mailbox, and your settings are changed - and saved. diff -Nru axmail-2.9/etc/help/.svn/text-base/verbose.hlp.svn-base axmail-2.11.1/etc/help/.svn/text-base/verbose.hlp.svn-base --- axmail-2.9/etc/help/.svn/text-base/verbose.hlp.svn-base 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/etc/help/.svn/text-base/verbose.hlp.svn-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -USAGE - Verbose - -DESCRIPTION - Like with the Read command, verbose will print out the full mail - headers along with the body of the message. This command requires - a parameter consisting of the message number you wish to read. - Ex: V 3 will verbosely print message #3 including all mail - headers. This can be quite lengthy but also can be quite - handy if you're trying to find out if someone else's mail - account may have been compromised or spoofed. diff -Nru axmail-2.9/INSTALL axmail-2.11.1/INSTALL --- axmail-2.9/INSTALL 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/INSTALL 2020-02-21 23:04:24.000000000 +0000 @@ -14,10 +14,12 @@ to send me your code and I'll import it in. This is probably one of the simplest packages to install and configure! -After you run tar zxvf axmail-0.0.8.tgz cd axmail-0.0.8 (which is where +After you run tar zxvf axmail-###.tgz cd axmail-#### (which is where you should be now if you're reading this :) ) and run: make; make install +Note: If you have clamsmtp and your clamsmtpd.conf is in /usr/local/etc, +symlink it to /etc. (on newer gcc/libs I do know that there's a warning after it makes but it doesn't prevent the binary from compiling and so far it seems to test diff -Nru axmail-2.9/mailcmd.c axmail-2.11.1/mailcmd.c --- axmail-2.9/mailcmd.c 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/mailcmd.c 2020-02-21 23:03:20.000000000 +0000 @@ -336,21 +336,35 @@ } /* append a signature file signature to the mail message */ FILE *stream; + FILE *streamm; char *line = NULL; char *sig = NULL; char buffer[79 + 1]; + char bufferr[50 + 1]; size_t len = 0; ssize_t read; - + sprintf(buffer,"%s/.signature", homedir); + sprintf(bufferr,"/etc/clamsmtpd.conf"); stream = fopen(buffer, "r"); + streamm = fopen(bufferr, "r"); if (stream == NULL) { printf("No signature file found, use the SIG command to make one.\n"); fprintf(f, "\n---\nsent via axMail-FAX by N1URO."); + if (streamm == NULL) { + } else { + fprintf(f, "\n---\nMail scanned for viri by ClamSMTP."); + fclose(streamm); + } goto mailmsg; } else { while ((read = getline(&line, &len, stream)) != -1) { fprintf(f, "\n---\n%s\nsent via axMail-FAX by N1URO.", line); + if (streamm == NULL) { + } else { + fprintf(f, "\n---\nMail scanned for viri by ClamSMTP."); + fclose(streamm); + } } free(line); @@ -365,8 +379,20 @@ return 0; } +delrcpt: if (strcasecmp(str, "n")) { - getstr(str, LINESIZE, "Request a delivery receipt? (y/N): "); + getstr(str, LINESIZE, "Request a delivery receipt? (y/N/?): "); + if (!strcasecmp(str, "?")) { + printf("Requesting a delivery receipt sends the remote mail server a command that tells\n"); + printf("it that you desire notification that your mail message not only was received but\n"); + printf("also that it was actually delivered to the user's mailbox. This comes in very handy\n"); + printf("if you need to log the fact that you sent a communication to a specific person\n"); + printf("especially for emergency communication purposes and they do NOT send you a read\n"); + printf("receipt even though you asked for one, this covers you and is your log of proof that\n"); + printf("you infact did send a communication and the remote person did in fact received it.\n"); + printf("This feature can ONLY be found in axMail-FAX.\n"); + goto delrcpt; + } if (!strcasecmp(str, "y")) { sprintf(str, "%s -N success,delay,failure -oem -t < %s", BIN_AXMAIL_SENDMAIL, tempMesg); system(str); @@ -499,21 +525,35 @@ /* append a signature file signature to the mail message */ FILE *stream; + FILE *streamm; char *line = NULL; char *sig = NULL; char buffer[79 + 1]; + char bufferr[50 + 1]; size_t len = 0; ssize_t read; sprintf(buffer,"%s/.signature", homedir); + sprintf(bufferr,"/etc/clamsmtpd.conf"); stream = fopen(buffer, "r"); + streamm = fopen(bufferr, "r"); if (stream == NULL) { printf("No signature file found, use the SIG command to make one.\n"); fprintf(f, "\n---\nsent via axMail-FAX by N1URO."); + if (streamm == NULL) { + } else { + fprintf(f, "\n---\nMail scanned for viri by ClamSMTP."); + fclose(streamm); + } goto pmailmsg; } else { while ((read = getline(&line, &len, stream)) != -1) { fprintf(f, "\n---\n%s\nsent via axMail-FAX by N1URO.", line); + if (streamm == NULL) { + } else { + fprintf(f, "\n---\nMail scanned for viri by ClamSMTP."); + fclose(streamm); + } } free(line); @@ -528,7 +568,19 @@ return 0; } if (strcasecmp(str, "n")) { - getstr(str, LINESIZE, "Request a delivery receipt? (y/N): "); +pdelrcpt: + getstr(str, LINESIZE, "Request a delivery receipt? (y/N/?): "); + if (!strcasecmp(str, "?")) { + printf("Requesting a delivery receipt sends the remote mail server a command that tells\n"); + printf("it that you desire notification that your mail message not only was received but\n"); + printf("also that it was actually delivered to the user's mailbox. This comes in very handy\n"); + printf("if you need to log the fact that you sent a communication to a specific person\n"); + printf("especially for emergency communication purposes and they do NOT send you a read\n"); + printf("receipt even though you asked for one, this covers you and is your log of proof that\n"); + printf("you infact did send a communication and the remote person did in fact received it.\n"); + printf("This feature can ONLY be found in axMail-FAX.\n"); + goto pdelrcpt; + } if (!strcasecmp(str, "y")) { sprintf(str, "%s -N success,delay,failure -oem -t < %s", BIN_AXMAIL_SENDMAIL, tempMesg); system(str); diff -Nru axmail-2.9/mailcmd.h axmail-2.11.1/mailcmd.h --- axmail-2.9/mailcmd.h 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/mailcmd.h 2020-02-18 11:52:31.000000000 +0000 @@ -7,4 +7,3 @@ extern int do_fax(int argc, char **argv); extern int do_kill(int argc, char **argv); extern int do_unkill(int argc, char **argv); - diff -Nru axmail-2.9/Makefile axmail-2.11.1/Makefile --- axmail-2.9/Makefile 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/Makefile 2020-02-21 23:09:26.000000000 +0000 @@ -10,7 +10,7 @@ .c.o: $(CC) $(CFLAGS) -c $< -upgrade: installbin installhelp installman installconf +upgrade: installbin installhelp installman install: installbin installconf installhelp installman diff -Nru axmail-2.9/README axmail-2.11.1/README --- axmail-2.9/README 2018-03-21 19:35:31.000000000 +0000 +++ axmail-2.11.1/README 2020-02-21 23:10:32.000000000 +0000 @@ -24,6 +24,37 @@ not be what you're looking for or expecting for a node based plugin CHANGE HISTORY: +axMail 2.11.1 + Updated February 21, 2020 by Brian Rogers (N1URO) +- removed the #ifdef CLAMSMTP routine from config.h +- fixed my routine for checking for /etc/clamsmtpd.conf so that it no longer + needs to be previously defined in config.h and auto senses now in mailcmd.c. + It dawned on me that the reason it was segfaulting if there was no .conf + file that trying to fclose() a file that did not exist was the reason that + it was causing axmail to segfault. +- made this version 2.11.1 in defines.h. +- updated INSTALL and README to reflect history and instructions. +- updated Makefile so make upgrade does not replace config files since + it's not required if you're simply upgrading from axmail-2.9 or greater. +axmail 2.11 + Updated February 18, 2020 by Brian Rogers (N1URO) +- Figured out how to add ClamSMTP to the mail system's MTA. Details + are posted on https://uronode.n1uro.com/linux/axclamsmtp.shtml + This will scan for viri both IN and OUT bound mails! Very handy! +- Added a define routine in config.h now. You must #define or #undef + CLAMSMTP based on whether or not you're running clamsmtp and have + /etc/clamsmtpd.conf in existance. If it's elsewhere on your system + create a symlink to it and you'll be fine. +- added the fact when #defined where mails are tagged with the fact that + your mail is being scanned by CLAMSMTP. This was done in mailcmd.c +- upped the version to 2.11 in defines.h +- added notes in INSTALL in regards to the new #define in config.h +axmail 2.10 + Updated April, 2019 by Brian Rogers (N1URO) +- added online help for the "Delivery Receipt" command. This keeps + it in line with all the other online helps. +- modified defines.h with this version number and also increased the + year that I'm still working on modifications to the project. axmail 2.9 Updated March, 2018 by Brian Rogers (N1URO) - Removed asking for password upon new user login, instead added a new diff -Nru axmail-2.9/.svn/entries axmail-2.11.1/.svn/entries --- axmail-2.9/.svn/entries 2018-03-21 18:24:27.000000000 +0000 +++ axmail-2.11.1/.svn/entries 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -10 - -dir -63 -svn://n1uro.ampr.org/axmail -svn://n1uro.ampr.org/axmail - - - - - - - - - - - - - - - - - - - -incomplete -64cb5372-df00-46e0-9426-e62cb31c67dc -