Move openssl(1) from /usr/sbin/openssl to /usr/bin/openssl, since it is not

a system/superuser binary. At the same time, move the source code from its
current lib/libssl/src/apps location to a more appropriate home under
usr.bin/openssl.

ok deraadt@ miod@

1 files changed, 27 insertions, 0 deletions

diff --git a/src/usr.bin/openssl/Makefile b/src/usr.bin/openssl/Makefile
new file mode 100644
index 0000000000..f4c9ed4f2b
--- /dev/null
+++ b/src/usr.bin/openssl/Makefile
@@ -0,0 +1,27 @@
+#       $OpenBSD: Makefile,v 1.1 2014/08/26 17:47:24 jsing Exp $
+
+PROG=   openssl
+LDADD=  -lssl -lcrypto
+DPADD=  ${LIBSSL} ${LIBCRYPTO}
+MAN1=   openssl.1
+
+CFLAGS+= -Wall -Werror
+CFLAGS+= -Wformat
+CFLAGS+= -Wformat-security
+CFLAGS+= -Wimplicit
+CFLAGS+= -Wreturn-type
+#CFLAGS+= -Wshadow
+CFLAGS+= -Wtrigraphs
+CFLAGS+= -Wuninitialized
+CFLAGS+= -Wunused
+
+CFLAGS+= -DLIBRESSL_INTERNAL
+
+SRCS=   apps.c asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c dh.c \
+        dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c errstr.c \
+        gendh.c gendsa.c genpkey.c genrsa.c nseq.c ocsp.c openssl.c passwd.c \
+        pkcs12.c pkcs7.c pkcs8.c pkey.c pkeyparam.c pkeyutl.c prime.c rand.c \
+        req.c rsa.c rsautl.c s_cb.c s_client.c s_server.c s_socket.c s_time.c \
+        sess_id.c smime.c speed.c spkac.c ts.c verify.c version.c x509.c
+
+.include <bsd.prog.mk>