* [gentoo-commits] gentoo-x86 commit in eclass: apache-2.eclass ChangeLog
@ 2012-03-05 8:20 Patrick Lauer (patrick)
0 siblings, 0 replies; 5+ messages in thread
From: Patrick Lauer (patrick) @ 2012-03-05 8:20 UTC (permalink / raw
To: gentoo-commits
patrick 12/03/05 08:20:52
Modified: apache-2.eclass ChangeLog
Log:
Don't set eapi in eclass, #405911
Revision Changes Path
1.27 eclass/apache-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.26&r2=1.27
Index: apache-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- apache-2.eclass 27 Dec 2011 17:55:12 -0000 1.26
+++ apache-2.eclass 5 Mar 2012 08:20:52 -0000 1.27
@@ -1,8 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.26 2011/12/27 17:55:12 fauli Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.27 2012/03/05 08:20:52 patrick Exp $
# @ECLASS: apache-2.eclass
# @MAINTAINER:
1.154 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.153&r2=1.154
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ChangeLog 3 Mar 2012 22:39:14 -0000 1.153
+++ ChangeLog 5 Mar 2012 08:20:52 -0000 1.154
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.153 2012/03/03 22:39:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.154 2012/03/05 08:20:52 patrick Exp $
+
+ 05 Mar 2012; Patrick Lauer <patrick@gentoo.org> apache-2.eclass:
+ Don't set eapi in eclass, #405911
03 Mar 2012; Vlastimil Babka <caster@gentoo.org> ant-tasks.eclass:
Add support for ANT_TASK_DISABLE_VM_DEPS variable - when enabled, the jdk/jre
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: apache-2.eclass ChangeLog
@ 2012-03-29 15:35 Patrick Lauer (patrick)
0 siblings, 0 replies; 5+ messages in thread
From: Patrick Lauer (patrick) @ 2012-03-29 15:35 UTC (permalink / raw
To: gentoo-commits
patrick 12/03/29 15:35:04
Modified: apache-2.eclass ChangeLog
Log:
Sanitizing directory permissions #398899
Revision Changes Path
1.28 eclass/apache-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.27&r2=1.28
Index: apache-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- apache-2.eclass 5 Mar 2012 08:20:52 -0000 1.27
+++ apache-2.eclass 29 Mar 2012 15:35:04 -0000 1.28
@@ -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.27 2012/03/05 08:20:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.28 2012/03/29 15:35:04 patrick Exp $
# @ECLASS: apache-2.eclass
# @MAINTAINER:
@@ -539,7 +539,7 @@
for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do
keepdir ${i}
fowners apache:apache ${i}
- fperms 0755 ${i}
+ fperms 0750 ${i}
done
}
@@ -550,6 +550,12 @@
# 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
1.194 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.194&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.194&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.193&r2=1.194
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- ChangeLog 29 Mar 2012 12:47:35 -0000 1.193
+++ ChangeLog 29 Mar 2012 15:35:04 -0000 1.194
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.193 2012/03/29 12:47:35 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.194 2012/03/29 15:35:04 patrick Exp $
+
+ 29 Mar 2012; Patrick Lauer <patrick@gentoo.org> apache-2.eclass:
+ Sanitizing directory permissions #398899
29 Mar 2012; Marien Zwart <marienz@gentoo.org> python.eclass:
Add more versions of pypy to the hardcoded mapping in python.eclass.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: apache-2.eclass ChangeLog
@ 2014-05-22 13:58 Lars Wendler (polynomial-c)
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler (polynomial-c) @ 2014-05-22 13:58 UTC (permalink / raw
To: gentoo-commits
polynomial-c 14/05/22 13:58:46
Modified: apache-2.eclass ChangeLog
Log:
Eclass cleanup. Now requires >=EAPI-4 ebuilds. Fixed bugs #509922 and #503640
Revision Changes Path
1.36 eclass/apache-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.35&r2=1.36
Index: apache-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- apache-2.eclass 12 Feb 2014 00:03:21 -0000 1.35
+++ apache-2.eclass 22 May 2014 13:58:46 -0000 1.36
@@ -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.35 2014/02/12 00:03:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.36 2014/05/22 13:58:46 polynomial-c Exp $
# @ECLASS: apache-2.eclass
# @MAINTAINER:
@@ -10,7 +10,28 @@
# This eclass handles apache-2.x ebuild functions such as LoadModule generation
# and inter-module dependency checking.
-inherit autotools eutils flag-o-matic multilib ssl-cert user toolchain-funcs
+inherit autotools eutils flag-o-matic multilib ssl-cert user toolchain-funcs versionator
+
+[[ ${CATEGORY}/${PN} != www-servers/apache ]] \
+ && die "Do not use this eclass with anything else than www-servers/apache ebuilds!"
+
+case ${EAPI:-0} in
+ 0|1|2|3)
+ die "This eclass requires >=EAPI-4"
+ ;;
+esac
+
+# settings which are version specific go in here:
+case $(get_version_component_range 1-2) in
+ 2.4)
+ DEFAULT_MPM_THREADED="event" #509922
+ RDEPEND=">=dev-libs/apr-1.5.1" #492578
+ ;;
+ *)
+ DEFAULT_MPM_THREADED="worker"
+ RDEPEND=">=dev-libs/apr-1.4.5" #368651
+ ;;
+esac
# ==============================================================================
# INTERNAL VARIABLES
@@ -81,11 +102,13 @@
=dev-libs/apr-1*
=dev-libs/apr-util-1*[ldap?]
dev-libs/libpcre
+ 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.8f )
+ ssl? ( >=dev-libs/openssl-0.9.8m )
!=www-servers/apache-1*"
-RDEPEND="${DEPEND}"
+RDEPEND+=" ${DEPEND}"
PDEPEND="~app-admin/apache-tools-${PV}"
S="${WORKDIR}/httpd-${PV}"
@@ -121,7 +144,7 @@
if [[ -z "${MY_MPM}" ]] ; then
if use threads ; then
- MY_MPM=worker
+ MY_MPM=${DEFAULT_MPM_THREADED}
elog
elog "Selected default threaded MPM: ${MY_MPM}"
elog
@@ -229,17 +252,17 @@
MY_CONF="--enable-so=static"
if use ldap ; then
- MY_CONF="${MY_CONF} --enable-authnz_ldap=${mod_type} --enable-ldap=${mod_type}"
- MY_MODS="${MY_MODS} ldap authnz_ldap"
+ MY_CONF+=" --enable-authnz_ldap=${mod_type} --enable-ldap=${mod_type}"
+ MY_MODS+=" ldap authnz_ldap"
else
- MY_CONF="${MY_CONF} --disable-authnz_ldap --disable-ldap"
+ MY_CONF+=" --disable-authnz_ldap --disable-ldap"
fi
if use ssl ; then
- MY_CONF="${MY_CONF} --with-ssl=/usr --enable-ssl=${mod_type}"
- MY_MODS="${MY_MODS} ssl"
+ MY_CONF+=" --with-ssl=/usr --enable-ssl=${mod_type}"
+ MY_MODS+=" ssl"
else
- MY_CONF="${MY_CONF} --without-ssl --disable-ssl"
+ MY_CONF+=" --without-ssl --disable-ssl"
fi
if use suexec ; then
@@ -256,27 +279,27 @@
elog " SUEXEC_UMASK: Umask for the suexec process (default: 077)"
elog
- MY_CONF="${MY_CONF} --with-suexec-safepath=${SUEXEC_SAFEPATH:-/usr/local/bin:/usr/bin:/bin}"
- MY_CONF="${MY_CONF} --with-suexec-logfile=${SUEXEC_LOGFILE:-/var/log/apache2/suexec_log}"
- MY_CONF="${MY_CONF} --with-suexec-bin=/usr/sbin/suexec"
- MY_CONF="${MY_CONF} --with-suexec-userdir=${SUEXEC_USERDIR:-public_html}"
- MY_CONF="${MY_CONF} --with-suexec-caller=${SUEXEC_CALLER:-apache}"
- MY_CONF="${MY_CONF} --with-suexec-docroot=${SUEXEC_DOCROOT:-/var/www}"
- MY_CONF="${MY_CONF} --with-suexec-uidmin=${SUEXEC_MINUID:-1000}"
- MY_CONF="${MY_CONF} --with-suexec-gidmin=${SUEXEC_MINGID:-100}"
- MY_CONF="${MY_CONF} --with-suexec-umask=${SUEXEC_UMASK:-077}"
- MY_CONF="${MY_CONF} --enable-suexec=${mod_type}"
- MY_MODS="${MY_MODS} suexec"
+ MY_CONF+=" --with-suexec-safepath=${SUEXEC_SAFEPATH:-/usr/local/bin:/usr/bin:/bin}"
+ MY_CONF+=" --with-suexec-logfile=${SUEXEC_LOGFILE:-/var/log/apache2/suexec_log}"
+ MY_CONF+=" --with-suexec-bin=/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:-/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="${MY_CONF} --disable-suexec"
+ MY_CONF+=" --disable-suexec"
fi
for x in ${IUSE_MODULES} ; do
if use apache2_modules_${x} ; then
- MY_CONF="${MY_CONF} --enable-${x}=${mod_type}"
- MY_MODS="${MY_MODS} ${x}"
+ MY_CONF+=" --enable-${x}=${mod_type}"
+ MY_MODS+=" ${x}"
else
- MY_CONF="${MY_CONF} --disable-${x}"
+ MY_CONF+=" --disable-${x}"
fi
done
@@ -368,7 +391,7 @@
setup_modules
if use debug; then
- MY_CONF="${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."
@@ -522,7 +545,7 @@
fi
# provide legacy symlink for apxs, bug 177697
- dosym /usr/sbin/apxs /usr/sbin/apxs2
+ dosym apxs /usr/sbin/apxs2
# install some documentation
dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING
@@ -531,6 +554,7 @@
# drop in a convenient link to the manual
if use doc ; then
sed -i -e "s:VERSION:${PVR}:" "${D}/etc/apache2/modules.d/00_apache_manual.conf"
+ docompress -x /usr/share/doc/${PF}/manual # 503640
else
rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf"
rm -Rf "${D}/usr/share/doc/${PF}/manual"
1.1262 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1262&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1262&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1261&r2=1.1262
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1261
retrieving revision 1.1262
diff -u -r1.1261 -r1.1262
--- ChangeLog 21 May 2014 21:30:26 -0000 1.1261
+++ ChangeLog 22 May 2014 13:58:46 -0000 1.1262
@@ -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.1261 2014/05/21 21:30:26 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1262 2014/05/22 13:58:46 polynomial-c Exp $
+
+ 22 May 2014; Lars Wendler <polynomial-c@gentoo.org> apache-2.eclass:
+ Eclass cleanup. Now requires >=EAPI-4 ebuilds. Fixed bugs #509922 and
+ #503640.
21 May 2014; Ryan Hill <rhill@gentoo.org> toolchain.eclass:
Bug #499774, take 2.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: apache-2.eclass ChangeLog
@ 2014-08-05 14:19 Christoph Junghans (ottxor)
0 siblings, 0 replies; 5+ messages in thread
From: Christoph Junghans (ottxor) @ 2014-08-05 14:19 UTC (permalink / raw
To: gentoo-commits
ottxor 14/08/05 14:19:19
Modified: apache-2.eclass ChangeLog
Log:
added prefix support (bug #433736)
Revision Changes Path
1.38 eclass/apache-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.37&r2=1.38
Index: apache-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- apache-2.eclass 30 Jul 2014 19:01:02 -0000 1.37
+++ apache-2.eclass 5 Aug 2014 14:19:19 -0000 1.38
@@ -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.37 2014/07/30 19:01:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.38 2014/08/05 14:19:19 ottxor Exp $
# @ECLASS: apache-2.eclass
# @MAINTAINER:
@@ -259,7 +259,7 @@
fi
if use ssl ; then
- MY_CONF+=" --with-ssl=/usr --enable-ssl=${mod_type}"
+ MY_CONF+=" --with-ssl="${EPREFIX}"/usr --enable-ssl=${mod_type}"
MY_MODS+=" ssl"
else
MY_CONF+=" --without-ssl --disable-ssl"
@@ -269,22 +269,22 @@
elog "You can manipulate several configure options of suexec"
elog "through the following environment variables:"
elog
- elog " SUEXEC_SAFEPATH: Default PATH for suexec (default: /usr/local/bin:/usr/bin:/bin)"
- elog " SUEXEC_LOGFILE: Path to the suexec logfile (default: /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: /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:-/usr/local/bin:/usr/bin:/bin}"
- MY_CONF+=" --with-suexec-logfile=${SUEXEC_LOGFILE:-/var/log/apache2/suexec_log}"
- MY_CONF+=" --with-suexec-bin=/usr/sbin/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:-/var/www}"
+ 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}"
@@ -321,7 +321,7 @@
# This internal function generates the LoadModule lines for httpd.conf based on
# the current module selection and MODULE_DEFINES
generate_load_module() {
- local endit=0 mod_lines= mod_dir="${D}/usr/$(get_libdir)/apache2/modules"
+ local endit=0 mod_lines= mod_dir="${ED}/usr/$(get_libdir)/apache2/modules"
if use static; then
sed -i -e "/%%LOAD_MODULE%%/d" \
@@ -358,9 +358,9 @@
# to convert this file to the new APACHE2_MODULES USE_EXPAND variable and remove
# it afterwards.
check_upgrade() {
- if [[ -e "${ROOT}"etc/apache2/apache2-builtin-mods ]]; then
+ if [[ -e "${EROOT}"etc/apache2/apache2-builtin-mods ]]; then
eerror "The previous configuration file for built-in modules"
- eerror "(${ROOT}etc/apache2/apache2-builtin-mods) exists on your"
+ eerror "(${EROOT}etc/apache2/apache2-builtin-mods) exists on your"
eerror "system."
eerror
eerror "Please read http://www.gentoo.org/doc/en/apache-upgrading.xml"
@@ -410,6 +410,13 @@
# This function applies patches, configures a custom file-system layout and
# rebuilds the configure scripts.
apache-2_src_prepare() {
+ #fix prefix in conf files etc (bug #433736)
+ use !prefix || sed -e "s@/\(usr\|var\|etc\|run\)/@${EPREFIX}&@g" \
+ -i "${GENTOO_PATCHDIR}"/conf/httpd.conf "${GENTOO_PATCHDIR}"/scripts/* \
+ "${GENTOO_PATCHDIR}"/docs/*.example "${GENTOO_PATCHDIR}"/patches/*.layout \
+ "${GENTOO_PATCHDIR}"/init/* "${GENTOO_PATCHDIR}"/conf/vhosts.d/* \
+ "${GENTOO_PATCHDIR}"/conf/modules.d/* || die
+
# 03_all_gentoo-apache-tools.patch injects -Wl,-z,now, which is not a good
# idea for everyone
case ${CHOST} in
@@ -487,16 +494,16 @@
# our myconf line too
ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
econf \
- --includedir=/usr/include/apache2 \
- --libexecdir=/usr/$(get_libdir)/apache2/modules \
- --datadir=/var/www/localhost \
- --sysconfdir=/etc/apache2 \
- --localstatedir=/var \
+ --includedir="${EPREFIX}"/usr/include/apache2 \
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
+ --datadir="${EPREFIX}"/var/www/localhost \
+ --sysconfdir="${EPREFIX}"/etc/apache2 \
+ --localstatedir="${EPREFIX}"/var \
--with-mpm=${MY_MPM} \
- --with-apr="${SYSROOT}"/usr \
- --with-apr-util="${SYSROOT}"/usr \
+ --with-apr="${SYSROOT}${EPREFIX}"/usr \
+ --with-apr-util="${SYSROOT}${EPREFIX}"/usr \
--with-pcre="${T}"/pcre-config \
- --with-z=/usr \
+ --with-z="${EPREFIX}"/usr \
--with-port=80 \
--with-program-name=apache2 \
--enable-layout=Gentoo \
@@ -556,19 +563,19 @@
# drop in a convenient link to the manual
if use doc ; then
- sed -i -e "s:VERSION:${PVR}:" "${D}/etc/apache2/modules.d/00_apache_manual.conf"
+ sed -i -e "s:VERSION:${PVR}:" "${ED}/etc/apache2/modules.d/00_apache_manual.conf"
docompress -x /usr/share/doc/${PF}/manual # 503640
else
- rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf"
- rm -Rf "${D}/usr/share/doc/${PF}/manual"
+ rm -f "${ED}/etc/apache2/modules.d/00_apache_manual.conf"
+ rm -Rf "${ED}/usr/share/doc/${PF}/manual"
fi
# the default icons and error pages get stored in
# /usr/share/apache2/{error,icons}
dodir /usr/share/apache2
- mv -f "${D}/var/www/localhost/error" "${D}/usr/share/apache2/error"
- mv -f "${D}/var/www/localhost/icons" "${D}/usr/share/apache2/icons"
- rm -rf "${D}/var/www/localhost/"
+ 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/"
eend $?
# set some sane permissions for suexec
@@ -594,7 +601,7 @@
# 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() {
- if use ssl && [[ ! -e "${ROOT}/etc/ssl/apache2/server.pem" ]]; then
+ if use ssl && [[ ! -e "${EROOT}/etc/ssl/apache2/server.pem" ]]; then
SSL_ORGANIZATION="${SSL_ORGANIZATION:-Apache HTTP Server}"
install_cert /etc/ssl/apache2/server
ewarn
@@ -606,9 +613,9 @@
ewarn
fi
- if [[ ! -e "${ROOT}/var/www/localhost" ]] ; then
- mkdir -p "${ROOT}/var/www/localhost/htdocs"
- echo "<html><body><h1>It works!</h1></body></html>" > "${ROOT}/var/www/localhost/htdocs/index.html"
+ if [[ ! -e "${EROOT}/var/www/localhost" ]] ; then
+ mkdir -p "${EROOT}/var/www/localhost/htdocs"
+ echo "<html><body><h1>It works!</h1></body></html>" > "${EROOT}/var/www/localhost/htdocs/index.html"
fi
echo
1.1341 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1341&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1341&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1340&r2=1.1341
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1340
retrieving revision 1.1341
diff -u -r1.1340 -r1.1341
--- ChangeLog 5 Aug 2014 01:41:01 -0000 1.1340
+++ ChangeLog 5 Aug 2014 14:19:19 -0000 1.1341
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1340 2014/08/05 01:41:01 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1341 2014/08/05 14:19:19 ottxor Exp $
+
+ 05 Aug 2014; Christoph Junghans <ottxor@gentoo.org> apache-2.eclass:
+ added prefix support (bug #433736)
05 Aug 2014; Mike Gilbert <floppym@gentoo.org> toolchain.eclass:
Another typo.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: apache-2.eclass ChangeLog
@ 2015-07-16 6:06 Lars Wendler (polynomial-c)
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler (polynomial-c) @ 2015-07-16 6:06 UTC (permalink / raw
To: gentoo-commits
polynomial-c 15/07/16 06:06:59
Modified: apache-2.eclass ChangeLog
Log:
Added slot dependency for openssl. Raised minimum required EAPI version to 5.
Revision Changes Path
1.42 eclass/apache-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.41&r2=1.42
Index: apache-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- apache-2.eclass 7 Jun 2015 19:22:36 -0000 1.41
+++ apache-2.eclass 16 Jul 2015 06:06:59 -0000 1.42
@@ -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.41 2015/06/07 19:22:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.42 2015/07/16 06:06:59 polynomial-c Exp $
# @ECLASS: apache-2.eclass
# @MAINTAINER:
@@ -16,8 +16,8 @@
&& die "Do not use this eclass with anything else than www-servers/apache ebuilds!"
case ${EAPI:-0} in
- 0|1|2|3)
- die "This eclass requires >=EAPI-4"
+ 0|1|2|3|4)
+ die "This eclass requires >=EAPI-5"
;;
esac
@@ -106,7 +106,7 @@
apache2_modules_deflate? ( sys-libs/zlib )
apache2_modules_mime? ( app-misc/mime-types )
ldap? ( =net-nds/openldap-2* )
- ssl? ( >=dev-libs/openssl-0.9.8m )
+ ssl? ( >=dev-libs/openssl-0.9.8m:0= )
!=www-servers/apache-1*"
RDEPEND+=" ${DEPEND}
selinux? ( sec-policy/selinux-apache )"
1.1711 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1711&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1711&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1710&r2=1.1711
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1710
retrieving revision 1.1711
diff -u -r1.1710 -r1.1711
--- ChangeLog 15 Jul 2015 09:03:11 -0000 1.1710
+++ ChangeLog 16 Jul 2015 06:06:59 -0000 1.1711
@@ -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.1710 2015/07/15 09:03:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1711 2015/07/16 06:06:59 polynomial-c Exp $
+
+ 16 Jul 2015; Lars Wendler <polynomial-c@gentoo.org> apache-2.eclass:
+ Added slot dependency for openssl. Raised minimum required EAPI version to 5.
15 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org> kde4-meta.eclass:
Fix unpacking of noakonadi branch
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-07-16 6:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-29 15:35 [gentoo-commits] gentoo-x86 commit in eclass: apache-2.eclass ChangeLog Patrick Lauer (patrick)
-- strict thread matches above, loose matches on Subject: below --
2015-07-16 6:06 Lars Wendler (polynomial-c)
2014-08-05 14:19 Christoph Junghans (ottxor)
2014-05-22 13:58 Lars Wendler (polynomial-c)
2012-03-05 8:20 Patrick Lauer (patrick)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox