From owner-svn-ports-head@freebsd.org  Fri Oct 28 08:03:00 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 8AB67C24240;
 Fri, 28 Oct 2016 08:03:00 +0000 (UTC)
 (envelope-from amdmi3@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 5C80B19F3;
 Fri, 28 Oct 2016 08:03:00 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9S82x8D022882;
 Fri, 28 Oct 2016 08:02:59 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9S82xkd022881;
 Fri, 28 Oct 2016 08:02:59 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201610280802.u9S82xkd022881@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 28 Oct 2016 08:02:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r424810 - head/security/py-pow/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-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Oct 2016 08:03:00 -0000

Author: amdmi3
Date: Fri Oct 28 08:02:59 2016
New Revision: 424810
URL: https://svnweb.freebsd.org/changeset/ports/424810

Log:
  - Fix build

Modified:
  head/security/py-pow/files/patch-POW.c

Modified: head/security/py-pow/files/patch-POW.c
==============================================================================
--- head/security/py-pow/files/patch-POW.c	Fri Oct 28 08:02:38 2016	(r424809)
+++ head/security/py-pow/files/patch-POW.c	Fri Oct 28 08:02:59 2016	(r424810)
@@ -150,8 +150,12 @@
  
     if ( !(self = PyObject_New( x509_crl_object, &x509_crltype ) ) )
        goto error;
-@@ -2435,7 +2428,7 @@ static X509_REVOKED *
- X509_REVOKED_dup(X509_REVOKED *rev)
+@@ -2432,10 +2425,10 @@ static char x509_crl_object_set_revoked_
+ 
+ // added because we don't already have one!
+ static X509_REVOKED *
+-X509_REVOKED_dup(X509_REVOKED *rev)
++X509_REVOKED_dupe(X509_REVOKED *rev)
  {
     return((X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED,
 -      (char *(*)())d2i_X509_REVOKED,(char *)rev));
@@ -159,6 +163,15 @@
  }
  
  static PyObject *
+@@ -2464,7 +2457,7 @@ x509_crl_object_set_revoked(x509_crl_obj
+       if ( !X_X509_revoked_Check( revoked ) )
+          { PyErr_SetString( PyExc_TypeError, "inapropriate type" ); goto error; }
+ 
+-      if ( !(tmp_revoked = X509_REVOKED_dup( revoked->revoked ) ) )
++      if ( !(tmp_revoked = X509_REVOKED_dupe( revoked->revoked ) ) )
+          { PyErr_SetString( SSLErrorObject, "could not allocate memory" ); goto error; }
+ 
+       if (!sk_X509_REVOKED_push( revoked_stack, tmp_revoked ) )
 @@ -2815,7 +2808,6 @@ static char x509_crl_object_sign__doc__[
  "         signed, it should be one of the following:\n"
  "      </para>\n"