diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 1995-01-21 00:39:25 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 1995-01-21 00:39:25 +0000 |
commit | 9cdcf9d15c1e1fc3c20d285eb6cf4b0647298e36 (patch) | |
tree | 8d8dff57e4a2c9a435714e8ed2ae5743a79e6063 /mail/pgpsendmail/files | |
parent | Upgrade (diff) |
Automatically encrypt/decrypt/sign incoming/outgoing mail
Notes
Notes:
svn path=/head/; revision=797
Diffstat (limited to 'mail/pgpsendmail/files')
-rw-r--r-- | mail/pgpsendmail/files/patch-aa | 124 | ||||
-rw-r--r-- | mail/pgpsendmail/files/patch-ab | 315 |
2 files changed, 439 insertions, 0 deletions
diff --git a/mail/pgpsendmail/files/patch-aa b/mail/pgpsendmail/files/patch-aa new file mode 100644 index 000000000000..e6e98bfbfe8b --- /dev/null +++ b/mail/pgpsendmail/files/patch-aa @@ -0,0 +1,124 @@ +*** Makefile.old Sat Oct 15 23:06:26 1994 +--- Makefile Sat Jan 21 03:04:40 1995 +*************** +*** 13,28 **** + # + #SENDMAIL = '-DSENDMAIL="/usr/lib/sendmail"' + + DEFINES = + +! CC = cc +! CFLAGS = $(DEFINES) -I. "-DVERSION=\"`cat version`\"" + + LDFLAGS = + + TARGETS = blindness_assist pgpsendmail pgpdaemon sendpgppass pgppipe + +! all: $(TARGETS) clean + + BLINDNESS_ASSIST_OBJ = blindness_assist.o + +--- 13,29 ---- + # + #SENDMAIL = '-DSENDMAIL="/usr/lib/sendmail"' + ++ PREFIX = /usr/local ++ + DEFINES = + +! CFLAGS += $(DEFINES) -I. "-DVERSION=\"`cat version`\"" + + LDFLAGS = + + TARGETS = blindness_assist pgpsendmail pgpdaemon sendpgppass pgppipe + +! all: $(TARGETS) + + BLINDNESS_ASSIST_OBJ = blindness_assist.o + +*************** +*** 39,55 **** + pgpsendmail.o: pgpsendmail.c + $(CC) $(CFLAGS) $(SENDMAIL) -c pgpsendmail.c + + pgpsendmail: $(PGPSENDMAIL_OBJ) + $(CC) -s -o pgpsendmail $(PGPSENDMAIL_OBJ) $(LDFLAGS) + @-./blindness_assist +- -./install pgpsendmail + + + PGPDAEMON_OBJ = pgpdaemon.o spawn.o strings.o memory.o misc.o + + pgpdaemon: $(PGPDAEMON_OBJ) + $(CC) -s -o pgpdaemon $(PGPDAEMON_OBJ) $(LDFLAGS) +- -./install pgpdaemon + + + SENDPGPPASS_OBJ = sendpgppass.o conn_to_pgpd.o strings.o spawn.o \ +--- 40,55 ---- + pgpsendmail.o: pgpsendmail.c + $(CC) $(CFLAGS) $(SENDMAIL) -c pgpsendmail.c + ++ + pgpsendmail: $(PGPSENDMAIL_OBJ) + $(CC) -s -o pgpsendmail $(PGPSENDMAIL_OBJ) $(LDFLAGS) + @-./blindness_assist + + + PGPDAEMON_OBJ = pgpdaemon.o spawn.o strings.o memory.o misc.o + + pgpdaemon: $(PGPDAEMON_OBJ) + $(CC) -s -o pgpdaemon $(PGPDAEMON_OBJ) $(LDFLAGS) + + + SENDPGPPASS_OBJ = sendpgppass.o conn_to_pgpd.o strings.o spawn.o \ +*************** +*** 57,72 **** + + sendpgppass: $(SENDPGPPASS_OBJ) + $(CC) -s -o sendpgppass $(SENDPGPPASS_OBJ) $(LDFLAGS) +- -./install sendpgppass + + + PGPPIPE_OBJ = pgppipe.o conn_to_pgpd.o memory.o misc.o + + pgppipe: $(PGPPIPE_OBJ) + $(CC) -s -o pgppipe $(PGPPIPE_OBJ) $(LDFLAGS) +- -./install pgppipe + + + clean: + rm -f *.BAK *.log *.sed .#* *~ *.bak */*.bak */tmp* .*defaults */*~ + -chmod u+rw,go-w * 2> /dev/null +--- 57,80 ---- + + sendpgppass: $(SENDPGPPASS_OBJ) + $(CC) -s -o sendpgppass $(SENDPGPPASS_OBJ) $(LDFLAGS) + + + PGPPIPE_OBJ = pgppipe.o conn_to_pgpd.o memory.o misc.o + + pgppipe: $(PGPPIPE_OBJ) + $(CC) -s -o pgppipe $(PGPPIPE_OBJ) $(LDFLAGS) + + ++ all_install: ++ $(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) pgpsendmail $(PREFIX)/lib ++ $(INSTALL) -c -o $(BINOWN) -g $(BINGRP) -m 644 doc/pgpsendmail.8 $(PREFIX)/man/man8 ++ $(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) pgpdaemon $(PREFIX)/bin ++ $(INSTALL) -c -o $(BINOWN) -g $(BINGRP) -m 644 doc/pgpdaemon.8 $(PREFIX)/man/man8 ++ $(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) pgppipe $(PREFIX)/bin ++ $(INSTALL) -c -o $(BINOWN) -g $(BINGRP) -m 644 doc/pgppipe.1 $(PREFIX)/man/man1 ++ $(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) sendpgppass $(PREFIX)/bin ++ $(INSTALL) -c -o $(BINOWN) -g $(BINGRP) -m 644 doc/sendpgppass.1 $(PREFIX)/man/man1 ++ + clean: + rm -f *.BAK *.log *.sed .#* *~ *.bak */*.bak */tmp* .*defaults */*~ + -chmod u+rw,go-w * 2> /dev/null +*************** +*** 88,90 **** +--- 96,99 ---- + memory.o: pgpsendmail.h karma.h + pgppipe.o: pgpsendmail.h karma.h version + misc.o: pgpsendmail.h karma.h ++ blindness_assist.o: pgpsendmail.h diff --git a/mail/pgpsendmail/files/patch-ab b/mail/pgpsendmail/files/patch-ab new file mode 100644 index 000000000000..c429a1ac4dde --- /dev/null +++ b/mail/pgpsendmail/files/patch-ab @@ -0,0 +1,315 @@ +*** conn_to_pgpd.c.orig Sat Dec 3 06:51:16 1994 +--- conn_to_pgpd.c Sat Jan 21 03:12:05 1995 +*************** +*** 96,102 **** +--- 96,104 ---- + char topipe_filename[STRING_LENGTH]; + char frompipe_filename[STRING_LENGTH]; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + if (gethostname (hostname, STRING_LENGTH - 1) != 0) + { +*** keylist.c.orig Sat Oct 15 20:31:05 1994 +--- keylist.c Sat Jan 21 03:12:05 1995 +*************** +*** 74,80 **** +--- 74,82 ---- + char txt[STRING_LENGTH]; + struct stat statbuf_list, statbuf_keyring; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + static char *argv[] = {"pgp", "-kv", NULL}; + + (void) sprintf (listfile, "%s/.keylist", pgppath); +*************** +*** 268,274 **** +--- 270,278 ---- + FILE *in_fp; + char keyfile[STRING_LENGTH]; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + (void) sprintf (keyfile, "%s/mypubkey.asc", pgppath); + if ( ( in_fp = fopen (keyfile, "r") ) == NULL ) +*** misc.c.orig Sat Dec 3 11:26:58 1994 +--- misc.c Sat Jan 21 03:12:05 1995 +*************** +*** 64,70 **** +--- 64,72 ---- + int count = -1; + char buffer[BUF_SIZE]; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + while ( ( len = read (in_fd, buffer, BUF_SIZE) ) > 0 ) + { +*************** +*** 195,201 **** +--- 197,205 ---- + struct stat statbuf; + char buf[BUF_SIZE]; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + m_clear (buf, BUF_SIZE); + if ( ( fd = open (filename, O_RDWR, 0) ) < 0 ) +*** options.c.orig Sat Oct 29 11:09:46 1994 +--- options.c Sat Jan 21 03:12:05 1995 +*************** +*** 158,164 **** +--- 158,166 ---- + char config_filename[STRING_LENGTH]; + char txt[STRING_LENGTH]; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + (void) sprintf (config_filename, "%s/PGPsendmail.config", pgppath); + if ( ( fp = fopen (config_filename, "r") ) == NULL ) +*** pgpdaemon.c.orig Wed Jan 4 08:15:01 1995 +--- pgpdaemon.c Sat Jan 21 03:19:13 1995 +*************** +*** 156,162 **** + # if defined(sparc) || defined(linux) + # define MAIL_SPOOL_DIR "/var/spool/mail" + # else +! # if defined(__bsdi__) || ( defined(sparc) && defined(__sysvr4__) ) + # define MAIL_SPOOL_DIR "/var/mail" + # else + # define MAIL_SPOOL_DIR "/usr/spool/mail" +--- 156,162 ---- + # if defined(sparc) || defined(linux) + # define MAIL_SPOOL_DIR "/var/spool/mail" + # else +! # if defined(__bsdi__) || defined(__FreeBSD__) || ( defined(sparc) && defined(__sysvr4__) ) + # define MAIL_SPOOL_DIR "/var/mail" + # else + # define MAIL_SPOOL_DIR "/usr/spool/mail" +*************** +*** 268,274 **** +--- 268,276 ---- + ERRNO_TYPE errno; + static char usage_string[] = + "Usage:\tpgpdaemon [-mailwait] [-detach] [-pgppath <path>]"; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + /* Read arguments */ + for (count = 1; count < argc; ++count) +*************** +*** 545,551 **** +--- 547,555 ---- + extern char passphrase[STRING_LENGTH]; + extern char *secring_buf; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + /* Connect to output pipe */ + for (count = 0; (count < 2) && (out_fd < 0); ++count) +*************** +*** 782,788 **** +--- 786,794 ---- + extern char my_userid[STRING_LENGTH]; + extern char passphrase[STRING_LENGTH]; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + /* Setup arguments to PGP */ + if (sign) +*************** +*** 879,885 **** +--- 885,893 ---- + char lock_name[STRING_LENGTH]; + char mlk_name[STRING_LENGTH]; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + (void) strcpy (lock_name, filename); + (void) strcat (lock_name, ".lock"); +*************** +*** 956,962 **** +--- 964,972 ---- + struct flock fl; + #endif + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + if (no_filelocking) return (TRUE); + #undef LOCKING_WORKS +*************** +*** 1032,1038 **** +--- 1042,1050 ---- + extern char outgoing_spool[STRING_LENGTH]; + extern char passphrase[STRING_LENGTH]; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + if (stat (incoming_spool, &statbuf) != 0) + { +*************** +*** 1436,1442 **** +--- 1448,1456 ---- + extern char incoming_spool[STRING_LENGTH]; + extern char outgoing_spool[STRING_LENGTH]; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + (void) sprintf (config_filename, "%s/PGPdaemon.config", pgppath); + if ( ( fp = fopen (config_filename, "r") ) == NULL ) +*************** +*** 1587,1593 **** +--- 1601,1609 ---- + extern char *secring_buf; + extern char *pgppath; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + (void) sprintf (filename, "%s/secring.pgp", pgppath); + if ( ( fd = open (filename, O_WRONLY | O_CREAT | O_EXCL, +*** pgppipe.c.orig Wed Dec 7 14:03:39 1994 +--- pgppipe.c Sat Jan 21 03:12:06 1995 +*************** +*** 67,73 **** +--- 67,75 ---- + char *pgp_start_line = "-----BEGIN PGP MESSAGE-----\n"; + char *pgp_end_line = "-----END PGP MESSAGE-----\n"; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + if ( ( pgppath = getenv ("PGPPATH") ) == NULL ) + { +*** pgpsendmail.c.orig Tue Jan 17 03:55:45 1995 +--- pgpsendmail.c Sat Jan 21 03:12:06 1995 +*************** +*** 184,190 **** +--- 184,192 ---- + extern char *username; + extern char **recipients; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + if (argv[0] == NULL) + { +*************** +*** 940,946 **** +--- 942,950 ---- + char *argv[6]; + extern char *username; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + /* Make stdout go to stderr */ + (void) fflush (stdout); +*************** +*** 1250,1256 **** +--- 1254,1262 ---- + extern char *buffer; + extern char *pgppath; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + if (!sign) + { +*** pgpsendmail.h.orig Sat Dec 3 06:23:34 1994 +--- pgpsendmail.h Sat Jan 21 03:12:06 1995 +*************** +*** 34,40 **** +--- 34,44 ---- + #define LINE_LENGTH 1024 + #define BUF_LEN 4096 + #ifndef SENDMAIL ++ #ifdef __FreeBSD__ ++ # define SENDMAIL "/usr/sbin/sendmail" ++ #else + # define SENDMAIL "/usr/lib/sendmail.real" ++ #endif + #endif + #define SECRING_SIZE_TYPE int + +*** sendpgppass.c.orig Sat Dec 3 07:10:21 1994 +--- sendpgppass.c Sat Jan 21 03:12:06 1995 +*************** +*** 118,124 **** +--- 118,126 ---- + char txt[STRING_LENGTH]; + char *pgp_argv[7]; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + if ( ( pgppath = getenv ("PGPPATH") ) == NULL ) + { +*************** +*** 323,329 **** +--- 325,333 ---- + int count; + int fd; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + static char buffer[STRING_LENGTH]; + + if ( ( fd = open (TTY, O_RDWR, 0) ) < 0 ) +*************** +*** 395,401 **** +--- 399,407 ---- + char config_filename[STRING_LENGTH]; + char txt[STRING_LENGTH]; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + (void) sprintf (config_filename, "%s/PGPdaemon.config", pgppath); + if ( ( fp = fopen (config_filename, "r") ) == NULL ) +*** spawn.c.orig Sat Dec 3 09:02:30 1994 +--- spawn.c Sat Jan 21 03:12:06 1995 +*************** +*** 79,85 **** +--- 79,87 ---- + int child_pid; + int in_fds[2], out_fds[2], err_fds[2]; + ERRNO_TYPE errno; ++ #ifndef __FreeBSD__ + extern char *sys_errlist[]; ++ #endif + + if (*in_fd < 0) + { |