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 3A82F15808B for ; Sun, 20 Mar 2022 21:04:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 685EEE079C; Sun, 20 Mar 2022 21:04:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3C07DE0769 for ; Sun, 20 Mar 2022 21:04:57 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C9083430B0 for ; Sun, 20 Mar 2022 21:04:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C2F8C32F for ; Sun, 20 Mar 2022 21:04:54 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1647810267.7accaa1bca99714064d7a7a69011d7186f8f0b92.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/, net-nds/openldap/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch net-nds/openldap/openldap-2.6.1.ebuild X-VCS-Directories: net-nds/openldap/ net-nds/openldap/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7accaa1bca99714064d7a7a69011d7186f8f0b92 X-VCS-Branch: master Date: Sun, 20 Mar 2022 21:04:54 +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: f1df1bb3-3a03-414a-88d9-01cc78ee9e59 X-Archives-Hash: 69fb95012f4c8f5fa1878c46a07ef915 commit: 7accaa1bca99714064d7a7a69011d7186f8f0b92 Author: Sam James gentoo org> AuthorDate: Sun Mar 20 20:26:09 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Mar 20 21:04:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7accaa1b net-nds/openldap: fix bashism in configure in 2.6.1 Signed-off-by: Sam James gentoo.org> .../files/openldap-2.6.1-fix-bashism-configure.patch | 13 +++++++++++++ net-nds/openldap/openldap-2.6.1.ebuild | 1 + 2 files changed, 14 insertions(+) diff --git a/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch b/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch new file mode 100644 index 000000000000..93b104198ba6 --- /dev/null +++ b/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index a5075be..b78f2ad 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2055,7 +2055,7 @@ dnl + WITH_SYSTEMD=no + systemdsystemunitdir= + ol_link_systemd=no +-if test $ol_enable_slapd == no && test $ol_enable_balancer != yes ; then ++if test $ol_enable_slapd = no && test $ol_enable_balancer != yes ; then + if test $ol_with_systemd != no ; then + AC_MSG_WARN([servers disabled, ignoring --with-systemd=$ol_with_systemd argument]) + ol_with_systemd=no diff --git a/net-nds/openldap/openldap-2.6.1.ebuild b/net-nds/openldap/openldap-2.6.1.ebuild index 30b563e02efb..252fe1d5b198 100644 --- a/net-nds/openldap/openldap-2.6.1.ebuild +++ b/net-nds/openldap/openldap-2.6.1.ebuild @@ -145,6 +145,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.1-flags.patch "${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch "${FILESDIR}"/${PN}-2.6.1-make-flags.patch + "${FILESDIR}"/${PN}-2.6.1-fix-bashism-configure.patch ) openldap_filecount() {