From owner-svn-ports-all@freebsd.org Sun Mar 13 01:50:08 2016 Return-Path: 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 2E6CDACE041; Sun, 13 Mar 2016 01:50:08 +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 E3B6DFF5; Sun, 13 Mar 2016 01:50:07 +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 u2D1o6JJ097668; Sun, 13 Mar 2016 01:50:06 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2D1o6sQ097666; Sun, 13 Mar 2016 01:50:06 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201603130150.u2D1o6sQ097666@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 13 Mar 2016 01:50:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410939 - in 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-all@freebsd.org X-Mailman-Version: 2.1.21 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: Sun, 13 Mar 2016 01:50:08 -0000 Author: amdmi3 Date: Sun Mar 13 01:50:06 2016 New Revision: 410939 URL: https://svnweb.freebsd.org/changeset/ports/410939 Log: - Switch to options helpers - Silence patching and stripping - Regenerate patches with `make makepatch` Modified: head/security/py-pow/Makefile head/security/py-pow/files/patch-POW.c Modified: head/security/py-pow/Makefile ============================================================================== --- head/security/py-pow/Makefile Sat Mar 12 22:43:39 2016 (r410938) +++ head/security/py-pow/Makefile Sun Mar 13 01:50:06 2016 (r410939) @@ -14,8 +14,6 @@ COMMENT= Python OpenSSL Wrappers LICENSE= BSD3CLAUSE -OPTIONS_DEFINE= DOCS - USES= python USE_PYTHON= distutils PYDISTUTILS_PKGNAME= POW @@ -23,14 +21,18 @@ USE_OPENSSL= yes PORTDOCS= POW.pdf +OPTIONS_DEFINE= DOCS + post-patch: - ${REINPLACE_CMD} -e 's|licence|license|' ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e 's|licence|license|' ${WRKSRC}/setup.py do-build: cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} build_ext -D NO_IDEA -D NO_RC5_32_12_16 ${PYDISTUTILS_BUILD_TARGET} post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/POW/_POW.so + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/POW/_POW.so + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR} Modified: head/security/py-pow/files/patch-POW.c ============================================================================== --- head/security/py-pow/files/patch-POW.c Sat Mar 12 22:43:39 2016 (r410938) +++ head/security/py-pow/files/patch-POW.c Sun Mar 13 01:50:06 2016 (r410939) @@ -1,5 +1,5 @@ ---- POW.c.orig 2002-09-18 05:54:28.000000000 +0200 -+++ POW.c 2014-04-16 10:32:11.000000000 +0200 +--- POW.c.orig 2002-09-18 03:54:28 UTC ++++ POW.c @@ -46,9 +46,10 @@ #include #include @@ -20,7 +20,7 @@ #define MD5_DIGEST 2 #define SHA_DIGEST 3 #define SHA1_DIGEST 4 -@@ -304,54 +304,54 @@ +@@ -304,54 +304,54 @@ evp_cipher_factory(int cipher_type) switch(cipher_type) { #ifndef NO_DES @@ -111,7 +111,7 @@ #endif default: return NULL; } -@@ -580,7 +580,7 @@ +@@ -580,7 +580,7 @@ static x509_object * X509_object_der_read(char *src, int len) { x509_object *self; @@ -120,7 +120,7 @@ if ( !(self = PyObject_New( x509_object, &x509type ) ) ) goto error; -@@ -767,7 +767,6 @@ +@@ -767,7 +767,6 @@ static char X509_object_sign__doc__[] = " signed, it should be one of the following:\n" " \n" " \n" @@ -128,7 +128,7 @@ " MD5_DIGEST\n" " SHA_DIGEST\n" " SHA1_DIGEST\n" -@@ -805,12 +804,6 @@ +@@ -805,12 +804,6 @@ X509_object_sign(x509_object *self, PyOb { PyErr_SetString( SSLErrorObject, "could not sign certificate" ); goto error; } break; } @@ -141,7 +141,7 @@ case SHA_DIGEST: { if (!X509_sign(self->x509, pkey, EVP_sha() ) ) -@@ -2050,7 +2043,7 @@ +@@ -2050,7 +2043,7 @@ static x509_crl_object * x509_crl_object_der_read(char *src, int len) { x509_crl_object *self; @@ -150,7 +150,7 @@ if ( !(self = PyObject_New( x509_crl_object, &x509_crltype ) ) ) goto error; -@@ -2435,7 +2428,7 @@ +@@ -2435,7 +2428,7 @@ static X509_REVOKED * X509_REVOKED_dup(X509_REVOKED *rev) { return((X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, @@ -159,7 +159,7 @@ } static PyObject * -@@ -2815,7 +2808,6 @@ +@@ -2815,7 +2808,6 @@ static char x509_crl_object_sign__doc__[ " signed, it should be one of the following:\n" " \n" " \n" @@ -167,7 +167,7 @@ " MD5_DIGEST\n" " SHA_DIGEST\n" " SHA1_DIGEST\n" -@@ -2852,12 +2844,6 @@ +@@ -2852,12 +2844,6 @@ x509_crl_object_sign(x509_crl_object *se { PyErr_SetString( SSLErrorObject, "could not sign certificate" ); goto error; } break; } @@ -180,7 +180,7 @@ case SHA_DIGEST: { if (!X509_CRL_sign(self->crl, pkey, EVP_sha() ) ) -@@ -4576,7 +4562,7 @@ +@@ -4576,7 +4562,7 @@ static asymmetric_object * asymmetric_object_der_read(int key_type, char *src, int len) { asymmetric_object *self=NULL; @@ -189,7 +189,7 @@ self = PyObject_New( asymmetric_object, &asymmetrictype ); if (self == NULL) -@@ -5031,7 +5017,6 @@ +@@ -5031,7 +5017,6 @@ static char asymmetric_object_sign__doc_ " following:\n" " \n" " \n" @@ -197,7 +197,7 @@ " MD5_DIGEST\n" " SHA_DIGEST\n" " SHA1_DIGEST\n" -@@ -5063,8 +5048,6 @@ +@@ -5063,8 +5048,6 @@ asymmetric_object_sign(asymmetric_object switch(digest_type) { @@ -206,7 +206,7 @@ case MD5_DIGEST: { digest_nid = NID_md5; digest_len = MD5_DIGEST_LENGTH; break; } case SHA_DIGEST: -@@ -5141,7 +5124,6 @@ +@@ -5141,7 +5124,6 @@ static char asymmetric_object_verify__do " following:\n" " \n" " \n" @@ -214,7 +214,7 @@ " MD5_DIGEST\n" " SHA_DIGEST\n" " SHA1_DIGEST\n" -@@ -5165,8 +5147,6 @@ +@@ -5165,8 +5147,6 @@ asymmetric_object_verify(asymmetric_obje switch(digest_type) { @@ -223,7 +223,7 @@ case MD5_DIGEST: { digest_len = MD5_DIGEST_LENGTH; digest_nid = NID_md5; break; } case SHA_DIGEST: -@@ -5567,8 +5547,6 @@ +@@ -5567,8 +5547,6 @@ digest_object_new(int digest_type) switch(digest_type) { @@ -232,7 +232,7 @@ case MD5_DIGEST: { self->digest_type = MD5_DIGEST; EVP_DigestInit( &self->digest_ctx, EVP_md5() ); break; } case SHA_DIGEST: -@@ -5777,7 +5755,7 @@ +@@ -5777,7 +5755,7 @@ static hmac_object * hmac_object_new(int digest_type, char *key, int key_len) { hmac_object *self=NULL; @@ -241,7 +241,7 @@ self = PyObject_New( hmac_object, &hmactype ); if (self == NULL) -@@ -5785,8 +5763,6 @@ +@@ -5785,8 +5763,6 @@ hmac_object_new(int digest_type, char *k switch(digest_type) { @@ -250,7 +250,7 @@ case MD5_DIGEST: { md = EVP_md5(); break; } case SHA_DIGEST: -@@ -6137,7 +6113,6 @@ +@@ -6137,7 +6113,6 @@ static char pow_module_new_digest__doc__ " of digest to create and should be one of the following: \n" " \n" " \n" @@ -258,7 +258,7 @@ " MD5_DIGEST\n" " SHA_DIGEST\n" " SHA1_DIGEST\n" -@@ -6176,7 +6151,6 @@ +@@ -6176,7 +6151,6 @@ static char pow_module_new_hmac__doc__[] " string and type should be one of the following: \n" " \n" " \n" @@ -266,7 +266,7 @@ " MD5_DIGEST\n" " SHA_DIGEST\n" " SHA1_DIGEST\n" -@@ -7078,7 +7052,6 @@ +@@ -7078,7 +7052,6 @@ init_POW(void) #endif // message digests