From owner-svn-ports-head@freebsd.org Mon Oct 7 14:48:43 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 91DF21315BB; Mon, 7 Oct 2019 14:48:43 +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 46n3JW3H6xz46cf; Mon, 7 Oct 2019 14:48:43 +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 52A6B182B7; Mon, 7 Oct 2019 14:48:43 +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 x97EmheK081734; Mon, 7 Oct 2019 14:48:43 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x97EmgwJ081732; Mon, 7 Oct 2019 14:48:42 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201910071448.x97EmgwJ081732@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Mon, 7 Oct 2019 14:48:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513952 - in head/security/protonvpn-cli: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/security/protonvpn-cli: . files X-SVN-Commit-Revision: 513952 X-SVN-Commit-Repository: ports 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.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Oct 2019 14:48:43 -0000 Author: swills Date: Mon Oct 7 14:48:42 2019 New Revision: 513952 URL: https://svnweb.freebsd.org/changeset/ports/513952 Log: security/protonvpn-cli: fixes issue with certs and issue with countries PR: 241103 Submitted by: Lorenzo Salvadore (maintainer) Modified: head/security/protonvpn-cli/Makefile (contents, props changed) head/security/protonvpn-cli/files/patch-protonvpn-cli.sh (contents, props changed) Modified: head/security/protonvpn-cli/Makefile ============================================================================== --- head/security/protonvpn-cli/Makefile Mon Oct 7 14:26:41 2019 (r513951) +++ head/security/protonvpn-cli/Makefile Mon Oct 7 14:48:42 2019 (r513952) @@ -3,6 +3,7 @@ PORTNAME= protonvpn-cli DISTVERSIONPREFIX= v DISTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= security net net-vpn MAINTAINER= phascolarctos@protonmail.ch @@ -16,7 +17,8 @@ LICENSE_DISTFILES_GPLv3= ${DISTFILES:M*scripts*} RUN_DEPENDS= bash:shells/bash \ openvpn:security/openvpn \ - wget:ftp/wget + wget:ftp/wget \ + ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USES= python @@ -34,7 +36,7 @@ PLIST_FILES= bin/protonvpn-cli \ post-patch: ${REINPLACE_CMD} s,\$$python,${PYTHON_CMD},g ${WRKSRC}/protonvpn-cli.sh - ${REINPLACE_CMD} s,wget,wget\ --no-check-certificate,g ${WRKSRC}/protonvpn-cli.sh + ${REINPLACE_CMD} s,wget,wget\ --ca-certificate\ ${LOCALBASE}/share/certs/ca-root-nss.crt,g ${WRKSRC}/protonvpn-cli.sh ${REINPLACE_CMD} s,%%LOCALBASE%%,${LOCALBASE},g ${WRKSRC}/protonvpn-cli.sh do-install: Modified: head/security/protonvpn-cli/files/patch-protonvpn-cli.sh ============================================================================== --- head/security/protonvpn-cli/files/patch-protonvpn-cli.sh Mon Oct 7 14:26:41 2019 (r513951) +++ head/security/protonvpn-cli/files/patch-protonvpn-cli.sh Mon Oct 7 14:48:42 2019 (r513952) @@ -229,10 +229,10 @@ + then + if [[ $1 -eq 1 ]] + then -+ country_id=6 ++ country_id=9 + elif [[ $1 -eq 2 ]] + then -+ country_id=7 ++ country_id=6 + fi + fi +