From 39da595a11458f882c7f4472d5700d73e30dfecd Mon Sep 17 00:00:00 2001 From: Renato Botelho do Couto Date: Mon, 12 Apr 2021 08:14:12 -0300 Subject: [PATCH] Welcome pfSense 2.5.1-RELEASE --- src/etc/version | 2 +- tools/builder_defaults.sh | 2 +- tools/conf/pfPorts/make.conf | 2 +- tools/templates/pkg_repos/pfSense-repo-251.abi | 1 - .../templates/pkg_repos/pfSense-repo-251.altabi | 1 - tools/templates/pkg_repos/pfSense-repo-251.conf | 17 ----------------- .../templates/pkg_repos/pfSense-repo-251.descr | 1 - tools/templates/pkg_repos/pfSense-repo.conf | 4 ++-- 8 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 tools/templates/pkg_repos/pfSense-repo-251.abi delete mode 100644 tools/templates/pkg_repos/pfSense-repo-251.altabi delete mode 100644 tools/templates/pkg_repos/pfSense-repo-251.conf delete mode 100644 tools/templates/pkg_repos/pfSense-repo-251.descr diff --git a/src/etc/version b/src/etc/version index 19ab9dbc6d3..7d3df47837f 100644 --- a/src/etc/version +++ b/src/etc/version @@ -1 +1 @@ -2.5.1-RC +2.5.1-RELEASE diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index ba81e8d71dc..a06a201ec5b 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -312,7 +312,7 @@ export CORE_PKG_REAL_PATH="${CORE_PKG_PATH}/.real_${DATESTRING}" export CORE_PKG_ALL_PATH="${CORE_PKG_PATH}/All" export PKG_REPO_BASE=${PKG_REPO_BASE:-"${BUILDER_TOOLS}/templates/pkg_repos"} -export PFSENSE_DEFAULT_REPO="${PRODUCT_NAME}-repo-251" +export PFSENSE_DEFAULT_REPO="${PRODUCT_NAME}-repo" export PKG_REPO_DEFAULT=${PKG_REPO_DEFAULT:-"${PKG_REPO_BASE}/${PFSENSE_DEFAULT_REPO}.conf"} export PFSENSE_BUILD_REPO="${PFSENSE_DEFAULT_REPO}" export PKG_REPO_BUILD=${PKG_REPO_BUILD:-"${PKG_REPO_BASE}/${PFSENSE_BUILD_REPO}.conf"} diff --git a/tools/conf/pfPorts/make.conf b/tools/conf/pfPorts/make.conf index 69a17f7c0ea..037e270570f 100644 --- a/tools/conf/pfPorts/make.conf +++ b/tools/conf/pfPorts/make.conf @@ -1,7 +1,7 @@ ALLOW_UNSUPPORTED_SYSTEM=yes # Define pfSense repos -PFSENSE_REPOS= %%PRODUCT_NAME%%-repo %%PRODUCT_NAME%%-repo-devel %%PRODUCT_NAME%%-repo-245 %%PRODUCT_NAME%%-repo-251 +PFSENSE_REPOS= %%PRODUCT_NAME%%-repo %%PRODUCT_NAME%%-repo-devel %%PRODUCT_NAME%%-repo-245 # Generic options OPTIONS_UNSET_FORCE= DOCS DOXYGEN EXAMPLES INFO MAN MANPAGES X11 diff --git a/tools/templates/pkg_repos/pfSense-repo-251.abi b/tools/templates/pkg_repos/pfSense-repo-251.abi deleted file mode 100644 index a6d37c26310..00000000000 --- a/tools/templates/pkg_repos/pfSense-repo-251.abi +++ /dev/null @@ -1 +0,0 @@ -FreeBSD:12:%%ARCH%% diff --git a/tools/templates/pkg_repos/pfSense-repo-251.altabi b/tools/templates/pkg_repos/pfSense-repo-251.altabi deleted file mode 100644 index e3479a96e57..00000000000 --- a/tools/templates/pkg_repos/pfSense-repo-251.altabi +++ /dev/null @@ -1 +0,0 @@ -freebsd:12:%%ARCH%% diff --git a/tools/templates/pkg_repos/pfSense-repo-251.conf b/tools/templates/pkg_repos/pfSense-repo-251.conf deleted file mode 100644 index 6cde860d749..00000000000 --- a/tools/templates/pkg_repos/pfSense-repo-251.conf +++ /dev/null @@ -1,17 +0,0 @@ -FreeBSD: { enabled: no } - -%%PRODUCT_NAME%%-core: { - url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%_%%ARCH%%-core", - mirror_type: "srv", - signature_type: "fingerprints", - fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg", - enabled: yes -} - -%%PRODUCT_NAME%%: { - url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%_%%ARCH%%-%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%", - mirror_type: "srv", - signature_type: "fingerprints", - fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg", - enabled: yes -} diff --git a/tools/templates/pkg_repos/pfSense-repo-251.descr b/tools/templates/pkg_repos/pfSense-repo-251.descr deleted file mode 100644 index 26de2d26541..00000000000 --- a/tools/templates/pkg_repos/pfSense-repo-251.descr +++ /dev/null @@ -1 +0,0 @@ -Next Release Candidate (2.5.1-RC) diff --git a/tools/templates/pkg_repos/pfSense-repo.conf b/tools/templates/pkg_repos/pfSense-repo.conf index 317ab0f5446..6cde860d749 100644 --- a/tools/templates/pkg_repos/pfSense-repo.conf +++ b/tools/templates/pkg_repos/pfSense-repo.conf @@ -1,7 +1,7 @@ FreeBSD: { enabled: no } %%PRODUCT_NAME%%-core: { - url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_5_0_%%ARCH%%-core", + url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%_%%ARCH%%-core", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg", @@ -9,7 +9,7 @@ FreeBSD: { enabled: no } } %%PRODUCT_NAME%%: { - url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_5_0_%%ARCH%%-%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_5_0", + url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%_%%ARCH%%-%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_RELEASE%%", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg",