Attachment 175238 Details for Bug 213056 – diff to portmgr web pages part 1

[patch] diff to portmgr web pages part 1

portmgr_diff.out (text/plain), 7.36 KB, created by Mark Linimon on 2016-09-29 00:39:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Linimon

Created: 2016-09-29 00:39:20 UTC

Size: 7.36 KB

patch

obsolete

>Index: htdocs/portmgr/charter.xml
>===================================================================
>--- htdocs/portmgr/charter.xml	(revision 49418)
>+++ htdocs/portmgr/charter.xml	(working copy)
>@@ -37,8 +37,8 @@
>   </li>
> 
>   <li>
>-    <p>Maintain the automated <a href="http://pkg.FreeBSD.org">
>-      package building cluster</a>, and make the resulting packages
>+    <p>Maintain the automated
>+      package building cluster, and make the resulting packages
>       available for download by FreeBSD users.</p>
>   </li>
> 
>Index: htdocs/portmgr/policies.xml
>===================================================================
>--- htdocs/portmgr/policies.xml	(revision 49418)
>+++ htdocs/portmgr/policies.xml	(working copy)
>@@ -31,7 +31,8 @@
> 
> <p>portmgr also runs periodic builds of proposed large changes to the
>   Ports Collection on a dedicated area of the automated
>-  <a href="http://pointyhat.FreeBSD.org">ports building cluster</a>.
>+  ports building cluster.  These are termed experimental builds
>+  (often referred to as "exp-runs").
>   Examples of changes that should be tested here before committing
>   include:</p>
> 
>@@ -43,11 +44,11 @@
> 	ports Makefiles, such as definitions or usage of common make
>         variables (or <tt>Makevar</tt>s). (e.g. consolidation of
> 	various implementations of USE_*, WITH_*, and so forth)</p></li>
>-  <li><p>large repocopies (such as when an existing port category
>+  <li><p>large changes to the repository (such as when an existing port category
> 	is divided up)</p></li>
> </ul>
> 
>-<p>Again, since the ports tree is not branched, any large-scale
>+<p>Any large-scale
>   failures that might be caused by any of the above need to be caught
>   first before a large number of user installations are affected.</p>
> 
>@@ -62,8 +63,7 @@
>   of inter-committer disputes that can not be solved among the
>   committers themselves.</p>
> 
>-<h3>Maintain The Automated <a href="http://pointyhat.FreeBSD.org">
>-  Ports Building Cluster</a></h3>
>+<h3>Maintain The Automated Ports Building Cluster</h3>
> 
> <p>portmgr maintains a set of machines that automatically build
>   packages on combinations of FreeBSD source tree versus CPU
>Index: htdocs/portmgr/policies_contributors.xml
>===================================================================
>--- htdocs/portmgr/policies_contributors.xml	(revision 49418)
>+++ htdocs/portmgr/policies_contributors.xml	(working copy)
>@@ -26,7 +26,7 @@
> 
> <p>We have an add-on to the Problem Reports database known as the auto-assigner,
>   which attempts to automatically notify maintainers of PRs; however,
>-  it depends on the Synopsis containing category/portname.  In general,
>+  it depends on the Summary containing category/portname.  In general,
>   various people attempt to catch and fix cases where it does not work,
>   but you should not assume so.  Therefore, please
>   check to see whether or not the maintainer knows about the PR before
>@@ -43,8 +43,7 @@
> 
> <p>This period may be shortened by portmgr if the email address returns
>   with a hard bounce.  In this case, it is probably desirable to reset
>-  all the maintainer's ports and change any PRs set to 'feedback' back
>-  to 'open'.</p>
>+  all the maintainer's ports and check the status of any PRs.</p>
> 
> <a name="commit_privileges"></a>
> <h3>Commit Privileges</h3>
>Index: htdocs/portmgr/policies_eol.xml
>===================================================================
>--- htdocs/portmgr/policies_eol.xml	(revision 49418)
>+++ htdocs/portmgr/policies_eol.xml	(working copy)
>@@ -14,7 +14,7 @@
>     <body class="navinclude.about">
> 
> <p>Support of FreeBSD releases by ports and the ports infrastructure
>-  matches the <a href="&base;/security/#sup">policies
>+  currently matches the <a href="&base;/security/#sup">policies
>   set out by the FreeBSD Security Officer</a>.  Once a major branch X
>   reaches its EOL date, the "last known good" ports tree will be tagged
>   with the <tt>RELEASE_X_EOL</tt> tag as a convenience to those
>@@ -21,7 +21,8 @@
>   remaining users who intend to self-support their installations.
>   This tag is not supported in any way and security fixes will not be
>   applied.  Usage is therefore highly discouraged and should only be
>-  used as a last resort.</p>
>+  used if there is no other option; consumers are expected to provide
>+  their own support.</p>
> 
> <p>For all supported major src branches, all ports will be included in
>   an automated quality assurance procedure which will build, install,
>@@ -29,7 +30,7 @@
>   href="&base;/doc/en_US.ISO8859-1/articles/committers-guide/archs.html#AEN1259">
>   Tier 1 platforms</a>.  Maintainers and committers are notified of
>   failures detected during testing.  Ports that are known not to build
>-  or run on a given supported branch or platform will be marked as
>+  or run on a given supported branch and/or platform will be marked as
>   such.</p>
> 
> <p>Prebuilt binary packages will also be provided for all major branches
>@@ -56,43 +57,64 @@
>     <th>Estimated EoL</th>
>   </tr>
>   <tr>
>-    <td>RELENG_8</td>
>-    <td>n/a</td>
>-    <td>RELENG_8_3</td>
>-    <td>packages-8-stable</td>
>-    <td>last release + 2 years</td>
>-   </tr>
>-   <tr>
>-     <td>RELENG_8_4</td>
>-     <td>8.4-RELEASE</td>
>-     <td>RELENG_8_4</td>
>-     <td>packages-8-stable</td>
>-     <td>June 30, 2015</td>
>-   </tr>
>-    <tr>
>     <td>RELENG_9</td>
>     <td>n/a</td>
>-    <td>RELENG_9_1</td>
>+    <td>RELENG_9_3</td>
>     <td>packages-9-stable</td>
>     <td>last release + 2 years</td>
>-   </tr>
>-    <tr>
>-     <td>RELENG_9_1</td>
>-     <td>9.1-RELEASE</td>
>-     <td>RELENG_9_1</td>
>+  </tr>
>+  <tr>
>+     <td>RELENG_9_3</td>
>+     <td>9.3-RELEASE</td>
>+     <td>RELENG_9_3</td>
>      <td>packages-9-stable</td>
>-     <td>December 31, 2014</td>
>-   </tr>
>-    <tr>
>+     <td>December 31, 2016</td>
>+  </tr>
>+  <tr>
>+    <td>RELENG_10</td>
>+    <td>n/a</td>
>+    <td>RELENG_10_1</td>
>+    <td>packages-10-stable</td>
>+    <td>last release + 2 years</td>
>+  </tr>
>+  <tr>
>+     <td>RELENG_10_1</td>
>+     <td>10.1-RELEASE</td>
>+     <td>RELENG_10_1</td>
>+     <td>packages-10-stable</td>
>+     <td>December 31, 2016</td>
>+  </tr>
>+  <tr>
>+     <td>RELENG_10_2</td>
>+     <td>10.2-RELEASE</td>
>+     <td>RELENG_10_1</td>
>+     <td>packages-10-stable</td>
>+     <td>December 31, 2016</td>
>+  </tr>
>+  <tr>
>+     <td>RELENG_10_3</td>
>+     <td>10.3-RELEASE</td>
>+     <td>RELENG_10_1</td>
>+     <td>packages-10-stable</td>
>+     <td>April 30, 2018</td>
>+  </tr>
>+  <tr>
>+    <td>RELENG_11</td>
>+    <td>n/a</td>
>+    <td>RELENG_11_1</td>
>+    <td>packages-11-stable</td>
>+    <td>last release + 2 years</td>
>+  </tr>
>+  <tr>
>      <td>HEAD</td>
>      <td>n/a</td>
>      <td>HEAD</td>
>-     <td>packages-10-current</td>
>+     <td>packages-12-current</td>
>      <td>Best Effort</td>
>-   </tr>
>+  </tr>
>  </table>
> 
>-<p>Older releases are not maintained, ports and packages may not be able
>+<p>Older releases are not maintained; ports and packages may not be able
>   to install or run.  Users are strongly encouraged to upgrade to one of
>   the supported releases mentioned above.</p>
> 
>Index: htdocs/security/security.xml
>===================================================================
>--- htdocs/security/security.xml	(revision 49418)
>+++ htdocs/security/security.xml	(working copy)
>@@ -41,6 +41,7 @@
>   <ul>
>     <li><a href="#recent">Recent FreeBSD security vulnerabilities</a></li>
>     <li><a href="#how">How to update your system</a></li>
>+    <li><a href="#sup">Supported FreeBSD releases</a></li>
>   </ul>
> 
>   <a name="recent"></a>

Actions: View | Diff

Attachments on bug 213056: 175238 | 187163 | 187191