cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to version 1.4.5.

Browse Source
This commit is contained in:
provos 1998-04-10 20:49:14 +00:00
parent b174295cc8
commit e9e7076d39
9 changed files with 204 additions and 421 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mail/pgpsendmail/Makefile
View File

@ -1,15 +1,16 @@
# OpenBSD makefile for: pgpsendmail
# Version required: 1.4
# Version required: 1.4.5
# Date created: 10 Nov 1997
# Whom: ejovi
#
# $OpenBSD: Makefile,v 1.2 1997/11/17 21:47:30 joey Exp $
# $OpenBSD: Makefile,v 1.3 1998/04/10 20:49:14 provos Exp $
#
DISTNAME= PGPsendmail-v1.4
PKGNAME= pgpsendmail-1.4
DISTNAME= PGPsendmail-v1.4.5
PKGNAME= pgpsendmail-1.4.5
CATEGORIES= mail
MASTER_SITES= ftp://ftp.dhp.com/pub/crypto/pgp/PGPsendmail/
MASTER_SITES= ftp://ftp.atnf.csiro.au/pub/people/rgooch/ \
ftp://ftp.dhp.com/pub/crypto/pgp/PGPsendmail/
MAINTAINER= joey@OpenBSD.ORG

2
mail/pgpsendmail/files/md5
View File

@ -1 +1 @@
MD5 (PGPsendmail-v1.4.tar.gz) = 086847b3c79736feab3d3d774cd023fb
MD5 (PGPsendmail-v1.4.5.tar.gz) = 9bad6e987d77d6d91c1356dee54fe5a3

144
mail/pgpsendmail/patches/patch-aa
View File

