[src/trunk]: src Fixup the OpenSSL library builds.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src Fixup the OpenSSL library builds.
From: thorpej <thorpej%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 07:14:08 +0000
details:   https://anonhg.NetBSD.org/src/rev/bf4dd8604c59
branches:  trunk
changeset: 487983:bf4dd8604c59
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Jun 16 06:16:37 2000 +0000

description:
Fixup the OpenSSL library builds.

diffstat:

 crypto/Makefile.openssl |   4 ++--
 lib/libcrypto/Makefile  |  36 +++++++++++++-----------------------
 lib/libcrypto/idea.inc  |   6 +++---
 lib/libcrypto/psrcs.inc |   3 ---
 lib/libcrypto/rc5.inc   |   6 +++---
 lib/libcrypto/rsa.inc   |   6 +++---
 lib/libcrypto/srcs.inc  |   5 +++++
 lib/libssl/Makefile     |  14 +++++++++-----
 lib/libssl/ssl.diff     |   4 ++--
 lib/libssl/ssl.inc      |   4 ++--
 10 files changed, 42 insertions(+), 46 deletions(-)

diffs (241 lines):

diff -r 86c35c808dd8 -r bf4dd8604c59 crypto/Makefile.openssl
--- a/crypto/Makefile.openssl   Fri Jun 16 05:45:14 2000 +0000
+++ b/crypto/Makefile.openssl   Fri Jun 16 06:16:37 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.openssl,v 1.1 2000/06/16 04:16:02 thorpej Exp $
+#      $NetBSD: Makefile.openssl,v 1.2 2000/06/16 06:16:37 thorpej Exp $
 
 .ifndef _MAKEFILE_OPENSSL_INCLUDED
 _MAKEFILE_OPENSSL_INCLUDED=1
@@ -8,7 +8,7 @@
 OPENSSLSRC=    ${CRYPTODIST}/openssl
 CPPFLAGS+= -DOPENSSLDIR=\"/etc/openssl\"
 
-.if !PATENTEDOPENSSLSRC
+.if defined(USELESS_CRYPTO)
 CPPFLAGS+= -DNO_IDEA -DNO_RC5 -DNO_RSA
 .endif
 
diff -r 86c35c808dd8 -r bf4dd8604c59 lib/libcrypto/Makefile
--- a/lib/libcrypto/Makefile    Fri Jun 16 05:45:14 2000 +0000
+++ b/lib/libcrypto/Makefile    Fri Jun 16 06:16:37 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: Makefile,v 1.2 2000/06/16 06:16:38 thorpej Exp $
 
 # RCSid:
 #      Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -16,11 +16,15 @@
 #      sjg%quick.com.au@localhost
 #
 
+# XXX There's a bit of work to do before we can enable warnings.
+WARNS=0
+
 LIB=   crypto
 CPPFLAGS+= -Dlib${LIB} -I. -I${OPENSSLSRC}/crypto
 
-CRYPTODIST=    ${.CURDIR}/../../dist
-.include "../../Makefile.openssl"
+CRYPTODIST=    ${.CURDIR}/../../crypto/dist
+
+.include "../../crypto/Makefile.openssl"
 .PATH: ${OPENSSLSRC}
 
 .include "srcs.inc"
@@ -52,36 +56,22 @@
 INCS+= ripemd.h safestack.h sha.h stack.h tmdiff.h
 INCS+= txt_db.h x509.h x509_vfy.h x509v3.h
 
-INCSDIR=/usr/include/openssl
-
-.if PATENTEDOPENSSLSRC
-.include "psrcs.inc"
-
+.if !defined(USELESS_CRYPTO)
 INCS+= rsa.h rc5.h idea.h
 INCS+= rsaref.h
 
 .PATH: ${OPENSSLSRC}/rsaref
 .endif
 
+INCSDIR=/usr/include/openssl
+
 # this rebuilds the `srcs.inc' and the .inc files it reads.
 # note that we have no idea, rc5 or rsa here so we include
 # them explicitely above if we are using these ciphers.
 
