[arch-commits] Commit in certbot/trunk (5 files)
George Rawlinson
grawlinson at gemini.archlinux.org
Wed Mar 23 01:37:48 UTC 2022
Date: Wednesday, March 23, 2022 @ 01:37:47
Author: grawlinson
Revision: 1171193
upgpkg: certbot 1.25.0-1
* New upstream release.
* Deprecate setuptools in favour of PEP-517 generation.
* Let systemd-tmpfiles generate system-level directories
instead of including them in the package.
* Include systemd timer/unit as per FS#73186.
* Create man pages.
* Add signing key alongside PKGBUILD.
Added:
certbot/trunk/86379B4F0AF371B50CD9E5FF3402831161D1D280.asc
certbot/trunk/certbot-renew.service
certbot/trunk/certbot-renew.timer
certbot/trunk/tmpfiles.conf
Modified:
certbot/trunk/PKGBUILD
----------------------------------------------+
86379B4F0AF371B50CD9E5FF3402831161D1D280.asc | 1
PKGBUILD | 95 +++++++++++++++++++------
certbot-renew.service | 8 ++
certbot-renew.timer | 10 ++
tmpfiles.conf | 3
5 files changed, 97 insertions(+), 20 deletions(-)
Added: 86379B4F0AF371B50CD9E5FF3402831161D1D280.asc
===================================================================
(Binary files differ)
Index: certbot/trunk/86379B4F0AF371B50CD9E5FF3402831161D1D280.asc
===================================================================
--- 86379B4F0AF371B50CD9E5FF3402831161D1D280.asc 2022-03-23 01:18:42 UTC (rev 1171192)
+++ 86379B4F0AF371B50CD9E5FF3402831161D1D280.asc 2022-03-23 01:37:47 UTC (rev 1171193)
Property changes on: certbot/trunk/86379B4F0AF371B50CD9E5FF3402831161D1D280.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-23 01:18:42 UTC (rev 1171192)
+++ PKGBUILD 2022-03-23 01:37:47 UTC (rev 1171193)
@@ -1,44 +1,99 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: George Rawlinson <grawlinson at archlinux.org>
+# Contributor: Felix Yan <felixonmars at archlinux.org>
# Contributor: Gordian Edenhofer <gordian.edenhofer[at]yahoo[dot]de>
pkgname=certbot
-pkgver=1.23.0
+pkgver=1.25.0
pkgrel=1
-pkgdesc="A tool to automatically receive and install X.509 certificates to enable TLS on servers. The client will interoperate with the Let’s Encrypt CA which will be issuing browser-trusted certificates for free."
+pkgdesc="An ACME client"
arch=('any')
license=('Apache')
url="https://certbot.eff.org"
-depends=('ca-certificates' 'python-acme' 'python-configargparse' 'python-configobj'
- 'python-cryptography' 'python-distro' 'python-parsedatetime'
- 'python-pyrfc3339' 'python-pytz' 'python-setuptools' 'python-zope-component'
- 'python-zope-interface')
+depends=(
+ 'ca-certificates'
+ 'python-acme'
+ 'python-configargparse'
+ 'python-configobj'
+ 'python-cryptography'
+ 'python-distro'
+ 'python-parsedatetime'
+ 'python-pyrfc3339'
+ 'python-pytz'
+ 'python-zope-component'
+ 'python-zope-interface'
+)
+makedepends=(
+ 'python-build'
+ 'python-wheel'
+ 'python-installer'
+ 'python-sphinx'
+ 'python-sphinx_rtd_theme'
+)
checkdepends=('python-pytest')
-optdepends=('certbot-apache: Apache plugin for Let’s Encrypt client'
- 'certbot-nginx: Nginx plugin for Let’s Encrypt client')
-replaces=("letsencrypt")
-source=("https://pypi.io/packages/source/c/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc})
+optdepends=(
+ 'certbot-apache: Apache plugin for Let’s Encrypt client'
+ 'certbot-nginx: Nginx plugin for Let’s Encrypt client'
+)
+replaces=('letsencrypt')
+source=(
+ "https://files.pythonhosted.org/packages/source/${pkgname::1}/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc}
+ 'tmpfiles.conf'
+ 'certbot-renew.service'
+ 'certbot-renew.timer'
+)
+sha512sums=('985daf1ae70296d9a6eba436a349be1f31570e8314bdcc514dea9ffbcdcf35c4917250757d14c9192475afde14b840d4df8f7763f607465195686d28580fb6b4'
+ 'SKIP'
+ 'fbb7bb4591876aeb2e118c3f3fc8ff507b6a3127de0f921c689e1d74c70320b4f2b8bf05b488ec4f714259701f1ac54e64a9f6181475da6bd6d1e3da3a602217'
+ 'ad639f33201089d5531d1b1dcd163e2f85bd84a6a9aa233bb04f1f86b34a4f9afa4aed274a27cc89a0664150e80af31742d425923015d585b781a8b139cb8954'
+ '471d371de385daf18f58a2e4eaed74f0d2d9931beb74ee28481ffb17ce4e4450752c135b920b6efd17a16f84f99fe38b69e6602e230ba09059f85390b08aaba1')
+b2sums=('ffdc7a89050734085bfa3a6f24e8bb9707c18169daaaada2837edd64de73aa93ca7cc6defc33cc3d3e0eac93abb902a2e7fd77804003c981954c3cd373a97bf6'
+ 'SKIP'
+ '7d2c26a9953d3b5a899053bdd7bd77051c67abe6480af2bfaaee06f20a399b0b4ccccc0af35cfe9e6d2b1fc833dbff928ba46771a9127720073dda29aef9a2e0'
+ '773be7c45aaf84b79b260053dd4555be1b913238f680cf2c816e20d585db21c11ff41c985915ab0804bb3bc78af2e1e09133ed3b04e276e6379f63e9522064c1'
+ 'a75e09a662be6ce1bc533c39bea8ecfd6c0feb3f0066db854de701c1af71534bca750ef5b50826446708823564945aac887649225d15a347efd864dd1e1a8e81')
validpgpkeys=('148C30F6F7E429337A72D992B00B9CC82D7ADF2C'
'1B41B758F9A78C7F444C20FA3E5B4152E3ADB1FD'
'A2CFB51FA275A7286234E7B24D17C995CD9775F2'
'20F201346BF8F3F455A73F9A780CC99432A28621'
'86379B4F0AF371B50CD9E5FF3402831161D1D280')
-sha512sums=('18bb89bce0cdcec4cb181c160e4eb331bfebfc0d3fe142678be81cba30e1719364ea151e04f2ff161238a3d8f46cf7b2f4aa1ef74575cc2938249a0289328db1'
- 'SKIP')
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ # nuke setuptools from orbit ^W install_requires
+ sed \
+ -e '/setuptools>=/d' \
+ -i setup.py
+}
+
build() {
- cd $pkgname-$pkgver
- python setup.py build
+ cd "$pkgname-$pkgver"
+
+ python -m build --wheel --no-isolation
+
+ # create man pages
+ make -C docs man
}
check() {
- cd $pkgname-$pkgver
+ cd "$pkgname-$pkgver"
+
python -m pytest
}
package() {
- cd $pkgname-$pkgver
- python setup.py install --root="$pkgdir"
+ # systemd integration
+ install -vDm644 -t "$pkgdir/usr/lib/systemd/system" certbot-renew.*
+ install -vDm644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
- mkdir -p "$pkgdir"/{etc,var/lib,var/log}/letsencrypt
- chmod 700 "$pkgdir"/var/log/letsencrypt
+ cd "$pkgname-$pkgver"
+
+ python -m installer --destdir="$pkgdir" dist/*.whl
+
+ # sometimes Python packaging tools don't set the correct permissions...
+ chmod 755 "$pkgdir"/usr/bin/*
+
+ # man pages
+ install -vDm644 -t "$pkgdir/usr/share/man/man1" docs/_build/man/*.1
+ install -vDm644 -t "$pkgdir/usr/share/man/man7" docs/_build/man/*.7
}
Added: certbot-renew.service
===================================================================
--- certbot-renew.service (rev 0)
+++ certbot-renew.service 2022-03-23 01:37:47 UTC (rev 1171193)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Renew certificates acquired via Certbot
+Documentation=https://eff-certbot.readthedocs.io/en/stable/
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/certbot -q renew
+PrivateTmp=true
Added: certbot-renew.timer
===================================================================
--- certbot-renew.timer (rev 0)
+++ certbot-renew.timer 2022-03-23 01:37:47 UTC (rev 1171193)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Run Certbot twice daily
+
+[Timer]
+OnCalendar=*-*-* 00/12:00:00
+RandomizedDelaySec=12h
+Persistent=true
+
+[Install]
+WantedBy=timers.target
Added: tmpfiles.conf
===================================================================
--- tmpfiles.conf (rev 0)
+++ tmpfiles.conf 2022-03-23 01:37:47 UTC (rev 1171193)
@@ -0,0 +1,3 @@
+d /etc/letsencrypt
+d /var/lib/letsencrypt
+d /var/log/letsencrypt 0700
More information about the arch-commits
mailing list