Browse Source

HBSD: added hardened/10.2-releng/master to the scripts, and removed smap topic branch until it's not fixed

Signed-off-by: Oliver Pinter <oliver.pinter@hardenedbsd.org>
master
Oliver Pinter 5 years ago
parent
commit
ba4df05dd5
3 changed files with 6 additions and 8 deletions
  1. +2
    -1
      hardenedBSD_branches.txt
  2. +0
    -4
      hardenedBSD_commits_not_in_hardened:current:master.csh
  3. +4
    -3
      hardenedBSD_init.csh

+ 2
- 1
hardenedBSD_branches.txt View File

@@ -2,8 +2,9 @@ master:freebsd/master
hardened/current/master:freebsd/master
stable/10:freebsd/stable/10
hardened/10-stable/master:freebsd/stable/10
releng/10.2:freebsd/releng/10.2
hardened/10.2-releng/master:freebsd/releng/10.2
hardened/experimental/10-stable:origin/hardened/10-stable/master
hardened/current/intel-smap:freebsd/master
hardened/current/aslr:origin/hardened/current/master
hardened/current/segvguard:origin/hardened/current/master
hardened/current/log:origin/hardened/current/master


+ 0
- 4
hardenedBSD_commits_not_in_hardened:current:master.csh View File

@@ -13,13 +13,9 @@ set ENABLE_MAIL="YES"
set BASE_BRANCH="origin/hardened/current/master"
set ORIGIN_BASED="hardened/current/aslr"
set ORIGIN_BASED="${ORIGIN_BASED} hardened/current/hardening"
set ORIGIN_BASED="${ORIGIN_BASED} hardened/current/intel-smap"
set ORIGIN_BASED="${ORIGIN_BASED} hardened/current/segvguard"
set ORIGIN_BASED="${ORIGIN_BASED} hardened/current/log"
set ORIGIN_BASED="${ORIGIN_BASED} hardened/current/ptrace"
set ORIGIN_BASED="${ORIGIN_BASED} hardened/current/userlandenhanced"
set ORIGIN_BASED="${ORIGIN_BASED} hardened/current/unstable"
set ORIGIN_BASED="${ORIGIN_BASED} hardened/current/pie"
set ORIGIN_BASED="${ORIGIN_BASED} hardened/current/noexec"
set FREEBSD_BASED=""



+ 4
- 3
hardenedBSD_init.csh View File

@@ -13,6 +13,7 @@ git fetch freebsd
# FreeBSD upstream repos
git branch --track {,freebsd/}master
git branch --track {,freebsd/}stable/10
git branch --track {,freebsd/}releng/10.2

# HardenedBSD master branch
git branch --track {,origin/}hardened/current/master
@@ -20,12 +21,12 @@ git branch --track {,origin/}hardened/current/master
# HardenedBSD 10-STABLE topic branches
git branch --track {,origin/}hardened/10-stable/master

# HardenedBSD 10.2-RELENG topic branches
git branch --track {,origin/}hardened/10.2-releng/master

# HardenedBSD CURRENT topic branches
git branch --track {,origin/}hardened/current/aslr
git branch --track {,origin/}hardened/current/intel-smap
git branch --track {,origin/}hardened/current/segvguard
git branch --track {,origin/}hardened/current/unstable
git branch --track {,origin/}hardened/current/log
git branch --track {,origin/}hardened/current/pie
# HardenedBSD CURRENT upsteaming branches
git branch --track {,origin/}hardened/current/upstreaming/aslr

Loading…
Cancel
Save