Date: Wed, 21 Nov 2018 09:52:16 +0100 From: Mathieu Arnold <mat@FreeBSD.org> To: Alan Somers <asomers@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r485231 - in branches/2018Q4/devel: p4 p4/files subversion/files Message-ID: <20181121085216.cfwbx6ywdmqrtdh3@atuin.in.mat.cc> In-Reply-To: <201811181606.wAIG6TVP072639@repo.freebsd.org> References: <201811181606.wAIG6TVP072639@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--ksj2h2qp53qdfzmp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Nov 18, 2018 at 04:06:29PM +0000, Alan Somers wrote: > Author: asomers (src committer) > Date: Sun Nov 18 16:06:28 2018 > New Revision: 485231 > URL: https://svnweb.freebsd.org/changeset/ports/485231 >=20 > Log: > MFH r484879 > =20 > devel/p4: fix build with OpenSSL 1.1 > =20 > PR: 229021 > Reported by: brnrd > Submitted by: ken > MFH: 2018Q4 > =20 > Approved by: ports-secteam (miwi) >=20 > Added: > branches/2018Q4/devel/p4/files/patch-net_netsslcredentials.cc > - copied unchanged from r484879, head/devel/p4/files/patch-net_netss= lcredentials.cc > Modified: > branches/2018Q4/devel/p4/Makefile > branches/2018Q4/devel/subversion/files/extra-patch-fbsd-template The subversion change was not present in the original commit, what happened here? > Directory Properties: > branches/2018Q4/ (props changed) >=20 > Modified: branches/2018Q4/devel/p4/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 @@ > =20 > PORTNAME=3D p4 > PORTVERSION=3D ${YEAR}.${MAJOR}.${MINOR} > -PORTREVISION=3D 2 > +PORTREVISION=3D 3 > CATEGORIES=3D 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 >=20 > Copied: branches/2018Q4/devel/p4/files/patch-net_netsslcredentials.cc (fr= om r484879, head/devel/p4/files/patch-net_netsslcredentials.cc) > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /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 <openssl/x509v3.h> > + # include <openssl/ssl.h> > + # include <openssl/x509_vfy.h> > ++# include <openssl/opensslv.h> > + } > + # include <stdio.h> > + # include "netdebug.h" > +@@ -218,7 +219,11 @@ NetSslCredentials::ReadCredentials( Error *e ) > + privateKey =3D 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 !=3D EVP_PKEY_RSA) > ++#else > ++ if (EVP_PKEY_base_id(privateKey) !=3D EVP_PKEY_RSA) > ++#endif > + { > + e->Set( MsgRpc::SslKeyNotRSA ); > + goto fail; > + >=20 > Modified: branches/2018Q4/devel/subversion/files/extra-patch-fbsd-template > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 @@ > =20 > =0C > =20 > -@@ -331,6 +334,71 @@ > +@@ -331,6 +334,72 @@ truncate_buffer_at_prefix(apr_size_t *new_len, > } > =20 > =20 > @@ -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 ign= ored--") > =20 > 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 =3D NULL; > struct log_msg_baton *lmb =3D baton; > svn_stringbuf_t *message =3D NULL; > + svn_config_t *cfg; > + const char *mfc_after, *sponsored_by; > -+ > -+ cfg =3D lmb->config ? svn_hash_gets(lmb->config, SVN_CONFIG_CATEGORY_= CONFIG) : NULL; > =20 > ++ cfg =3D lmb->config ? svn_hash_gets(lmb->config, SVN_CONFIG_CATEGORY_= CONFIG) : NULL; > ++ > /* Set default message. */ > default_msg =3D svn_stringbuf_create(APR_EOL_STR, pool); > + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); > @@ -118,6 +119,7 @@ > + if (sponsored_by !=3D 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: Se= t to 'yes' for mention in release notes." APR_EOL_STR); > + svn_stringbuf_appendcstr(default_msg, "> Security: Vu= lnerability 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: ht= tps://github.com/freebsd/freebsd/pull/### (*full* GitHub URL needed)." APR_= EOL_STR); > + svn_stringbuf_appendcstr(default_msg, "> Differential Revision: ht= tps://reviews.freebsd.org/D### (*full* phabric URL needed)." APR_EOL_STR); > + svn_stringbuf_appendcstr(default_msg, "> Empty fields above will be a= utomatically removed." APR_EOL_STR); > + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); > =20 > *tmp_file =3D 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_st= r->data, > EDITOR_EOF_PREFIX); > @@ -148,7 +151,7 @@ > =20 > *log_msg =3D 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); >=20 >=20 --=20 Mathieu Arnold --ksj2h2qp53qdfzmp Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAlv1HL9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD zkiI+Q//eP7rlnxluS/5wBc3DgvtpRoQNs0LV5vgj/R99EJLuqlXEnKZhB6i+3xT ec+p+tWLpCm9OMaPZ0/MLlrr/EldNeXylipFklxMg/VhEeD5khrZdJjrf6MixXjK 3lxsFuwKvdIOM3UvM2OxbgNlroM9CkuziC6JGN/zmW/2VVOAJMRurjBT64d4n5XC JCqP0B6cxUD79TykGzNwHUmRPGhbczv+uoa+cqhKUOtS+CEupJtenjBUg0ed+vvG 2WnbuTBi+fm/J26AKjoxDZZ0DuG//TpstLbTUvy4kxaaeIBS/zvlaRvsiZU6ZJtm PSjVFOoBXIlm1L09J/Dn3OJICuuC2swbeDE8NwGkgzuM46QrGTQEpy9oZ3OJOzBi 0vZ+ytF00VBQHtWWTgl+waR3GNnOlGiEU6eUmAlOkBIfwdqNKx4CJYybR0XlCcEF 81PtatVOEe0WXbQCHc1oWNdhdsRikGXx2m8p4yyp2GKrYLub6B+KLKg7M9+LfbQi 71u/YmJAK1YFzeHHr6vOsnRux8vdiYUJayBgZAmmvLAMKWCJZjJzHZP/llgbMGaP 2AQLYQeMj3dwo/ETR7hh3SNhJgzDeuZSwJZdLNOmLe9qh+iUq7aNJBMgU+aWimP/ zQuwcDNSpt5bJ9jhsyZ81fkG9Y0OPtEteiHeG/Ibg3jukYSkBe4= =aYLZ -----END PGP SIGNATURE----- --ksj2h2qp53qdfzmp--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20181121085216.cfwbx6ywdmqrtdh3>