@ -1,124 +1,56 @@
*** Makefile.old Sat Oct 15 23:06:26 1994
--- Makefile Sat Jan 21 03:04:40 1995
*** Makefile.orig Mon Oct 20 18:58:19 1997
--- Makefile Thu Apr 9 23:30:29 1998
***************
*** 13,28 ****
*** 30,36 ****
# Where do your manpages reside?
#
#SENDMAIL = '-DSENDMAIL="/usr/lib/sendmail"'
! MANDIR = /usr/man
DEFINES =
! CC = cc
! CFLAGS = $(DEFINES) -I. "-DVERSION=\"`cat version`\""
# Various compilers: if you have problems compiling, you may comment out the
--- 30,36 ----
LDFLAGS =
TARGETS = blindness_assist pgpsendmail pgpdaemon sendpgppass pgppipe
! all: $(TARGETS) clean
BLINDNESS_ASSIST_OBJ = blindness_assist.o
--- 13,29 ----
# Where do your manpages reside?
#
#SENDMAIL = '-DSENDMAIL="/usr/lib/sendmail"'
! MANDIR = /usr/local/man
+ 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
# Various compilers: if you have problems compiling, you may comment out the
***************
*** 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
*** 112,119 ****
$(CC) -o match-email-addr match-email-addr.o $(LDFLAGS)
PGPDAEMON_OBJ = pgpdaemon.o spawn.o strings.o memory.o misc.o
pgpdaemon: $(PGPDAEMON_OBJ)
$(CC) -s -o pgpdaemon $(PGPDAEMON_OBJ) $(LDFLAGS)
- -./install pgpdaemon
! install: dummy pgpsendmail pgpdaemon sendpgppass pgppipe pgpsign extract-addrs\
! match-email-addr install.man
./install pgpsendmail $(SENDMAIL)
./install pgpdaemon
./install sendpgppass
--- 112,119 ----
$(CC) -o match-email-addr match-email-addr.o $(LDFLAGS)
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 \
! all_install: dummy pgpsendmail pgpdaemon sendpgppass pgppipe pgpsign \
! extract-addrs match-email-addr install.man
./install pgpsendmail $(SENDMAIL)
./install pgpdaemon
./install sendpgppass
***************
*** 57,72 ****
*** 123,130 ****
./install match-email-addr
sendpgppass: $(SENDPGPPASS_OBJ)
$(CC) -s -o sendpgppass $(SENDPGPPASS_OBJ) $(LDFLAGS)
- -./install sendpgppass
install.man: clean
! cp -rp man/* $(MANDIR)
!
reminder:
@echo ""
--- 123,129 ----
./install match-email-addr
PGPPIPE_OBJ = pgppipe.o conn_to_pgpd.o memory.o misc.o
install.man: clean
! cp -r man/* $(MANDIR)
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:
+ /usr/bin/install $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) pgpsendmail $(PREFIX)/lib
+ /usr/bin/install -c -o $(BINOWN) -g $(BINGRP) -m 644 doc/pgpsendmail.8 $(PREFIX)/man/man8
+ /usr/bin/install $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) pgpdaemon $(PREFIX)/bin
+ /usr/bin/install -c -o $(BINOWN) -g $(BINGRP) -m 644 doc/pgpdaemon.8 $(PREFIX)/man/man8
+ /usr/bin/install $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) pgppipe $(PREFIX)/bin
+ /usr/bin/install -c -o $(BINOWN) -g $(BINGRP) -m 644 doc/pgppipe.1 $(PREFIX)/man/man1
+ /usr/bin/install $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) sendpgppass $(PREFIX)/bin
+ /usr/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
reminder:
@echo ""

313
mail/pgpsendmail/patches/patch-ab
View File

@ -1,313 +1,12 @@
*** conn_to_pgpd.c.orig Sat Dec 3 06:51:16 1994
--- conn_to_pgpd.c Sat Jan 21 03:12:05 1995
*** lib/spawn.c.orig Thu Sep 25 00:21:58 1997
--- lib/spawn.c Thu Apr 9 23:15:05 1998
***************
*** 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 ----
*** 82,88 ****
--- 82,90 ----
{
int child_pid;
int in_fds[2], out_fds[2], err_fds[2];
ERRNO_TYPE errno;
+ #ifndef __FreeBSD__
+ #ifndef __OpenBSD__
extern char *sys_errlist[];
+ #endif

26
mail/pgpsendmail/patches/patch-ac Executable file
View File

@ -0,0 +1,26 @@
*** lib/keylist.c.orig Thu Apr 9 23:10:15 1998
--- lib/keylist.c Thu Apr 9 23:10:49 1998
***************
*** 76,82 ****
--- 76,84 ----
char keyring[STRING_LENGTH];
char txt[STRING_LENGTH];
struct stat statbuf_list, statbuf_keyring;
+ #ifndef __OpenBSD__
extern char *sys_errlist[];
+ #endif
static char *argv[] = {"pgp", "-kv", "+language=en", NULL};
sprintf (listfile, "%s/.keylist", pgppath);
***************
*** 263,269 ****
--- 265,273 ----
int ch;
FILE *in_fp;
char keyfile[STRING_LENGTH];
+ #ifndef __OpenBSD__
extern char *sys_errlist[];
+ #endif
sprintf (keyfile, "%s/mypubkey.asc", pgppath);
if ( ( in_fp = fopen (keyfile, "r") ) == NULL )

12
mail/pgpsendmail/patches/patch-ad Executable file
View File

@ -0,0 +1,12 @@
*** lib/options.c.orig Thu Apr 9 23:15:59 1998
--- lib/options.c Thu Apr 9 23:16:21 1998
***************
*** 69,74 ****
--- 69,75 ----
#include <sys/stat.h>
#include <fcntl.h>
#include <regex.h>
+ #include <errno.h>
#include "pgpsendmail.h"

12
mail/pgpsendmail/patches/patch-ae Executable file
View File

@ -0,0 +1,12 @@
*** pgpsign.c.orig Thu Apr 9 23:16:52 1998
--- pgpsign.c Thu Apr 9 23:17:02 1998
***************
*** 46,51 ****
--- 46,52 ----
#include <stdlib.h>
#include <signal.h>
#include <string.h>
+ #include <errno.h>
#include <pgpsendmail.h>
#include <version.h>

94
mail/pgpsendmail/patches/patch-af Executable file
View File

@ -0,0 +1,94 @@
*** install.orig Thu Oct 9 08:58:17 1997
--- install Thu Apr 9 23:44:20 1998
***************
*** 1,5 ****
--- 1,7 ----
#! /bin/csh -f
+ set USRBINPATH=/usr/local/bin
+
if ("$#argv" < "1") then
echo "Usage: install binary"
exit 1
***************
*** 29,39 ****
exit 0
endif
if ( ! -f $USRBINPATH/$binary ) then
! cp -p $binary $USRBINPATH
exit 0
endif
mv $USRBINPATH/$binary $USRBINPATH/${binary}.old
! cp -p $binary $USRBINPATH
if ("$status" != "0") then
mv $USRBINPATH/${binary}.old $USRBINPATH/$binary
exit 1
--- 31,43 ----
exit 0
endif
if ( ! -f $USRBINPATH/$binary ) then
! cp $binary $USRBINPATH
! chmod 755 $USRBINPATH/$binary
exit 0
endif
mv $USRBINPATH/$binary $USRBINPATH/${binary}.old
! cp $binary $USRBINPATH
! chmod 755 $USRBINPATH/$binary
if ("$status" != "0") then
mv $USRBINPATH/${binary}.old $USRBINPATH/$binary
exit 1
***************
*** 73,80 ****
echo "You cannot over-write ${sendmail_dir}/pgpsendmail"
exit 1
endif
! cp -p pgpsendmail ${sendmail_dir}/pgpsendmail.new
mv -f ${sendmail_dir}/pgpsendmail.new ${sendmail_dir}/pgpsendmail
echo "PGPsendmail installed as ${sendmail_dir}/pgpsendmail"
if ("$mortal" == "TRUE") then
echo "PGPsendmail will expect the real sendmail is ${sendmail_dir}/sendmail"
--- 77,85 ----
echo "You cannot over-write ${sendmail_dir}/pgpsendmail"
exit 1
endif
! cp pgpsendmail ${sendmail_dir}/pgpsendmail.new
mv -f ${sendmail_dir}/pgpsendmail.new ${sendmail_dir}/pgpsendmail
+ chmod 555 ${sendmail_dir}/pgpsendmail
echo "PGPsendmail installed as ${sendmail_dir}/pgpsendmail"
if ("$mortal" == "TRUE") then
echo "PGPsendmail will expect the real sendmail is ${sendmail_dir}/sendmail"
***************
*** 90,104 ****
if ("$?USRBINPATH" != "0") then
if (-w $USRBINPATH) then
echo "Writing PGPsendmail as: $USRBINPATH/pgpsendmail instead"
! cp -p pgpsendmail $USRBINPATH
exit 0
endif
endif
echo "PGPsendmail not installed. Do it yourself."
exit 2
endif
! cp -p pgpsendmail ${sendmail_dir}
cd ${sendmail_dir}
mv sendmail sendmail.real
ln -s pgpsendmail sendmail
--- 95,111 ----
if ("$?USRBINPATH" != "0") then
if (-w $USRBINPATH) then
echo "Writing PGPsendmail as: $USRBINPATH/pgpsendmail instead"
! cp pgpsendmail $USRBINPATH
! chmod 555 $USRBINPATH/pgpsendmail
exit 0
endif
endif
echo "PGPsendmail not installed. Do it yourself."
exit 2
endif
! cp pgpsendmail ${sendmail_dir}
cd ${sendmail_dir}
+ chmod 4555 pgpsendmail
mv sendmail sendmail.real
ln -s pgpsendmail sendmail

11
mail/pgpsendmail/pkg/PLIST
View File

@ -1,8 +1,15 @@
lib/pgpsendmail
@cwd /usr
sbin/pgpsendmail
@cwd /usr/local
bin/pgpdaemon
bin/pgppipe
bin/sendpgppass
man/man8/pgpsendmail.8
bin/match-email-addr
bin/extract-addrs
man/man8/pgpdaemon.8
man/man1/pgppipe.1
man/man1/sendpgppass.1
man/man1/pgpsendmail.1
man/man1/pgpsign.1
man/man1/extract-addrs.1
man/man1/match-email-addr.1