Page MenuHomeFreeBSD
Files F170756035

D18308.id51001.diff
No OneTemporary
Actions

D18308.id51001.diff
View Options

Index: articles/committers-guide/article.xml
===================================================================
--- articles/committers-guide/article.xml
+++ articles/committers-guide/article.xml
@@ -4404,13 +4404,13 @@
<qandaentry xml:id="ports-qa-blanket">
<question>
- <para>Are there any changes that can be committed without
- approval?</para>
+ <para>Are there any changes that can be merged without
+ asking for approval?</para>
</question>
<answer>
- <para>The following blanket approvals are in
- effect:</para>
+ <para>The following blanket approvals for merging to the
+ quarterly branches are in effect:</para>
<important>
<para>These fixes <emphasis>must</emphasis> be
@@ -4804,6 +4804,53 @@
<qandadiv xml:id="ports-qa-misc-questions">
<title>Miscellaneous Questions</title>
+ <qandaentry xml:id="ports-qa-misc-blanket-approval">
+ <question>
+ <para>Are there changes that can be committed without
+ asking the maintainer for approval?</para>
+ </question>
+
+ <answer>
+ <para>Blanket approval for most ports applies to these
+ types of fixes:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Most infrastructure changes to a port (that is,
+ modernizing, but not changing the functionality).
+ For example, converting to staging, enabling verbose
+ builds, <varname>USE_GMAKE</varname> to
+ <literal>USES=gmake</literal>, the new
+ <varname>LIB_DEPENDS</varname> format...</para>
+ </listitem>
+
+ <listitem>
+ <para>Trivial and <emphasis>tested</emphasis> build
+ and runtime fixes.</para>
+ </listitem>
+ </itemizedlist>
+
+ <warning>
+ <para>Blanket approval does not apply to ports that are
+ maintained by teams like <email
+ role="nolink">autotools@FreeBSD.org</email>, <email
+ role="nolink">x11@FreeBSD.org</email>, <email
+ role="nolink">gnome@FreeBSD.org</email>, or <email
+ role="nolink">kde@FreeBSD.org</email>. These teams
+ use external repositories and can have work that would
+ conflict with changes that would normally fall under
+ blanket approval.</para>
+ </warning>
+
+ <important>
+ <para>Exceptions to this are anything maintained by the
+ &a.portmgr;, or the &a.security-officer;. No
+ unauthorized commits may ever be made to ports
+ maintained by those groups.</para>
+ </important>
+ </answer>
+ </qandaentry>
+
<qandaentry xml:id="ports-qa-misc-correctly-building">
<question>
<para>How do I know if my port is building correctly or
Index: books/porters-handbook/makefiles/chapter.xml
===================================================================
--- books/porters-handbook/makefiles/chapter.xml
+++ books/porters-handbook/makefiles/chapter.xml
@@ -4050,24 +4050,12 @@
with changes that would normally fall under blanket
approval.</para>
- <para>Blanket approval for most ports applies to these types of
- fixes:</para>
-
- <itemizedlist>
- <listitem>
- <para>Most infrastructure changes to a port (that is,
- modernizing, but not changing the functionality). For
- example, converting to staging, enabling verbose builds,
- <varname>USE_GMAKE</varname> to
- <literal>USES=gmake</literal>, the new
- <varname>LIB_DEPENDS</varname> format...</para>
- </listitem>
-
- <listitem>
- <para>Trivial and <emphasis>tested</emphasis> build and
- runtime fixes.</para>
- </listitem>
- </itemizedlist>
+ <para>Blanket approval for most ports applies to fixes like
+ infrastructure changes, or trivial and
+ <emphasis>tested</emphasis> build and runtime fixes. The
+ current list is available in <link
+ xlink:href="&url.articles.committers-guide;/ports.html#ports-qa-misc-blanket-approval">Ports
+ section of the Committer's Guide</link>.</para>
</note>
<para>Other changes to the port will be sent to the maintainer

File Metadata

Mime Type
text/plain
Expires
Mon, Sep 7, 10:46 AM (4 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38464020
Default Alt Text
D18308.id51001.diff (3 KB)

Event Timeline