From owner-svn-ports-all@freebsd.org  Sun Jul 31 15:03:43 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1602BA95FF;
 Sun, 31 Jul 2016 15:03:43 +0000 (UTC)
 (envelope-from bapt@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 mx1.freebsd.org (Postfix) with ESMTPS id 726A31D99;
 Sun, 31 Jul 2016 15:03:43 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6VF3gEc012041;
 Sun, 31 Jul 2016 15:03:42 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6VF3gkd012040;
 Sun, 31 Jul 2016 15:03:42 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201607311503.u6VF3gkd012040@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 31 Jul 2016 15:03:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r419387 - head/security/pgp/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Jul 2016 15:03:43 -0000

Author: bapt
Date: Sun Jul 31 15:03:42 2016
New Revision: 419387
URL: https://svnweb.freebsd.org/changeset/ports/419387

Log:
  Fix build with getline(3) in libc

Added:
  head/security/pgp/files/patch-armor.c   (contents, props changed)

Added: head/security/pgp/files/patch-armor.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/pgp/files/patch-armor.c	Sun Jul 31 15:03:42 2016	(r419387)
@@ -0,0 +1,29 @@
+--- armor.c.orig	1996-01-17 19:37:20 UTC
++++ armor.c
+@@ -343,7 +343,7 @@ copyline(FILE * in, FILE * out)
+  * idea.
+  */
+ static int
+-getline(char *buf, int n, FILE * f)
++get_line(char *buf, int n, FILE * f)
+ {
+     int state;
+     char *p;
+@@ -547,7 +547,7 @@ armor_file(char *infilename, char *outfi
+ 	    return 1;
+ 	}
+ 	fprintf(outFile, "-----BEGIN PGP SIGNED MESSAGE-----\n\n");
+-	while ((i = getline(buffer, sizeof buffer, clearFile)) >= 0) {
++	while ((i = get_line(buffer, sizeof buffer, clearFile)) >= 0) {
+ 	    /* Quote lines beginning with '-' as per RFC1113;
+ 	     * Also quote lines beginning with "From "; this is
+ 	     * for Unix mailers which add ">" to such lines.
+@@ -1231,7 +1231,7 @@ LANG("\n\007Unable to write ciphertext o
+ 	for (;;) {
+ 	    ++infile_line;
+ 	    nline = status;
+-	    status = getline(buf, sizeof buf, in);
++	    status = get_line(buf, sizeof buf, in);
+ 	    if (status < 0) {
+ 		fprintf(pgpout,
+ LANG("ERROR: ASCII armor decode input ended unexpectedly!\n"));