DragonFly submit List (threaded) for 2003-08
[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index][Thread Index]

NOSECURE removal

From:	Jeroen Ruigrok/asmodai <asmodai@xxxxxxxxxx>
Date:	Sun, 3 Aug 2003 18:12:37 +0200

Tested with both a buildworld and installworld, this patch removes
NOSECURE, which serves no purpose anymore.

Funny thing, when I was doing this I noticed, when I finished of course,
that FreeBSD did the same thing.  (No, I don't read FreeBSD's CVS email
since months ago.) :)

-- 
Jeroen Ruigrok van der Werven <asmodai(at)wxs.nl> / asmodai
PGP fingerprint: 2D92 980E 45FE 2C28 9DB7  9D88 97E6 839B 2EAC 625B
http://www.tendra.org/   | http://www.in-nomine.org/~asmodai/diary/
The wisdom of the wise, and the experience of ages, may be preserved by
quotations...

Index: src/Makefile.inc1
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/Makefile.inc1,v
retrieving revision 1.2
diff -u -r1.2 Makefile.inc1
--- src/Makefile.inc1	17 Jun 2003 04:21:10 -0000	1.2
+++ src/Makefile.inc1	3 Aug 2003 12:11:36 -0000
@@ -10,7 +10,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
@@ -78,7 +77,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)
@@ -723,7 +722,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/DragonFlyBSD/src/bin/ed/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- src/bin/ed/Makefile	17 Jun 2003 04:22:49 -0000	1.2
+++ src/bin/ed/Makefile	3 Aug 2003 12:13:06 -0000
@@ -6,7 +6,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/etc/defaults/make.conf
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/etc/defaults/make.conf,v
retrieving revision 1.3
diff -u -r1.3 make.conf
--- src/etc/defaults/make.conf	17 Jun 2003 05:14:59 -0000	1.3
+++ src/etc/defaults/make.conf	3 Aug 2003 12:13:17 -0000
@@ -110,7 +110,6 @@
 #NOMAN=		true	# do not build manual pages
 #NOPERL=	true	# do not build perl. Disables OpenSSL optimizations
 #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/lib/Makefile
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/lib/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- src/lib/Makefile	17 Jun 2003 04:26:38 -0000	1.2
+++ src/lib/Makefile	3 Aug 2003 13:11:46 -0000
@@ -66,7 +66,7 @@
 
 .if defined(RELEASEDIR) || \
     (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberosIV)) || \
-    defined(NOCRYPT) || (defined(NOSECURE) && !defined(MAKE_KERBEROS4))
+    defined(NOCRYPT) || !defined(MAKE_KERBEROS4)
 _libtelnet=	libtelnet
 .endif
 
Index: src/lib/libcrypt/Makefile
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/lib/libcrypt/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- src/lib/libcrypt/Makefile	17 Jun 2003 04:26:49 -0000	1.2
+++ src/lib/libcrypt/Makefile	3 Aug 2003 12:22:52 -0000
@@ -14,7 +14,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/DragonFlyBSD/src/lib/libfetch/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- src/lib/libfetch/Makefile	17 Jun 2003 04:26:49 -0000	1.2
+++ src/lib/libfetch/Makefile	3 Aug 2003 12:25:30 -0000
@@ -12,7 +12,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/pam_kerberosIV/Makefile
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/lib/libpam/modules/pam_kerberosIV/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- src/lib/libpam/modules/pam_kerberosIV/Makefile	17 Jun 2003 04:26:50 -0000	1.2
+++ src/lib/libpam/modules/pam_kerberosIV/Makefile	3 Aug 2003 12:26:39 -0000
@@ -34,10 +34,8 @@
 CFLAGS+=	-DKERBEROS
 DPADD+=		${LIBKRB}
 LDADD+=		-lkrb
-.if !defined(NOSECURE)
 DPADD+=		${LIBCRYPTO}
 LDADD+=		-lcrypto
-.endif
 DPADD+=		${LIBCOM_ERR}
 LDADD+=		-lcom_err
 
Index: src/libexec/Makefile
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/libexec/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- src/libexec/Makefile	17 Jun 2003 05:15:10 -0000	1.3
+++ src/libexec/Makefile	3 Aug 2003 13:14:37 -0000
@@ -47,7 +47,7 @@
 
 .if defined(RELEASEDIR) || \
     (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberosIV)) || \
-    defined(NOCRYPT) || (defined(NOSECURE) && !defined(MAKE_KERBEROS4))
+    defined(NOCRYPT) || !defined(MAKE_KERBEROS4)
 # make release needs both
 SUBDIR+=telnetd
 .endif
