Attachment 149692 Details for Bug 195252 – patch for devel/subversion16

[patch] patch for devel/subversion16

s16.diff (text/plain), 6.79 KB, created by Jason Helfman on 2014-11-21 20:44:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Helfman

Created: 2014-11-21 20:44:14 UTC

Size: 6.79 KB

patch

obsolete

>Index: Makefile.common
>===================================================================
>--- Makefile.common	(revision 373008)
>+++ Makefile.common	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	subversion
> PORTVERSION=	#please edit Makefile.inc for PORTVERSION, so ../svnmerge can stay in sync.
>-PORTREVISION?=	8
>+PORTREVISION?=	9
> CATEGORIES+=	devel
> PKGNAMESUFFIX=	16
> MASTER_SITES=	http://subversion.tigris.org/downloads/
>Index: files/extra-patch-fbsd-template
>===================================================================
>--- files/extra-patch-fbsd-template	(revision 373008)
>+++ files/extra-patch-fbsd-template	(working copy)
>@@ -1,6 +1,16 @@
>---- ./subversion/svn/util.c.orig	2011-05-06 16:43:48.000000000 +0200
>-+++ ./subversion/svn/util.c	2014-04-11 19:08:35.000000000 +0200
>-@@ -664,6 +664,69 @@
>+--- subversion/svn/util.c.orig	2014-03-20 14:29:13.887966536 -0400
>++++ subversion/svn/util.c	2014-03-20 14:29:53.806964066 -0400
>+@@ -66,6 +66,9 @@
>+ #include "private/svn_client_private.h"
>+ #include "private/svn_cmdline_private.h"
>+ #include "private/svn_string_private.h"
>++#ifdef HAS_ORGANIZATION_NAME
>++#include "freebsd-organization.h"
>++#endif
>+ 
>+ 
>+ 
>+@@ -322,6 +325,71 @@
>  }
>  
>  
>@@ -10,10 +20,11 @@
> + * projects that won't be expecting them.
> + */
> +
>-+#define NPREFIX 7
>-+char *prefixes[NPREFIX] = {
>++static const char *prefixes[] = {
> +  "PR:",
>++  "Differential Revision:",
> +  "Submitted by:",
>++  "Reported by:",
> +  "Reviewed by:",
> +  "Approved by:",
> +  "Obtained from:",
>@@ -21,6 +32,7 @@
> +  "MFH:",
> +  "Relnotes:",
> +  "Security:",
>++  "Sponsored by:"
> +};
> +
> +void
>@@ -32,7 +44,7 @@
> +  char *p;
> +  int empty;
> +
>-+  for (i = 0; i < NPREFIX; i++) {
>++  for (i = 0; i < sizeof(prefixes) / sizeof(prefixes[0]); i++) {
> +    pos = s;
> +    while ((kw = strstr(pos, prefixes[i])) != NULL) {
> +      /* Check to see if keyword is at start of line (or buffer) */
>@@ -70,39 +82,49 @@
>  #define EDITOR_EOF_PREFIX  _("--This line, and those below, will be ignored--")
>  
>  svn_error_t *
>-@@ -679,8 +742,30 @@
>+@@ -337,8 +403,40 @@
>  
>    /* Set default message.  */
>    default_msg = svn_stringbuf_create(APR_EOL_STR, pool);
> +  svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
> +  svn_stringbuf_appendcstr(default_msg, "PR:\t\t" APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "Differential Revision:\t" APR_EOL_STR);
> +  svn_stringbuf_appendcstr(default_msg, "Submitted by:\t" APR_EOL_STR);
> +  svn_stringbuf_appendcstr(default_msg, "Reviewed by:\t" APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "Reported by:\t" APR_EOL_STR);
> +  svn_stringbuf_appendcstr(default_msg, "Approved by:\t" APR_EOL_STR);
> +  svn_stringbuf_appendcstr(default_msg, "Obtained from:\t" APR_EOL_STR);
> +  svn_stringbuf_appendcstr(default_msg, "MFC after:\t" APR_EOL_STR);
>-+  svn_stringbuf_appendcstr(default_msg, "MFH:\t" APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "MFH:\t\t" APR_EOL_STR);
> +  svn_stringbuf_appendcstr(default_msg, "Relnotes:\t" APR_EOL_STR);
> +  svn_stringbuf_appendcstr(default_msg, "Security:\t" APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "Sponsored by:\t"
>++#ifdef HAS_ORGANIZATION_NAME
>++      ORGANIZATION_NAME
>++#endif
>++      APR_EOL_STR);
>    svn_stringbuf_appendcstr(default_msg, EDITOR_EOF_PREFIX);
> -  svn_stringbuf_appendcstr(default_msg, APR_EOL_STR APR_EOL_STR);
> +  svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
> +  svn_stringbuf_appendcstr(default_msg, "> Description of fields to fill in above:                     76 columns --|" APR_EOL_STR);
>-+  svn_stringbuf_appendcstr(default_msg, "> PR:            If a GNATS PR is affected by the change." APR_EOL_STR);
>-+  svn_stringbuf_appendcstr(default_msg, "> Submitted by:  If someone else sent in the change." APR_EOL_STR);
>-+  svn_stringbuf_appendcstr(default_msg, "> Reviewed by:   If someone else reviewed your modification." APR_EOL_STR);
>-+  svn_stringbuf_appendcstr(default_msg, "> Approved by:   If you needed approval for this commit." APR_EOL_STR);
>-+  svn_stringbuf_appendcstr(default_msg, "> Obtained from: If the change is from a third party." APR_EOL_STR);
>-+  svn_stringbuf_appendcstr(default_msg, "> MFC after:     N [day[s]|week[s]|month[s]].  Request a reminder email." APR_EOL_STR);
>-+  svn_stringbuf_appendcstr(default_msg, "> MFH:           Ports tree branch name.  Request approval for merge." APR_EOL_STR);
>-+  svn_stringbuf_appendcstr(default_msg, "> Relnotes:      Set to 'yes' for mention in release notes." APR_EOL_STR);
>-+  svn_stringbuf_appendcstr(default_msg, "> Security:      Vulnerability reference (one per line) or description." APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "> PR:                       If a GNATS PR is affected by the change." APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "> Differential Revision:    https://reviews.freebsd.org/D### (*full* phabric URL needed)." APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "> Submitted by:             If someone else sent in the change." APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "> Reported by:              If someone else reported the issue." APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "> Reviewed by:              If someone else reviewed your modification." APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "> Approved by:              If you needed approval for this commit." APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "> Obtained from:            If the change is from a third party." APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "> MFC after:                N [day[s]|week[s]|month[s]].  Request a reminder email." APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "> MFH:                      Ports tree branch name.  Request approval for merge." APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "> Relnotes:                 Set to 'yes' for mention in release notes." APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "> Security:                 Vulnerability reference (one per line) or description." APR_EOL_STR);
>++  svn_stringbuf_appendcstr(default_msg, "> Sponsored by:             If the change was sponsored by an organization." APR_EOL_STR);
> +  svn_stringbuf_appendcstr(default_msg, "> Empty fields above will be automatically removed." APR_EOL_STR);
> +  svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
>  
>    *tmp_file = NULL;
>    if (lmb->message)
>-@@ -692,6 +777,7 @@
>+@@ -350,6 +447,7 @@
>           that follows it.  */
>        truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data,
>                                  EDITOR_EOF_PREFIX);
>@@ -110,7 +132,7 @@
>  
>        /* Make a string from a stringbuf, sharing the data allocation. */
>        log_msg_str->data = log_msg_buf->data;
>-@@ -811,6 +897,13 @@
>+@@ -470,6 +568,13 @@
>        if (message)
>          truncate_buffer_at_prefix(&message->len, message->data,
>                                    EDITOR_EOF_PREFIX);

Actions: View | Diff

Attachments on bug 195252: 149677 | 149689 | 149691 | 149692