Index: administration.xml =================================================================== --- administration.xml +++ administration.xml @@ -43,6 +43,7 @@
  • Donations Team
  • Marketing Team
  • Security Team
  • +
  • Ports Security Team
  • Vendor Relations
  • @@ -61,10 +62,16 @@
  • Bugmeisters
  • Cluster Administrators
  • DNS Administrators
  • +
  • Forum Administrators
  • +
  • GitHub Repository Mirror
  • +
  • Jenkins Continuous Integration + Testing Administrators
  • FTP/WWW Mirror Site Coordinators
  • Perforce Repository Administrators
  • +
  • Phabricator Code Review + Administration
  • Postmaster Team
  • Subversion Administrators
  • Webmaster Team
  • @@ -150,7 +157,6 @@
  • &a.gjb.email; (Lead)
  • &a.kib.email;
  • &a.blackend.email;
  • -
  • &a.delphij.email;
  • &a.remko.email; (Security Team Liaison)
  • &a.rodrigc.email;
  • &a.hrs.email;
  • @@ -184,7 +190,6 @@ href="donations/">FreeBSD Donations Liaison page.

    +

    Ports Security Team + <ports-secteam@FreeBSD.org>

    + +

    The FreeBSD Ports Security Team (headed by the Security Officer) + is specifically tasked with handling security issues discovered in + ported software, maintaining the security of the packaging tools and + infrastructure. Similarly to the Security Team their + responsibilities include keeping the community aware of issues + primarily by maintaining the VuXML database of vulnerabiities and + the quarterly Ports security branches.

    + + +

    Vendor Relations <vendor-relations@FreeBSD.org>

    @@ -318,10 +346,8 @@ committers in the project. Requests for new accounts will not be acted upon without the proper approval from the appropriate entity.

    - +

    Email sent to the Accounts Team is currently forwarded to Cluster Administration.

    Backups Administrators @@ -329,10 +355,8 @@

    The Backups Administrators handle all backups on the FreeBSD cluster.

    - +

    Email sent to the Backups Team is currently forwarded to Cluster Administration.

    Bugmeisters <bugmeister@FreeBSD.org>

    @@ -366,12 +390,10 @@ in greater detail.

    Subversion Administrators <svnadm@>

    The FreeBSD Subversion team is responsible for maintaining the health of - the Subversion Repositories.

    - - + the Subversion Repositories.

    +

    Email to the Subversion Administration team is currently + forwarded to Cluster Administration.

    +

    Webmaster Team <webmaster@FreeBSD.org>

    @@ -462,12 +543,11 @@ belongs to the scope of the Webmaster Team, excluding bugs in the documentation.

    +

    Email to the Webmaster Team is currently forwarded to the Documentation Engineering team with the + addition of:

    + Index: internal/hats.xml =================================================================== --- internal/hats.xml +++ internal/hats.xml @@ -24,38 +24,46 @@

    The current set of core-appointed hats is core secretary, head release engineer, the security officer, and postmaster.

    -

    It is suggested that shortened terms longer than half of a core - term be considered a full term for purposes of eligibility.

    +

    The FreeBSD Core team has approved the following hats term limits + policy. This was first posted to the Developers mailing list on June 22, + 2012, and amended in June 2015.

    -

    This policy will begin with the start of the next core term, and - all hats will start off with zero terms at that time.

    +

    Policy

    -

    The FreeBSD Core team approved the following hats term limits - policy which was posted to the Developers mailing list on June 22, - 2012.

    +

    An individual may serve as a core-appointed hat so long as:

    -

    Policy

    + + +

    Hats are appointed at the pleasure of core. Appointments may be + rescinded by core at any time where this serves the needs of the + project.

    + +

    Each hat's term begins three months after the start of a core + team's term and ends three months after the end of a core team's + term. Hats are explicitly approved by the new core team at the + start of a hat's term.

    -

    An individual may serve as a core-appointed hat for at most two - consecutive terms. Each hat's term begins three months after the - start of a core team's term and ends three months after the end of - a core team's term. Hats are explicitly approved by the new core - team at the start of a hat's term. An individual who serves as a - hat for two consecutive terms may serve again after a break of at - least one full term.

    +

    If a hat becomes vacant during a term, core shall appoint a + replacement for the remainder of the term.

    Core shall review all hats annually.

    -

    If a hat becomes vacant during a term, core shall appoint a - replacement for the remainder of the term. It is at core's - discretion whether the shortened term will count for purposes of - limiting the terms of the replacement.

    +

    It is expected that each hat will serve for no more than two + complete two-year core terms, but this is not a hard limit and + role-holders may continue for longer.

    + +

    Each hat should appoint a deputy who can cover their role in the + case of absence or illness, and be trained and ready to take over + the role (subject to core approval) should the role holder resign + before the end of their term.

    If a core team is dissolved prematurely, then the next term for each hat will begin three months after the new core team's term - begins. It is at the new core's discretion whether the shortened - term will count for purposes of limiting the terms of current - hats.

    + begins.

    These limits apply to individual hats and not to teams. For teams with a single lead role, the limits shall apply to the lead