Index: src/release/picobsd/dial/crunch.conf
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/release/picobsd/dial/crunch.conf,v
retrieving revision 1.2
diff -u -r1.2 crunch.conf
--- src/release/picobsd/dial/crunch.conf	17 Jun 2003 04:27:20 -0000	1.2
+++ src/release/picobsd/dial/crunch.conf	3 Aug 2003 12:57:26 -0000
@@ -5,7 +5,7 @@
 # correct value set in 'build' script - you should change it there
 
 # Default build options
-buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+buildopts -DNOPAM -DRELEASE_CRUNCH -DNOCRYPT -DNONETGRAPH -DNOIPSEC
 
 # other sources
 srcdirs /usr/src/bin
Index: src/release/picobsd/isp/crunch.conf
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/release/picobsd/isp/crunch.conf,v
retrieving revision 1.2
diff -u -r1.2 crunch.conf
--- src/release/picobsd/isp/crunch.conf	17 Jun 2003 04:27:20 -0000	1.2
+++ src/release/picobsd/isp/crunch.conf	3 Aug 2003 12:57:43 -0000
@@ -6,7 +6,7 @@
 # correct value set in 'build' script - you should change it there
 
 # Default build options
-buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+buildopts -DNOPAM -DRELEASE_CRUNCH -DNOCRYPT -DNONETGRAPH -DNOIPSEC
 
 # other sources
 srcdirs /usr/src/bin
Index: src/release/picobsd/net/crunch.conf
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/release/picobsd/net/crunch.conf,v
retrieving revision 1.2
diff -u -r1.2 crunch.conf
--- src/release/picobsd/net/crunch.conf	17 Jun 2003 04:27:20 -0000	1.2
+++ src/release/picobsd/net/crunch.conf	3 Aug 2003 12:57:47 -0000
@@ -6,7 +6,7 @@
 # correct value set in 'build' script - you should change it there
 
 # Default build options.
-buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+buildopts -DNOPAM -DRELEASE_CRUNCH -DNOCRYPT -DNONETGRAPH -DNOIPSEC
 
 # other sources
 srcdirs /usr/src/bin
Index: src/release/picobsd/router/crunch.conf
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/release/picobsd/router/crunch.conf,v
retrieving revision 1.2
diff -u -r1.2 crunch.conf
--- src/release/picobsd/router/crunch.conf	17 Jun 2003 04:27:20 -0000	1.2
+++ src/release/picobsd/router/crunch.conf	3 Aug 2003 12:57:50 -0000
@@ -5,7 +5,7 @@
 # correct value set in 'build' script - you should change it there
 
 # Default build options
-buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+buildopts -DNOPAM -DRELEASE_CRUNCH -DNOCRYPT -DNONETGRAPH -DNOIPSEC
 
 # other sources
 srcdirs /usr/src/bin
Index: src/share/man/man5/make.conf.5
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/share/man/man5/make.conf.5,v
retrieving revision 1.3
diff -u -r1.3 make.conf.5
--- src/share/man/man5/make.conf.5	17 Jun 2003 05:15:13 -0000	1.3
+++ src/share/man/man5/make.conf.5	3 Aug 2003 12:58:17 -0000
@@ -546,11 +546,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/Makefile
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/usr.bin/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- src/usr.bin/Makefile	29 Jul 2003 00:29:07 -0000	1.3
+++ src/usr.bin/Makefile	3 Aug 2003 13:16:41 -0000
@@ -208,7 +208,7 @@
 
 .if defined(RELEASEDIR) || \
     (!exists(${.CURDIR}/../kerberosIV) && !exists(${.CURDIR}/../secure)) || \
-    defined(NOCRYPT) || (defined(NOSECURE) && !defined(MAKE_KERBEROS4))
+    defined(NOCRYPT) || !defined(MAKE_KERBEROS4)
 # Releases need both this non-crypt telnet and the crypt telnet.
 SUBDIR+=telnet
 .endif
Index: src/usr.bin/fetch/Makefile
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/usr.bin/fetch/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- src/usr.bin/fetch/Makefile	17 Jun 2003 04:29:26 -0000	1.2
+++ src/usr.bin/fetch/Makefile	3 Aug 2003 12:59:21 -0000
@@ -6,7 +6,7 @@
 WARNS?=		2
 DPADD=		${LIBFETCH}
 LDADD=		-lfetch
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 DPADD+=		${LIBCRYPTO} ${LIBSSL}
 LDADD+=		-lcrypto -lssl
 .endif
