Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 07 Jan 2014 17:01:32 -0500
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        Dirk Meyer <dinoex@FreeBSD.org>, ports-committers@freebsd.org,  svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r339031 - in head/security/openssl: . files
Message-ID:  <52CC793C.8030801@FreeBSD.org>
In-Reply-To: <201401072040.s07KeN7v084781@svn.freebsd.org>
References:  <201401072040.s07KeN7v084781@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------090300070709010402060805
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2014-01-07 15:40:22 -0500, Dirk Meyer wrote:
> Author: dinoex Date: Tue Jan  7 20:40:22 2014 New Revision: 339031 
> URL: http://svnweb.freebsd.org/changeset/ports/339031
> 
> Log: - Security update to openssl-1.0.1f - remove broken patches -
> new fix for perl5.18
...

The fix for pod2man is incomplete.  In fact, the upstream fixed the
problem and it is little different from yours:

http://git.openssl.org/gitweb/?p=openssl.git;h=c8919dde

To reproduce the upstream patch, the sed expression must be changed.
Please see the attached patch, for example.

Jung-uk Kim
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (FreeBSD)

iQEcBAEBAgAGBQJSzHk8AAoJEHyflib82/FGXyYIAJS7qxQ+UuDMV4/CBjpJBOUV
51bH7SeF+Tihq1A6yHG1XARsBC3uvbgNGxncr7fTwQBqP9ifiDB/e7JqZ5JjJcL4
7jYxXB0nu+g9wr+zaATobw6uk85WPx2OsyIA9YByKmtizq/ABXUjwzTpnLLlaqoe
/sAVKNyzZTFRlCr2V2AI7GwOH0+D85NM7aFVXXHM5WSg5IsVSL94DtnHOZ8z3TxK
+egsIM3Xn4qtzxNf2dfIjWQnLI4EgxVFxH2YfMXC5g/h42/hRY1930C5JopGevU7
/jmoyYOS5aXYnmV/1oH1lCa0VKrNiOo1PDEy+3Kvz0SWyEbA1xH0PC261GggCII=
=GseI
-----END PGP SIGNATURE-----

--------------090300070709010402060805
Content-Type: text/x-patch;
 name="openssl.diff"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment;
 filename="openssl.diff"

Index: Makefile
===================================================================
--- Makefile	(리비전 339037)
+++ Makefile	(작업 사본)
@@ -58,14 +58,16 @@ MANPREFIX=	${PREFIX}
 
 FIX_POD=apps/cms.pod \
 	apps/smime.pod \
-	ssl/SSL_accept.pod \
-	ssl/SSL_clear.pod \
-	ssl/SSL_COMP_add_compression_method.pod ssl/SSL_connect.pod \
-	ssl/SSL_CTX_add_session.pod ssl/SSL_CTX_load_verify_locations.pod \
+	ssl/SSL_COMP_add_compression_method.pod \
+	ssl/SSL_CTX_add_session.pod \
+	ssl/SSL_CTX_load_verify_locations.pod \
 	ssl/SSL_CTX_set_client_CA_list.pod \
 	ssl/SSL_CTX_set_session_id_context.pod \
 	ssl/SSL_CTX_set_ssl_version.pod \
 	ssl/SSL_CTX_use_psk_identity_hint.pod \
+	ssl/SSL_accept.pod \
+	ssl/SSL_clear.pod \
+	ssl/SSL_connect.pod \
 	ssl/SSL_do_handshake.pod \
 	ssl/SSL_read.pod \
 	ssl/SSL_session_reused.pod \
@@ -1177,7 +1179,7 @@ pre-everything::
 .endif
 
 pre-patch:
-	${REINPLACE_CMD} -e 's|^=item \([0-9]\)$$|=item C<\1>|' \
+	${REINPLACE_CMD} -E -e 's|^=item ([0-9])[[:blank:]]*$$|=item Z<>\1|' \
 		${FIX_POD:S,^,${WRKSRC}/doc/,}
 
 post-patch:

--------------090300070709010402060805--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52CC793C.8030801>