From owner-svn-ports-branches@freebsd.org Sun Nov 18 16:06:30 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A4611105F09; Sun, 18 Nov 2018 16:06:30 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 193D683C10; Sun, 18 Nov 2018 16:06:30 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EA6F2158AB; Sun, 18 Nov 2018 16:06:29 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAIG6T7G072642; Sun, 18 Nov 2018 16:06:29 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAIG6TVP072639; Sun, 18 Nov 2018 16:06:29 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201811181606.wAIG6TVP072639@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 18 Nov 2018 16:06:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485231 - in branches/2018Q4/devel: p4 p4/files subversion/files X-SVN-Group: ports-branches X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in branches/2018Q4/devel: p4 p4/files subversion/files X-SVN-Commit-Revision: 485231 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 193D683C10 X-Spamd-Result: default: False [-0.19 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.19)[-0.189,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Nov 2018 16:06:30 -0000 Author: asomers (src committer) Date: Sun Nov 18 16:06:28 2018 New Revision: 485231 URL: https://svnweb.freebsd.org/changeset/ports/485231 Log: MFH r484879 devel/p4: fix build with OpenSSL 1.1 PR: 229021 Reported by: brnrd Submitted by: ken MFH: 2018Q4 Approved by: ports-secteam (miwi) Added: branches/2018Q4/devel/p4/files/patch-net_netsslcredentials.cc - copied unchanged from r484879, head/devel/p4/files/patch-net_netsslcredentials.cc Modified: branches/2018Q4/devel/p4/Makefile branches/2018Q4/devel/subversion/files/extra-patch-fbsd-template Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/devel/p4/Makefile ============================================================================== --- branches/2018Q4/devel/p4/Makefile Sun Nov 18 15:55:33 2018 (r485230) +++ branches/2018Q4/devel/p4/Makefile Sun Nov 18 16:06:28 2018 (r485231) @@ -3,7 +3,7 @@ PORTNAME= p4 PORTVERSION= ${YEAR}.${MAJOR}.${MINOR} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel # Perforce stupidly rerolls their distfiles on a regular basis, updating the # files' timestamps when they do, which changes the zip file's checksum. Work Copied: branches/2018Q4/devel/p4/files/patch-net_netsslcredentials.cc (from r484879, head/devel/p4/files/patch-net_netsslcredentials.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/devel/p4/files/patch-net_netsslcredentials.cc Sun Nov 18 16:06:28 2018 (r485231, copy of r484879, head/devel/p4/files/patch-net_netsslcredentials.cc) @@ -0,0 +1,23 @@ +--- net/netsslcredentials.cc.orig 2018-02-05 20:46:46.000000000 +0000 ++++ net/netsslcredentials.cc 2018-11-08 16:32:39.241553000 +0000 +@@ -42,6 +42,7 @@ extern "C" + # include + # include + # include ++# include + } + # include + # include "netdebug.h" +@@ -218,7 +219,11 @@ NetSslCredentials::ReadCredentials( Error *e ) + privateKey = PEM_read_PrivateKey(fp, NULL, 0, NULL ); + SSLNULLHANDLER( privateKey, e, "NetSslCredentials::ReadCredentials PEM_read_PrivateKey", failSetError ); + // verify that RSA key ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if (privateKey->type != EVP_PKEY_RSA) ++#else ++ if (EVP_PKEY_base_id(privateKey) != EVP_PKEY_RSA) ++#endif + { + e->Set( MsgRpc::SslKeyNotRSA ); + goto fail; + Modified: branches/2018Q4/devel/subversion/files/extra-patch-fbsd-template ============================================================================== --- branches/2018Q4/devel/subversion/files/extra-patch-fbsd-template Sun Nov 18 15:55:33 2018 (r485230) +++ branches/2018Q4/devel/subversion/files/extra-patch-fbsd-template Sun Nov 18 16:06:28 2018 (r485231) @@ -1,5 +1,5 @@ ---- 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 +--- subversion/svn/util.c.orig 2015-02-28 10:37:27 UTC ++++ subversion/svn/util.c @@ -66,6 +66,9 @@ #include "private/svn_client_private.h" #include "private/svn_cmdline_private.h" @@ -10,7 +10,7 @@ -@@ -331,6 +334,71 @@ +@@ -331,6 +334,72 @@ truncate_buffer_at_prefix(apr_size_t *new_len, } @@ -32,6 +32,7 @@ + "Relnotes:", + "Security:", + "Sponsored by:", ++ "Pull Request:", + "Differential Revision:", +}; + @@ -82,15 +83,15 @@ #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--") svn_error_t * -@@ -343,11 +411,56 @@ +@@ -343,11 +412,58 @@ svn_cl__get_log_message(const char **log_msg, 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; ++ 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); @@ -118,6 +119,7 @@ + if (sponsored_by != NULL) + svn_stringbuf_appendcstr(default_msg, sponsored_by); + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); ++ svn_stringbuf_appendcstr(default_msg, "Pull Request:\t" 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); @@ -134,13 +136,14 @@ + 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, "> Pull Request: https://github.com/freebsd/freebsd/pull/### (*full* GitHub URL needed)." 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 @@ +@@ -362,6 +478,7 @@ svn_cl__get_log_message(const char **log_msg, /* 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); @@ -148,7 +151,7 @@ *log_msg = log_msg_str->data; return SVN_NO_ERROR; -@@ -472,6 +586,13 @@ +@@ -472,6 +589,13 @@ svn_cl__get_log_message(const char **log_msg, if (message) truncate_buffer_at_prefix(&message->len, message->data, EDITOR_EOF_PREFIX);