diff options
author | Mike Frysinger <vapier@gentoo.org> | 2013-05-28 00:21:36 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2013-05-28 00:21:36 +0000 |
commit | b997d6a04d969eb75fdbeb01a99797dffa71c4c9 (patch) | |
tree | 72b62995edaef29efc3e2158a0f477cfadb9a879 /www-apache | |
parent | glance-2013.1 fix for bug 471290 (diff) | |
download | historical-b997d6a04d969eb75fdbeb01a99797dffa71c4c9.tar.gz historical-b997d6a04d969eb75fdbeb01a99797dffa71c4c9.tar.bz2 historical-b997d6a04d969eb75fdbeb01a99797dffa71c4c9.zip |
Initial ebuild #412451 by candrews.
Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156
Diffstat (limited to 'www-apache')
-rw-r--r-- | www-apache/mod_spdy/ChangeLog | 12 | ||||
-rw-r--r-- | www-apache/mod_spdy/Manifest | 28 | ||||
-rwxr-xr-x | www-apache/mod_spdy/files/make-snapshot.sh | 47 | ||||
-rw-r--r-- | www-apache/mod_spdy/files/mod_spdy-0.9.3.3-execinfo.patch | 30 | ||||
-rw-r--r-- | www-apache/mod_spdy/files/mod_spdy-0.9.3.3-system-zlib.patch | 39 | ||||
-rw-r--r-- | www-apache/mod_spdy/metadata.xml | 7 | ||||
-rw-r--r-- | www-apache/mod_spdy/mod_spdy-0.9.3.3.ebuild | 112 | ||||
-rw-r--r-- | www-apache/mod_spdy/mod_spdy-9999.ebuild | 112 |
8 files changed, 387 insertions, 0 deletions
diff --git a/www-apache/mod_spdy/ChangeLog b/www-apache/mod_spdy/ChangeLog new file mode 100644 index 000000000000..cdb5f911d4f6 --- /dev/null +++ b/www-apache/mod_spdy/ChangeLog @@ -0,0 +1,12 @@ +# ChangeLog for www-apache/mod_spdy +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_spdy/ChangeLog,v 1.1 2013/05/28 00:21:25 vapier Exp $ + +*mod_spdy-0.9.3.3 (28 May 2013) +*mod_spdy-9999 (28 May 2013) + + 28 May 2013; Mike Frysinger <vapier@gentoo.org> +files/make-snapshot.sh, + +files/mod_spdy-0.9.3.3-execinfo.patch, + +files/mod_spdy-0.9.3.3-system-zlib.patch, +metadata.xml, + +mod_spdy-0.9.3.3.ebuild, +mod_spdy-9999.ebuild: + Initial ebuild #412451 by candrews. diff --git a/www-apache/mod_spdy/Manifest b/www-apache/mod_spdy/Manifest new file mode 100644 index 000000000000..b84a17b843c2 --- /dev/null +++ b/www-apache/mod_spdy/Manifest @@ -0,0 +1,28 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX make-snapshot.sh 892 SHA256 b4ac12118e392cf60a1bd3fcb2230dd51a7583bcb10d634493b209c340b58ebe SHA512 e07a087caa035bc681df66dac682852a01a736153a168422a1cfffa0c15f329b99a0fa6b20ca7d4b5c6f89a3323bb28d8656ee6885edcf600dcb29bc254d7d68 WHIRLPOOL 634c3c2d62eaf1ec81d3943578de5862b7613087552265d45e5571da10b4237b0c7a9df11d3c9fe36b1e521ec145e2a376ff843ef1011673d3b0b02cba5a42f2 +AUX mod_spdy-0.9.3.3-execinfo.patch 788 SHA256 d9345674431c71da2a6a5be0d3700103caa7532c1bf31f1df12d6c64399fc534 SHA512 7541659087072b75353c9b17889226b0e8843f592ec5b8fa31a4ddc09a8bf853296eb5efddcbc5dd9ca6c8c223888fb48a4af54323b8b6af0e62b3c0ea71e0c5 WHIRLPOOL 777697cc00a498f9622ee977b88d7bdebcef18c68237ac28a89e727b79444103d4e465fda8ebbb17445dca1bba40bf3f9a51f1866bb68dd5f48efc2035543dd7 +AUX mod_spdy-0.9.3.3-system-zlib.patch 1182 SHA256 5f1dca3b0e437071293bbcaf14bf4880490b5f85ca94e5dfc517fd9c90c0daa4 SHA512 f108f5ed301b2ea78a2fe16bd438d4d5e7ead09c3f4e5ce03442e32dc87c40311ea6ada49d11411136afd887e88dc0683a9c1ba4bc0d8d2d78295ff16dd271a0 WHIRLPOOL 2516dd79519c043fc3ee75031aaecaf07d16049cd87af122ccbb42c9daee40e151ca23145e5a92f51c6256f22c100da22e3d7ef917af1cc41232aeefe1a8f940 +DIST mod_spdy-0.9.3.3.tar.xz 6537516 SHA256 39e64b0e8ef4dc6f41e2b6880040ef4d2485619653feafbc2b29cade7e49978b SHA512 079370642dbefde5da0bc4fbc98b57daa3c58bb7f4459b07d32b0807124aa31eaa702781be58597597cafc4d29df8b09cd189f2641c18590430ae4d2a667493e WHIRLPOOL 54363789d2f157fa6bef60314e04234a5341b730caaaa09233e986c8e795f0049f227845a3abce3e6e47a7cdef695adc3780b8e1c4568e6e426a9a4c17575836 +EBUILD mod_spdy-0.9.3.3.ebuild 2586 SHA256 3ae052e3e17d7571f01f4fcee36ef1678885312a9fe385e30cde177027fa1ebf SHA512 5fb7596ef93eaa67ee6164ad8134e0399a3c7256149e50b22848fe6849dd367e2a367406aed8eac0f88d6116807a84a3093a2761ea9de66378a6e070530fbd46 WHIRLPOOL e4425d277d1f37ac1565e331c785042c7b622e8d33b28df73c9a7e504e8f44fbe5d3199bcb9b4b69e17c73e25f8e85eb2985133ea77f0986b2ff2ec0edbdecc3 +EBUILD mod_spdy-9999.ebuild 2583 SHA256 57c2d3302995eb86206ae4aed04a0d2ba4561218d25b0477bed8f9124c3563b4 SHA512 b01768b8144775ad8580b6fd5d3f704aa2ca26ab66c9349f571e5028472172234253da385200be1bdb746ee16eadfd13279d72f850955d03de71613ac685bc12 WHIRLPOOL 5b02ae29ce91ef244cfa0be8bd5304aea54c8c539284ad93e020a1feb238ff9b9beb0271c262739d8e985db349133a1200f16945f80646e6c04b159ce6b244da +MISC ChangeLog 539 SHA256 af9690db7161be9bfeefaca894461d2dd8e96d37fed3d4d77b11a0059c279105 SHA512 b2ae157f1dfb04d7c0c3a2e62b7e279d6d2787da6415679a333df0eb7b66ba63e760b2d368bad8333c1f48583c3aad8c515cecd9d75e87c9ae0b33957d141bd2 WHIRLPOOL bfde44df0cef2b8e3f320b75deae846d564af231d749c627ed8ef0e779ba51a2efadc775846c138b300796dc71a2ab994e25a77818f45364ad521f34a11d3638 +MISC metadata.xml 200 SHA256 eb63f2affd0b8e3f5149df2f2f964910eb2127b650919a9e7892fae011e2b22b SHA512 da94c752d3f451652f15c0c459caa079e1d11f37278f86da057ed915ba167688ea62ec62c3c6406200fa951f8f495e9dd782d0e12f9e315187ba4de305f13a1d WHIRLPOOL 80bd517227281caf99e291cd59cd6e5deec972d693473727c7dcd6195450ea9dca63a151e52111c7c2456831f19113008ec60a5c1a66cc3b24f8b17c74e2c373 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQIcBAEBCAAGBQJRo/iMAAoJELEHsLL7fEFW7nEP/2UTASFtTNnBhJOnPOH+2Bz0 +S6R7SizY2qa2OsGZmhOkydBQ/Q6eB1MExRiP+eBzOLUv9V6fpKCdM8STcSvAQKo8 +a6n7R4vzNoI689SBMHVuN4tLR0KrwxMUu0nK9X70Kzs6D9LVWL503ucZR4yNtzQK ++XF4i+DEoCzYu+BCa7WtStE38pVYo3bgBL2X4OH/FXiN2i8/hpu/w6A7r4r3YLaC +yPPkUXD4gOwtPRv7vkqoq9BWMu8Ca+llqMe2BG5stYtaaZzoBjIv+thXPgjWpeqt +V70atxneNhV9pHin4yA/8yMWbXvhj1xAuHw716gtJdwc4DBzp1wGgXF61FMOFTsO +VZn8pG5uMQODqab3wacvN1+aTiWBFcs7F1tL6BwpcK/2UudcFs9QErYnZjT2ylCb +DCV4hpxhSlRufPHpO6A4r3aofvJmNpHWhPno4cYqmlpBlyS8MPQdYEtnN+D6cBi/ +OujD+oOA/lpCJk6AdruRJ8kU2qdzE+PNCMWjoca+eCHN1OWJ7Q2AbCLB3ehf4ZLG +7VZZu0mviK5pf6GElQOwVpMZALghtUOXzPfjOVzw+FdUoBdXuCHZ+V9e9mPPsi5Y +MdN9gTJOi5hFNkYiky1aQ5gUTzElUHfjnUTuCi4zb+22DBEKiweMu+VrIXHJb3h4 +JvPltqZzjTQBitTNHdyH +=jcR4 +-----END PGP SIGNATURE----- diff --git a/www-apache/mod_spdy/files/make-snapshot.sh b/www-apache/mod_spdy/files/make-snapshot.sh new file mode 100755 index 000000000000..0fd294a11d9c --- /dev/null +++ b/www-apache/mod_spdy/files/make-snapshot.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +if [[ $# -gt 1 || $1 == -* ]] ; then + echo "Usage: $0 [ver]" + exit 1 +fi + +set -ex + +SPDY_URL_BASE="http://mod-spdy.googlecode.com/svn/tags" + +if [[ $# -eq 1 ]] ; then + PV=$1 +else + svnout=$(svn ls ${SPDY_URL_BASE} | grep -v current | sort -V | tail -1) + PV=${svnout%/} +fi + +PN="mod_spdy" +P="${PN}-${PV}" + +: ${TMPDIR:=/tmp} + +tmp="${TMPDIR}/${PN}" +rm -rf "${tmp}" +mkdir "${tmp}" +cd "${tmp}" + +DEPOT_TOOLS_URL="https://chromium.googlesource.com/chromium/tools/depot_tools.git" +SPDY_URL="http://mod-spdy.googlecode.com/svn/tags/${PV}/src" + +git clone --single-branch --depth 1 ${DEPOT_TOOLS_URL} +rm -rf depot_tools/.git +PATH=${PWD}/depot_tools:${PATH} +mkdir ${P} +cd ${P} +gclient config ${SPDY_URL} +gclient sync --force --nohooks --delete_unversioned_trees +cd .. + +tar cf - depot_tools ${P} | xz > ${P}.tar.xz + +mv ${P}.tar.xz "${TMPDIR}"/ +cd / +rm -rf "${tmp}" + +du -hb "${TMPDIR}/${P}.tar.xz" diff --git a/www-apache/mod_spdy/files/mod_spdy-0.9.3.3-execinfo.patch b/www-apache/mod_spdy/files/mod_spdy-0.9.3.3-execinfo.patch new file mode 100644 index 000000000000..67b83adf3094 --- /dev/null +++ b/www-apache/mod_spdy/files/mod_spdy-0.9.3.3-execinfo.patch @@ -0,0 +1,30 @@ +not everyone has this header + +--- a/src/third_party/chromium/src/base/debug/debugger_posix.cc ++++ b/src/third_party/chromium/src/base/debug/debugger_posix.cc +@@ -17,10 +17,6 @@ + #include <string> + #include <vector> + +-#if !defined(OS_ANDROID) && !defined(OS_NACL) +-#include <execinfo.h> +-#endif +- + #if defined(__GLIBCXX__) + #include <cxxabi.h> + #endif +--- a/src/third_party/chromium/src/base/debug/stack_trace_posix.cc ++++ b/src/third_party/chromium/src/base/debug/stack_trace_posix.cc +@@ -5,7 +5,12 @@ + #include "base/debug/stack_trace.h" + + #include <errno.h> ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + #include <execinfo.h> ++#else ++#define backtrace(array, size) 0 ++#define backtrace_symbols(array, size) NULL ++#endif + #include <fcntl.h> + #include <stdio.h> + #include <stdlib.h> diff --git a/www-apache/mod_spdy/files/mod_spdy-0.9.3.3-system-zlib.patch b/www-apache/mod_spdy/files/mod_spdy-0.9.3.3-system-zlib.patch new file mode 100644 index 000000000000..797566896352 --- /dev/null +++ b/www-apache/mod_spdy/files/mod_spdy-0.9.3.3-system-zlib.patch @@ -0,0 +1,39 @@ +--- src/third_party/zlib/zlib.gyp ++++ src/third_party/zlib/zlib.gyp +@@ -81,14 +81,6 @@ + 'defines': [ + 'USE_SYSTEM_ZLIB', + ], +- 'sources': [ +- 'contrib/minizip/ioapi.c', +- 'contrib/minizip/ioapi.h', +- 'contrib/minizip/unzip.c', +- 'contrib/minizip/unzip.h', +- 'contrib/minizip/zip.c', +- 'contrib/minizip/zip.h', +- ], + 'conditions': [ + ['OS=="android"', { + 'toolsets': ['target', 'host'], +@@ -97,6 +89,7 @@ + 'link_settings': { + 'libraries': [ + '-lz', ++ '-lminizip', + ], + }, + }], + +https://code.google.com/p/mod-spdy/issues/detail?id=71 + +--- src/build/common.gypi ++++ src/build/common.gypi +@@ -25,7 +25,7 @@ + # (Chromium already has transitive dependencies on these libraries + # via gtk). We want to link these libraries into our binaries so + # we change the default behavior. +- 'use_system_zlib': 0, ++ 'use_system_zlib%': 0, + 'use_system_apache_dev%': 0, + + # Putting a variables dict inside another variables dict looks kind of diff --git a/www-apache/mod_spdy/metadata.xml b/www-apache/mod_spdy/metadata.xml new file mode 100644 index 000000000000..7123fa8f9ece --- /dev/null +++ b/www-apache/mod_spdy/metadata.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer> + <email>vapier@gentoo.org</email> +</maintainer> +</pkgmetadata> diff --git a/www-apache/mod_spdy/mod_spdy-0.9.3.3.ebuild b/www-apache/mod_spdy/mod_spdy-0.9.3.3.ebuild new file mode 100644 index 000000000000..663d160cfa35 --- /dev/null +++ b/www-apache/mod_spdy/mod_spdy-0.9.3.3.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_spdy/mod_spdy-0.9.3.3.ebuild,v 1.1 2013/05/28 00:21:25 vapier Exp $ + +EAPI="4" + +inherit apache-module eutils + +if [[ ${PV} == 9999 ]] ; then + ESVN_REPO_URI="http://mod-spdy.googlecode.com/svn/trunk/src" + ESVN_RESTRICT="export" + EGIT_REPO_URI="https://chromium.googlesource.com/chromium/tools/depot_tools.git" + EGIT_SOURCEDIR="${WORKDIR}/depot_tools" + inherit subversion git-2 +else + SRC_URI="mirror://gentoo/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Apache module for rewriting web pages to reduce latency and bandwidth" +HOMEPAGE="http://code.google.com/p/modpagespeed" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="debug test" + +RDEPEND="sys-libs/zlib[minizip]" +DEPEND="${RDEPEND}" +if [[ ${PV} == 9999 ]] ; then + DEPEND+=" net-misc/rsync" +fi + +need_apache2_2 + +e() { echo "$@"; "$@" || die; } + +EGCLIENT="${WORKDIR}/depot_tools/gclient" +egclient() { set -- "${EGCLIENT}" "$@"; e "$@"; } + +src_unpack() { + if [[ ${PN} == "9999" ]] ; then + git-2_src_unpack + + subversion_src_unpack + mkdir -p "${ESVN_STORE_DIR}/${PN}" || die + cd "${ESVN_STORE_DIR}/${PN}" || die + + egclient config ${ESVN_REPO_URI} + egclient sync --force --nohooks --delete_unversioned_trees + e rsync -a --exclude=".svn/" ./ "${S}/" + else + default + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.9.3.3-execinfo.patch + + # Make sure the system zlib is used. + epatch "${FILESDIR}"/${PN}-0.9.3.3-system-zlib.patch + find src/third_party/zlib/ -name '*.[ch]' -delete +} + +src_configure() { + tc-export AR CC CXX RANLIB + tc-export_build_env BUILD_AR BUILD_CC BUILD_CXX + + local myconf=( + -Duse_system_zlib=1 + -Duse_system_ssl=1 + -Dwerror= + ) + #egclient runhooks "${myconf[@]}" + e python src/build/gyp_chromium "${myconf[@]}" +} + +echo_tests() { echo base_unittests spdy_{apache,common}_test; } +src_compile() { + emake -C src \ + V=1 \ + BUILDTYPE=$(usex debug Debug Release) \ + mod_spdy \ + $(use test && echo_tests) +} + +src_test() { + cd src/out/Release + local t + for t in $(echo_tests) ; do + e ./${t} + done +} + +src_install() { + ln -sf src/out/*/libmod_spdy.so ${PN}.so || die + APACHE2_MOD_FILE="${PWD}/${PN}.so" + APACHE2_MOD_DEFINE="SPDY" + apache-module_src_install + + # Workaround #471442 + cd "${S}/src" + local conf="${T}/80_${PN}.conf" + cat <<-EOF > "${conf}" + <IfDefine SPDY> + $(sed 's:@@APACHE_MODULEDIR@@:modules:' install/common/spdy.load.template) + + $(<install/common/spdy.conf.template) + </IfDefine> + EOF + insinto "${APACHE_MODULES_CONFDIR}" + doins "${conf}" +} diff --git a/www-apache/mod_spdy/mod_spdy-9999.ebuild b/www-apache/mod_spdy/mod_spdy-9999.ebuild new file mode 100644 index 000000000000..4b6819502a5b --- /dev/null +++ b/www-apache/mod_spdy/mod_spdy-9999.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_spdy/mod_spdy-9999.ebuild,v 1.1 2013/05/28 00:21:25 vapier Exp $ + +EAPI="4" + +inherit apache-module eutils + +if [[ ${PV} == 9999 ]] ; then + ESVN_REPO_URI="http://mod-spdy.googlecode.com/svn/trunk/src" + ESVN_RESTRICT="export" + EGIT_REPO_URI="https://chromium.googlesource.com/chromium/tools/depot_tools.git" + EGIT_SOURCEDIR="${WORKDIR}/depot_tools" + inherit subversion git-2 +else + SRC_URI="mirror://gentoo/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Apache module for rewriting web pages to reduce latency and bandwidth" +HOMEPAGE="http://code.google.com/p/modpagespeed" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="debug test" + +RDEPEND="sys-libs/zlib[minizip]" +DEPEND="${RDEPEND}" +if [[ ${PV} == 9999 ]] ; then + DEPEND+=" net-misc/rsync" +fi + +need_apache2_2 + +e() { echo "$@"; "$@" || die; } + +EGCLIENT="${WORKDIR}/depot_tools/gclient" +egclient() { set -- "${EGCLIENT}" "$@"; e "$@"; } + +src_unpack() { + if [[ ${PN} == "9999" ]] ; then + git-2_src_unpack + + subversion_src_unpack + mkdir -p "${ESVN_STORE_DIR}/${PN}" || die + cd "${ESVN_STORE_DIR}/${PN}" || die + + egclient config ${ESVN_REPO_URI} + egclient sync --force --nohooks --delete_unversioned_trees + e rsync -a --exclude=".svn/" ./ "${S}/" + else + default + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.9.3.3-execinfo.patch + + # Make sure the system zlib is used. + epatch "${FILESDIR}"/${PN}-0.9.3.3-system-zlib.patch + find src/third_party/zlib/ -name '*.[ch]' -delete +} + +src_configure() { + tc-export AR CC CXX RANLIB + tc-export_build_env BUILD_AR BUILD_CC BUILD_CXX + + local myconf=( + -Duse_system_zlib=1 + -Duse_system_ssl=1 + -Dwerror= + ) + #egclient runhooks "${myconf[@]}" + e python src/build/gyp_chromium "${myconf[@]}" +} + +echo_tests() { echo base_unittests spdy_{apache,common}_test; } +src_compile() { + emake -C src \ + V=1 \ + BUILDTYPE=$(usex debug Debug Release) \ + mod_spdy \ + $(use test && echo_tests) +} + +src_test() { + cd src/out/Release + local t + for t in $(echo_tests) ; do + e ./${t} + done +} + +src_install() { + ln -sf src/out/*/libmod_spdy.so ${PN}.so || die + APACHE2_MOD_FILE="${PWD}/${PN}.so" + APACHE2_MOD_DEFINE="SPDY" + apache-module_src_install + + # Workaround #471442 + cd "${S}/src" + local conf="${T}/80_${PN}.conf" + cat <<-EOF > "${conf}" + <IfDefine SPDY> + $(sed 's:@@APACHE_MODULEDIR@@:modules:' install/common/spdy.load.template) + + $(<install/common/spdy.conf.template) + </IfDefine> + EOF + insinto "${APACHE_MODULES_CONFDIR}" + doins "${conf}" +} |