* [gentoo-commits] repo/gentoo:master commit in: app-crypt/dehydrated/files/, app-crypt/dehydrated/
@ 2017-03-03 0:57 Marc Schiffbauer
0 siblings, 0 replies; 3+ messages in thread
From: Marc Schiffbauer @ 2017-03-03 0:57 UTC (permalink / raw
To: gentoo-commits
commit: 740e257ecbd3a1060fda762c7d244fea7f657447
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 3 00:55:34 2017 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Fri Mar 3 00:57:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=740e257e
app-crypt/dehydrated: revbump: add setting in 00_gentoo.conf
instead of modifying upstream config
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../{dehydrated-0.4.0-r2.ebuild => dehydrated-0.4.0-r3.ebuild} | 1 -
app-crypt/dehydrated/files/00_gentoo.sh | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-crypt/dehydrated/dehydrated-0.4.0-r2.ebuild b/app-crypt/dehydrated/dehydrated-0.4.0-r3.ebuild
similarity index 91%
rename from app-crypt/dehydrated/dehydrated-0.4.0-r2.ebuild
rename to app-crypt/dehydrated/dehydrated-0.4.0-r3.ebuild
index e7b70869cef..04a980e238a 100644
--- a/app-crypt/dehydrated/dehydrated-0.4.0-r2.ebuild
+++ b/app-crypt/dehydrated/dehydrated-0.4.0-r3.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
src_configure() {
default
sed -i 's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
- sed -i 's,^#DOMAINS_TXT=.*,DOMAINS_TXT="/etc/dehydrated/domains.txt",' docs/examples/config || die "could not set config (DOMAINS_TXT)"
}
src_install() {
diff --git a/app-crypt/dehydrated/files/00_gentoo.sh b/app-crypt/dehydrated/files/00_gentoo.sh
index 99b6c0efee5..cab73dbfa8e 100644
--- a/app-crypt/dehydrated/files/00_gentoo.sh
+++ b/app-crypt/dehydrated/files/00_gentoo.sh
@@ -1,2 +1,3 @@
# base config required for gentoo defaults
BASEDIR="/var/lib/dehydrated"
+DOMAINS_TXT="/etc/dehydrated/domains.txt"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/dehydrated/files/, app-crypt/dehydrated/
@ 2022-10-03 1:48 Marc Schiffbauer
0 siblings, 0 replies; 3+ messages in thread
From: Marc Schiffbauer @ 2022-10-03 1:48 UTC (permalink / raw
To: gentoo-commits
commit: 370fd55d28e4b63b7cac1e756bd06a9804402a10
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 3 01:48:10 2022 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Oct 3 01:48:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=370fd55d
app-crypt/dehydrated: drop 0.7.0
Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>
app-crypt/dehydrated/dehydrated-0.7.0.ebuild | 50 ----------------------------
app-crypt/dehydrated/files/cron | 2 --
2 files changed, 52 deletions(-)
diff --git a/app-crypt/dehydrated/dehydrated-0.7.0.ebuild b/app-crypt/dehydrated/dehydrated-0.7.0.ebuild
deleted file mode 100644
index ff4c301408bd..000000000000
--- a/app-crypt/dehydrated/dehydrated-0.7.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="A client for signing certificates with an ACME-server"
-HOMEPAGE="https://github.com/lukas2511/dehydrated"
-SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-IUSE="+cron"
-
-RDEPEND="acct-group/dehydrated
- acct-user/dehydrated
- app-shells/bash
- net-misc/curl
- cron? ( virtual/cron )"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-CN-extraction-for-older-openssl-versions.patch )
-
-src_configure() {
- default
- sed -i 's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
-}
-
-src_install() {
- dobin ${PN}
- insinto /etc/${PN}
- doins docs/examples/{config,domains.txt,hook.sh}
- fperms u+x /etc/${PN}/hook.sh
- dodoc docs/*.md
-
- insinto /etc/${PN}/config.d
- doins "${FILESDIR}"/00_gentoo.sh
-
- if use cron ; then
- insinto /etc/cron.d
- newins "${FILESDIR}"/cron ${PN}
- fi
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]] ; then
- einfo "See /etc/dehydrated/config for configuration."
-
- use cron && einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
- fi
-}
diff --git a/app-crypt/dehydrated/files/cron b/app-crypt/dehydrated/files/cron
deleted file mode 100644
index df03b5fcee13..000000000000
--- a/app-crypt/dehydrated/files/cron
+++ /dev/null
@@ -1,2 +0,0 @@
-# dehydrated cron job
-#0 2 * * * dehydrated /usr/bin/dehydrated --cron
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/dehydrated/files/, app-crypt/dehydrated/
@ 2025-01-03 0:38 Marc Schiffbauer
0 siblings, 0 replies; 3+ messages in thread
From: Marc Schiffbauer @ 2025-01-03 0:38 UTC (permalink / raw
To: gentoo-commits
commit: 1e9bc7bf78116de4f64fd98a1705da1cd8cac286
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 15:34:57 2024 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Fri Jan 3 00:38:38 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e9bc7bf
app-crypt/dehydrated: Ignore output of "openssl req"
Closes: https://bugs.gentoo.org/942637
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/39864
Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>
app-crypt/dehydrated/dehydrated-0.7.1-r1.ebuild | 63 ++++++++++++++++++++++
.../files/dehydrated-0.7.1-openssl-stdout.patch | 19 +++++++
2 files changed, 82 insertions(+)
diff --git a/app-crypt/dehydrated/dehydrated-0.7.1-r1.ebuild b/app-crypt/dehydrated/dehydrated-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..db7d63245d29
--- /dev/null
+++ b/app-crypt/dehydrated/dehydrated-0.7.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dehydrated.asc
+
+inherit verify-sig
+
+DESCRIPTION="A client for signing certificates with an ACME-server"
+HOMEPAGE="https://dehydrated.io/"
+SRC_URI="
+ https://github.com/dehydrated-io/${PN}/releases/download/v${PV}/${P}.tar.gz
+ verify-sig? ( https://github.com/dehydrated-io/${PN}/releases/download/v${PV}/${P}.tar.gz.asc )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+cron"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-dehydrated )"
+RDEPEND="acct-group/dehydrated
+ acct-user/dehydrated
+ app-shells/bash
+ net-misc/curl
+ cron? ( virtual/cron )"
+
+PATCHES=( "${FILESDIR}"/${P}-openssl-stdout.patch )
+
+src_configure() {
+ default
+ sed -i 's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config \
+ || die "could not set config (CONFIG_D)"
+}
+
+src_install() {
+ dobin ${PN}
+ insinto /etc/${PN}
+ doins docs/examples/{config,domains.txt,hook.sh}
+ fperms u+x /etc/${PN}/hook.sh
+ dodoc docs/*.md
+
+ insinto /etc/${PN}/config.d
+ newins "${FILESDIR}"/00_gentoo.sh-r1 00_gentoo.sh
+
+ keepdir /etc/${PN}/domains.d
+
+ doman docs/man/dehydrated.1
+
+ if use cron ; then
+ insinto /etc/cron.d
+ newins "${FILESDIR}"/cron-r1 ${PN}
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ einfo "See /etc/dehydrated/config for configuration."
+
+ use cron && einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
+ fi
+}
diff --git a/app-crypt/dehydrated/files/dehydrated-0.7.1-openssl-stdout.patch b/app-crypt/dehydrated/files/dehydrated-0.7.1-openssl-stdout.patch
new file mode 100644
index 000000000000..16e8271d4678
--- /dev/null
+++ b/app-crypt/dehydrated/files/dehydrated-0.7.1-openssl-stdout.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/942637
+
+commit 4fd777e87e589652b1127b79ac6688ed7cb151fe
+Author: Wilfried Teiken <wteiken@teiken.org>
+Date: Sun Dec 3 15:07:01 2023 -0500
+
+ Ignore output of 'openssl req -verify'.
+
+--- a/dehydrated
++++ b/dehydrated
+@@ -1011,7 +1011,7 @@ signed_request() {
+ extract_altnames() {
+ csr="${1}" # the CSR itself (not a file)
+
+- if ! <<<"${csr}" "${OPENSSL}" req -verify -noout 2>/dev/null; then
++ if ! <<<"${csr}" "${OPENSSL}" req -verify -noout >/dev/null 2>&1; then
+ _exiterr "Certificate signing request isn't valid"
+ fi
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-01-03 0:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-03 1:48 [gentoo-commits] repo/gentoo:master commit in: app-crypt/dehydrated/files/, app-crypt/dehydrated/ Marc Schiffbauer
-- strict thread matches above, loose matches on Subject: below --
2025-01-03 0:38 Marc Schiffbauer
2017-03-03 0:57 Marc Schiffbauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox