Welcome pfSense 2.4.4-RC

9 files changed, 28 insertions, 7 deletions

diff --git a/src/etc/phpshellsessions/gitsync b/src/etc/phpshellsessions/gitsync
index 8c57a45..b4677cc 100644
--- a/src/etc/phpshellsessions/gitsync
+++ b/src/etc/phpshellsessions/gitsync
@@ -28,13 +28,14 @@ require_once("pfsense-utils.inc");
 $GIT_PKG = "git"; // Either "git" or the full package URL
 $GIT_BIN= "/usr/local/bin/git";
 $GIT_REPO = "git://github.com/pfsense/pfsense.git";
-$DEFAULT_BRANCH = "master";
+$DEFAULT_BRANCH = "RELENG_2_4_4";
 $CODIR =  "/root/pfsense";
 $GITSYNC_MERGE = "/root/.gitsync_merge";
 
 /* NOTE: Set branches here */
 $branches = array(
-	"master" => "2.4.3 development branch",
+	"master" => "2.4.5 development branch",
+	"RELENG_2_4_4" => "2.4.4 stable branch",
 	"build_commit" => "The commit originally used to build the image"
 );
 
diff --git a/src/etc/version b/src/etc/version
index d12764d..eb3d005 100644
--- a/src/etc/version
+++ b/src/etc/version
@@ -1 +1 @@
-2.4.4-DEVELOPMENT
+2.4.4-RC
diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php
index 0725005..3b5ce53 100644
--- a/src/usr/local/www/system_update_settings.php
+++ b/src/usr/local/www/system_update_settings.php
@@ -196,7 +196,7 @@ if (file_exists("/usr/local/bin/git")) {
 		'Branch name',
 		'text',
 		($gitcfg['branch'] ? $gitcfg['branch'] : '')
-		))->setHelp('The most recently used branch was "%1$s". (Usually the branch name is master)' .
+		))->setHelp('The most recently used branch was "%1$s". (Usually the branch name is RELENG_2_4_4)' .
 					'%2$sNote: Sync will not be performed if a branch is not specified.', $lastbranch, '<br />');
 
 	$group = new Form_Group('Sync options');
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 595a8d3..80c8b24 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -213,7 +213,7 @@ if [ -z "${REPO_BRANCH_PREFIX}" ]; then
 else
 	export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"${GIT_REPO_BASE}/${REPO_BRANCH_PREFIX}ports.git"}
 fi
-export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"${REPO_BRANCH_PREFIX}devel"}
+export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"${REPO_BRANCH_PREFIX}RELENG_2_4_4"}
 
 # Use vX_Y instead of RELENG_X_Y for poudriere to make it shorter
 POUDRIERE_PORTS_BRANCH=$(echo "${POUDRIERE_PORTS_GIT_BRANCH}" | sed 's,RELENG_,v,')
@@ -311,7 +311,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-devel"
+export PFSENSE_DEFAULT_REPO="${PRODUCT_NAME}-repo-rc"
 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 23ae875..eb762d2 100644
--- a/tools/conf/pfPorts/make.conf
+++ b/tools/conf/pfPorts/make.conf
@@ -1,6 +1,6 @@
 # Define pfSense repos
 PFSENSE_REPOS=	pfSense-repo pfSense-repo-devel pfSense-repo-legacy-devel-23 \
-		pfSense-repo-legacy-23
+		pfSense-repo-legacy-23 pfSense-repo-rc
 
 # Generic options
 OPTIONS_UNSET_FORCE=	X11 DOCS EXAMPLES MAN INFO MANPAGES
diff --git a/tools/templates/pkg_repos/pfSense-repo-rc.abi b/tools/templates/pkg_repos/pfSense-repo-rc.abi
new file mode 100644
index 0000000..cd3225c
--- /dev/null
+++ b/tools/templates/pkg_repos/pfSense-repo-rc.abi
@@ -0,0 +1 @@
+FreeBSD:11:%%ARCH%%
diff --git a/tools/templates/pkg_repos/pfSense-repo-rc.altabi b/tools/templates/pkg_repos/pfSense-repo-rc.altabi
new file mode 100644
index 0000000..ac860a1
--- /dev/null
+++ b/tools/templates/pkg_repos/pfSense-repo-rc.altabi
@@ -0,0 +1 @@
+freebsd:11:%%ARCH%%
diff --git a/tools/templates/pkg_repos/pfSense-repo-rc.conf b/tools/templates/pkg_repos/pfSense-repo-rc.conf
new file mode 100644
index 0000000..ea33753
--- /dev/null
+++ b/tools/templates/pkg_repos/pfSense-repo-rc.conf
@@ -0,0 +1,17 @@
+FreeBSD: { enabled: no }
+
+%%PRODUCT_NAME%%-core: {
+  url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_4_4_%%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%%_%%REPO_BRANCH_PREFIX%%v2_4_4_%%ARCH%%-%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_4_4",
+  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-rc.descr b/tools/templates/pkg_repos/pfSense-repo-rc.descr
new file mode 100644
index 0000000..5b9f01f
--- /dev/null
+++ b/tools/templates/pkg_repos/pfSense-repo-rc.descr
@@ -0,0 +1 @@
+Next Release Candidate (2.4.4-RC)