mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Welcome pfSense 2.3.4-RELEASE

Browse Source
This commit is contained in:
Renato Botelho 2017-05-03 13:36:11 -03:00
parent af0f961b36
commit db2a45dafd
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/etc/phpshellsessions/gitsync
View File

@ -60,7 +60,7 @@ 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 = "RELENG_2_3";
$DEFAULT_BRANCH = "RELENG_2_3_4";
$CODIR = "/root/pfsense";
$GITSYNC_MERGE = "/root/.gitsync_merge";
@ -68,6 +68,7 @@ $GITSYNC_MERGE = "/root/.gitsync_merge";
$branches = array(
"master" => "2.4 development branch",
"RELENG_2_3" => "2.3 development branch",
"RELENG_2_3_4" => "2.3.4 stable branch",
"build_commit" => "The commit originally used to build the image"
);

2
src/etc/version
View File

@ -1 +1 @@
2.3.4-DEVELOPMENT
2.3.4-RELEASE

2
src/usr/local/www/system_update_settings.php
View File

@ -254,7 +254,7 @@ if (file_exists("/usr/local/bin/git") && $g['platform'] == $g['product_name']) {
'Branch name',
'text',
($gitcfg['branch'] ? $gitcfg['branch'] : '')
))->setHelp('The most recently used branch was "%s". (Usually the branch name is RELENG_2_3)' .
))->setHelp('The most recently used branch was "%s". (Usually the branch name is RELENG_2_3_4)' .
'<br />Note: Sync will not be performed if a branch is not specified.', [$lastbranch]);
$group = new Form_Group('Sync options');

6
tools/builder_defaults.sh
View File

@ -145,7 +145,7 @@ GIT_REPO_BASE=$(git -C ${BUILDER_ROOT} config --get remote.origin.url | sed -e '
# This is used for using svn for retrieving src
export FREEBSD_REPO_BASE=${FREEBSD_REPO_BASE:-"${GIT_REPO_BASE}/freebsd-src.git"}
export FREEBSD_BRANCH=${FREEBSD_BRANCH:-"RELENG_2_3"}
export FREEBSD_BRANCH=${FREEBSD_BRANCH:-"RELENG_2_3_4"}
export FREEBSD_PARENT_BRANCH=${FREEBSD_PARENT_BRANCH:-"releng/10.3"}
export FREEBSD_SRC_DIR=${FREEBSD_SRC_DIR:-"${SCRATCHDIR}/FreeBSD-src"}
@ -280,7 +280,7 @@ export POUDRIERE_PORTS_NAME=${POUDRIERE_PORTS_NAME:-"${PRODUCT_NAME}_${POUDRIERE
export POUDRIERE_BULK=${POUDRIERE_BULK:-"${BUILDER_TOOLS}/conf/pfPorts/poudriere_bulk"}
export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"${GIT_REPO_BASE}/freebsd-ports.git"}
export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"RELENG_2_3"}
export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"RELENG_2_3_4"}
unset _IS_RELEASE
unset _IS_RC
@ -338,7 +338,7 @@ if [ -n "${_IS_RELEASE}" -o -n "${_IS_RC}" ]; then
export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-"v2_3"}
export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_RELEASE}}
else
export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_3_3"}
export PKG_REPO_BRANCH_RELEASE=${PKG_REPO_BRANCH_RELEASE:-"v2_3_4"}
export PKG_REPO_BRANCH_DEVEL=${PKG_REPO_BRANCH_DEVEL:-${POUDRIERE_BRANCH}}
export PKG_REPO_BRANCH_STAGING=${PKG_REPO_BRANCH_STAGING:-${PKG_REPO_BRANCH_DEVEL}}
fi

4
tools/templates/pkg_repos/pfSense-repo.conf
View File

@ -1,7 +1,7 @@
FreeBSD: { enabled: no }
%%PRODUCT_NAME%%-core: {
url: "%%PKG_REPO_SERVER_DEVEL%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_DEVEL%%_%%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_DEVEL%%/%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_DEVEL%%_%%ARCH%%-%%PRODUCT_NAME%%_%%PKG_REPO_BRANCH_DEVEL%%",
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",