From owner-svn-src-head@FreeBSD.ORG Fri Jun 6 04:09:09 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DC5B0759; Fri, 6 Jun 2014 04:09:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BD2BC2F3E; Fri, 6 Jun 2014 04:09:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s56499ST082872; Fri, 6 Jun 2014 04:09:09 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s564971o082857; Fri, 6 Jun 2014 04:09:07 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201406060409.s564971o082857@svn.freebsd.org> From: Warner Losh Date: Fri, 6 Jun 2014 04:09:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267147 - in head: bin/ed lib/libtelnet libexec/telnetd release/picobsd/bridge release/picobsd/qemu usr.bin/telnet usr.sbin/ntp/ntp-keygen usr.sbin/ntp/ntpd usr.sbin/ppp usr.sbin/sendma... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jun 2014 04:09:10 -0000 Author: imp Date: Fri Jun 6 04:09:07 2014 New Revision: 267147 URL: http://svnweb.freebsd.org/changeset/base/267147 Log: When building picobsd, define WITHOUT_OPENSSL and WITHOUT_KERBEROS and remove the now-redundant checks for RELEASE_CRUNCH. This originally was defined for building smaller sysinstall images, but was later also used by picobsd builds for a similar purpose. Now that we've moved away from sysinstall, picobsd is the only remaining consumer of this interface. Adding these two options reduces the RELEASE_CRUNCH special cases in the tree by half. Modified: head/bin/ed/Makefile head/lib/libtelnet/Makefile head/libexec/telnetd/Makefile head/release/picobsd/bridge/crunch.conf head/release/picobsd/qemu/crunch.conf head/usr.bin/telnet/Makefile head/usr.sbin/ntp/ntp-keygen/Makefile head/usr.sbin/ntp/ntpd/Makefile head/usr.sbin/ppp/Makefile head/usr.sbin/sendmail/Makefile head/usr.sbin/tcpdump/tcpdump/Makefile Modified: head/bin/ed/Makefile ============================================================================== --- head/bin/ed/Makefile Fri Jun 6 04:08:55 2014 (r267146) +++ head/bin/ed/Makefile Fri Jun 6 04:09:07 2014 (r267147) @@ -7,9 +7,7 @@ SRCS= buf.c cbc.c glbl.c io.c main.c re. LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if !defined(RELEASE_CRUNCH) && \ - ${MK_OPENSSL} != "no" && \ - ${MK_ED_CRYPTO} != "no" +.if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no" CFLAGS+=-DDES DPADD= ${LIBCRYPTO} LDADD= -lcrypto Modified: head/lib/libtelnet/Makefile ============================================================================== --- head/lib/libtelnet/Makefile Fri Jun 6 04:08:55 2014 (r267146) +++ head/lib/libtelnet/Makefile Fri Jun 6 04:09:07 2014 (r267147) @@ -15,7 +15,6 @@ CFLAGS+= -I${TELNETDIR} WARNS?= 2 -.if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA @@ -26,7 +25,6 @@ SRCS+= kerberos5.c CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR} CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write .endif -.endif INCS= ${TELNETDIR}/arpa/telnet.h INCSDIR= ${INCLUDEDIR}/arpa Modified: head/libexec/telnetd/Makefile ============================================================================== --- head/libexec/telnetd/Makefile Fri Jun 6 04:08:55 2014 (r267146) +++ head/libexec/telnetd/Makefile Fri Jun 6 04:09:07 2014 (r267147) @@ -31,8 +31,6 @@ LIBTELNET= ${.OBJDIR}/../../lib/libtelne DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} LDADD= -lutil -ltermcap ${LIBTELNET} -# XXX for src/release/picobsd -.if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION @@ -45,6 +43,5 @@ CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=te DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} LDADD+= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err .endif -.endif .include Modified: head/release/picobsd/bridge/crunch.conf ============================================================================== --- head/release/picobsd/bridge/crunch.conf Fri Jun 6 04:08:55 2014 (r267146) +++ head/release/picobsd/bridge/crunch.conf Fri Jun 6 04:09:07 2014 (r267147) @@ -31,6 +31,7 @@ buildopts -DWITHOUT_PAM -DRELEASE_CRUNCH -DPPP_NO_NETGRAPH buildopts -DTRACEROUTE_NO_IPSEC -DNO_INET6 +buildopts -DWITHOUT_KERBEROS -DWITHOUT_OPENSSL # Directories where to look for sources of various binaries. # @__CWD__@ is a magic keyword in the picobsd's (Makefile.conf) Modified: head/release/picobsd/qemu/crunch.conf ============================================================================== --- head/release/picobsd/qemu/crunch.conf Fri Jun 6 04:08:55 2014 (r267146) +++ head/release/picobsd/qemu/crunch.conf Fri Jun 6 04:09:07 2014 (r267147) @@ -31,6 +31,7 @@ buildopts -DWITHOUT_PAM -DRELEASE_CRUNCH -DPPP_NO_NETGRAPH buildopts -DTRACEROUTE_NO_IPSEC -DNO_INET6 +buildopts -DWITHOUT_KERBEROS -DWITHOUT_OPENSSL # Directories where to look for sources of various binaries. # @__CWD__@ is a magic keyword in the picobsd's (Makefile.conf) Modified: head/usr.bin/telnet/Makefile ============================================================================== --- head/usr.bin/telnet/Makefile Fri Jun 6 04:08:55 2014 (r267146) +++ head/usr.bin/telnet/Makefile Fri Jun 6 04:09:07 2014 (r267147) @@ -34,7 +34,6 @@ SRCS+= genget.c getent.c misc.c CFLAGS+= -DHAS_CGETENT .endif -.if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" SRCS+= authenc.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DIPSEC @@ -47,6 +46,5 @@ CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=te DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} LDADD+= -lkrb5 -lhx509 -lasn1 -lcom_err -lroken .endif -.endif .include Modified: head/usr.sbin/ntp/ntp-keygen/Makefile ============================================================================== --- head/usr.sbin/ntp/ntp-keygen/Makefile Fri Jun 6 04:08:55 2014 (r267146) +++ head/usr.sbin/ntp/ntp-keygen/Makefile Fri Jun 6 04:09:07 2014 (r267147) @@ -16,7 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/n DPADD= ${LIBNTP} ${LIBOPTS} LDADD= ${LIBNTP} ${LIBOPTS} -.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) +.if ${MK_OPENSSL} != "no" DPADD+= ${LIBMD} ${LIBCRYPTO} LDADD+= -lmd -lcrypto .endif Modified: head/usr.sbin/ntp/ntpd/Makefile ============================================================================== --- head/usr.sbin/ntp/ntpd/Makefile Fri Jun 6 04:08:55 2014 (r267146) +++ head/usr.sbin/ntp/ntpd/Makefile Fri Jun 6 04:09:07 2014 (r267147) @@ -35,7 +35,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/n DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD} ${LIBRT} ${LIBOPTS} LDADD= ${LIBPARSE} ${LIBNTP} -lm -lmd -lrt ${LIBOPTS} -.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) +.if ${MK_OPENSSL} != "no" DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto .endif Modified: head/usr.sbin/ppp/Makefile ============================================================================== --- head/usr.sbin/ppp/Makefile Fri Jun 6 04:08:55 2014 (r267146) +++ head/usr.sbin/ppp/Makefile Fri Jun 6 04:09:07 2014 (r267147) @@ -76,8 +76,7 @@ CFLAGS+=-DNOSUID SRCS+= id.c .endif -.if defined(RELEASE_CRUNCH) || ${MK_OPENSSL} == "no" || \ - defined(PPP_NO_DES) +.if ${MK_OPENSSL} == "no" || defined(PPP_NO_DES) CFLAGS+=-DNODES .else SRCS+= chap_ms.c mppe.c Modified: head/usr.sbin/sendmail/Makefile ============================================================================== --- head/usr.sbin/sendmail/Makefile Fri Jun 6 04:08:55 2014 (r267146) +++ head/usr.sbin/sendmail/Makefile Fri Jun 6 04:09:07 2014 (r267147) @@ -60,7 +60,7 @@ LDADD+= ${LIBSMUTIL} ${LIBSM} SRCS+= sm_os.h CLEANFILES+=sm_os.h -.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) +.if ${MK_OPENSSL} != "no" # STARTTLS support CFLAGS+= -DSTARTTLS -D_FFR_TLS_1 DPADD+= ${LIBSSL} ${LIBCRYPTO} Modified: head/usr.sbin/tcpdump/tcpdump/Makefile ============================================================================== --- head/usr.sbin/tcpdump/tcpdump/Makefile Fri Jun 6 04:08:55 2014 (r267146) +++ head/usr.sbin/tcpdump/tcpdump/Makefile Fri Jun 6 04:09:07 2014 (r267147) @@ -167,7 +167,7 @@ DPADD+= ${LIBCAPSICUM} ${LIBNV} LDADD+= -lcapsicum -lnv CFLAGS+=-DHAVE_LIBCAPSICUM .endif -.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) +.if ${MK_OPENSSL} != "no" DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto CFLAGS+= -I${DESTDIR}/usr/include/openssl