Index: src/usr.sbin/pkg_install/Makefile
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/usr.sbin/pkg_install/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- src/usr.sbin/pkg_install/Makefile	17 Jun 2003 04:29:59 -0000	1.2
+++ src/usr.sbin/pkg_install/Makefile	3 Aug 2003 12:59:28 -0000
@@ -3,7 +3,7 @@
 
 SUBDIR=	lib add create delete info update 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/DragonFlyBSD/src/usr.sbin/pkg_install/add/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- src/usr.sbin/pkg_install/add/Makefile	17 Jun 2003 04:29:59 -0000	1.2
+++ src/usr.sbin/pkg_install/add/Makefile	3 Aug 2003 12:59:37 -0000
@@ -11,7 +11,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/DragonFlyBSD/src/usr.sbin/pkg_install/create/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- src/usr.sbin/pkg_install/create/Makefile	17 Jun 2003 04:29:59 -0000	1.2
+++ src/usr.sbin/pkg_install/create/Makefile	3 Aug 2003 12:59:41 -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/delete/Makefile
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/usr.sbin/pkg_install/delete/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- src/usr.sbin/pkg_install/delete/Makefile	17 Jun 2003 04:29:59 -0000	1.2
+++ src/usr.sbin/pkg_install/delete/Makefile	3 Aug 2003 12:59:46 -0000
@@ -11,7 +11,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/info/Makefile
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/usr.sbin/pkg_install/info/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- src/usr.sbin/pkg_install/info/Makefile	17 Jun 2003 04:29:59 -0000	1.2
+++ src/usr.sbin/pkg_install/info/Makefile	3 Aug 2003 12:59:51 -0000
@@ -11,7 +11,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/DragonFlyBSD/src/usr.sbin/ppp/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- src/usr.sbin/ppp/Makefile	17 Jun 2003 04:30:00 -0000	1.2
+++ src/usr.sbin/ppp/Makefile	3 Aug 2003 13:00:25 -0000
@@ -16,7 +16,6 @@
 NONAT=		true
 NOKLDLOAD=	true
 NORADIUS=	true
-NOSECURE=	true
 NOSUID=		true
 .endif
 
@@ -71,7 +70,7 @@
 SRCS+=	id.c
 .endif
 
-.if !exists(${.CURDIR}/../../secure) || defined(NOCRYPT) || defined(NOSECURE) || defined(NO_OPENSSL) || defined(NODES)
+.if !exists(${.CURDIR}/../../secure) || defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NODES)
 CFLAGS+=-DNODES
 .else
 DISTRIBUTION=crypto
Index: src/usr.sbin/pppd/Makefile
===================================================================
RCS file: /home/ncvs/DragonFlyBSD/src/usr.sbin/pppd/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- src/usr.sbin/pppd/Makefile	17 Jun 2003 04:30:01 -0000	1.2
+++ src/usr.sbin/pppd/Makefile	3 Aug 2003 13:00:40 -0000
@@ -31,7 +31,7 @@
 DPADD+=	${LIBPCAP}
 
 # MS-CHAP support.  Requires the DES library.
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if exists(${.CURDIR}/../../secure) && !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/DragonFlyBSD/src/usr.sbin/sendmail/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- src/usr.sbin/sendmail/Makefile	17 Jun 2003 04:30:03 -0000	1.2
+++ src/usr.sbin/sendmail/Makefile	3 Aug 2003 13:00:58 -0000
@@ -60,8 +60,7 @@
 CLEANFILES+=sm_os.h
 
 .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && \
-	!defined(NOSECURE) && !defined(NO_OPENSSL) && \
-	!defined(RELEASE_CRUNCH)
+	!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/DragonFlyBSD/src/usr.sbin/tcpdump/tcpdump/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- src/usr.sbin/tcpdump/tcpdump/Makefile	17 Jun 2003 04:30:03 -0000	1.2
+++ src/usr.sbin/tcpdump/tcpdump/Makefile	3 Aug 2003 13:01:37 -0000
@@ -41,8 +41,8 @@
 
 DPADD=	${LIBL} ${LIBPCAP}
 LDADD=	-ll -lpcap
-.if exists(../../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && \
-	!defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if exists(../../../secure) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && \
+	!defined(RELEASE_CRUNCH)
 DISTRIBUTION=crypto
 DPADD+= ${LIBCRYPTO}
 LDADD+= -lcrypto

Follow-Ups:
- Re: NOSECURE removal
  - From: Matthew Dillon

[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index][Thread Index]