Date: Tue, 11 Apr 2023 23:21:02 GMT From: Ed Maste <emaste@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9c3a4e604986 - main - devel/subversion: retire commit message FreeBSD template Message-ID: <202304112321.33BNL2VP098588@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c3a4e604986121c2c7947403090b378b3413615 commit 9c3a4e604986121c2c7947403090b378b3413615 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2022-12-21 02:44:48 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2023-04-11 23:19:50 +0000 devel/subversion: retire commit message FreeBSD template With all FreeBSD repos converted to Git there is no need for the custom svn template option. Reviewed by: lev Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38640 --- devel/subversion-lts/Makefile | 5 +- .../subversion-lts/files/extra-patch-fbsd-template | 164 --------------------- devel/subversion/Makefile | 6 +- devel/subversion/files/extra-patch-fbsd-template | 164 --------------------- 4 files changed, 2 insertions(+), 337 deletions(-) diff --git a/devel/subversion-lts/Makefile b/devel/subversion-lts/Makefile index 7790ec677a67..5c228c600386 100644 --- a/devel/subversion-lts/Makefile +++ b/devel/subversion-lts/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 3 +PORTREVISION= 4 PKGNAMESUFFIX= -lts MAINTAINER= lev@FreeBSD.org @@ -26,7 +26,6 @@ OPTIONS_DEFINE= \ OPTIONS_DEFAULT=SERF TOOLS -FREEBSD_TEMPLATE_DESC= FreeBSD Project log template GPG_AGENT_DESC= Enable GPG agent password store SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module STATIC_DESC= Build static version (no shared libs) @@ -34,8 +33,6 @@ SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter) TEST_DESC= Run subversion test suite TOOLS_DESC= Install several tools -# Patches required for use with the FreeBSD Project repository only -FREEBSD_TEMPLATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-fbsd-template SVNSERVE_WRAPPER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-svnserve-wrapper USES+= shebangfix python:2.7,env diff --git a/devel/subversion-lts/files/extra-patch-fbsd-template b/devel/subversion-lts/files/extra-patch-fbsd-template deleted file mode 100644 index ee4bf924c32e..000000000000 --- a/devel/subversion-lts/files/extra-patch-fbsd-template +++ /dev/null @@ -1,164 +0,0 @@ ---- subversion/svn/util.c.orig 2015-02-28 13:37:27.000000000 +0300 -+++ subversion/svn/util.c 2016-03-19 16:53:13.016472654 +0300 -@@ -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 - - - -@@ -331,6 +334,71 @@ - } - - -+/* -+ * Since we're adding freebsd-specific tokens to the log message, -+ * clean out any leftovers to avoid accidently sending them to other -+ * projects that won't be expecting them. -+ */ -+ -+static const char *prefixes[] = { -+ "PR:", -+ "Submitted by:", -+ "Reported by:", -+ "Reviewed by:", -+ "Approved by:", -+ "Obtained from:", -+ "MFC after:", -+ "MFH:", -+ "Relnotes:", -+ "Security:", -+ "Sponsored by:", -+ "Differential Revision:", -+}; -+ -+void -+cleanmsg(apr_size_t *l, char *s) -+{ -+ int i; -+ char *pos; -+ char *kw; -+ char *p; -+ int empty; -+ -+ 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) */ -+ if (!(kw == s || kw[-1] == '\r' || kw[-1] == '\n')) { -+ pos = kw + 1; -+ continue; -+ } -+ p = kw + strlen(prefixes[i]); -+ empty = 1; -+ while (1) { -+ if (*p == ' ' || *p == '\t') { -+ p++; -+ continue; -+ } -+ if (*p == '\0' || *p == '\r' || *p == '\n') -+ break; -+ empty = 0; -+ break; -+ } -+ if (empty && (*p == '\r' || *p == '\n')) { -+ memmove(kw, p + 1, strlen(p + 1) + 1); -+ if (l) -+ *l -= (p + 1 - kw); -+ } else if (empty) { -+ *kw = '\0'; -+ if (l) -+ *l -= (p - kw); -+ } else { -+ pos = p; -+ } -+ } -+ } -+} -+ - #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--") - - svn_error_t * -@@ -343,11 +411,56 @@ - svn_stringbuf_t *default_msg = NULL; - struct log_msg_baton *lmb = baton; - svn_stringbuf_t *message = NULL; -+ svn_config_t *cfg; -+ const char *mfc_after, *sponsored_by; -+ -+ cfg = lmb->config ? svn_hash_gets(lmb->config, SVN_CONFIG_CATEGORY_CONFIG) : NULL; - - /* 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, "Submitted by:\t" APR_EOL_STR); -+ svn_stringbuf_appendcstr(default_msg, "Reported by:\t" APR_EOL_STR); -+ svn_stringbuf_appendcstr(default_msg, "Reviewed 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"); -+ svn_config_get(cfg, &mfc_after, SVN_CONFIG_SECTION_MISCELLANY, "freebsd-mfc-after", NULL); -+ if (mfc_after != NULL) -+ svn_stringbuf_appendcstr(default_msg, mfc_after); -+ svn_stringbuf_appendcstr(default_msg, 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"); -+ svn_config_get(cfg, &sponsored_by, SVN_CONFIG_SECTION_MISCELLANY, "freebsd-sponsored-by", -+#ifdef HAS_ORGANIZATION_NAME -+ ORGANIZATION_NAME); -+#else -+ NULL); -+#endif -+ if (sponsored_by != NULL) -+ svn_stringbuf_appendcstr(default_msg, sponsored_by); -+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); -+ svn_stringbuf_appendcstr(default_msg, "Differential Revision:\t" 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 and which Problem Report is related." 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 (each collaborator)." 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, "> Empty fields above will be automatically removed." APR_EOL_STR); -+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); - - *tmp_file = NULL; - if (lmb->message) -@@ -362,6 +475,7 @@ - /* Strip off the EOF marker text and the junk that follows it. */ - truncate_buffer_at_prefix(&(log_msg_str->len), (char *)log_msg_str->data, - EDITOR_EOF_PREFIX); -+ cleanmsg(NULL, (char*)log_msg_str->data); - - *log_msg = log_msg_str->data; - return SVN_NO_ERROR; -@@ -472,6 +586,13 @@ - if (message) - truncate_buffer_at_prefix(&message->len, message->data, - EDITOR_EOF_PREFIX); -+ /* -+ * Since we're adding freebsd-specific tokens to the log message, -+ * clean out any leftovers to avoid accidently sending them to other -+ * projects that won't be expecting them. -+ */ -+ if (message) -+ cleanmsg(&message->len, message->data); - - if (message) - { diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index b317b2fe8ee7..9b5b6f5e62e5 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 2 +PORTREVISION= 3 MAINTAINER= lev@FreeBSD.org COMMENT= Version control system @@ -13,7 +13,6 @@ PORTDOCS= BUGS CHANGES COMMITTERS INSTALL README OPTIONS_DEFINE= \ BDB \ DOCS \ - FREEBSD_TEMPLATE\ GPG_AGENT \ NLS \ SASL \ @@ -25,7 +24,6 @@ OPTIONS_DEFINE= \ OPTIONS_DEFAULT=GPG_AGENT SERF TOOLS -FREEBSD_TEMPLATE_DESC= FreeBSD Project log template GPG_AGENT_DESC= Enable GPG agent password store SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module STATIC_DESC= No shared libs (disables SVN integration) @@ -33,8 +31,6 @@ SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter) TEST_DESC= Run subversion test suite TOOLS_DESC= Install several tools -# Patches required for use with the FreeBSD Project repository only -FREEBSD_TEMPLATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-fbsd-template SVNSERVE_WRAPPER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-svnserve-wrapper USES+= shebangfix python:3.5+,env diff --git a/devel/subversion/files/extra-patch-fbsd-template b/devel/subversion/files/extra-patch-fbsd-template deleted file mode 100644 index ee4bf924c32e..000000000000 --- a/devel/subversion/files/extra-patch-fbsd-template +++ /dev/null @@ -1,164 +0,0 @@ ---- subversion/svn/util.c.orig 2015-02-28 13:37:27.000000000 +0300 -+++ subversion/svn/util.c 2016-03-19 16:53:13.016472654 +0300 -@@ -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 - - - -@@ -331,6 +334,71 @@ - } - - -+/* -+ * Since we're adding freebsd-specific tokens to the log message, -+ * clean out any leftovers to avoid accidently sending them to other -+ * projects that won't be expecting them. -+ */ -+ -+static const char *prefixes[] = { -+ "PR:", -+ "Submitted by:", -+ "Reported by:", -+ "Reviewed by:", -+ "Approved by:", -+ "Obtained from:", -+ "MFC after:", -+ "MFH:", -+ "Relnotes:", -+ "Security:", -+ "Sponsored by:", -+ "Differential Revision:", -+}; -+ -+void -+cleanmsg(apr_size_t *l, char *s) -+{ -+ int i; -+ char *pos; -+ char *kw; -+ char *p; -+ int empty; -+ -+ 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) */ -+ if (!(kw == s || kw[-1] == '\r' || kw[-1] == '\n')) { -+ pos = kw + 1; -+ continue; -+ } -+ p = kw + strlen(prefixes[i]); -+ empty = 1; -+ while (1) { -+ if (*p == ' ' || *p == '\t') { -+ p++; -+ continue; -+ } -+ if (*p == '\0' || *p == '\r' || *p == '\n') -+ break; -+ empty = 0; -+ break; -+ } -+ if (empty && (*p == '\r' || *p == '\n')) { -+ memmove(kw, p + 1, strlen(p + 1) + 1); -+ if (l) -+ *l -= (p + 1 - kw); -+ } else if (empty) { -+ *kw = '\0'; -+ if (l) -+ *l -= (p - kw); -+ } else { -+ pos = p; -+ } -+ } -+ } -+} -+ - #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--") - - svn_error_t * -@@ -343,11 +411,56 @@ - svn_stringbuf_t *default_msg = NULL; - struct log_msg_baton *lmb = baton; - svn_stringbuf_t *message = NULL; -+ svn_config_t *cfg; -+ const char *mfc_after, *sponsored_by; -+ -+ cfg = lmb->config ? svn_hash_gets(lmb->config, SVN_CONFIG_CATEGORY_CONFIG) : NULL; - - /* 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, "Submitted by:\t" APR_EOL_STR); -+ svn_stringbuf_appendcstr(default_msg, "Reported by:\t" APR_EOL_STR); -+ svn_stringbuf_appendcstr(default_msg, "Reviewed 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"); -+ svn_config_get(cfg, &mfc_after, SVN_CONFIG_SECTION_MISCELLANY, "freebsd-mfc-after", NULL); -+ if (mfc_after != NULL) -+ svn_stringbuf_appendcstr(default_msg, mfc_after); -+ svn_stringbuf_appendcstr(default_msg, 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"); -+ svn_config_get(cfg, &sponsored_by, SVN_CONFIG_SECTION_MISCELLANY, "freebsd-sponsored-by", -+#ifdef HAS_ORGANIZATION_NAME -+ ORGANIZATION_NAME); -+#else -+ NULL); -+#endif -+ if (sponsored_by != NULL) -+ svn_stringbuf_appendcstr(default_msg, sponsored_by); -+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); -+ svn_stringbuf_appendcstr(default_msg, "Differential Revision:\t" 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 and which Problem Report is related." 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 (each collaborator)." 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, "> Empty fields above will be automatically removed." APR_EOL_STR); -+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); - - *tmp_file = NULL; - if (lmb->message) -@@ -362,6 +475,7 @@ - /* Strip off the EOF marker text and the junk that follows it. */ - truncate_buffer_at_prefix(&(log_msg_str->len), (char *)log_msg_str->data, - EDITOR_EOF_PREFIX); -+ cleanmsg(NULL, (char*)log_msg_str->data); - - *log_msg = log_msg_str->data; - return SVN_NO_ERROR; -@@ -472,6 +586,13 @@ - if (message) - truncate_buffer_at_prefix(&message->len, message->data, - EDITOR_EOF_PREFIX); -+ /* -+ * Since we're adding freebsd-specific tokens to the log message, -+ * clean out any leftovers to avoid accidently sending them to other -+ * projects that won't be expecting them. -+ */ -+ if (message) -+ cleanmsg(&message->len, message->data); - - if (message) - {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304112321.33BNL2VP098588>