From owner-svn-ports-all@freebsd.org Fri Apr 26 19:29:31 2019 Return-Path: Delivered-To: svn-ports-all@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 5D2D3159C238; Fri, 26 Apr 2019 19:29:31 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 052B28223C; Fri, 26 Apr 2019 19:29:31 +0000 (UTC) (envelope-from swills@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 D4E3C181D9; Fri, 26 Apr 2019 19:29:30 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3QJTUAA076821; Fri, 26 Apr 2019 19:29:30 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3QJTUlu076819; Fri, 26 Apr 2019 19:29:30 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201904261929.x3QJTUlu076819@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 26 Apr 2019 19:29:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500127 - in head/archivers/py-attic: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/archivers/py-attic: . files X-SVN-Commit-Revision: 500127 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 052B28223C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Apr 2019 19:29:31 -0000 Author: swills Date: Fri Apr 26 19:29:30 2019 New Revision: 500127 URL: https://svnweb.freebsd.org/changeset/ports/500127 Log: archivers/py-attic: Remove BROKEN, add DEPRECATED PR: 237560 Submitted by: Thomas Hurst (maintainer) Added: head/archivers/py-attic/files/ head/archivers/py-attic/files/patch-attic_crypto.pyx (contents, props changed) Modified: head/archivers/py-attic/Makefile (contents, props changed) Modified: head/archivers/py-attic/Makefile ============================================================================== --- head/archivers/py-attic/Makefile Fri Apr 26 19:05:48 2019 (r500126) +++ head/archivers/py-attic/Makefile Fri Apr 26 19:29:30 2019 (r500127) @@ -3,7 +3,7 @@ PORTNAME= attic PORTVERSION= 0.16 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,14 +15,15 @@ COMMENT= Deduplicating backup program LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_12= does not build with OpenSSL 1.1 -BROKEN_FreeBSD_13= does not build with OpenSSL 1.1 +DEPRECATED= Unsupported by upstream, please migrate to archivers/py-borg. \ + See https://borgbackup.readthedocs.io/en/stable/usage/upgrade.html\#borg-upgrade +EXPIRATION_DATE= 2019-09-01 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.10:devel/py-msgpack@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.10:devel/py-msgpack@${PY_FLAVOR} USES= python:3.3-3.6 ssl -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist cython distutils PYDISTUTILS_BUILDPATH=${BUILD_WRKSRC}/build/lib.${OPSYS:tl}-${UNAMER}-${ARCH}-${PYTHON_VER} REINPLACE_ARGS= -i '' Added: head/archivers/py-attic/files/patch-attic_crypto.pyx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/py-attic/files/patch-attic_crypto.pyx Fri Apr 26 19:29:30 2019 (r500127) @@ -0,0 +1,59 @@ +--- attic/crypto.pyx.orig 2015-04-27 20:15:50 UTC ++++ attic/crypto.pyx +@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h": + pass + const EVP_MD *EVP_sha256() + const EVP_CIPHER *EVP_aes_256_ctr() +- void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a) +- void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a) ++ EVP_CIPHER_CTX *EVP_CIPHER_CTX_new() ++ const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a) ++ void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a) + + int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl, + const unsigned char *key, const unsigned char *iv) +@@ -84,16 +85,16 @@ def get_random_bytes(n): + cdef class AES: + """A thin wrapper around the OpenSSL EVP cipher API + """ +- cdef EVP_CIPHER_CTX ctx ++ cdef EVP_CIPHER_CTX * ctx + + def __cinit__(self, key, iv=None): +- EVP_CIPHER_CTX_init(&self.ctx) +- if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL): ++ self.ctx = EVP_CIPHER_CTX_new(); ++ if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL): + raise Exception('EVP_EncryptInit_ex failed') + self.reset(key, iv) + + def __dealloc__(self): +- EVP_CIPHER_CTX_cleanup(&self.ctx) ++ EVP_CIPHER_CTX_free(self.ctx) + + def reset(self, key=None, iv=None): + cdef const unsigned char *key2 = NULL +@@ -102,12 +103,12 @@ cdef class AES: + key2 = key + if iv: + iv2 = iv +- if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2): ++ if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2): + raise Exception('EVP_EncryptInit_ex failed') + + @property + def iv(self): +- return self.ctx.iv[:16] ++ return EVP_CIPHER_CTX_iv(self.ctx)[:16] + + def encrypt(self, data): + cdef int inl = len(data) +@@ -116,7 +117,7 @@ cdef class AES: + if not out: + raise MemoryError + try: +- if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl): ++ if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl): + raise Exception('EVP_EncryptUpdate failed') + return out[:inl] + finally: