[packages/dehydrated] letsencrypt.sh renamed to dehydrated; up to 0.3.1
glen
glen at pld-linux.org
Mon Oct 17 21:06:54 CEST 2016
commit 0b9f695c5bb9e779b3b8fa7db80c53624fdcfe5a
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Oct 17 22:05:41 2016 +0300
letsencrypt.sh renamed to dehydrated; up to 0.3.1
letsencrypt.sh.spec => dehydrated.spec | 26 +++++++++++++-------------
letsencrypt.sh-agrurl.patch | 12 ------------
pld.patch | 23 +++++++----------------
3 files changed, 20 insertions(+), 41 deletions(-)
---
diff --git a/letsencrypt.sh.spec b/dehydrated.spec
similarity index 83%
rename from letsencrypt.sh.spec
rename to dehydrated.spec
index a1f663d..ebfd1f2 100644
--- a/letsencrypt.sh.spec
+++ b/dehydrated.spec
@@ -1,11 +1,11 @@
Summary: letsencrypt/acme client implemented as a shell-script
-Name: letsencrypt.sh
-Version: 0.2.0
-Release: 4
+Name: dehydrated
+Version: 0.3.1
+Release: 0.1
License: MIT
Group: Applications/Networking
-Source0: https://github.com/lukas2511/letsencrypt.sh/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 74974ab79d6879b92ba353bbf3d1257e
+Source0: https://github.com/lukas2511/dehydrated/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 7a3b92b963da6469c4a53f051d6efa24
Source1: apache.conf
Source2: lighttpd.conf
Source3: config.sh
@@ -13,8 +13,7 @@ Source4: domains.txt
Source5: hook.sh
Source6: crontab
Patch0: pld.patch
-Patch1: letsencrypt.sh-agrurl.patch
-URL: https://github.com/lukas2511/letsencrypt.sh
+URL: https://github.com/lukas2511/dehydrated
BuildRequires: rpmbuild(macros) >= 1.713
Requires: crondaemon
Requires: curl
@@ -25,6 +24,8 @@ Requires: sed
Requires: webapps
Suggests: webserver(access)
Suggests: webserver(alias)
+Provides: letsencrypt.sh = %{version}
+Obsoletes: letsencrypt.sh < 0.3
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -48,18 +49,17 @@ Current features:
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/{acme-challenges,certs},/etc/cron.d}
-install -p letsencrypt.sh $RPM_BUILD_ROOT%{_sbindir}
+install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}
-cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.d/letsencrypt
+cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.d/%{name}
install -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}
cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
@@ -87,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc README.md CHANGELOG LICENSE
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/letsencrypt
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}
%dir %attr(750,root,http) %{_sysconfdir}
%dir %attr(700,root,root) %{_sysconfdir}/certs
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
@@ -96,7 +96,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config.sh
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/domains.txt
%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hook.sh
-# challenges written here from letsencrypt.sh, need to be readable by webserver
+# challenges written here, need to be readable by webserver
%dir %attr(751,root,root) %{_sysconfdir}/acme-challenges
-%attr(755,root,root) %{_sbindir}/letsencrypt.sh
+%attr(755,root,root) %{_sbindir}/%{name}
diff --git a/letsencrypt.sh-agrurl.patch b/letsencrypt.sh-agrurl.patch
deleted file mode 100644
index 0c043c4..0000000
--- a/letsencrypt.sh-agrurl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN letsencrypt.sh-0.2.0.org/letsencrypt.sh letsencrypt.sh-0.2.0/letsencrypt.sh
---- letsencrypt.sh-0.2.0.org/letsencrypt.sh 2016-05-22 16:10:12.000000000 +0200
-+++ letsencrypt.sh-0.2.0/letsencrypt.sh 2016-08-14 12:58:37.860936998 +0200
-@@ -61,7 +61,7 @@
-
- # Default values
- CA="https://acme-v01.api.letsencrypt.org/directory"
-- LICENSE="https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf"
-+ LICENSE="https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf"
- CHALLENGETYPE="http-01"
- CONFIG_D=
- HOOK=
diff --git a/pld.patch b/pld.patch
index e2545a8..e3f43e2 100644
--- a/pld.patch
+++ b/pld.patch
@@ -1,26 +1,17 @@
---- letsencrypt.sh-0.1.0/letsencrypt.sh 2016-05-14 15:51:55.000000000 +0300
-+++ letsencrypt.sh-0.1.0/letsencrypt.sh 2016-05-14 15:58:33.687279548 +0300
+--- dehydrated-0.3.1/dehydrated 2016-05-14 15:51:55.000000000 +0300
++++ dehydrated-0.3.1/dehydrated 2016-10-17 22:03:54.184281322 +0300
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
# letsencrypt.sh by lukas2511
# Source: https://github.com/lukas2511/letsencrypt.sh
-@@ -42,7 +42,7 @@
+@@ -94,7 +94,7 @@
load_config() {
# Check for config in various locations
if [[ -z "${CONFIG:-}" ]]; then
-- for check_config in "/etc/letsencrypt.sh" "/usr/local/etc/letsencrypt.sh" "${PWD}" "${SCRIPTDIR}"; do
-+ for check_config in "/etc/letsencrypt.sh" "/etc/webapps/letsencrypt.sh" "/usr/local/etc/letsencrypt.sh" "${PWD}" "${SCRIPTDIR}"; do
- if [[ -e "${check_config}/config.sh" ]]; then
+- for check_config in "/etc/dehydrated" "/usr/local/etc/dehydrated" "${PWD}" "${SCRIPTDIR}"; do
++ for check_config in "/etc/dehydrated" "/usr/local/etc/dehydrated" "/etc/webapps/letsencrypt.sh" "${PWD}" "${SCRIPTDIR}"; do
+ if [[ -f "${check_config}/config" ]]; then
BASEDIR="${check_config}"
- CONFIG="${check_config}/config.sh"
-@@ -117,7 +117,7 @@ load_config() {
-
- [[ -z "${ACCOUNT_KEY}" ]] && ACCOUNT_KEY="${BASEDIR}/private_key.pem"
- [[ -z "${ACCOUNT_KEY_JSON}" ]] && ACCOUNT_KEY_JSON="${BASEDIR}/private_key.json"
-- [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="${BASEDIR}/.acme-challenges"
-+ [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="${BASEDIR}/acme-challenges"
- [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock"
-
- [[ -n "${PARAM_HOOK:-}" ]] && HOOK="${PARAM_HOOK}"
+ CONFIG="${check_config}/config"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dehydrated.git/commitdiff/0b9f695c5bb9e779b3b8fa7db80c53624fdcfe5a
More information about the pld-cvs-commit
mailing list