| 1 |
commit: beea04c481c315ecfe368a9fb70c0eddf5ab6805 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 30 13:34:12 2021 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 30 13:34:12 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beea04c4 |
| 7 |
|
| 8 |
net-misc/openntpd: remove libressl support |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
net-misc/openntpd/metadata.xml | 1 - |
| 14 |
net-misc/openntpd/openntpd-6.2_p3-r2.ebuild | 10 ++++------ |
| 15 |
net-misc/openntpd/openntpd-6.8_p1-r1.ebuild | 7 ++----- |
| 16 |
net-misc/openntpd/openntpd-6.8_p1.ebuild | 13 +++++-------- |
| 17 |
4 files changed, 11 insertions(+), 20 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml |
| 20 |
index 8cf4c9d357c..b87fa42aa95 100644 |
| 21 |
--- a/net-misc/openntpd/metadata.xml |
| 22 |
+++ b/net-misc/openntpd/metadata.xml |
| 23 |
@@ -17,6 +17,5 @@ |
| 24 |
</longdescription> |
| 25 |
<use> |
| 26 |
<flag name="constraints">Enable HTTPS TLS time constraint support</flag> |
| 27 |
- <flag name="libressl">Enable HTTPS TLS time constraint support using <pkg>dev-libs/libressl</pkg></flag> |
| 28 |
</use> |
| 29 |
</pkgmetadata> |
| 30 |
|
| 31 |
diff --git a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild |
| 32 |
index 8f65c14883e..4d7fc203e16 100644 |
| 33 |
--- a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild |
| 34 |
+++ b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild |
| 35 |
@@ -14,11 +14,10 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" |
| 36 |
LICENSE="BSD GPL-2" |
| 37 |
SLOT="0" |
| 38 |
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" |
| 39 |
-IUSE="libressl selinux" |
| 40 |
+IUSE="selinux" |
| 41 |
|
| 42 |
DEPEND=" |
| 43 |
- !net-misc/ntp[-openntpd] |
| 44 |
- libressl? ( dev-libs/libressl:0= )" |
| 45 |
+ !net-misc/ntp[-openntpd]" |
| 46 |
|
| 47 |
RDEPEND=" |
| 48 |
${DEPEND} |
| 49 |
@@ -47,15 +46,14 @@ src_prepare() { |
| 50 |
sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die |
| 51 |
printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die |
| 52 |
|
| 53 |
- # disable constraint config if libressl not enabled |
| 54 |
- use libressl || sed -ie 's/^constraints/#constraints/g' ntpd.conf || die |
| 55 |
+ sed -ie 's/^constraints/#constraints/g' ntpd.conf || die |
| 56 |
} |
| 57 |
|
| 58 |
src_configure() { |
| 59 |
econf \ |
| 60 |
--with-privsep-user=openntpd \ |
| 61 |
--with-privsep-path=/var/lib/openntpd/chroot \ |
| 62 |
- $(use_enable libressl https-constraint) |
| 63 |
+ --disable-https-constraint |
| 64 |
} |
| 65 |
|
| 66 |
src_install() { |
| 67 |
|
| 68 |
diff --git a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild |
| 69 |
index 49bc5ddd4cc..a600e51c8b8 100644 |
| 70 |
--- a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild |
| 71 |
+++ b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild |
| 72 |
@@ -14,14 +14,11 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" |
| 73 |
LICENSE="BSD GPL-2" |
| 74 |
SLOT="0" |
| 75 |
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
| 76 |
-IUSE="constraints libressl selinux" |
| 77 |
+IUSE="constraints selinux" |
| 78 |
|
| 79 |
DEPEND=" |
| 80 |
!net-misc/ntp[-openntpd] |
| 81 |
- constraints? ( |
| 82 |
- libressl? ( dev-libs/libressl:= ) |
| 83 |
- !libressl? ( dev-libs/libretls:= ) |
| 84 |
- )" |
| 85 |
+ constraints? ( dev-libs/libretls:= )" |
| 86 |
|
| 87 |
RDEPEND=" |
| 88 |
${DEPEND} |
| 89 |
|
| 90 |
diff --git a/net-misc/openntpd/openntpd-6.8_p1.ebuild b/net-misc/openntpd/openntpd-6.8_p1.ebuild |
| 91 |
index ce6e6c78891..ee0f69ce539 100644 |
| 92 |
--- a/net-misc/openntpd/openntpd-6.8_p1.ebuild |
| 93 |
+++ b/net-misc/openntpd/openntpd-6.8_p1.ebuild |
| 94 |
@@ -1,4 +1,4 @@ |
| 95 |
-# Copyright 1999-2020 Gentoo Authors |
| 96 |
+# Copyright 1999-2021 Gentoo Authors |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
|
| 99 |
EAPI=7 |
| 100 |
@@ -14,12 +14,10 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" |
| 101 |
LICENSE="BSD GPL-2" |
| 102 |
SLOT="0" |
| 103 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
| 104 |
-IUSE="libressl selinux" |
| 105 |
+IUSE="selinux" |
| 106 |
|
| 107 |
DEPEND=" |
| 108 |
- !net-misc/ntp[-openntpd] |
| 109 |
- libressl? ( dev-libs/libressl:0= )" |
| 110 |
- |
| 111 |
+ !net-misc/ntp[-openntpd]" |
| 112 |
RDEPEND=" |
| 113 |
${DEPEND} |
| 114 |
acct-group/openntpd |
| 115 |
@@ -43,14 +41,13 @@ src_prepare() { |
| 116 |
sed -i 's:^server:#server:g' ntpd.conf || die |
| 117 |
printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die |
| 118 |
|
| 119 |
- # disable constraint config if libressl not enabled |
| 120 |
- use libressl || sed -ie 's/^constraints/#constraints/g' ntpd.conf || die |
| 121 |
+ sed -ie 's/^constraints/#constraints/g' ntpd.conf || die |
| 122 |
} |
| 123 |
|
| 124 |
src_configure() { |
| 125 |
econf \ |
| 126 |
--with-privsep-user=openntpd \ |
| 127 |
- $(use_enable libressl https-constraint) |
| 128 |
+ --disable-https-constraint |
| 129 |
} |
| 130 |
|
| 131 |
src_install() { |
Archives