commit: e65f4f75e4b07cfd4c7182d71c9c5e37503db2b0 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Sun Apr 21 20:49:46 2024 +0000 Commit: Julien Roy <julien <AT> jroy <DOT> ca> CommitDate: Sun Apr 21 20:52:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e65f4f75
sys-libs/nss-tls: fix for bug 928369, general improvement Closes: https://bugs.gentoo.org/928369 Signed-off-by: Julien Roy <julien <AT> jroy.ca> sys-libs/nss-tls/nss-tls-1.1-r1.ebuild | 46 +++++++++++++++++++++++++++ sys-libs/nss-tls/nss-tls-1.1.ebuild | 57 ---------------------------------- 2 files changed, 46 insertions(+), 57 deletions(-) diff --git a/sys-libs/nss-tls/nss-tls-1.1-r1.ebuild b/sys-libs/nss-tls/nss-tls-1.1-r1.ebuild new file mode 100644 index 0000000000..74f3c2550e --- /dev/null +++ b/sys-libs/nss-tls/nss-tls-1.1-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A DNS over HTTPS resolver for glibc" +HOMEPAGE="https://github.com/dimkr/nss-tls"; +SRC_URI="https://github.com/dimkr/nss-tls/archive/${PV}.tar.gz -> ${P}.tar.gz" + +inherit meson systemd + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-libs/glib + net-libs/libsoup:2.4 +" +DEPEND=" + ${RDEPEND} + sys-libs/glibc[nscd(+)]" + +src_prepare() { + default + sed -e "s/@0@\/run\/nss-tls/\/var\/run\/nss-tls/" -i "${S}"/meson.build || die + + if use systemd; then + sed -i -e "s/systemd = /systemd = dependency('systemd')" meson.build || die + else + sed -i -e "s/systemd = /systemd = disabler()" meson.build || die + fi +} + +src_install() { + meson_src_install + + systemd_newunit "${S}"/nss-tlsd.service.in nss-tlsd.service + doinitd "${FILESDIR}"/nss-tlsd +} + +post_install() { + ewarn "Do Not put ip address of the server in nss-tls.conf" + ewarn "use the dns name and add record of dns server in /etc/hosts" + ewarn "echo "8.8.8.8 dns.google" >> /etc/hosts" +} diff --git a/sys-libs/nss-tls/nss-tls-1.1.ebuild b/sys-libs/nss-tls/nss-tls-1.1.ebuild deleted file mode 100644 index 4a701a186a..0000000000 --- a/sys-libs/nss-tls/nss-tls-1.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A DNS over HTTPS resolver for glibc" -HOMEPAGE="https://github.com/dimkr/nss-tls"; -SRC_URI="https://github.com/dimkr/nss-tls/archive/${PV}.tar.gz -> ${P}.tar.gz" - -inherit meson systemd - -LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~x86" -IUSE="systemd" -SLOT="0" - -RDEPEND="dev-libs/glib - net-libs/libsoup" -DEPEND="${RDEPEND} - sys-libs/glibc[nscd(+)]" -BDEPEND=" - ${DEPEND} - app-alternatives/ninja - dev-build/meson -" - -src_prepare() { - default - sed -e "s/@0@\/run\/nss-tls/\/var\/run\/nss-tls/" -i "${S}"/meson.build || die -} - -src_configure() { - local emesonargs=( - --buildtype=release - ) - meson_src_configure -} - -src_compile() { - meson_src_compile -} - -src_install() { - if use systemd ; then - systemd_newunit "${S}"/nss-tlsd.service.in nss-tlsd.service - else - doinitd "${FILESDIR}"/nss-tlsd - fi - meson_src_install -} - -post_install() { - ewarn "Do Not put ip address of the server in nss-tls.conf" - ewarn "use the dns name and add record of dns server in /etc/hosts" - ewarn "echo "8.8.8.8 dns.google" >> /etc/hosts" - -}
