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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B2930138359 for ; Thu, 1 Oct 2020 14:07:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63AE4E0831; Thu, 1 Oct 2020 14:07:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 495D9E0831 for ; Thu, 1 Oct 2020 14:07:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B962340ADB for ; Thu, 1 Oct 2020 14:07:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DCB7438C for ; Thu, 1 Oct 2020 14:07:38 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1601561255.9aedb53327ace38bdc197d166757afa79526619d.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/apache-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 9aedb53327ace38bdc197d166757afa79526619d X-VCS-Branch: master Date: Thu, 1 Oct 2020 14:07:38 +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: 92675f37-6edd-4981-997a-517a29ae0ce5 X-Archives-Hash: 81e413286e1ae5106b33fb089dd79750 commit: 9aedb53327ace38bdc197d166757afa79526619d Author: Lars Wendler gentoo org> AuthorDate: Thu Oct 1 14:04:57 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Oct 1 14:07:35 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aedb533 apache-2.eclass: Added missing "|| die" statements Signed-off-by: Lars Wendler gentoo.org> eclass/apache-2.eclass | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index 601a7fb0873..17301c36f8b 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -436,12 +436,14 @@ apache-2_src_prepare() { ;; *-darwin*) sed -i -e 's/-Wl,-z,now/-Wl,-bind_at_load/g' \ - "${GENTOO_PATCHDIR}"/patches/03_all_gentoo_apache-tools.patch + "${GENTOO_PATCHDIR}"/patches/03_all_gentoo_apache-tools.patch \ + || die ;; *) # patch it out to be like upstream sed -i -e 's/-Wl,-z,now//g' \ - "${GENTOO_PATCHDIR}"/patches/03_all_gentoo_apache-tools.patch + "${GENTOO_PATCHDIR}"/patches/03_all_gentoo_apache-tools.patch \ + || die ;; esac @@ -479,18 +481,18 @@ apache-2_src_prepare() { # setup the filesystem layout config cat "${GENTOO_PATCHDIR}"/patches/config.layout >> "${S}"/config.layout || \ die "Failed preparing config.layout!" - sed -i -e "s:version:${PF}:g" "${S}"/config.layout + sed -i -e "s:version:${PF}:g" "${S}"/config.layout || die # apache2.8 instead of httpd.8 (bug #194828) - mv docs/man/{httpd,apache2}.8 - sed -i -e 's/httpd\.8/apache2.8/g' Makefile.in + mv docs/man/{httpd,apache2}.8 || die + sed -i -e 's/httpd\.8/apache2.8/g' Makefile.in || die # patched-in MPMs need the build environment rebuilt - sed -i -e '/sinclude/d' configure.ac + sed -i -e '/sinclude/d' configure.ac || die AT_M4DIR=build eautoreconf # ${T} must be not group-writable, else grsec TPE will block it - chmod g-w "${T}" + chmod g-w "${T}" || die # This package really should upgrade to using pcre's .pc file. cat <<-\EOF >"${T}"/pcre-config @@ -505,7 +507,7 @@ apache-2_src_prepare() { done exec ${PKG_CONFIG} libpcre "${flags[@]}" EOF - chmod a+x "${T}"/pcre-config + chmod a+x "${T}"/pcre-config || die } # @FUNCTION: apache-2_src_configure @@ -605,19 +607,24 @@ apache-2_src_install() { # drop in a convenient link to the manual if use doc ; then - sed -i -e "s:VERSION:${PVR}:" "${ED%/}/etc/apache2/modules.d/00_apache_manual.conf" + sed -i -e "s:VERSION:${PVR}:" \ + "${ED%/}/etc/apache2/modules.d/00_apache_manual.conf" \ + || die docompress -x /usr/share/doc/${PF}/manual # 503640 else - rm -f "${ED%/}/etc/apache2/modules.d/00_apache_manual.conf" - rm -Rf "${ED%/}/usr/share/doc/${PF}/manual" + rm -f "${ED%/}/etc/apache2/modules.d/00_apache_manual.conf" \ + || die + rm -Rf "${ED%/}/usr/share/doc/${PF}/manual" || die fi # the default icons and error pages get stored in # /usr/share/apache2/{error,icons} dodir /usr/share/apache2 - mv -f "${ED%/}/var/www/localhost/error" "${ED%/}/usr/share/apache2/error" - mv -f "${ED%/}/var/www/localhost/icons" "${ED%/}/usr/share/apache2/icons" - rm -rf "${ED%/}/var/www/localhost/" + mv -f "${ED%/}/var/www/localhost/error" \ + "${ED%/}/usr/share/apache2/error" || die + mv -f "${ED%/}/var/www/localhost/icons" \ + "${ED%/}/usr/share/apache2/icons" || die + rm -rf "${ED%/}/var/www/localhost/" || die eend $? # set some sane permissions for suexec