* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog apache-2.eclass
@ 2012-05-23 3:24 Diego Petteno (flameeyes)
0 siblings, 0 replies; 7+ messages in thread
From: Diego Petteno (flameeyes) @ 2012-05-23 3:24 UTC (permalink / raw
To: gentoo-commits
flameeyes 12/05/23 03:24:44
Modified: ChangeLog apache-2.eclass
Log:
Avoid using 'make' for installing; use 'mkdir -p' for creating the directories to solve parallel install issues (Apache's script is not safe, but we expect a working mkdir -p). Tested on a 32-way system.
Revision Changes Path
1.264 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.264&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.264&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.263&r2=1.264
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- ChangeLog 22 May 2012 14:29:06 -0000 1.263
+++ ChangeLog 23 May 2012 03:24:44 -0000 1.264
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.263 2012/05/22 14:29:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.264 2012/05/23 03:24:44 flameeyes Exp $
+
+ 23 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> apache-2.eclass:
+ Avoid using 'make' for installing; use 'mkdir -p' for creating the
+ directories to solve parallel install issues (Apache's script is not safe,
+ but we expect a working mkdir -p). Tested on a 32-way system.
22 May 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Call eaclocal unconditionally; _elibtoolize no longer does that.
1.29 eclass/apache-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.28&r2=1.29
Index: apache-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- apache-2.eclass 29 Mar 2012 15:35:04 -0000 1.28
+++ apache-2.eclass 23 May 2012 03:24:44 -0000 1.29
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.28 2012/03/29 15:35:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.29 2012/05/23 03:24:44 flameeyes Exp $
# @ECLASS: apache-2.eclass
# @MAINTAINER:
@@ -467,7 +467,7 @@
# This function runs `emake install' and generates, installs and adapts the gentoo
# specific configuration files found in the tarball
apache-2_src_install() {
- make DESTDIR="${D}" install || die "make install failed"
+ emake DESTDIR="${D}" MKINSTALLDIRS="mkdir -p" install || die "make install failed"
# install our configuration files
keepdir /etc/apache2/vhosts.d
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog apache-2.eclass
@ 2013-03-08 10:26 Hanno Boeck (hanno)
0 siblings, 0 replies; 7+ messages in thread
From: Hanno Boeck (hanno) @ 2013-03-08 10:26 UTC (permalink / raw
To: gentoo-commits
hanno 13/03/08 10:26:42
Modified: ChangeLog apache-2.eclass
Log:
Don't let apache install re-set all permissions on log-dir.
Revision Changes Path
1.719 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.719&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.719&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.718&r2=1.719
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.718
retrieving revision 1.719
diff -u -r1.718 -r1.719
--- ChangeLog 7 Mar 2013 21:02:06 -0000 1.718
+++ ChangeLog 8 Mar 2013 10:26:42 -0000 1.719
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.718 2013/03/07 21:02:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.719 2013/03/08 10:26:42 hanno Exp $
+
+ 08 Mar 2013; Hanno Boeck <hanno@gentoo.org> apache-2.eclass:
+ Remove re-setting of permissions every time apache gets reinstalled. See bug
+ #398899.
07 Mar 2013; Tim Harder <radhermit@gentoo.org> python.eclass:
Add 2.7-jython.
1.30 eclass/apache-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.29&r2=1.30
Index: apache-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- apache-2.eclass 23 May 2012 03:24:44 -0000 1.29
+++ apache-2.eclass 8 Mar 2013 10:26:42 -0000 1.30
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.29 2012/05/23 03:24:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.30 2013/03/08 10:26:42 hanno Exp $
# @ECLASS: apache-2.eclass
# @MAINTAINER:
@@ -550,12 +550,6 @@
# because the default webroot is a copy of the files that exist elsewhere and we
# don't want them to be managed/removed by portage when apache is upgraded.
apache-2_pkg_postinst() {
- # fix previously wrong set permissions Bug#398899
- einfo "Sanitizing directory permissions ..."
- for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do
- chmod 0750 ${i}
- done
-
if use ssl && [[ ! -e "${ROOT}/etc/ssl/apache2/server.pem" ]]; then
SSL_ORGANIZATION="${SSL_ORGANIZATION:-Apache HTTP Server}"
install_cert /etc/ssl/apache2/server
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog apache-2.eclass
@ 2014-01-08 8:38 Patrick Lauer (patrick)
0 siblings, 0 replies; 7+ messages in thread
From: Patrick Lauer (patrick) @ 2014-01-08 8:38 UTC (permalink / raw
To: gentoo-commits
patrick 14/01/08 08:38:11
Modified: ChangeLog apache-2.eclass
Log:
Removing silly beep from apache-2.eclass
Revision Changes Path
1.1110 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1110&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1110&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1109&r2=1.1110
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1109
retrieving revision 1.1110
diff -u -r1.1109 -r1.1110
--- ChangeLog 5 Jan 2014 11:39:48 -0000 1.1109
+++ ChangeLog 8 Jan 2014 08:38:10 -0000 1.1110
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1109 2014/01/05 11:39:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1110 2014/01/08 08:38:10 patrick Exp $
+
+ 08 Jan 2014; Patrick Lauer <patrick@gentoo.org> apache-2.eclass,
+ python-utils-r1.eclass:
+ Removing silly beep from apache-2.eclass
05 Jan 2014; Pacho Ramos <pacho@gentoo.org> aspell-dict.eclass,
freedict.eclass, myspell.eclass, myspell-r2.eclass:
1.33 eclass/apache-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.32&r2=1.33
Index: apache-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- apache-2.eclass 8 Jan 2014 06:20:29 -0000 1.32
+++ apache-2.eclass 8 Jan 2014 08:38:10 -0000 1.33
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.32 2014/01/08 06:20:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.33 2014/01/08 08:38:10 patrick Exp $
# @ECLASS: apache-2.eclass
# @MAINTAINER:
@@ -171,7 +171,6 @@
ewarn "Although this is not an error, please be"
ewarn "aware that this setup is UNSUPPORTED."
ewarn
- ebeep 10
fi
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog apache-2.eclass
@ 2014-07-30 19:01 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 7+ messages in thread
From: Robin H. Johnson (robbat2) @ 2014-07-30 19:01 UTC (permalink / raw
To: gentoo-commits
robbat2 14/07/30 19:01:02
Modified: ChangeLog apache-2.eclass
Log:
Handle grsec TPE to ensure apache can compile. $T is group-writable, owned by portage, and TPE blocks that.
Revision Changes Path
1.1332 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1332&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1332&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1331&r2=1.1332
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1331
retrieving revision 1.1332
diff -p -w -b -B -u -u -r1.1331 -r1.1332
--- ChangeLog 29 Jul 2014 17:59:21 -0000 1.1331
+++ ChangeLog 30 Jul 2014 19:01:02 -0000 1.1332
@@ -1,6 +1,15 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1331 2014/07/29 17:59:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1332 2014/07/30 19:01:02 robbat2 Exp $
+
+ 30 Jul 2014; Robin H. Johnson <robbat2@gentoo.org> apache-2.eclass:
+ Handle grsec TPE to ensure apache can compile. $T is group-writable, owned by
+ portage, and TPE blocks that.
+
+ 29 Jul 2014; Robin H. Johnson <robbat2@gentoo.org> mysql.eclass,
+ mysql-multilib.eclass, mysql-v2.eclass:
+ Convert mysql eclasses to git-r3 eclass, so we can remove RESTRICT=userpriv
+ for live copies of the patches.
29 Jul 2014; Robin H. Johnson <robbat2@gentoo.org> +mysql-multilib.eclass,
mysql.eclass, mysql-autotools.eclass, mysql-cmake.eclass, mysql-v2.eclass,
1.37 eclass/apache-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.36&r2=1.37
Index: apache-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -p -w -b -B -u -u -r1.36 -r1.37
--- apache-2.eclass 22 May 2014 13:58:46 -0000 1.36
+++ apache-2.eclass 30 Jul 2014 19:01:02 -0000 1.37
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.36 2014/05/22 13:58:46 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.37 2014/07/30 19:01:02 robbat2 Exp $
# @ECLASS: apache-2.eclass
# @MAINTAINER:
@@ -448,6 +448,9 @@ apache-2_src_prepare() {
sed -i -e '/sinclude/d' configure.in
AT_M4DIR=build eautoreconf
+ # ${T} must be not group-writable, else grsec TPE will block it
+ chmod g-w "${T}"
+
# This package really should upgrade to using pcre's .pc file.
cat <<-\EOF >"${T}"/pcre-config
#!/bin/sh
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog apache-2.eclass
@ 2014-08-07 7:37 Lars Wendler (polynomial-c)
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler (polynomial-c) @ 2014-08-07 7:37 UTC (permalink / raw
To: gentoo-commits
polynomial-c 14/08/07 07:37:54
Modified: ChangeLog apache-2.eclass
Log:
Fixed numerous misquotings by introducing arrays
Revision Changes Path
1.1344 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1344&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1344&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1343&r2=1.1344
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1343
retrieving revision 1.1344
diff -u -r1.1343 -r1.1344
--- ChangeLog 6 Aug 2014 08:25:02 -0000 1.1343
+++ ChangeLog 7 Aug 2014 07:37:54 -0000 1.1344
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1343 2014/08/06 08:25:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1344 2014/08/07 07:37:54 polynomial-c Exp $
+
+ 07 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> apache-2.eclass:
+ Fixed numerous misquotings by introducing arrays. Removed some useless "die"
+ statements. Thanks to Arfrever for sorting out these issues.
06 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-policy-2.eclass:
Add support for different GIT repositories with SELinux policy ebuilds
1.39 eclass/apache-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.38&r2=1.39
Index: apache-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- apache-2.eclass 5 Aug 2014 14:19:19 -0000 1.38
+++ apache-2.eclass 7 Aug 2014 07:37:54 -0000 1.39
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.38 2014/08/05 14:19:19 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.39 2014/08/07 07:37:54 polynomial-c Exp $
# @ECLASS: apache-2.eclass
# @MAINTAINER:
@@ -181,7 +181,7 @@
local unsupported=0
for m in ${MODULE_CRITICAL} ; do
- if ! has ${m} ${MY_MODS} ; then
+ if ! has ${m} ${MY_MODS[@]} ; then
ewarn "Module '${m}' is required in the default apache configuration."
unsupported=1
fi
@@ -210,7 +210,7 @@
check_module_depends() {
local err=0
- for m in ${MY_MODS} ; do
+ for m in ${MY_MODS[@]} ; do
for dep in ${MODULE_DEPENDS} ; do
if [[ "${m}" == "${dep%:*}" ]] ; then
if ! use apache2_modules_${dep#*:} ; then
@@ -249,62 +249,63 @@
mod_type="shared"
fi
- MY_CONF="--enable-so=static"
+ MY_CONF=( --enable-so=static )
+ MY_MODS=()
if use ldap ; then
- MY_CONF+=" --enable-authnz_ldap=${mod_type} --enable-ldap=${mod_type}"
- MY_MODS+=" ldap authnz_ldap"
+ MY_CONF+=( --enable-authnz_ldap=${mod_type} --enable-ldap=${mod_type} )
+ MY_MODS+=( ldap authnz_ldap )
else
- MY_CONF+=" --disable-authnz_ldap --disable-ldap"
+ MY_CONF+=( --disable-authnz_ldap --disable-ldap )
fi
if use ssl ; then
- MY_CONF+=" --with-ssl="${EPREFIX}"/usr --enable-ssl=${mod_type}"
- MY_MODS+=" ssl"
+ MY_CONF+=( --with-ssl="${EPREFIX}"/usr --enable-ssl=${mod_type} )
+ MY_MODS+=( ssl )
else
- MY_CONF+=" --without-ssl --disable-ssl"
+ MY_CONF+=( --without-ssl --disable-ssl )
fi
if use suexec ; then
elog "You can manipulate several configure options of suexec"
elog "through the following environment variables:"
elog
- elog " SUEXEC_SAFEPATH: Default PATH for suexec (default: "${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/bin)"
- elog " SUEXEC_LOGFILE: Path to the suexec logfile (default: "${EPREFIX}"/var/log/apache2/suexec_log)"
+ elog " SUEXEC_SAFEPATH: Default PATH for suexec (default: '${EPREFIX}/usr/local/bin:${EPREFIX}/usr/bin:${EPREFIX}/bin')"
+ elog " SUEXEC_LOGFILE: Path to the suexec logfile (default: '${EPREFIX}/var/log/apache2/suexec_log')"
elog " SUEXEC_CALLER: Name of the user Apache is running as (default: apache)"
- elog " SUEXEC_DOCROOT: Directory in which suexec will run scripts (default: "${EPREFIX}"/var/www)"
+ elog " SUEXEC_DOCROOT: Directory in which suexec will run scripts (default: '${EPREFIX}/var/www')"
elog " SUEXEC_MINUID: Minimum UID, which is allowed to run scripts via suexec (default: 1000)"
elog " SUEXEC_MINGID: Minimum GID, which is allowed to run scripts via suexec (default: 100)"
elog " SUEXEC_USERDIR: User subdirectories (like /home/user/html) (default: public_html)"
elog " SUEXEC_UMASK: Umask for the suexec process (default: 077)"
elog
- MY_CONF+=" --with-suexec-safepath=${SUEXEC_SAFEPATH:-"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/bin}"
- MY_CONF+=" --with-suexec-logfile=${SUEXEC_LOGFILE:-"${EPREFIX}"/var/log/apache2/suexec_log}"
- MY_CONF+=" --with-suexec-bin="${EPREFIX}"/usr/sbin/suexec"
- MY_CONF+=" --with-suexec-userdir=${SUEXEC_USERDIR:-public_html}"
- MY_CONF+=" --with-suexec-caller=${SUEXEC_CALLER:-apache}"
- MY_CONF+=" --with-suexec-docroot=${SUEXEC_DOCROOT:-"${EPREFIX}"/var/www}"
- MY_CONF+=" --with-suexec-uidmin=${SUEXEC_MINUID:-1000}"
- MY_CONF+=" --with-suexec-gidmin=${SUEXEC_MINGID:-100}"
- MY_CONF+=" --with-suexec-umask=${SUEXEC_UMASK:-077}"
- MY_CONF+=" --enable-suexec=${mod_type}"
- MY_MODS+=" suexec"
+ MY_CONF+=( --with-suexec-safepath="${SUEXEC_SAFEPATH:-${EPREFIX}/usr/local/bin:${EPREFIX}/usr/bin:${EPREFIX}/bin}" )
+ MY_CONF+=( --with-suexec-logfile="${SUEXEC_LOGFILE:-${EPREFIX}/var/log/apache2/suexec_log}" )
+ MY_CONF+=( --with-suexec-bin="${EPREFIX}/usr/sbin/suexec" )
+ MY_CONF+=( --with-suexec-userdir=${SUEXEC_USERDIR:-public_html} )
+ MY_CONF+=( --with-suexec-caller=${SUEXEC_CALLER:-apache} )
+ MY_CONF+=( --with-suexec-docroot="${SUEXEC_DOCROOT:-${EPREFIX}/var/www}" )
+ MY_CONF+=( --with-suexec-uidmin=${SUEXEC_MINUID:-1000} )
+ MY_CONF+=( --with-suexec-gidmin=${SUEXEC_MINGID:-100} )
+ MY_CONF+=( --with-suexec-umask=${SUEXEC_UMASK:-077} )
+ MY_CONF+=( --enable-suexec=${mod_type} )
+ MY_MODS+=( suexec )
else
- MY_CONF+=" --disable-suexec"
+ MY_CONF+=( --disable-suexec )
fi
for x in ${IUSE_MODULES} ; do
if use apache2_modules_${x} ; then
- MY_CONF+=" --enable-${x}=${mod_type}"
- MY_MODS+=" ${x}"
+ MY_CONF+=( --enable-${x}=${mod_type} )
+ MY_MODS+=( ${x} )
else
- MY_CONF+=" --disable-${x}"
+ MY_CONF+=( --disable-${x} )
fi
done
# sort and uniquify MY_MODS
- MY_MODS=$(echo ${MY_MODS} | tr ' ' '\n' | sort -u)
+ MY_MODS=( $(echo ${MY_MODS[@]} | tr ' ' '\n' | sort -u) )
check_module_depends
check_module_critical
}
@@ -329,7 +330,7 @@
return
fi
- for m in ${MY_MODS} ; do
+ for m in ${MY_MODS[@]} ; do
if [[ -e "${mod_dir}/mod_${m}.so" ]] ; then
for def in ${MODULE_DEFINES} ; do
if [[ "${m}" == "${def%:*}" ]] ; then
@@ -391,7 +392,7 @@
setup_modules
if use debug; then
- MY_CONF+=" --enable-maintainer-mode --enable-exception-hook"
+ MY_CONF+=( --enable-maintainer-mode --enable-exception-hook )
fi
elog "Please note that you need SysV IPC support in your kernel."
@@ -507,7 +508,7 @@
--with-port=80 \
--with-program-name=apache2 \
--enable-layout=Gentoo \
- ${MY_CONF} || die "econf failed!"
+ "${MY_CONF[@]}"
sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
}
@@ -517,7 +518,7 @@
# This function runs `emake install' and generates, installs and adapts the gentoo
# specific configuration files found in the tarball
apache-2_src_install() {
- emake DESTDIR="${D}" MKINSTALLDIRS="mkdir -p" install || die "make install failed"
+ emake DESTDIR="${D}" MKINSTALLDIRS="mkdir -p" install
# install our configuration files
keepdir /etc/apache2/vhosts.d
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog apache-2.eclass
@ 2015-05-30 14:11 Lars Wendler (polynomial-c)
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler (polynomial-c) @ 2015-05-30 14:11 UTC (permalink / raw
To: gentoo-commits
polynomial-c 15/05/30 14:11:49
Modified: ChangeLog apache-2.eclass
Log:
Moved selinux dependency from DEPEND to RDEPEND (bug #550822). Fixed maintainer email in eclass
Revision Changes Path
1.1628 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1628&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1628&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1627&r2=1.1628
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1627
retrieving revision 1.1628
diff -u -r1.1627 -r1.1628
--- ChangeLog 28 May 2015 06:37:16 -0000 1.1627
+++ ChangeLog 30 May 2015 14:11:49 -0000 1.1628
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1627 2015/05/28 06:37:16 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1628 2015/05/30 14:11:49 polynomial-c Exp $
+
+ 30 May 2015; Lars Wendler <polynomial-c@gentoo.org> apache-2.eclass:
+ Moved selinux dependency from DEPEND to RDEPEND (bug #550822). Fixed
+ maintainer email in eclass.
28 May 2015; Lars Wendler <polynomial-c@gentoo.org> mozconfig-v5.33.eclass:
Fixed case syntax.
1.40 eclass/apache-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.39&r2=1.40
Index: apache-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- apache-2.eclass 7 Aug 2014 07:37:54 -0000 1.39
+++ apache-2.eclass 30 May 2015 14:11:49 -0000 1.40
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.39 2014/08/07 07:37:54 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.40 2015/05/30 14:11:49 polynomial-c Exp $
# @ECLASS: apache-2.eclass
# @MAINTAINER:
-# apache-devs@gentoo.org
+# polynomial-c@gentoo.org
# @BLURB: Provides a common set of functions for apache-2.x ebuilds
# @DESCRIPTION:
# This eclass handles apache-2.x ebuild functions such as LoadModule generation
@@ -105,10 +105,10 @@
apache2_modules_deflate? ( sys-libs/zlib )
apache2_modules_mime? ( app-misc/mime-types )
ldap? ( =net-nds/openldap-2* )
- selinux? ( sec-policy/selinux-apache )
ssl? ( >=dev-libs/openssl-0.9.8m )
!=www-servers/apache-1*"
-RDEPEND+=" ${DEPEND}"
+RDEPEND+=" ${DEPEND}
+ selinux? ( sec-policy/selinux-apache )"
PDEPEND="~app-admin/apache-tools-${PV}"
S="${WORKDIR}/httpd-${PV}"
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog apache-2.eclass
@ 2015-06-07 19:22 Pacho Ramos (pacho)
0 siblings, 0 replies; 7+ messages in thread
From: Pacho Ramos (pacho) @ 2015-06-07 19:22 UTC (permalink / raw
To: gentoo-commits
pacho 15/06/07 19:22:36
Modified: ChangeLog apache-2.eclass
Log:
mod_macro is now provided by apache itself (#477702)
Revision Changes Path
1.1643 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1643&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1643&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1642&r2=1.1643
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1642
retrieving revision 1.1643
diff -u -r1.1642 -r1.1643
--- ChangeLog 7 Jun 2015 12:55:46 -0000 1.1642
+++ ChangeLog 7 Jun 2015 19:22:36 -0000 1.1643
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1642 2015/06/07 12:55:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1643 2015/06/07 19:22:36 pacho Exp $
+
+ 07 Jun 2015; Pacho Ramos <pacho@gentoo.org> apache-2.eclass:
+ mod_macro is now provided by apache itself (#477702)
07 Jun 2015; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Remove deprecated remove_libtool_files() function.
1.41 eclass/apache-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.40&r2=1.41
Index: apache-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- apache-2.eclass 30 May 2015 14:11:49 -0000 1.40
+++ apache-2.eclass 7 Jun 2015 19:22:36 -0000 1.41
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.40 2015/05/30 14:11:49 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.41 2015/06/07 19:22:36 pacho Exp $
# @ECLASS: apache-2.eclass
# @MAINTAINER:
@@ -25,7 +25,8 @@
case $(get_version_component_range 1-2) in
2.4)
DEFAULT_MPM_THREADED="event" #509922
- RDEPEND=">=dev-libs/apr-1.5.1" #492578
+ RDEPEND=">=dev-libs/apr-1.5.1
+ !www-apache/mod_macro" #492578 #477702
;;
*)
DEFAULT_MPM_THREADED="worker"
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-06-07 19:22 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-08 10:26 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog apache-2.eclass Hanno Boeck (hanno)
-- strict thread matches above, loose matches on Subject: below --
2015-06-07 19:22 Pacho Ramos (pacho)
2015-05-30 14:11 Lars Wendler (polynomial-c)
2014-08-07 7:37 Lars Wendler (polynomial-c)
2014-07-30 19:01 Robin H. Johnson (robbat2)
2014-01-08 8:38 Patrick Lauer (patrick)
2012-05-23 3:24 Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox