summaryrefslogtreecommitdiff
path: root/www-apache
diff options
context:
space:
mode:
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/mod_ruid2/mod_ruid2-0.9.8.ebuild18
-rw-r--r--www-apache/mod_ruid2/mod_ruid2-9999.ebuild18
2 files changed, 18 insertions, 18 deletions
diff --git a/www-apache/mod_ruid2/mod_ruid2-0.9.8.ebuild b/www-apache/mod_ruid2/mod_ruid2-0.9.8.ebuild
index dc56cb49..d80d85fc 100644
--- a/www-apache/mod_ruid2/mod_ruid2-0.9.8.ebuild
+++ b/www-apache/mod_ruid2/mod_ruid2-0.9.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit apache-module eutils toolchain-funcs
DESCRIPTION="suexec module for apache, based on mod_ruid and mod_suid2"
@@ -17,6 +17,13 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/mod-ruid2-${P}"
+PATCHES=(
+ "${FILESDIR}/${PV}-MINOR-Add-a-proper-Makefile-to-build-project.patch"
+ "${FILESDIR}/${PV}-BUG-MEDIUM-make-RGroups-working-in-mode-stat-not-onl.patch"
+ "${FILESDIR}/${PV}-BUG-MINOR-Add-all-RGroups-even-when-when-group-is-no.patch"
+ "${FILESDIR}/${PV}-BUG-MEDIUM-Switch-to-default-UID-GID-when-UID-GID-is.patch"
+)
+
#APACHE2_MOD_CONF="10_${PN}"
APACHE2_MOD_FILE="${S}/${PN}.so"
@@ -24,13 +31,6 @@ DOCFILES="README ruid2.conf"
need_apache2
-src_prepare() {
- epatch "${FILESDIR}/${PV}-MINOR-Add-a-proper-Makefile-to-build-project.patch"
- epatch "${FILESDIR}/${PV}-BUG-MEDIUM-make-RGroups-working-in-mode-stat-not-onl.patch"
- epatch "${FILESDIR}/${PV}-BUG-MINOR-Add-all-RGroups-even-when-when-group-is-no.patch"
- epatch "${FILESDIR}/${PV}-BUG-MEDIUM-Switch-to-default-UID-GID-when-UID-GID-is.patch"
-}
-
src_compile() {
emake CC="$(tc-getCC)" V=1
}
diff --git a/www-apache/mod_ruid2/mod_ruid2-9999.ebuild b/www-apache/mod_ruid2/mod_ruid2-9999.ebuild
index a7dba66d..525f50f7 100644
--- a/www-apache/mod_ruid2/mod_ruid2-9999.ebuild
+++ b/www-apache/mod_ruid2/mod_ruid2-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit apache-module eutils toolchain-funcs git-r3
DESCRIPTION="suexec module for apache, based on mod_ruid and mod_suid2"
@@ -15,6 +15,13 @@ KEYWORDS=""
DEPEND="sys-libs/libcap"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PV}-MINOR-Add-a-proper-Makefile-to-build-project.patch"
+ "${FILESDIR}/${PV}-BUG-MEDIUM-make-RGroups-working-in-mode-stat-not-onl.patch"
+ "${FILESDIR}/${PV}-BUG-MINOR-Add-all-RGroups-even-when-when-group-is-no.patch"
+ "${FILESDIR}/${PV}-BUG-MEDIUM-Switch-to-default-UID-GID-when-UID-GID-is.patch"
+)
+
#APACHE2_MOD_CONF="10_${PN}"
APACHE2_MOD_FILE="${S}/${PN}.so"
@@ -22,13 +29,6 @@ DOCFILES="README ruid2.conf"
need_apache2
-src_prepare() {
- epatch "${FILESDIR}/${PV}-MINOR-Add-a-proper-Makefile-to-build-project.patch"
- epatch "${FILESDIR}/${PV}-BUG-MEDIUM-make-RGroups-working-in-mode-stat-not-onl.patch"
- epatch "${FILESDIR}/${PV}-BUG-MINOR-Add-all-RGroups-even-when-when-group-is-no.patch"
- epatch "${FILESDIR}/${PV}-BUG-MEDIUM-Switch-to-default-UID-GID-when-UID-GID-is.patch"
-}
-
src_compile() {
emake CC="$(tc-getCC)" V=1
}