s-nail has replaced nail
This commit is contained in:
william
parent
e686c252a6
commit
948424fc01
@ -1,36 +0,0 @@
|
||||
# $OpenBSD: Makefile,v 1.26 2013/03/11 11:23:51 espie Exp $
|
||||
|
||||
COMMENT= enhanced, MIME capable Berkeley Mail
|
||||
|
||||
V= 12.4
|
||||
REVISION= 2
|
||||
DISTNAME= mailx-${V}
|
||||
PKGNAME= nail-${V}
|
||||
CATEGORIES= mail
|
||||
HOMEPAGE= http://heirloom.sourceforge.net/mailx.html
|
||||
|
||||
# BSD
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
WANTLIB= c crypto ssl
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=heirloom/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MODULES= converters/libiconv
|
||||
|
||||
MAKE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib" \
|
||||
|
||||
MAKE_FLAGS= SENDMAIL="/usr/sbin/sendmail" \
|
||||
LIBS="-liconv"
|
||||
USE_GROFF = Yes
|
||||
|
||||
NO_TEST= Yes
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/mailx ${PREFIX}/bin/nail
|
||||
${INSTALL_MAN} ${WRKSRC}/mailx.1 ${PREFIX}/man/man1/nail.1
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nail
|
||||
${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/share/examples/nail/
|
||||
|
||||
.include <bsd.port.mk>
|
||||
@ -1,5 +0,0 @@
|
||||
MD5 (mailx-12.4.tar.bz2) = DJN1njQgDrVqDnxGRoClSg==
|
||||
RMD160 (mailx-12.4.tar.bz2) = gkTQTQoAWP2+mGfKUDx82o1YAVQ=
|
||||
SHA1 (mailx-12.4.tar.bz2) = seEFrfnTYmna8xfe32i25MykBKc=
|
||||
SHA256 (mailx-12.4.tar.bz2) = kiAedp/jRrwDZMh0N6Mw7zyXqz6deyI1uT9QnoXlcWo=
|
||||
SIZE (mailx-12.4.tar.bz2) = 271482
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,41 +0,0 @@
|
||||
$OpenBSD: patch-makeconfig,v 1.1 2010/10/03 21:24:52 sthen Exp $
|
||||
|
||||
work with OpenSSL 1.0, from upstream repo.
|
||||
|
||||
--- makeconfig.orig Sat Apr 14 16:24:28 2007
|
||||
+++ makeconfig Sun Oct 3 21:14:23 2010
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
-# Sccsid @(#)makeconfig 1.43 (gritter) 4/14/07
|
||||
+# Sccsid @(#)makeconfig 1.44 (gritter) 5/26/09
|
||||
#
|
||||
|
||||
tmp=___build$$
|
||||
@@ -393,6 +393,25 @@ CERTAltNameEncodedContext foo;
|
||||
!
|
||||
fi
|
||||
|
||||
+if test x$have_openssl = xyes
|
||||
+then
|
||||
+ compile_check stack_of 'for STACK_OF()' '#define HAVE_STACK_OF' <<\!
|
||||
+#include <openssl/ssl.h>
|
||||
+#include <openssl/err.h>
|
||||
+#include <openssl/x509v3.h>
|
||||
+#include <openssl/x509.h>
|
||||
+#include <openssl/rand.h>
|
||||
+
|
||||
+int main(void)
|
||||
+{
|
||||
+ STACK_OF(GENERAL_NAME) *gens = NULL;
|
||||
+ printf("%p", gens); /* to make it used */
|
||||
+ SSLv23_client_method();
|
||||
+ PEM_read_PrivateKey(0, 0, 0, 0);
|
||||
+ return 0;
|
||||
+}
|
||||
+!
|
||||
+fi
|
||||
|
||||
cat >$tmp2.c <<\!
|
||||
#include <gssapi/gssapi.h>
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-nail_rc,v 1.3 2006/04/26 15:37:25 naddy Exp $
|
||||
--- nail.rc.orig Fri Mar 3 19:01:19 2006
|
||||
+++ nail.rc Mon Apr 24 10:44:06 2006
|
||||
@@ -17,6 +17,9 @@ set append
|
||||
# Ask for a message subject.
|
||||
set ask
|
||||
|
||||
+# Use the traditional BSD Mail interface style.
|
||||
+set bsdcompat
|
||||
+
|
||||
# Assume a CRT-like terminal and invoke a pager.
|
||||
set crt
|
||||
|
||||
@ -1,146 +0,0 @@
|
||||
$OpenBSD: patch-openssl_c,v 1.2 2012/06/26 10:10:20 jasper Exp $
|
||||
|
||||
- Work with OpenSSL 1.0, from upstream repo.
|
||||
- Build with OpenSSL without SSLv2 support.
|
||||
|
||||
--- openssl.c.orig Sat Aug 4 07:38:03 2007
|
||||
+++ openssl.c Sat Jun 23 20:23:23 2012
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
#ifndef lint
|
||||
#ifdef DOSCCS
|
||||
-static char sccsid[] = "@(#)openssl.c 1.25 (gritter) 8/4/07";
|
||||
+static char sccsid[] = "@(#)openssl.c 1.26 (gritter) 5/26/09";
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
@@ -101,12 +101,17 @@ static void sslcatch(int s);
|
||||
static int ssl_rand_init(void);
|
||||
static void ssl_init(void);
|
||||
static int ssl_verify_cb(int success, X509_STORE_CTX *store);
|
||||
-static SSL_METHOD *ssl_select_method(const char *uhp);
|
||||
+static const SSL_METHOD *ssl_select_method(const char *uhp);
|
||||
static void ssl_load_verifications(struct sock *sp);
|
||||
static void ssl_certificate(struct sock *sp, const char *uhp);
|
||||
static enum okay ssl_check_host(const char *server, struct sock *sp);
|
||||
+#ifdef HAVE_STACK_OF
|
||||
+static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain,
|
||||
+ X509_STORE *store);
|
||||
+#else
|
||||
static int smime_verify(struct message *m, int n, STACK *chain,
|
||||
X509_STORE *store);
|
||||
+#endif
|
||||
static EVP_CIPHER *smime_cipher(const char *name);
|
||||
static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata);
|
||||
static FILE *smime_sign_cert(const char *xname, const char *xname2, int warn);
|
||||
@@ -203,17 +208,20 @@ ssl_verify_cb(int success, X509_STORE_CTX *store)
|
||||
return 1;
|
||||
}
|
||||
|
||||
-static SSL_METHOD *
|
||||
+static const SSL_METHOD *
|
||||
ssl_select_method(const char *uhp)
|
||||
{
|
||||
- SSL_METHOD *method;
|
||||
+ const SSL_METHOD *method;
|
||||
char *cp;
|
||||
|
||||
cp = ssl_method_string(uhp);
|
||||
if (cp != NULL) {
|
||||
+#ifndef OPENSSL_NO_SSL2
|
||||
if (equal(cp, "ssl2"))
|
||||
method = SSLv2_client_method();
|
||||
- else if (equal(cp, "ssl3"))
|
||||
+ else
|
||||
+#endif
|
||||
+ if (equal(cp, "ssl3"))
|
||||
method = SSLv3_client_method();
|
||||
else if (equal(cp, "tls1"))
|
||||
method = TLSv1_client_method();
|
||||
@@ -308,7 +316,11 @@ ssl_check_host(const char *server, struct sock *sp)
|
||||
X509 *cert;
|
||||
X509_NAME *subj;
|
||||
char data[256];
|
||||
+#ifdef HAVE_STACK_OF
|
||||
+ STACK_OF(GENERAL_NAME) *gens;
|
||||
+#else
|
||||
/*GENERAL_NAMES*/STACK *gens;
|
||||
+#endif
|
||||
GENERAL_NAME *gen;
|
||||
int i;
|
||||
|
||||
@@ -357,7 +369,8 @@ ssl_open(const char *server, struct sock *sp, const ch
|
||||
|
||||
ssl_init();
|
||||
ssl_set_vrfy_level(uhp);
|
||||
- if ((sp->s_ctx = SSL_CTX_new(ssl_select_method(uhp))) == NULL) {
|
||||
+ if ((sp->s_ctx =
|
||||
+ SSL_CTX_new((SSL_METHOD *)ssl_select_method(uhp))) == NULL) {
|
||||
ssl_gen_err(catgets(catd, CATSET, 261, "SSL_CTX_new() failed"));
|
||||
return STOP;
|
||||
}
|
||||
@@ -496,7 +509,11 @@ smime_sign(FILE *ip, struct header *headp)
|
||||
}
|
||||
|
||||
static int
|
||||
+#ifdef HAVE_STACK_OF
|
||||
+smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE *store)
|
||||
+#else
|
||||
smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store)
|
||||
+#endif
|
||||
{
|
||||
struct message *x;
|
||||
char *cp, *sender, *to, *cc, *cnttype;
|
||||
@@ -505,7 +522,12 @@ smime_verify(struct message *m, int n, STACK *chain, X
|
||||
off_t size;
|
||||
BIO *fb, *pb;
|
||||
PKCS7 *pkcs7;
|
||||
+#ifdef HAVE_STACK_OF
|
||||
+ STACK_OF(X509) *certs;
|
||||
+ STACK_OF(GENERAL_NAME) *gens;
|
||||
+#else
|
||||
STACK *certs, *gens;
|
||||
+#endif
|
||||
X509 *cert;
|
||||
X509_NAME *subj;
|
||||
char data[LINESIZE];
|
||||
@@ -614,7 +636,11 @@ cverify(void *vp)
|
||||
{
|
||||
int *msgvec = vp, *ip;
|
||||
int ec = 0;
|
||||
+#ifdef HAVE_STACK_OF
|
||||
+ STACK_OF(X509) *chain = NULL;
|
||||
+#else
|
||||
STACK *chain = NULL;
|
||||
+#endif
|
||||
X509_STORE *store;
|
||||
char *ca_dir, *ca_file;
|
||||
|
||||
@@ -687,7 +713,11 @@ smime_encrypt(FILE *ip, const char *certfile, const ch
|
||||
X509 *cert;
|
||||
PKCS7 *pkcs7;
|
||||
BIO *bb, *yb;
|
||||
+#ifdef HAVE_STACK_OF
|
||||
+ STACK_OF(X509) *certs;
|
||||
+#else
|
||||
STACK *certs;
|
||||
+#endif
|
||||
EVP_CIPHER *cipher;
|
||||
|
||||
certfile = expand((char *)certfile);
|
||||
@@ -950,9 +980,14 @@ smime_certsave(struct message *m, int n, FILE *op)
|
||||
off_t size;
|
||||
BIO *fb, *pb;
|
||||
PKCS7 *pkcs7;
|
||||
+#ifdef HAVE_STACK_OF
|
||||
+ STACK_OF(X509) *certs;
|
||||
+ STACK_OF(X509) *chain = NULL;
|
||||
+#else
|
||||
STACK *certs;
|
||||
- X509 *cert;
|
||||
STACK *chain = NULL;
|
||||
+#endif
|
||||
+ X509 *cert;
|
||||
enum okay ok = OKAY;
|
||||
|
||||
message_number = n;
|
||||
@ -1,4 +0,0 @@
|
||||
Heirloom mailx (previously known as nail) is a mail user agent
|
||||
derived from Berkeley Mail 8.1 and is intended to provide the
|
||||
functionality of the POSIX.2 mailx command with additional
|
||||
support for MIME messages, POP3, and SMTP.
|
||||
@ -1,6 +0,0 @@
|
||||
@comment $OpenBSD: PLIST,v 1.5 2009/05/04 19:10:49 okan Exp $
|
||||
@bin bin/nail
|
||||
@man man/man1/nail.1
|
||||
share/examples/nail/
|
||||
share/examples/nail/nail.rc
|
||||
@sample ${SYSCONFDIR}/nail.rc
|
||||
Loading…
x
Reference in New Issue
Block a user