From b5d5d321a92ef9a1ee59bc6ffebc3bb2d2f93454 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 16 Aug 2020 15:35:06 +0200 Subject: [PATCH] - updated to 0.6.5 --- dehydrated.spec | 13 +++++++------ tld.patch | 28 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dehydrated.spec b/dehydrated.spec index 3a25b89..21c1103 100644 --- a/dehydrated.spec +++ b/dehydrated.spec @@ -1,11 +1,11 @@ Summary: letsencrypt/acme client implemented as a shell-script Name: dehydrated -Version: 0.6.2 -Release: 4 +Version: 0.6.5 +Release: 1 License: MIT Group: Applications/Networking Source0: https://github.com/lukas2511/dehydrated/archive/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: d4db13d5965054b0a231bf95285c6cf0 +# Source0-md5: cedf07369517c317c4e1075540b94699 Source1: httpd.conf Source2: lighttpd.conf Source3: nginx.conf @@ -66,7 +66,7 @@ Current features: %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_sbindir},{/etc/%{name},%{_webapps}/%{name}}/{conf.d,hooks,hooks.d},/etc/{cron,sudoers}.d} \ - $RPM_BUILD_ROOT/var/lib/%{name}/{accounts,acme-challenges,certs} + $RPM_BUILD_ROOT/var/lib/%{name}/{accounts,acme-challenges,alpn-certs,certs} install -p %{name} $RPM_BUILD_ROOT%{_sbindir} cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{name}/httpd.conf @@ -115,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc README.md CHANGELOG LICENSE +%doc README.md CHANGELOG LICENSE docs/*.md docs/examples/config %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sudoers.d/%{name} %dir %attr(750,root,http) %{_webapps}/%{name} @@ -136,6 +136,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_sbindir}/%{name} %dir %attr(751,root,root) /var/lib/%{name} %dir %attr(700,root,root) /var/lib/%{name}/accounts +%dir %attr(750,root,dehydrated) /var/lib/%{name}/alpn-certs %dir %attr(750,root,dehydrated) /var/lib/%{name}/certs -# challenges written here, need to be readable by webserver +# challenges are written here, need to be readable by webserver %dir %attr(751,root,dehydrated) /var/lib/%{name}/acme-challenges diff --git a/tld.patch b/tld.patch index d70c466..9c8e779 100644 --- a/tld.patch +++ b/tld.patch @@ -1,6 +1,6 @@ -diff -ur dehydrated-0.6.2.orig/dehydrated dehydrated-0.6.2/dehydrated ---- dehydrated-0.6.2.orig/dehydrated 2018-04-25 21:22:40.000000000 +0000 -+++ dehydrated-0.6.2/dehydrated 2018-12-19 22:00:23.842403000 +0000 +diff -ur dehydrated-0.6.5.orig/dehydrated dehydrated-0.6.5/dehydrated +--- dehydrated-0.6.5.orig/dehydrated 2019-06-26 12:33:35.000000000 +0200 ++++ dehydrated-0.6.5/dehydrated 2020-08-16 15:17:01.872293508 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash @@ -25,7 +25,7 @@ diff -ur dehydrated-0.6.2.orig/dehydrated dehydrated-0.6.2/dehydrated ORIGARGS="$@" # Create (identifiable) temporary files -@@ -133,7 +133,7 @@ +@@ -135,7 +135,7 @@ DOMAINS_TXT= HOOK= HOOK_CHAIN="no" @@ -34,7 +34,7 @@ diff -ur dehydrated-0.6.2.orig/dehydrated dehydrated-0.6.2/dehydrated KEYSIZE="4096" WELLKNOWN= PRIVATE_KEY_RENEW="yes" -@@ -148,8 +148,8 @@ +@@ -151,8 +151,8 @@ IP_VERSION= CHAINCACHE= AUTO_CLEANUP="no" @@ -45,9 +45,9 @@ diff -ur dehydrated-0.6.2.orig/dehydrated dehydrated-0.6.2/dehydrated API="auto" if [[ -z "${CONFIG:-}" ]]; then -@@ -255,8 +255,8 @@ - +@@ -260,8 +260,8 @@ [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs" + [[ -z "${ALPNCERTDIR}" ]] && ALPNCERTDIR="${BASEDIR}/alpn-certs" [[ -z "${CHAINCACHE}" ]] && CHAINCACHE="${BASEDIR}/chains" - [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt" - [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated" @@ -56,12 +56,12 @@ diff -ur dehydrated-0.6.2.orig/dehydrated dehydrated-0.6.2/dehydrated [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock" [[ -z "${OPENSSL_CNF}" ]] && OPENSSL_CNF="$("${OPENSSL}" version -d | cut -d\" -f2)/openssl.cnf" [[ -n "${PARAM_LOCKFILE_SUFFIX:-}" ]] && LOCKFILE="${LOCKFILE}-${PARAM_LOCKFILE_SUFFIX}" -diff -ur dehydrated-0.6.2.orig/docs/examples/config dehydrated-0.6.2/docs/examples/config ---- dehydrated-0.6.2.orig/docs/examples/config 2018-04-25 21:22:40.000000000 +0000 -+++ dehydrated-0.6.2/docs/examples/config 2018-12-19 21:54:12.003403000 +0000 -@@ -40,11 +40,11 @@ +diff -ur dehydrated-0.6.5.orig/docs/examples/config dehydrated-0.6.5/docs/examples/config +--- dehydrated-0.6.5.orig/docs/examples/config 2019-06-26 12:33:35.000000000 +0200 ++++ dehydrated-0.6.5/docs/examples/config 2020-08-16 15:17:01.872293508 +0200 +@@ -45,11 +45,11 @@ # default: - #CONFIG_D= + #DOMAINS_D= -# Base directory for account key, generated certificates and list of domains (default: $SCRIPTDIR -- uses config directory if undefined) -#BASEDIR=$SCRIPTDIR @@ -74,7 +74,7 @@ diff -ur dehydrated-0.6.2.orig/docs/examples/config dehydrated-0.6.2/docs/exampl # Output directory for generated certificates #CERTDIR="${BASEDIR}/certs" -@@ -53,7 +53,7 @@ +@@ -61,7 +61,7 @@ #ACCOUNTDIR="${BASEDIR}/accounts" # Output directory for challenge-tokens to be served by webserver or deployed in HOOK (default: /var/www/dehydrated) @@ -83,7 +83,7 @@ diff -ur dehydrated-0.6.2.orig/docs/examples/config dehydrated-0.6.2/docs/exampl # Default keysize for private keys (default: 4096) #KEYSIZE="4096" -@@ -77,13 +77,13 @@ +@@ -85,13 +85,13 @@ # # BASEDIR and WELLKNOWN variables are exported and can be used in an external program # default: -- 2.46.0