summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNP-Hardass <NP-Hardass@gentoo.org>2017-12-07 19:23:40 -0500
committerNP-Hardass <NP-Hardass@gentoo.org>2017-12-07 19:35:19 -0500
commit860825c5351c93a0b5c7fafe74de372230ed395f (patch)
treec1196c91401d223aa7c84687761d93ee438fc2e1
parentgames-strategy/freeorion: Switch to python-single-r1 from python-any-r1 (diff)
downloadgentoo-860825c5351c93a0b5c7fafe74de372230ed395f.tar.gz
gentoo-860825c5351c93a0b5c7fafe74de372230ed395f.tar.bz2
gentoo-860825c5351c93a0b5c7fafe74de372230ed395f.zip
app-crypt/acme-tiny: Bump to 20170917
Refactors contact-info PR Fix 9999 naming to 9999999 Closes: https://bugs.gentoo.org/639282 Package-Manager: Portage-2.3.16, Repoman-2.3.6
-rw-r--r--app-crypt/acme-tiny/Manifest2
-rw-r--r--app-crypt/acme-tiny/acme-tiny-20170917.ebuild (renamed from app-crypt/acme-tiny/acme-tiny-20170207.ebuild)4
-rw-r--r--app-crypt/acme-tiny/acme-tiny-99999999.ebuild (renamed from app-crypt/acme-tiny/acme-tiny-9999.ebuild)4
-rw-r--r--app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch4
4 files changed, 7 insertions, 7 deletions
diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
index 022d3d6856d..adc866795dd 100644
--- a/app-crypt/acme-tiny/Manifest
+++ b/app-crypt/acme-tiny/Manifest
@@ -1 +1 @@
-DIST acme-tiny-20170207.tar.gz 10510 SHA256 aef2541c7270a9aa4d4ce49509d6a0f48e59eccc116df0fe7defe77df724f544 SHA512 260de3fe3052e3eba3e8438b15e34d95c99f95d75137ddabe9c031a83bd7b967bebabe6916fa23de6194ab19cc687942af0cc700b7095b7c810820800c26061e WHIRLPOOL f16ed8b8f0a096bf379ad203343061b9bc078999029254b9462178a930e08728f370f0837991676f5d6bad41cd5279fbecc27dfa9b08c307341e1052cd9bbdfb
+DIST acme-tiny-20170917.tar.gz 10516 BLAKE2B e9d4ae170579cd5379dbb4d900d051bc1789ac994eb491aafb9952cd004b3e3feed20ef505f88587035f3f16163e7965a1b3883caaaa8c2327fca6be0240a17f SHA512 0bfb0d064f21f9d89e3c5863f33c7326c02948a42e2c8dc11c7b5baaf5e0dfcaeba0ad461b2ad12e292cc14f64b44f331f11b56dda6592a4663baf0714048700
diff --git a/app-crypt/acme-tiny/acme-tiny-20170207.ebuild b/app-crypt/acme-tiny/acme-tiny-20170917.ebuild
index 05ce311583f..c185d254315 100644
--- a/app-crypt/acme-tiny/acme-tiny-20170207.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-20170917.ebuild
@@ -6,12 +6,12 @@ EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == 99999999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
KEYWORDS=""
else
- HASH="daba51d37efd7c1f205f9da383b9b09968e30d29"
+ HASH="4ed13950c0a9cf61f1ca81ff1874cde1cf48ab32"
SRC_URI="https://github.com/diafygi/${PN}/archive/${HASH}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${PN}-${HASH}"
diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-99999999.ebuild
index 05ce311583f..c185d254315 100644
--- a/app-crypt/acme-tiny/acme-tiny-9999.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-99999999.ebuild
@@ -6,12 +6,12 @@ EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == 99999999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
KEYWORDS=""
else
- HASH="daba51d37efd7c1f205f9da383b9b09968e30d29"
+ HASH="4ed13950c0a9cf61f1ca81ff1874cde1cf48ab32"
SRC_URI="https://github.com/diafygi/${PN}/archive/${HASH}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${PN}-${HASH}"
diff --git a/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch b/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch
index 787b66c1129..63727840d8e 100644
--- a/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch
+++ b/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch
@@ -27,7 +27,7 @@ index 34a1863..bd79321 100644
- code, result = _send_signed_request(CA + "/acme/new-reg", {
+ payload = {
"resource": "new-reg",
- "agreement": "https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf",
+ "agreement": json.loads(urlopen(CA + "/directory").read().decode('utf8'))['meta']['terms-of-service'],
- })
+ }
+ if account_email:
@@ -64,7 +64,7 @@ index bd79321..cea57ee 100644
--- a/acme_tiny.py
+++ b/acme_tiny.py
@@ -85,7 +85,7 @@ def _send_signed_request(url, payload):
- "agreement": "https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf",
+ "agreement": json.loads(urlopen(CA + "/directory").read().decode('utf8'))['meta']['terms-of-service'],
}
if account_email:
- payload["contact"] = ["mailto:"+account_email]