polynomial-c 14/05/22 14:02:43 Modified: ChangeLog metadata.xml Added: apache-2.4.9-r3.ebuild apache-2.2.27-r3.ebuild Removed: apache-2.4.9-r2.ebuild apache-2.2.27-r2.ebuild Log: Revbumps. Cleaned up ebuilds a bit. Moved apxs to /usr/bin (bug #502384). Fixed bugs #489236, #493020, #493360, #503986 and #509772 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Revision Changes Path 1.275 www-servers/apache/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.275&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.275&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?r1=1.274&r2=1.275 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- ChangeLog 21 May 2014 06:22:13 -0000 1.274 +++ ChangeLog 22 May 2014 14:02:43 -0000 1.275 @@ -1,6 +1,14 @@ # ChangeLog for www-servers/apache # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.274 2014/05/21 06:22:13 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.275 2014/05/22 14:02:43 polynomial-c Exp $ + +*apache-2.4.9-r3 (22 May 2014) +*apache-2.2.27-r3 (22 May 2014) + + 22 May 2014; Lars Wendler <polynomia...@gentoo.org> -apache-2.2.27-r2.ebuild, + +apache-2.2.27-r3.ebuild, -apache-2.4.9-r2.ebuild, +apache-2.4.9-r3.ebuild: + Revbumps. Cleaned up ebuilds a bit. Moved apxs to /usr/bin (bug #502384). + Fixed bugs #489236, #493020, #493360, #503986 and #509772. 21 May 2014; Lars Wendler <polynomia...@gentoo.org> -apache-2.2.24.ebuild, -apache-2.2.25.ebuild: 1.18 www-servers/apache/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/metadata.xml?rev=1.18&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/metadata.xml?rev=1.18&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/metadata.xml?r1=1.17&r2=1.18 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/metadata.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- metadata.xml 24 Apr 2014 09:38:26 -0000 1.17 +++ metadata.xml 22 May 2014 14:02:43 -0000 1.18 @@ -17,6 +17,7 @@ <flag name='apache2_modules_access_compat'>Group authorizations based on host (name or IP address). Available as a compatibility module with previous versions.</flag> <flag name='apache2_modules_authn_core'>Provides core authentication capabilities common to all authentication providers (functionality provided by authn_alias in previous versions).</flag> <flag name='apache2_modules_authz_core'>Provides core authorization capabilities to various authorization/authorization modules, such as authn_file and authz_user.</flag> + <flag name='apache2_modules_authz_dbd'>Provides authorization capabilities via SQL database so that authenticated users can be allowed or denied access to portions of the web site by group membership.</flag> <flag name='apache2_modules_cache_disk'>Disk based storage module for the HTTP caching filter (similar to mem_cache in previous versions).</flag> <flag name='apache2_modules_lbmethod_byrequests'>Request counting load balancer scheduler algorithm for proxy_balancer.</flag> <flag name='apache2_modules_lbmethod_bytraffic'>Weighted traffic counting load balancer scheduler algorithm for proxy_balancer.</flag> @@ -26,6 +27,7 @@ <flag name='apache2_modules_socache_shmcb'>A shared object cache provider using a high-performance cyclic buffer inside a shared memory segment.</flag> <flag name='apache2_modules_unixd'>Basic (required) security for Unix-family platforms.</flag> <flag name='apache2_modules_proxy_fcgi'>FCGI support module for mod_proxy.</flag> + <flag name='apache2_modules_proxy_wstunnel'>Provides support for the tunnelling of web socket connections to a backend websockets server.</flag> <flag name='apache2_modules_ratelimit'>Ratelimit module for transfer rate management</flag> <flag name='apache2_modules_remoteip'>Remotip module for logging</flag> </use> 1.1 www-servers/apache/apache-2.4.9-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.9-r3.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.9-r3.ebuild?rev=1.1&content-type=text/plain Index: apache-2.4.9-r3.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.9-r3.ebuild,v 1.1 2014/05/22 14:02:43 polynomial-c Exp $ EAPI=5 # latest gentoo apache files GENTOO_PATCHSTAMP="20140522" GENTOO_DEVELOPER="polynomial-c" GENTOO_PATCHNAME="gentoo-apache-2.4.9-r3" # IUSE/USE_EXPAND magic IUSE_MPMS_FORK="peruser prefork" IUSE_MPMS_THREAD="event worker" # << obsolete modules: # authn_default authz_default mem_cache # mem_cache is replaced by cache_disk # ?? buggy modules # proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found # >> added modules for reason: # compat: compatibility with 2.2 access control # authz_host: new module for access control # authn_core: functionality provided by authn_alias in previous versions # authz_core: new module, provides core authorization capabilities # cache_disk: replacement for mem_cache # lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3 # lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3 # lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3 # lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3 # slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests). # socache_shmcb: shared object cache provider. Default config with ssl needs it # unixd: fixes startup error: Invalid command 'User' IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex cache cache_disk cern_meta charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir dumpio env expires ext_filter file_cache filter headers ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat log_config log_forensic logio mime mime_magic negotiation proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack unixd version vhost_alias" # The following are also in the source as of this version, but are not available # for user selection: # bucketeer case_filter case_filter_in echo http isapi optional_fn_export # optional_fn_import optional_hook_export optional_hook_import # inter-module dependencies # TODO: this may still be incomplete MODULE_DEPENDS=" dav_fs:dav dav_lock:dav deflate:filter cache_disk:cache ext_filter:filter file_cache:cache lbmethod_byrequests:proxy_balancer lbmethod_byrequests:slotmem_shm lbmethod_bytraffic:proxy_balancer lbmethod_bybusyness:proxy_balancer lbmethod_heartbeat:proxy_balancer log_forensic:log_config logio:log_config cache_disk:cache mime_magic:mime proxy_ajp:proxy proxy_balancer:proxy proxy_balancer:slotmem_shm proxy_connect:proxy proxy_ftp:proxy proxy_http:proxy proxy_scgi:proxy proxy_fcgi:proxy proxy_wstunnel:proxy substitute:filter " # module<->define mappings MODULE_DEFINES=" auth_digest:AUTH_DIGEST authnz_ldap:AUTHNZ_LDAP cache:CACHE cache_disk:CACHE dav:DAV dav_fs:DAV dav_lock:DAV file_cache:CACHE info:INFO ldap:LDAP proxy:PROXY proxy_ajp:PROXY proxy_balancer:PROXY proxy_connect:PROXY proxy_ftp:PROXY proxy_http:PROXY proxy_fcgi:PROXY proxy_scgi:PROXY proxy_wstunnel:PROXY socache_shmcb:SSL ssl:SSL status:STATUS suexec:SUEXEC userdir:USERDIR " # critical modules for the default config MODULE_CRITICAL=" authn_core authz_core authz_host dir mime unixd " inherit eutils apache-2 systemd toolchain-funcs DESCRIPTION="The Apache Web Server." HOMEPAGE="http://httpd.apache.org/"; # some helper scripts are Apache-1.1, thus both are here LICENSE="Apache-2.0 Apache-1.1" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="" pkg_setup() { # dependend critical modules which are not allowed in global scope due # to USE flag conditionals (bug #499260) use ssl && MODULE_CRITICAL+=" socache_shmcb" use doc && MODULE_CRITICAL+=" alias negotiation setenvif" apache-2_pkg_setup } src_configure() { # Brain dead check. tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" apache-2_src_configure } src_compile() { if tc-is-cross-compiler; then # This header is the same across targets, so use the build compiler. pushd server >/dev/null emake gen_test_char tc-export_build_env BUILD_CC ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die popd >/dev/null fi default } src_install() { apache-2_src_install for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do rm "${D}"/$i || die "Failed to prune apache-tools bits" done for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do rm "${D}"/$i || die "Failed to prune apache-tools bits" done for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do rm "${D}"/$i || die "Failed to prune apache-tools bits" done for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do rm "${D}/"$i || die "Failed to prune apache-tools bits" done # install apxs in /usr/bin (bug #502384) and put a symlink into the # old location until all ebuilds and eclasses have been modified to # use the new location. local apxs="/usr/bin/apxs" cp "${S}"/support/apxs "${D}"${apxs} || die "Failed to install apxs" ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die chmod 0755 "${D}"${apxs} || die # Note: wait for mod_systemd to be included in the next release, # then apache2.4.service can be used and systemd support controlled # through --enable-systemd systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service" systemd_dotmpfilesd "${FILESDIR}/apache.conf" #insinto /etc/apache2/modules.d #doins "${FILESDIR}/00_systemd.conf" } pkg_postinst() { apache-2_pkg_postinst || die "apache-2_pkg_postinst failed" # warnings that default config might not work out of the box for mod in $MODULE_CRITICAL; do if ! use "apache2_modules_${mod}"; then echo ewarn "Warning: Critical module not installed!" ewarn "Modules 'authn_core', 'authz_core' and 'unixd'" ewarn "are highly recomended but might not be in the base profile yet." ewarn "Default config for ssl needs module 'socache_shmcb'." ewarn "Enabling the following flags is highly recommended:" for cmod in $MODULE_CRITICAL; do use "apache2_modules_${cmod}" || \ ewarn "+ apache2_modules_${cmod}" done echo break fi done # warning for proxy_balancer and missing load balancing scheduler if use apache2_modules_proxy_balancer; then local lbset= for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do if use "apache2_modules_${mod}"; then lbset=1 && break fi done if [ ! $lbset ]; then echo ewarn "Info: Missing load balancing scheduler algorithm module" ewarn "(They were split off from proxy_balancer in 2.3)" ewarn "In order to get the ability of load balancing, at least" ewarn "one of these modules has to be present:" ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat" echo fi fi } 1.1 www-servers/apache/apache-2.2.27-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.27-r3.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.2.27-r3.ebuild?rev=1.1&content-type=text/plain Index: apache-2.2.27-r3.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.27-r3.ebuild,v 1.1 2014/05/22 14:02:43 polynomial-c Exp $ EAPI=5 # latest gentoo apache files GENTOO_PATCHSTAMP="20140522" GENTOO_DEVELOPER="polynomial-c" GENTOO_PATCHNAME="gentoo-apache-2.2.27-r3" # IUSE/USE_EXPAND magic IUSE_MPMS_FORK="itk peruser prefork" IUSE_MPMS_THREAD="event worker" IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio env expires ext_filter file_cache filter headers ident imagemap include info log_config log_forensic logio mem_cache mime mime_magic negotiation proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite reqtimeout setenvif speling status substitute unique_id userdir usertrack version vhost_alias" # The following are also in the source as of this version, but are not available # for user selection: # bucketeer case_filter case_filter_in echo http isapi optional_fn_export # optional_fn_import optional_hook_export optional_hook_import # inter-module dependencies # TODO: this may still be incomplete MODULE_DEPENDS=" dav_fs:dav dav_lock:dav deflate:filter disk_cache:cache ext_filter:filter file_cache:cache log_forensic:log_config logio:log_config mem_cache:cache mime_magic:mime proxy_ajp:proxy proxy_balancer:proxy proxy_connect:proxy proxy_ftp:proxy proxy_http:proxy proxy_scgi:proxy substitute:filter " # module<->define mappings MODULE_DEFINES=" auth_digest:AUTH_DIGEST authnz_ldap:AUTHNZ_LDAP cache:CACHE dav:DAV dav_fs:DAV dav_lock:DAV disk_cache:CACHE file_cache:CACHE info:INFO ldap:LDAP mem_cache:CACHE proxy:PROXY proxy_ajp:PROXY proxy_balancer:PROXY proxy_connect:PROXY proxy_ftp:PROXY proxy_http:PROXY ssl:SSL status:STATUS suexec:SUEXEC userdir:USERDIR " # critical modules for the default config MODULE_CRITICAL=" authz_host dir mime " inherit apache-2 systemd toolchain-funcs DESCRIPTION="The Apache Web Server." HOMEPAGE="http://httpd.apache.org/"; # some helper scripts are Apache-1.1, thus both are here LICENSE="Apache-2.0 Apache-1.1" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="" src_configure() { # Brain dead check. tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" apache-2_src_configure } src_install() { apache-2_src_install # install apxs in /usr/bin (bug #502384) and put a symlink into the # old location until all ebuilds and eclasses have been modified to # use the new location. local apxs_dir="/usr/bin" dodir ${apxs_dir} mv "${D}"/usr/sbin/apxs "${D}"${apxs_dir} || die ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service" systemd_dotmpfilesd "${FILESDIR}/apache.conf" }
