On Sat, Apr 10, 2021 at 02:59:36PM +0200, Eric Faurot wrote:
> Do not build unused files and remove related prototypes.
> Also remove bogus libm dependency.
ok tb
>
> Index: smtpd.h
> ===================================================================
> RCS file: /cvs/src/usr.sbin/smtpd/smtpd.h,v
> retrieving revision 1.666
> diff -u -p -r1.666 smtpd.h
> --- smtpd.h 10 Apr 2021 06:44:18 -0000 1.666
> +++ smtpd.h 10 Apr 2021 12:34:27 -0000
> @@ -1638,11 +1638,6 @@ const char *srs_encode(const char *, con
> const char *srs_decode(const char *);
>
>
> -/* ssl_smtpd.c */
> -void *ssl_mta_init(void *, char *, off_t, const char *);
> -void *ssl_smtp_init(void *, int);
> -
> -
> /* stat_backend.c */
> struct stat_backend *stat_backend_lookup(const char *);
> void stat_increment(const char *, size_t);
> Index: ssl.h
> ===================================================================
> RCS file: /cvs/src/usr.sbin/smtpd/ssl.h,v
> retrieving revision 1.22
> diff -u -p -r1.22 ssl.h
> --- ssl.h 5 Mar 2021 12:37:32 -0000 1.22
> +++ ssl.h 10 Apr 2021 12:54:19 -0000
> @@ -65,9 +65,3 @@ int ssl_load_pkey(const void *, size_t,
> int ssl_ctx_fake_private_key(SSL_CTX *, const void *, size_t,
> char *, off_t, X509 **, EVP_PKEY **);
> char *ssl_pubkey_hash(const char *, off_t);
> -
> -/* ssl_privsep.c */
> -int ssl_by_mem_ctrl(X509_LOOKUP *, int, const char *, long, char
> **);
> -
> -/* ssl_verify.c */
> -int ssl_check_name(X509 *, const char *, int *);
> Index: smtpd/Makefile
> ===================================================================
> RCS file: /cvs/src/usr.sbin/smtpd/smtpd/Makefile,v
> retrieving revision 1.111
> diff -u -p -r1.111 Makefile
> --- smtpd/Makefile 5 Mar 2021 12:37:32 -0000 1.111
> +++ smtpd/Makefile 10 Apr 2021 12:33:13 -0000
> @@ -51,8 +51,6 @@ SRCS+= smtp_session.c
> SRCS+= smtpd.c
> SRCS+= srs.c
> SRCS+= ssl.c
> -SRCS+= ssl_smtpd.c
> -SRCS+= ssl_verify.c
> SRCS+= stat_backend.c
> SRCS+= table.c
> SRCS+= to.c
> @@ -82,8 +80,8 @@ SRCS+= stat_ramstat.c
> MAN= sendmail.8 smtpd.8 smtpd.conf.5 table.5
> BINDIR= /usr/sbin
>
> -LDADD+= -levent -lutil -ltls -lssl -lcrypto -lm -lz
> -DPADD+= ${LIBEVENT} ${LIBUTIL} ${LIBTLS} ${LIBSSL} ${LIBCRYPTO}
> ${LIBM} ${LIBZ}
> +LDADD+= -levent -lutil -ltls -lssl -lcrypto -lz
> +DPADD+= ${LIBEVENT} ${LIBUTIL} ${LIBTLS} ${LIBSSL} ${LIBCRYPTO}
> ${LIBZ}
>
> CFLAGS+= -fstack-protector-all
> CFLAGS+= -I${.CURDIR}/..
>
