From 1d80a6fae47812544d2bb4e071499822eb951d11 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 24 Oct 2019 09:17:53 +0200
Subject: [PATCH] Framework: partially sync with upstream

Taken from: HardenedBSD
---
 LEGAL                      | 1 -
 MOVED                      | 1 +
 Mk/bsd.default-versions.mk | 2 +-
 Mk/bsd.java.mk             | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/LEGAL b/LEGAL
index 7a1184f53eb..db2b511379c 100644
--- a/LEGAL
+++ b/LEGAL
@@ -223,7 +223,6 @@ xrisk-*			games/xrisk		Possible copyright/trademark violation
 xtr1.50e*		japanese/xtr		Need to obtain permission for commercial redistribution
 xtris-*.tar.gz		games/xtris		Possible trademark infringement
 xzx-pro-*.tar.gz	emulators/xzx		Redistribution forbidden by license
-yasou-fpw*		japanese/yasou-fpw	No commercial use, and no redistribution allowed with fee except media and/or shipping cost
 yEd*			graphics/yed		Downloading requires acceptance of license agreement
 zh-moettf/*		chinese/moettf		Contact Taiwan's Ministry of Education for commercial use
 UrbanTerror*.zip	games/urbanterror-data	The mod files may not be sold or distributed on physical media unless with permission from id Software.
diff --git a/MOVED b/MOVED
index 24f128e64b2..5fd8be9ae85 100644
--- a/MOVED
+++ b/MOVED
@@ -13432,3 +13432,4 @@ www/nuvolaplayer-spotify||2019-10-21|Useless without audio/nuvolaplayer
 www/nuvolaplayer-tunein||2019-10-21|Useless without audio/nuvolaplayer
 www/nuvolaplayer-yandex-music||2019-10-21|Useless without audio/nuvolaplayer
 www/nuvolaplayer-youtube||2019-10-21|Useless without audio/nuvolaplayer
+japanese/yasou-fpw||2019-10-23|Has expired: the only remaining mastersite times out
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 8fa8373cab9..42c91efcf04 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -91,7 +91,7 @@ PYTHON2_DEFAULT?=	2.7
 # Possible values: 3.5, 3.6, 3.7
 PYTHON3_DEFAULT?=	3.6
 # Possible values: 2.4, 2.5, 2.6
-RUBY_DEFAULT?=		2.5
+RUBY_DEFAULT?=		2.6
 # Possible values: rust, rust-nightly
 RUST_DEFAULT?=		rust
 # Possible values: 4.8, 4.10
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk
index be5e825ed3b..57623384fae 100644
--- a/Mk/bsd.java.mk
+++ b/Mk/bsd.java.mk
@@ -162,7 +162,7 @@ SUB_LIST+=		JAVA_OS="${JAVA_OS}"
 .		endif
 
 # The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST=	6 7 8 9 10 11 12 13
+__JAVA_VERSION_LIST=	6 7 8 11 12 13
 _JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
 _JAVA_OS_LIST=			native linux
 _JAVA_VENDOR_LIST=		openjdk oracle
@@ -270,7 +270,7 @@ JAVA_RUN=	jre
 .		undef _JAVA_PORTS_INSTALLED
 .		undef _JAVA_PORTS_POSSIBLE
 .		if defined(JAVA_VERSION)
-_JAVA_VERSION=	${JAVA_VERSION:S/1.6+/1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.9+/11+/:S/1.6/7/:S/1.7/7/:S/1.8/8/:S/1.9/11/:S/9/11/:S/10/11/:S/6+/7+/:S/7+/7 8+/:S/8+/8 11+/:S/9+/11+/:S/10+/11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13/}
+_JAVA_VERSION=	${JAVA_VERSION:S/1.6+/1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.6/7/:S/1.7/7/:S/1.8/8/:S/6+/7+/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13/}
 .		else
 _JAVA_VERSION=	${__JAVA_VERSION_LIST}
 .		endif