Index: en_US.ISO8859-1/articles/committers-guide/article.xml
===================================================================
--- en_US.ISO8859-1/articles/committers-guide/article.xml
+++ en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -3994,19 +3994,37 @@
This is essentially the reverse of deleting a
port.
+
+ Do not use svn add to add the
+ port. Follow these steps. If they are unclear, or are
+ not working, ask for help, do not just svn
+ add the port.
+
+
Figure out when the port was removed. Use this
list
+ xlink:href="http://people.freebsd.org/~crees/removed_ports/index.xml">list,
+ or look for the port on freshports,
and then copy the last living revision of the
port:&prompt.user; cd /usr/ports/category
-&prompt.user; svn cp 'svn+ssh://svn.freebsd.org/ports/head/category/portname/@{YYYY-MM-DD}' portname
+&prompt.user; svn cp 'svn+ssh://svn.freebsd.org/ports/head/category/portname/@XXXXXX' portname
+
+ Pick the revision that is just before the
+ removal. For example, if the revision where it was
+ removed is 269874, use
+ 269873.
+
+ It is also possible to specify a date. In that
+ case, pick a date that is before the removal but
+ after the last true commit.
- Pick a date that is before the removal but after
- the last true commit.
+ &prompt.user; cd /usr/ports/category
+&prompt.user; svn cp 'svn+ssh://svn.freebsd.org/ports/head/category/portname/@{YYYY-MM-DD}' portname
@@ -4018,16 +4036,22 @@
- svn add or
- svn remove any appropriate
- files.
+ If some files have been added, or were removed
+ during the resurrection process, use svn
+ add or svn remove
+ appropriately.Restore the SUBDIR listing of
the port in the parent directory
- Makefile, and delete the entry
- from ports/MOVED.
+ Makefile, keeping the entries
+ sorted.
+
+
+
+ Delete the port entry from
+ ports/MOVED.
@@ -4612,7 +4636,7 @@
or any file under a subdirectory that starts with an
uppercase letter (Mk/,
Tools/, etc.). In particular, the
- Ports Management Team is very protective of
+ &a.portmgr; is very protective of
ports/Mk/bsd.port*.mk so do not
commit changes to those files unless you want to face
their wra(i)th.
@@ -4640,6 +4664,109 @@
distfile has changed.
+
+
+
+ What is the procedure to request authorization for
+ merging a commit to the quarterly branch.
+
+
+
+ When doing the commit, add the branch name to the
+ MFH: line, for example:
+
+ MFH: 2014Q1
+
+ It will automatically notify &a.ports-secteam; and
+ &a.portmgr;. They will then decide if the commit can be
+ merged and answer with the procedure on doing so.
+
+ If the commit has already been made, send an email
+ to &a.ports-secteam; and &a.portmgr; with the revision
+ number, and a small description of why the commit needs
+ to be merged.
+
+ To merge a specific commit, a script to automate the
+ merge is provided,
+ ports/Tools/scripts/mfh. It can be
+ used as follows:
+
+ &prompt.user; /usr/ports/Tools/scripts/mfh 2015Q1 380362
+ U 2015Q1
+Checked out revision 380443.
+A 2015Q1/security
+Updating '2015Q1/security/rubygem-sshkit':
+A 2015Q1/security/rubygem-sshkit
+A 2015Q1/security/rubygem-sshkit/Makefile
+A 2015Q1/security/rubygem-sshkit/distinfo
+A 2015Q1/security/rubygem-sshkit/pkg-descr
+Updated to revision 380443.
+--- Merging r380362 into '2015Q1':
+U 2015Q1/security/rubygem-sshkit/Makefile
+U 2015Q1/security/rubygem-sshkit/distinfo
+--- Recording mergeinfo for merge of r380362 into '2015Q1':
+ U 2015Q1
+--- Recording mergeinfo for merge of r380362 into '2015Q1/security':
+ G 2015Q1/security
+--- Eliding mergeinfo from '2015Q1/security':
+ U 2015Q1/security
+--- Recording mergeinfo for merge of r380362 into '2015Q1/security/rubygem-sshkit':
+ G 2015Q1/security/rubygem-sshkit
+--- Eliding mergeinfo from '2015Q1/security/rubygem-sshkit':
+ U 2015Q1/security/rubygem-sshkit
+ M 2015Q1
+M 2015Q1/security/rubygem-sshkit/Makefile
+M 2015Q1/security/rubygem-sshkit/distinfo
+Index: 2015Q1/security/rubygem-sshkit/Makefile
+===================================================================
+--- 2015Q1/security/rubygem-sshkit/Makefile (revision 380443)
++++ 2015Q1/security/rubygem-sshkit/Makefile (working copy)
+@@ -2,7 +2,7 @@
+ # $FreeBSD$
+
+ PORTNAME= sshkit
+-PORTVERSION= 1.6.1
++PORTVERSION= 1.7.0
+ CATEGORIES= security rubygems
+ MASTER_SITES= RG
+
+Index: 2015Q1/security/rubygem-sshkit/distinfo
+===================================================================
+--- 2015Q1/security/rubygem-sshkit/distinfo (revision 380443)
++++ 2015Q1/security/rubygem-sshkit/distinfo (working copy)
+@@ -1,2 +1,2 @@
+-SHA256 (rubygem/sshkit-1.6.1.gem) = 8ca67e46bb4ea50fdb0553cda77552f3e41b17a5aa919877d93875dfa22c03a7
+-SIZE (rubygem/sshkit-1.6.1.gem) = 135680
++SHA256 (rubygem/sshkit-1.7.0.gem) = 90effd1813363bae7355f4a45ebc8335a8ca74acc8d0933ba6ee6d40f281a2cf
++SIZE (rubygem/sshkit-1.7.0.gem) = 136192
+Index: 2015Q1
+===================================================================
+--- 2015Q1 (revision 380443)
++++ 2015Q1 (working copy)
+
+Property changes on: 2015Q1
+___________________________________________________________________
+Modified: svn:mergeinfo
+ Merged /head:r380362
+Do you want to commit? (no = start a shell) [y/n]
+
+
+ At that point, the script will either open a shell
+ for you to fix things, or open your text editor with the
+ commit message all prepared and then commit the
+ merge.
+
+ The script assumes that you can connect to
+ svn.FreeBSD.org with
+ SSH directly, so if your
+ local login name is different than your &os; cluster
+ account, you need a few lines in your
+ ~/.ssh/config:
+
+ Host svn.freebsd.org # Can be *.freebsd.org
+ User freebsd-login
+
+