-update_inc: update_non_patent update_patent
-
-update_non_patent:
-       (cd ${.CURDIR}; find ../../dist/openssl/crypto \
+update_inc:
+       (cd ${.CURDIR}; find ${OPENSSLSRC}/crypto \
            -name Makefile.ssl | \
-           perl ../../dist/openssl/extsrcs.pl 2> srcs.inc )
-
-update_patent:
-.if exists(${PATENTEDOPENSSLSRC}/crypto)
-       (cd ${.CURDIR}; find ${PATENTEDOPENSSLSRC}/crypto/rsa \
-           ${PATENTEDOPENSSLSRC}/crypto/rc5 \
-           ${PATENTEDOPENSSLSRC}/crypto/idea \
-           -name Makefile.ssl | \
-           perl ../../dist/openssl/extsrcs.pl \
-               -D '$${PATENTEDOPENSSLSRC}' 2> psrcs.inc )
-.endif
+           perl ${OPENSSLSRC}/extsrcs.pl 2> srcs.inc )
 
 .include <bsd.lib.mk>
diff -r 86c35c808dd8 -r bf4dd8604c59 lib/libcrypto/idea.inc
--- a/lib/libcrypto/idea.inc    Fri Jun 16 05:45:14 2000 +0000
+++ b/lib/libcrypto/idea.inc    Fri Jun 16 06:16:37 2000 +0000
@@ -1,13 +1,13 @@
-#      $NetBSD: idea.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: idea.inc,v 1.2 2000/06/16 06:16:38 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
 #      SRCS extracted from /usr/src/openssl/crypto/idea/Makefile.ssl
 #
 
-.PATH: ${PATENTEDOPENSSLSRC}/crypto/idea
+.PATH: ${OPENSSLSRC}/crypto/idea
 
-CPPFLAGS+=     -I${PATENTEDOPENSSLSRC}/crypto/idea
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/idea
 
 SRCS+=i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c i_skey.c
 
diff -r 86c35c808dd8 -r bf4dd8604c59 lib/libcrypto/psrcs.inc
--- a/lib/libcrypto/psrcs.inc   Fri Jun 16 05:45:14 2000 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-.include "rsa.inc"
-.include "rc5.inc"
-.include "idea.inc"
diff -r 86c35c808dd8 -r bf4dd8604c59 lib/libcrypto/rc5.inc
--- a/lib/libcrypto/rc5.inc     Fri Jun 16 05:45:14 2000 +0000
+++ b/lib/libcrypto/rc5.inc     Fri Jun 16 06:16:37 2000 +0000
@@ -1,13 +1,13 @@
-#      $NetBSD: rc5.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: rc5.inc,v 1.2 2000/06/16 06:16:39 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
 #      SRCS extracted from /usr/src/openssl/crypto/rc5/Makefile.ssl
 #
 
-.PATH: ${PATENTEDOPENSSLSRC}/crypto/rc5
+.PATH: ${OPENSSLSRC}/crypto/rc5
 
-CPPFLAGS+=     -I${PATENTEDOPENSSLSRC}/crypto/rc5
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/rc5
 
 SRCS+=rc5_skey.c rc5_ecb.c   rc5_enc.c  rc5cfb64.c rc5ofb64.c
 
diff -r 86c35c808dd8 -r bf4dd8604c59 lib/libcrypto/rsa.inc
--- a/lib/libcrypto/rsa.inc     Fri Jun 16 05:45:14 2000 +0000
+++ b/lib/libcrypto/rsa.inc     Fri Jun 16 06:16:37 2000 +0000
@@ -1,13 +1,13 @@
-#      $NetBSD: rsa.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
+#      $NetBSD: rsa.inc,v 1.2 2000/06/16 06:16:39 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
 #      SRCS extracted from /usr/src/openssl/crypto/rsa/Makefile.ssl
 #
 
-.PATH: ${PATENTEDOPENSSLSRC}/crypto/rsa
+.PATH: ${OPENSSLSRC}/crypto/rsa
 
-CPPFLAGS+=     -I${PATENTEDOPENSSLSRC}/crypto/rsa
+CPPFLAGS+=     -I${OPENSSLSRC}/crypto/rsa
 
 SRCS+= rsa_chk.c rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c \
        rsa_err.c rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c
diff -r 86c35c808dd8 -r bf4dd8604c59 lib/libcrypto/srcs.inc
--- a/lib/libcrypto/srcs.inc    Fri Jun 16 05:45:14 2000 +0000
+++ b/lib/libcrypto/srcs.inc    Fri Jun 16 06:16:37 2000 +0000
@@ -30,3 +30,8 @@
 .include "txt_db.inc"
 .include "x509.inc"
 .include "x509v3.inc"
