From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A6B0815800F for ; Mon, 30 Jan 2023 16:46:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4892E0A62; Mon, 30 Jan 2023 16:46:09 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8430FE0A62 for ; Mon, 30 Jan 2023 16:46:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9EAF333BE99 for ; Mon, 30 Jan 2023 16:46:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 958E5828 for ; Mon, 30 Jan 2023 16:46:05 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1675097069.3a18977dfe87fa97e472701a98a7e1640c5176f7.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nds/openldap/openldap-2.6.3-r6.ebuild X-VCS-Directories: net-nds/openldap/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 3a18977dfe87fa97e472701a98a7e1640c5176f7 X-VCS-Branch: master Date: Mon, 30 Jan 2023 16:46:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 97100863-df6a-4cdd-b943-b8b423eb3015 X-Archives-Hash: 5f3d410b078a139a63c84c2f534a9019 commit: 3a18977dfe87fa97e472701a98a7e1640c5176f7 Author: Mike Gilbert gentoo org> AuthorDate: Mon Jan 30 16:43:19 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Jan 30 16:44:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a18977d net-nds/openldap: adjust systemd unit install logic Only install slapd.service when USE=systemd; it has Type=notify and is therefore uselesss without sd_notify. Also remove the upstream unit file to prevent weirdness with split-usr. Closes: https://bugs.gentoo.org/892627 Signed-off-by: Mike Gilbert gentoo.org> net-nds/openldap/openldap-2.6.3-r6.ebuild | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/net-nds/openldap/openldap-2.6.3-r6.ebuild b/net-nds/openldap/openldap-2.6.3-r6.ebuild index 96d3a30492af..2645e95da094 100644 --- a/net-nds/openldap/openldap-2.6.3-r6.ebuild +++ b/net-nds/openldap/openldap-2.6.3-r6.ebuild @@ -326,12 +326,6 @@ src_prepare() { -e "s:\$(localstatedir)/run:${EPREFIX}/run:" \ servers/slapd/Makefile.in || die 'adjusting slapd Makefile.in failed' - # Hack for bug #885457 - sed -i \ - -e "s:systemdsystemunitdir=/usr/lib/systemd/system:systemdsystemunitdir=$(systemd_get_systemunitdir):" \ - -e "s:systemdsystemunitdir=/lib/systemd/system:systemdsystemunitdir=$(systemd_get_systemunitdir):" \ - configure.ac || die - pushd build &>/dev/null || die "pushd build" einfo "Making sure upstream build strip does not do stripping too early" sed -i.orig \ @@ -669,11 +663,15 @@ multilib_src_install() { doinitd "${T}"/slapd newconfd "${FILESDIR}"/slapd-confd-2.6.1 slapd - einfo "Install systemd service" - sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-2.6.1.service > "${T}"/slapd.service || die - systemd_dounit "${T}"/slapd.service - systemd_install_serviced "${FILESDIR}"/slapd.service.conf - newtmpfiles "${FILESDIR}"/slapd.tmpfilesd slapd.conf + if use systemd; then + # The systemd unit uses Type=notify, so it is useless without USE=systemd + einfo "Install systemd service" + rm -rf "${ED}"/{,usr/}lib/systemd + sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-2.6.1.service > "${T}"/slapd.service || die + systemd_dounit "${T}"/slapd.service + systemd_install_serviced "${FILESDIR}"/slapd.service.conf + newtmpfiles "${FILESDIR}"/slapd.tmpfilesd slapd.conf + fi # if built without SLP, we don't need to be before avahi sed -i \ @@ -763,7 +761,9 @@ pkg_preinst() { pkg_postinst() { if ! use minimal ; then - tmpfiles_process slapd.conf + if use systemd; then + tmpfiles_process slapd.conf + fi # You cannot build SSL certificates during src_install that will make # binary packages containing your SSL key, which is both a security risk