diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d233cc14a93d..a92c8b267db3 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.2028 2017/11/12 13:34:14 khorben Exp $ +# $NetBSD: bsd.pkg.mk,v 1.2029 2018/01/02 05:49:44 maya Exp $ # # This file is in the public domain. # @@ -80,8 +80,6 @@ PKG_FAIL_REASON+= "Circular dependency detected" # Transform package Makefile variables and set defaults ############################################################################ -MKCRYPTO?= YES # build crypto packages by default - ##### Others BUILD_DEPENDS?= # empty @@ -451,9 +449,6 @@ PATH= ${_PATH_COMPONENTS:ts:} # Don't build a package if it's restricted and we don't want to # get into that. # -# Don't build any package that utilizes strong cryptography, for -# when the law of the land forbids it. -# # Don't attempt to build packages against X if we don't have X. # # Don't build a package if it's broken. @@ -478,11 +473,6 @@ PKG_SKIP_REASON+= "${PKGNAME} may not be placed in source form on a CDROM:" \ PKG_SKIP_REASON+= "${PKGNAME} is restricted:" \ " "${RESTRICTED:Q} . endif -. if !(${MKCRYPTO} == "YES" || ${MKCRYPTO} == yes) -. if defined(CRYPTO) -PKG_SKIP_REASON+= "${PKGNAME} may not be built, because it utilizes strong cryptography" -. endif -. endif . if defined(USE_X11) && (${X11_TYPE} == "native") && !exists(${X11BASE}) PKG_FAIL_REASON+= "${PKGNAME} uses X11, but ${X11BASE} not found" . endif diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 9bd4f3584429..cbaae33e4667 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.66 2017/03/05 10:38:37 kamil Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.67 2018/01/02 05:49:44 maya Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -62,7 +62,6 @@ PREFIX= ${LOCALBASE} ### PKG_USE_KERBEROS .if defined(PKG_USE_KERBEROS) -CRYPTO?= uses Kerberos encryption code BUILD_DEFS+= KERBEROS .endif diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 14b996fb7487..e669bc8297ac 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.289 2018/01/01 10:23:09 wiz Exp $ +# $NetBSD: mk.conf,v 1.290 2018/01/02 05:49:44 maya Exp $ # # This file provides default values for variables that may be overridden @@ -65,11 +65,6 @@ GZIP?= -9 # this. Disabling this for an individual package can be done by # setting MAKE_JOBS_SAFE=NO within the per package Makefile. -#MKCRYPTO= no -# If not YES or yes, don't fetch, build or install crypto packages. -# Possible: not defined, no -# Default: yes - #OBJHOSTNAME= # use hostname-specific object directories, e.g. work.amnesiac, work.localhost # OBJHOSTNAME takes precedence over OBJMACHINE (see below). @@ -1731,11 +1726,6 @@ USE_CROSS_COMPILE?= NO # Possible: YES, NO # Default: NO -USE_CRYPTO?= YES -# Used in speakfreely to choose support for encrypted connections. -# Possible: YES, or NO. -# Default: YES - USERPPP_GROUP?= network # Used in the userppp package to specify the default group. # Possible: any group name