+.if !defined(USELESS_CRYPTO)
+.include "rsa.inc"
+.include "rc5.inc"
+.include "idea.inc"
+.endif
diff -r 86c35c808dd8 -r bf4dd8604c59 lib/libssl/Makefile
--- a/lib/libssl/Makefile       Fri Jun 16 05:45:14 2000 +0000
+++ b/lib/libssl/Makefile       Fri Jun 16 06:16:37 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2000/06/16 04:54:48 thorpej Exp $
+#      $NetBSD: Makefile,v 1.2 2000/06/16 06:16:40 thorpej Exp $
 
 # RCSid:
 #      Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -16,11 +16,15 @@
 #      sjg%quick.com.au@localhost
 #
 
+# XXX There's a bit of work to do before we can enable warnings.
+WARNS=0
+
 LIB=   ssl
 CFLAGS+= -Dlib${LIB}
 
-CRYPTODIST=    ${.CURDIR}/../../dist
-.include "../../Makefile.openssl"
+CRYPTODIST=    ${.CURDIR}/../../crypto/dist
+
+.include "../../crypto/Makefile.openssl"
 .PATH: ${OPENSSLSRC}
 
 .include "srcs.inc"
@@ -43,8 +47,8 @@
 # we patch `ssl.inc' as we need to be able to turn off SSLv2.
 update_inc:
        (cd ${.CURDIR}; \
-       find ../../dist/openssl/ssl -name Makefile.ssl | \
-               perl ../../dist/openssl/extsrcs.pl 2> srcs.inc; \
+       find ${OPENSSLSRC}/ssl -name Makefile.ssl | \
+               perl ${OPENSSLSRC}/extsrcs.pl 2> srcs.inc; \
        patch -s ssl.inc < ssl.diff )
 
 .include <bsd.lib.mk>
diff -r 86c35c808dd8 -r bf4dd8604c59 lib/libssl/ssl.diff
--- a/lib/libssl/ssl.diff       Fri Jun 16 05:45:14 2000 +0000
+++ b/lib/libssl/ssl.diff       Fri Jun 16 06:16:37 2000 +0000
@@ -1,4 +1,4 @@
-$NetBSD: ssl.diff,v 1.1.1.1 2000/06/16 04:54:48 thorpej Exp $
+$NetBSD: ssl.diff,v 1.2 2000/06/16 06:16:40 thorpej Exp $
 
 --- ssl.inc.orig       Tue Jul 20 19:09:24 1999
 +++ ssl.inc    Tue Jul 20 19:09:41 1999
@@ -6,7 +6,7 @@
  
  CPPFLAGS+=    -I${OPENSSLSRC}/ssl
  
-+.if exists(${PATENTEDOPENSSLSRC}/crypto)
++.if !defined(USELESS_CRYPTO)
 +SRCS+=        s2_meth.c  s2_srvr.c  s2_clnt.c  s2_lib.c  s2_enc.c s2_pkt.c
 +.else
 +CPPFLAGS+=    -DNO_SSL2
diff -r 86c35c808dd8 -r bf4dd8604c59 lib/libssl/ssl.inc
--- a/lib/libssl/ssl.inc        Fri Jun 16 05:45:14 2000 +0000
+++ b/lib/libssl/ssl.inc        Fri Jun 16 06:16:37 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: ssl.inc,v 1.1.1.1 2000/06/16 04:54:48 thorpej Exp $
+#      $NetBSD: ssl.inc,v 1.2 2000/06/16 06:16:40 thorpej Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -9,7 +9,7 @@
 
 CPPFLAGS+=     -I${OPENSSLSRC}/ssl
 
-.if exists(${PATENTEDOPENSSLSRC}/crypto)
+.if !defined(USELESS_CRYPTO)
 SRCS+= s2_meth.c  s2_srvr.c  s2_clnt.c  s2_lib.c  s2_enc.c s2_pkt.c
 .else
 CPPFLAGS+=     -DNO_SSL2
Prev by Date: [src/trunk]: src/crypto/dist/openssl/crypto The pieces of OpenSSL missing fro...
Next by Date: [src/trunk]: src/lib/libcurses Really fix the __endwin/stop handler problem.
Previous by Thread: [src/trunk]: src/crypto/dist/openssl/crypto The pieces of OpenSSL missing fro...
Next by Thread: [src/trunk]: src/lib/libcurses Really fix the __endwin/stop handler problem.
Indexes:
Home | Main Index | Thread Index | Old Index