Date: Thu, 15 May 2003 17:34:09 +0200 From: Dag-Erling Smorgrav <des@ofug.org> To: Ruslan Ermilov <ru@freebsd.org> Cc: arch@freebsd.org Subject: Re: NOCRYPT / NOSECURE Message-ID: <xzpd6ikmdfy.fsf@flood.ping.uio.no> In-Reply-To: <xzphe7wmdhy.fsf@flood.ping.uio.no> (Dag-Erling Smorgrav's message of "Thu, 15 May 2003 17:32:57 %2B0200") References: <xzpr870mgvb.fsf@flood.ping.uio.no> <20030515145721.GA68695@sunbay.com> <xzphe7wmdhy.fsf@flood.ping.uio.no>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Dag-Erling Smorgrav <des@ofug.org> writes:
> See attached patch.
Gah.
DES
--
Dag-Erling Smorgrav - des@ofug.org
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=nosecure.diff
Index: src/Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.356
diff -u -r1.356 Makefile.inc1
--- src/Makefile.inc1 5 May 2003 12:54:26 -0000 1.356
+++ src/Makefile.inc1 15 May 2003 15:18:51 -0000
@@ -8,7 +8,6 @@
# -DNOCRYPT will prevent building of crypt versions
# -DNOMAN do not build the manual pages
# -DNOPROFILE do not build profiled libraries
-# -DNOSECURE do not go into secure subdir
# -DNOGAMES do not go into games subdir
# -DNOSHARE do not go into share subdir
# -DNOINFO do not make or install info files
@@ -70,7 +69,7 @@
.if exists(${.CURDIR}/sbin)
SUBDIR+= sbin
.endif
-.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE)
+.if exists(${.CURDIR}/secure) && !defined(NOCRYPT)
SUBDIR+= secure
.endif
.if exists(${.CURDIR}/share) && !defined(NOSHARE)
@@ -799,7 +798,7 @@
_generic_libs+= lib
-.if !defined(NOCRYPT) && !defined(NOSECURE)
+.if !defined(NOCRYPT)
.if !defined(NO_OPENSSL)
_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl
.if !defined(NO_OPENSSH)
Index: src/bin/ed/Makefile
===================================================================
RCS file: /home/ncvs/src/bin/ed/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- src/bin/ed/Makefile 6 Dec 2001 10:50:23 -0000 1.21
+++ src/bin/ed/Makefile 15 May 2003 15:18:55 -0000
@@ -5,7 +5,7 @@
LINKS= ${BINDIR}/ed ${BINDIR}/red
MLINKS= ed.1 red.1
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE)
+.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT)
DISTRIBUTION=crypto
CFLAGS+=-DDES
DPADD= ${LIBCIPHER}
Index: src/lib/Makefile
===================================================================
RCS file: /home/ncvs/src/lib/Makefile,v
retrieving revision 1.156
diff -u -r1.156 Makefile
--- src/lib/Makefile 5 May 2003 07:58:42 -0000 1.156
+++ src/lib/Makefile 15 May 2003 15:19:29 -0000
@@ -79,13 +79,11 @@
.if defined(RELEASEDIR) || \
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
- defined(NOCRYPT) || defined(NO_OPENSSL) || \
- (defined(NOSECURE) && defined(NO_KERBEROS))
+ defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS)
_libtelnet= libtelnet
.endif
-.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) \
- && !defined(NOSECURE)
+.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
_libmp= libmp
.endif
Index: src/lib/libcrypt/Makefile
===================================================================
RCS file: /home/ncvs/src/lib/libcrypt/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- src/lib/libcrypt/Makefile 27 Mar 2001 17:26:59 -0000 1.30
+++ src/lib/libcrypt/Makefile 15 May 2003 15:19:54 -0000
@@ -13,7 +13,7 @@
CFLAGS+= -DLIBC_SCCS -Wall
# Pull in the crypt-des.c source, assuming it is present.
.if exists(${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c) && \
- !defined(NOSECURE) && !defined(NOCRYPT)
+ !defined(NOCRYPT)
.PATH: ${.CURDIR}/../../secure/lib/libcrypt
SRCS+= crypt-des.c crypt-blowfish.c blowfish.c
CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH
Index: src/lib/libfetch/Makefile
===================================================================
RCS file: /home/ncvs/src/lib/libfetch/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- src/lib/libfetch/Makefile 1 May 2003 14:39:43 -0000 1.40
+++ src/lib/libfetch/Makefile 15 May 2003 15:20:02 -0000
@@ -9,7 +9,7 @@
MAN= fetch.3
CLEANFILES= ftperr.h httperr.h
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
CFLAGS+= -DWITH_SSL
DPADD= ${LIBSSL} ${LIBCRYPTO}
LDADD= -lssl -lcrypto
Index: src/lib/libpam/modules/modules.inc
===================================================================
RCS file: /home/ncvs/src/lib/libpam/modules/modules.inc,v
retrieving revision 1.16
diff -u -r1.16 modules.inc
--- src/lib/libpam/modules/modules.inc 5 May 2003 07:58:42 -0000 1.16
+++ src/lib/libpam/modules/modules.inc 15 May 2003 15:20:08 -0000
@@ -24,8 +24,7 @@
MODULES += pam_rootok
MODULES += pam_securetty
MODULES += pam_self
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) && \
- !defined(NOSECURE)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
MODULES += pam_ssh
.endif
MODULES += pam_tacplus
Index: src/libexec/Makefile
===================================================================
RCS file: /home/ncvs/src/libexec/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- src/libexec/Makefile 11 May 2003 18:48:29 -0000 1.60
+++ src/libexec/Makefile 15 May 2003 15:20:21 -0000
@@ -43,8 +43,7 @@
.if defined(RELEASEDIR) || \
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
- defined(NOCRYPT) || defined(NO_OPENSSL) || \
- (defined(NOSECURE) && defined(NO_KERBEROS))
+ defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS)
# make release needs both
SUBDIR+=telnetd
.endif
Index: src/share/examples/etc/make.conf
===================================================================
RCS file: /home/ncvs/src/share/examples/etc/make.conf,v
retrieving revision 1.214
diff -u -r1.214 make.conf
--- src/share/examples/etc/make.conf 6 May 2003 19:26:55 -0000 1.214
+++ src/share/examples/etc/make.conf 15 May 2003 15:20:26 -0000
@@ -124,7 +124,6 @@
#NOLIBC_R= true # do not build libc_r (re-entrant version of libc)
#NOMAN= true # do not build manual pages
#NOPROFILE= true # Avoid compiling profiled libraries
-#NOSECURE= true # do not build crypto code in secure/ subdir
#NOSHARE= true # do not go into the share subdir
#
# To build sys/modules when building the world (our old way of doing things)
Index: src/share/man/man5/make.conf.5
===================================================================
RCS file: /home/ncvs/src/share/man/man5/make.conf.5,v
retrieving revision 1.72
diff -u -r1.72 make.conf.5
--- src/share/man/man5/make.conf.5 5 May 2003 07:58:43 -0000 1.72
+++ src/share/man/man5/make.conf.5 15 May 2003 15:20:34 -0000
@@ -536,11 +536,6 @@
.It Va NOPROFILE
.Pq Vt bool
Set to avoid compiling profiled libraries.
-.It Va NOSECURE
-.Pq Vt bool
-set to not build crypto code in
-.Pa secure
-subdir.
.It Va NOSHARE
.Pq Vt bool
Set to not build in the
Index: src/usr.bin/fetch/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/fetch/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- src/usr.bin/fetch/Makefile 1 May 2003 14:40:55 -0000 1.13
+++ src/usr.bin/fetch/Makefile 15 May 2003 15:20:51 -0000
@@ -5,7 +5,7 @@
WARNS?= 6
DPADD= ${LIBFETCH}
LDADD= -lfetch
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
.endif
Index: src/usr.bin/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/Makefile,v
retrieving revision 1.238
diff -u -r1.238 Makefile
--- src/usr.bin/Makefile 8 May 2003 06:33:07 -0000 1.238
+++ src/usr.bin/Makefile 15 May 2003 15:21:12 -0000
@@ -218,8 +218,7 @@
.if defined(RELEASEDIR) || \
(!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
- defined(NOCRYPT) || defined(NO_OPENSSL) || \
- (defined(NOSECURE) && defined(NO_KERBEROS))
+ defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS)
# make release needs both
SUBDIR+=telnet
.endif
@@ -248,8 +247,7 @@
SUBDIR+=uac
.endif
-.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) \
- && !defined(NOSECURE)
+.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
SUBDIR+=chkey newkey
.endif
Index: src/usr.sbin/pkg_install/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pkg_install/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- src/usr.sbin/pkg_install/Makefile 9 Jan 2003 12:04:21 -0000 1.13
+++ src/usr.sbin/pkg_install/Makefile 15 May 2003 15:21:21 -0000
@@ -2,7 +2,7 @@
SUBDIR= lib add create delete info version
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DISTRIBUTION= crypto
SUBDIR+= sign
.endif
Index: src/usr.sbin/pkg_install/add/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pkg_install/add/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- src/usr.sbin/pkg_install/add/Makefile 12 Jun 2002 12:45:23 -0000 1.16
+++ src/usr.sbin/pkg_install/add/Makefile 15 May 2003 15:21:27 -0000
@@ -10,7 +10,7 @@
DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
LDADD= ${LIBINSTALL} -lfetch -lmd
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
.endif
Index: src/usr.sbin/pkg_install/create/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pkg_install/create/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- src/usr.sbin/pkg_install/create/Makefile 6 Nov 2002 08:57:03 -0000 1.17
+++ src/usr.sbin/pkg_install/create/Makefile 15 May 2003 15:21:33 -0000
@@ -10,7 +10,7 @@
DPADD= ${LIBINSTALL} ${LIBMD}
LDADD= ${LIBINSTALL} -lmd
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
.endif
Index: src/usr.sbin/pkg_install/delete/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pkg_install/delete/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- src/usr.sbin/pkg_install/delete/Makefile 25 Feb 2003 15:01:54 -0000 1.18
+++ src/usr.sbin/pkg_install/delete/Makefile 15 May 2003 15:21:38 -0000
@@ -10,7 +10,7 @@
DPADD= ${LIBINSTALL} ${LIBMD}
LDADD= ${LIBINSTALL} -lmd
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
.endif
Index: src/usr.sbin/pkg_install/info/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pkg_install/info/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- src/usr.sbin/pkg_install/info/Makefile 12 Jun 2002 12:45:24 -0000 1.16
+++ src/usr.sbin/pkg_install/info/Makefile 15 May 2003 15:21:43 -0000
@@ -10,7 +10,7 @@
DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
LDADD= ${LIBINSTALL} -lfetch -lmd
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
.endif
Index: src/usr.sbin/pkg_install/version/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pkg_install/version/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- src/usr.sbin/pkg_install/version/Makefile 24 Jun 2002 16:03:24 -0000 1.11
+++ src/usr.sbin/pkg_install/version/Makefile 15 May 2003 15:21:52 -0000
@@ -10,7 +10,7 @@
DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
LDADD= ${LIBINSTALL} -lfetch -lmd
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
.endif
Index: src/usr.sbin/ppp/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ppp/Makefile,v
retrieving revision 1.94
diff -u -r1.94 Makefile
--- src/usr.sbin/ppp/Makefile 30 Mar 2002 17:57:51 -0000 1.94
+++ src/usr.sbin/ppp/Makefile 15 May 2003 15:22:05 -0000
@@ -15,7 +15,6 @@
NONAT= true
NOKLDLOAD= true
NORADIUS= true
-NOSECURE= true
NOSUID= true
.endif
@@ -70,7 +69,7 @@
SRCS+= id.c
.endif
-.if !exists(${.CURDIR}/../../secure) || defined(NOCRYPT) || defined(NOSECURE) || defined(NO_OPENSSL) || defined(NODES)
+.if !exists(${.CURDIR}/../../crypto) || defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NODES)
CFLAGS+=-DNODES
.else
DISTRIBUTION=crypto
Index: src/usr.sbin/pppd/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pppd/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- src/usr.sbin/pppd/Makefile 4 Apr 2003 17:49:17 -0000 1.24
+++ src/usr.sbin/pppd/Makefile 15 May 2003 15:22:20 -0000
@@ -30,7 +30,7 @@
LDADD+= -lpcap
# MS-CHAP support. Requires the DES library.
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
DISTRIBUTION=crypto
CFLAGS+= -DCHAPMS
SRCS+= chap_ms.c
Index: src/usr.sbin/sendmail/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sendmail/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- src/usr.sbin/sendmail/Makefile 4 Apr 2003 17:49:19 -0000 1.39
+++ src/usr.sbin/sendmail/Makefile 15 May 2003 15:22:34 -0000
@@ -58,9 +58,8 @@
SRCS+= sm_os.h
CLEANFILES+=sm_os.h
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && \
- !defined(NOSECURE) && !defined(NO_OPENSSL) && \
- !defined(RELEASE_CRUNCH)
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && \
+ !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
# STARTTLS support
DISTRIBUTION= crypto
CFLAGS+= -DSTARTTLS -D_FFR_TLS_1
Index: src/usr.sbin/tcpdump/tcpdump/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/tcpdump/tcpdump/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- src/usr.sbin/tcpdump/tcpdump/Makefile 26 Jun 2002 01:37:45 -0000 1.35
+++ src/usr.sbin/tcpdump/tcpdump/Makefile 15 May 2003 15:22:50 -0000
@@ -39,7 +39,7 @@
DPADD= ${LIBL} ${LIBPCAP}
LDADD= -ll -lpcap
-.if exists(../../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && \
+.if exists(../../../crypto) && !defined(NOCRYPT) && \
!defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
DISTRIBUTION=crypto
DPADD+= ${LIBCRYPTO}
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzpd6ikmdfy.fsf>