[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog apache-2.eclass

2015-06-07 Thread Pacho Ramos (pacho) 
pacho   15/06/07 19:22:36

  Modified: ChangeLog apache-2.eclass
  Log:
  mod_macro is now provided by apache itself (#477702)

Revision  ChangesPath
1.1643   eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1643view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1643content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1642r2=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 -   1.1642
+++ ChangeLog   7 Jun 2015 19:22:36 -   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 pa...@gentoo.org apache-2.eclass:
+  mod_macro is now provided by apache itself (#477702)
 
   07 Jun 2015; Michał Górny mgo...@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.41view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.41content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.40r2=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 -  1.40
+++ apache-2.eclass 7 Jun 2015 19:22:36 -   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

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog apache-2.eclass

2015-05-30 Thread Lars Wendler (polynomial-c) 
polynomial-c15/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  ChangesPath
1.1628   eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1628view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1628content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1627r2=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 -  1.1627
+++ ChangeLog   30 May 2015 14:11:49 -  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 polynomia...@gentoo.org apache-2.eclass:
+  Moved selinux dependency from DEPEND to RDEPEND (bug #550822). Fixed
+  maintainer email in eclass.
 
   28 May 2015; Lars Wendler polynomia...@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.40view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.40content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.39r2=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 -   1.39
+++ apache-2.eclass 30 May 2015 14:11:49 -  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-d...@gentoo.org
+# polynomia...@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}

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog apache-2.eclass

2014-08-07 Thread Lars Wendler (polynomial-c) 
polynomial-c14/08/07 07:37:54

  Modified: ChangeLog apache-2.eclass
  Log:
  Fixed numerous misquotings by introducing arrays

Revision  ChangesPath
1.1344   eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1344view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1344content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1343r2=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 -   1.1343
+++ ChangeLog   7 Aug 2014 07:37:54 -   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 polynomia...@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 sw...@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.39view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.39content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.38r2=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 -   1.38
+++ apache-2.eclass 7 Aug 2014 07:37:54 -   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')
elogSUEXEC_CALLER: Name of the user Apache

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog apache-2.eclass

2014-07-30 Thread Robin H. Johnson (robbat2) 
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  ChangesPath
1.1332   eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1332view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1332content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1331r2=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 -  1.1331
+++ ChangeLog   30 Jul 2014 19:01:02 -  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 robb...@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 robb...@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 robb...@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.37view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?rev=1.37content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/apache-2.eclass?r1=1.36r2=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 -  1.36
+++ apache-2.eclass 30 Jul 2014 19:01:02 -  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