Re: py-requests: use system cert.pem file

2016-10-11 Thread Alexandr Shadchin
On Tue, Oct 11, 2016 at 10:01:50AM +0100, Stuart Henderson wrote:
> This doesn't fix my crash but while investigating it, I noticed that
> py-requests is using its own cacert.pem, it should use the system one.
> Fixup the distfile name while there as well. OK?
> 

ok shadchin@

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/py-requests/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile  30 Sep 2016 09:45:56 -  1.18
> +++ Makefile  11 Oct 2016 08:57:49 -
> @@ -3,11 +3,12 @@
>  COMMENT= elegant and simple HTTP library for Python
>  
>  MODPY_EGG_VERSION=   2.11.1
> -DISTNAME=v${MODPY_EGG_VERSION}
>  PKGNAME= py-requests-${MODPY_EGG_VERSION}
> +REVISION=0
>  
>  GH_ACCOUNT=  kennethreitz
>  GH_PROJECT=  requests
> +GH_TAGNAME=  v${MODPY_EGG_VERSION}
>  
>  CATEGORIES=  www
>  
> @@ -31,6 +32,10 @@ FLAVOR?=
>  MODPY_SETUPTOOLS=Yes
>  
>  WRKDIST= ${WRKDIR}/requests-${MODPY_EGG_VERSION}
> +
> +post-install:
> + ln -fs /etc/ssl/cert.pem \
> +   ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/requests/cacert.pem
>  
>  do-test:
>   cd ${WRKSRC} && ${MODPY_BIN} -m pytest
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/py-requests/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo  30 Sep 2016 09:45:56 -  1.13
> +++ distinfo  11 Oct 2016 08:57:49 -
> @@ -1,2 +1,2 @@
> -SHA256 (v2.11.1.tar.gz) = 6OVxCukjoA5FYx8OR8MOv8g7eoxKeoGPeL+CD5tgdVg=
> -SIZE (v2.11.1.tar.gz) = 718073
> +SHA256 (requests-2.11.1.tar.gz) = 
> 6OVxCukjoA5FYx8OR8MOv8g7eoxKeoGPeL+CD5tgdVg=
> +SIZE (requests-2.11.1.tar.gz) = 718073
> 

-- 
Alexandr Shadchin



Re: py-requests: use system cert.pem file

2016-10-11 Thread David Coppa
On Tue, Oct 11, 2016 at 11:01 AM, Stuart Henderson  wrote:
> This doesn't fix my crash but while investigating it, I noticed that
> py-requests is using its own cacert.pem, it should use the system one.
> Fixup the distfile name while there as well. OK?

Sure, looks good to me.

> Index: Makefile
> ===
> RCS file: /cvs/ports/www/py-requests/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile30 Sep 2016 09:45:56 -  1.18
> +++ Makefile11 Oct 2016 08:57:49 -
> @@ -3,11 +3,12 @@
>  COMMENT=   elegant and simple HTTP library for Python
>
>  MODPY_EGG_VERSION= 2.11.1
> -DISTNAME=  v${MODPY_EGG_VERSION}
>  PKGNAME=   py-requests-${MODPY_EGG_VERSION}
> +REVISION=  0
>
>  GH_ACCOUNT=kennethreitz
>  GH_PROJECT=requests
> +GH_TAGNAME=v${MODPY_EGG_VERSION}
>
>  CATEGORIES=www
>
> @@ -31,6 +32,10 @@ FLAVOR?=
>  MODPY_SETUPTOOLS=  Yes
>
>  WRKDIST=   ${WRKDIR}/requests-${MODPY_EGG_VERSION}
> +
> +post-install:
> +   ln -fs /etc/ssl/cert.pem \
> + 
> ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/requests/cacert.pem
>
>  do-test:
> cd ${WRKSRC} && ${MODPY_BIN} -m pytest
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/py-requests/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo30 Sep 2016 09:45:56 -  1.13
> +++ distinfo11 Oct 2016 08:57:49 -
> @@ -1,2 +1,2 @@
> -SHA256 (v2.11.1.tar.gz) = 6OVxCukjoA5FYx8OR8MOv8g7eoxKeoGPeL+CD5tgdVg=
> -SIZE (v2.11.1.tar.gz) = 718073
> +SHA256 (requests-2.11.1.tar.gz) = 
> 6OVxCukjoA5FYx8OR8MOv8g7eoxKeoGPeL+CD5tgdVg=
> +SIZE (requests-2.11.1.tar.gz) = 718073
>



-- 
"If you try a few times and give up, you'll never get there. But if
you keep at it... There's a lot of problems in the world which can
really be solved by applying two or three times the persistence that
other people will."
-- Stewart Nelson