Update to version 0.1.16

3 files changed, 36 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index acfa3f9a630c..1551c43021c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,22 @@
 pkgbase = acme-client
 	pkgdesc = Secure Let's Encrypt client
-	pkgver = 0.1.15
+	pkgver = 0.1.16
 	pkgrel = 1
 	url = https://kristaps.bsd.lv/acme-client/
 	arch = x86_64
 	arch = i686
-	license = BSD
+	license = custom:ISC
 	depends = libbsd
 	provides = letskencrypt
 	replaces = letskencrypt
-	source = https://github.com/kristapsdz/acme-client-portable/archive/VERSION_0_1_15.tar.gz
-	source = http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.5.0.tar.gz
+	source = https://kristaps.bsd.lv/acme-client/snapshots/acme-client-portable-0.1.16.tgz
+	source = http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.5.1.tar.gz
 	source = README.archlinux
-	source = acme-client-no-seccomp.patch
-	sha512sums = 3d78dc152aceaf1712f2deb19923a1b998b1f93cf86b4e0c1918abcd01e074318ee4874dec17aadf07cdfbd4ab266c4985608aecfddbbd785314e96a147d84eb
-	sha512sums = 6372b27f1696e957389646a05b0572ad6936443b34fee0e57153b063831e00318fa1b434e3e0369f0c3df872e15ad3bee2f85db0851021444612f2a6f266a332
+	source = LICENSE.md
+	sha512sums = 730c20bdf9d72b24e66c54b009a282e04da3ea8ce3b9eb053750672c53c9586b2879d87a565ddbab033d7ba6a577dd6399313b20cf654b185905db4de988b6b7
+	sha512sums = 44557c7c3e6bc9c0af9ae83b26765be9707d53708a32a5a945108a49ea20503afa4197919801830d27821c069b87e0e0edd284bd1b8a85340dbc0da2c162c2f9
 	sha512sums = 0a1d1baad45510687e66fafb44459a503f6688a73f7ceb402c204b096dee4e56ea2e9f71ed6f59421b81acf854a3d39395739a5a063c1536d557e3eccac6cee4
-	sha512sums = f8ff25c0f1933f2f6d6c5f6f4605147f62ff7b88bbdad6b20182f1bec4a04a6ffad362e0fc1cc44796223cc70240de5abb55daa9ac4e4bfb47e2f3e863788f47
+	sha512sums = b3580f1332469005c03b695ba1c5bc4d36accd2983f8d59f9fe6ce5616b208f1a7c65ad9c3d6a28d4b196ee765d07753e9c1308b5428408ccb3d5049b69c970c
 
 pkgname = acme-client
 
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 000000000000..48c55031e7e4
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,14 @@
+Copyright (c) 2016, Kristaps Dzonsons <kristaps@bsd.lv>
+
+Permission to use, copy, modify, and/or distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.
+
diff --git a/PKGBUILD b/PKGBUILD
index 534c723a8644..8e2e80524ee4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,26 @@
-_libressl_ver='2.5.0'
+_libressl_ver='2.5.1'
 pkgname='acme-client'
 pkgdesc="Secure Let's Encrypt client"
-pkgver='0.1.15'
+pkgver='0.1.16'
 pkgrel='1'
-license=('BSD')
+license=('custom:ISC')
 url='https://kristaps.bsd.lv/acme-client/'
 arch=('x86_64' 'i686')
 depends=('libbsd')
-source=("https://github.com/kristapsdz/acme-client-portable/archive/VERSION_${pkgver//\./_}.tar.gz"
-		"http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${_libressl_ver}.tar.gz"
-		README.archlinux acme-client-no-seccomp.patch)
-sha512sums=('3d78dc152aceaf1712f2deb19923a1b998b1f93cf86b4e0c1918abcd01e074318ee4874dec17aadf07cdfbd4ab266c4985608aecfddbbd785314e96a147d84eb'
-            '6372b27f1696e957389646a05b0572ad6936443b34fee0e57153b063831e00318fa1b434e3e0369f0c3df872e15ad3bee2f85db0851021444612f2a6f266a332'
+source=("https://kristaps.bsd.lv/acme-client/snapshots/${pkgname}-portable-${pkgver}.tgz"
+	"http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${_libressl_ver}.tar.gz"
+	README.archlinux LICENSE.md)
+sha512sums=('730c20bdf9d72b24e66c54b009a282e04da3ea8ce3b9eb053750672c53c9586b2879d87a565ddbab033d7ba6a577dd6399313b20cf654b185905db4de988b6b7'
+            '44557c7c3e6bc9c0af9ae83b26765be9707d53708a32a5a945108a49ea20503afa4197919801830d27821c069b87e0e0edd284bd1b8a85340dbc0da2c162c2f9'
             '0a1d1baad45510687e66fafb44459a503f6688a73f7ceb402c204b096dee4e56ea2e9f71ed6f59421b81acf854a3d39395739a5a063c1536d557e3eccac6cee4'
-            'f8ff25c0f1933f2f6d6c5f6f4605147f62ff7b88bbdad6b20182f1bec4a04a6ffad362e0fc1cc44796223cc70240de5abb55daa9ac4e4bfb47e2f3e863788f47')
+            'b3580f1332469005c03b695ba1c5bc4d36accd2983f8d59f9fe6ce5616b208f1a7c65ad9c3d6a28d4b196ee765d07753e9c1308b5428408ccb3d5049b69c970c')
 replaces=('letskencrypt')
 provides=('letskencrypt')
 
 prepare () {
-	cd "${srcdir}/${pkgname}-portable-VERSION_${pkgver//\./_}"
+	cd "${srcdir}/${pkgname}-portable-${pkgver}"
 	# Remove this definition, we'll pass a value below.
 	sed -i -e '/^#define[[:space:]]\+WWW_DIR\b/d' main.c
-
-	# TODO: Remove patch once seccomp sandboxing works with glibc.
-	patch -p0 < "${srcdir}/acme-client-no-seccomp.patch"
 }
 
 build () {
@@ -32,7 +29,7 @@ build () {
 	./configure --disable-shared --enable-static --prefix=/usr --sysconfdir=/etc
 	make install DESTDIR="$(pwd)/prefix"
 
-	cd "${srcdir}/${pkgname}-portable-VERSION_${pkgver//\./_}"
+	cd "${srcdir}/${pkgname}-portable-${pkgver}"
 	local wwwdir='-DWWW_DIR=\""/srv/http/acme\""'
 	make PREFIX=/usr \
 		CPPFLAGS="-I${srcdir}/libressl-${_libressl_ver}/prefix/usr/include ${wwwdir}" \
@@ -40,7 +37,7 @@ build () {
 }
 
 package () {
-	cd "${srcdir}/${pkgname}-portable-VERSION_${pkgver//\./_}"
+	cd "${srcdir}/${pkgname}-portable-${pkgver}"
 	make PREFIX="${pkgdir}/usr" install
 
 	# Fix manual page location
@@ -50,11 +47,10 @@ package () {
 	fi
 
 	# Custom license
-	install -Dm644 LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm644 "${srcdir}/LICENSE.md" \
+		"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
 	# Additional documentation
-	install -Dm644 README.md \
-		"${pkgdir}/usr/share/doc/${pkgname}/README.md"
 	install -Dm644 "${srcdir}/README.archlinux" \
 		"${pkgdir}/usr/share/doc/${pkgname}/README.archlinux"