From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- www-apache/Manifest.gz | Bin 7097 -> 7091 bytes www-apache/mod_h2/Manifest | 2 + www-apache/mod_h2/mod_h2-1.15.11.ebuild | 49 ++++++++ www-apache/mod_limitipconn/Manifest | 2 +- .../mod_limitipconn/mod_limitipconn-0.24-r3.ebuild | 6 +- www-apache/mod_security/Manifest | 4 +- .../mod_security/mod_security-2.9.1-r1.ebuild | 6 +- www-apache/mod_security/mod_security-2.9.3.ebuild | 6 +- www-apache/passenger/Manifest | 6 +- www-apache/passenger/passenger-6.0.3.ebuild | 127 -------------------- www-apache/passenger/passenger-6.0.4.ebuild | 4 +- www-apache/passenger/passenger-6.0.5.ebuild | 130 +++++++++++++++++++++ 12 files changed, 198 insertions(+), 144 deletions(-) create mode 100644 www-apache/mod_h2/mod_h2-1.15.11.ebuild delete mode 100644 www-apache/passenger/passenger-6.0.3.ebuild create mode 100644 www-apache/passenger/passenger-6.0.5.ebuild (limited to 'www-apache') diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz index 13104287ac5a..28255f097240 100644 Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest index 5d1e05493721..8acdba4e3225 100644 --- a/www-apache/mod_h2/Manifest +++ b/www-apache/mod_h2/Manifest @@ -1,9 +1,11 @@ AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5 DIST mod_h2-1.15.10.tar.gz 699783 BLAKE2B f4457128fc77048cc3f4c394892499e555f5335ab3165ee6426cc882694e250e2eace47e38c96d12673ceba8507ad699d4c2937e50ced33aab18f81861c0bf0e SHA512 7050c216ebab05f240495dbeac86915cabee49f62a51b19d87b078469ab3733ca266cd16bd0a009e782c37d8090ccfefbb8043e1e75660f8adc7d4ecf72818e6 +DIST mod_h2-1.15.11.tar.gz 701334 BLAKE2B f6ae8a71be849af53fd6931fc66f801892f055d217fd280ac42ed157e4002c6d7c9f3c5bb849d6561bc84d235d844fd0af49a39deb003dc530e477e2d13ac8cf SHA512 3fde7c2e4af25ae4e1ec3d0f9e824a68c6077953c4349b55f05712a53fff07cc615a7348b323264da75b791a18eb59cc32ca919d02b26a711b45d8cd97f92d6b DIST mod_h2-1.15.9.tar.gz 699712 BLAKE2B 035cc7ec8df4727abdd2cb90dfd4c0e6c94dac8a3872122bd3160a594207b7b948278662e8bbe538f736d4981cf6dde3207951f10b0525281f4547603323b604 SHA512 3743d530d2c70577142745046ddcee227b0a8c5e6d42c96d26df71c8c6234ffa20d36fd176c4e8e81a26835669409afb17df018139a7cfebb04748a84a467191 DIST mod_http2-1.15.7.tar.gz 1042030 BLAKE2B 5252e15fbc71845db557d567daba63452df0693baad18f8b83f937adbd760f1fa931fbf663f1f5ec475760e75fc132fb0de63784e046092669b1d8fb44d96e9a SHA512 effe0a8f41603865a9dceea6fa109a924e6f2f904a2a02ebf10a20e0315f248cfaf91d4b2a0d6168ee94fb0f4af2680a6992c43cc91b0bf47a13d739b4cf9228 DIST mod_http2-1.15.8.tar.gz 1029471 BLAKE2B 10dcbafeee8be71858f1eace6c65b31d4a06b9598ba0ed8dd0d191c6fa8eb0475e0b9bd9f52a09fdf3430b18c770f0cd41057e9661f252d11df0edab8189cb26 SHA512 47ee0ef6d5e6cdce8b5d35cdca107331378c3d3ccb6d7b6c36eea8e04dda3d5665233aa7834f122d2069d7c81a833bff08e3f0a279d4a5a0bd1ec6b366696fd3 EBUILD mod_h2-1.15.10.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f +EBUILD mod_h2-1.15.11.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f EBUILD mod_h2-1.15.7.ebuild 888 BLAKE2B d4171c6dd0716f1abc2b1d8fb4cee3f122df146115712c406910b3a60718f6d7bed2a208785ce617d5f03173d6f07214df024a0a8fcdac832775a49688748d6f SHA512 ffe2aab1c735be9ccf6ab510c35c0e05218d495750e75f3c476dd79f160c296f87c1cc956b703c7535b009c2cd32e4c5637cefe45a0fda15174b124aeee71994 EBUILD mod_h2-1.15.8.ebuild 888 BLAKE2B d4171c6dd0716f1abc2b1d8fb4cee3f122df146115712c406910b3a60718f6d7bed2a208785ce617d5f03173d6f07214df024a0a8fcdac832775a49688748d6f SHA512 ffe2aab1c735be9ccf6ab510c35c0e05218d495750e75f3c476dd79f160c296f87c1cc956b703c7535b009c2cd32e4c5637cefe45a0fda15174b124aeee71994 EBUILD mod_h2-1.15.9.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f diff --git a/www-apache/mod_h2/mod_h2-1.15.11.ebuild b/www-apache/mod_h2/mod_h2-1.15.11.ebuild new file mode 100644 index 000000000000..b158648fdb59 --- /dev/null +++ b/www-apache/mod_h2/mod_h2-1.15.11.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit apache-module autotools + +MY_P="${PN/h2/http2}-${PV}" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/icing/mod_h2.git" + inherit git-r3 +else + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="HTTP/2 module for Apache" +HOMEPAGE="https://github.com/icing/mod_h2" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="ssl" + +RDEPEND=">=net-libs/nghttp2-1.0 + >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${P}" + +need_apache2_4 + +src_prepare() { + default + eautoreconf +} + +src_compile() { + default +} + +src_install() { + default + + APACHE2_MOD_DEFINE="HTTP2" + insinto "${APACHE_MODULES_CONFDIR}" + newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf" +} diff --git a/www-apache/mod_limitipconn/Manifest b/www-apache/mod_limitipconn/Manifest index a80600fbd0a9..a162350cfa04 100644 --- a/www-apache/mod_limitipconn/Manifest +++ b/www-apache/mod_limitipconn/Manifest @@ -1,4 +1,4 @@ AUX 27_mod_limitipconn.conf 554 BLAKE2B 2bd5e2224a19d2b5a18b64224db41e232ed2c9028fdcaa751251e29d9990e1006b0ca25d09682f1a108d176a5898d2460bb26dc92816dd79530706434ac1adb6 SHA512 7ded8b48b769529a8fcb6b25855d31ef82cf3de423a75ae5e986974ba2c21643adff235ec9bfcde1955513d10fc3fc9dde172ddb9fb43626eb625bed96936c3d DIST mod_limitipconn-0.24.tar.bz2 10150 BLAKE2B 0715a0494f6d434217093625f10b5b723de3823c88c82fe2ffa22972b2496abae0924fc7b5d773568af125dc92466e8ab84e3e86acde7756c9535b244e729e88 SHA512 caf1337231ac83ef57938b0f89769afcf309a4a09a0a2c3fb171e49f038d42a5859dfdac06b2c7766f05d9431132b8752aa8ad5164794c89638eb90f392e827f -EBUILD mod_limitipconn-0.24-r3.ebuild 563 BLAKE2B d703559d5b77d66386af7c1b39329a614ab5157696b890ed04e12d6886d23abd61180a2fc4f11c670cf9fd00af43ee72f6bcc9c4fc34e4f2162907380690954e SHA512 bb08f2755a05ff01588a20656edd41b344e85cd8dca8977c934ef1ecfaf316ed3931e55f510fdd2d51d1beb5bf4828d5b6ad19ebed0a005bd765b1d38709c78b +EBUILD mod_limitipconn-0.24-r3.ebuild 565 BLAKE2B ce72b3c89d8a92fda493c2c7e8bd35e554a4632af9c28e6dc010394263fd60dafef962864f5e1637d6111aa2c55181e8e72dbe28a754916c26aaf2398c4b9d88 SHA512 bcbaa759c915729b218e229847f0327d95f564c2a22df9473a8aa21472923485a79dc3d8add58fca17c88c4ca705317755cc5f49a85e4f522887ae1baf8dd875 MISC metadata.xml 358 BLAKE2B 557957d79622c5cee28e1c29cf2b72a812814427f198e5795af545a705848766278b04d6d7f650dac7e7374e82456208716cf2223b562707d5870a0020dfe973 SHA512 89dd1558e063150565f346d3b844bb6534bf49fb65c0f32208c620df671c9482d42b8f50c93de34d1d5f290c9e5bb4109d8a818edf994871c5428f7b3a387930 diff --git a/www-apache/mod_limitipconn/mod_limitipconn-0.24-r3.ebuild b/www-apache/mod_limitipconn/mod_limitipconn-0.24-r3.ebuild index ac1f72d9e153..3d72dec23584 100644 --- a/www-apache/mod_limitipconn/mod_limitipconn-0.24-r3.ebuild +++ b/www-apache/mod_limitipconn/mod_limitipconn-0.24-r3.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 inherit apache-module DESCRIPTION="Limit the number of simultaneous apache connections" -HOMEPAGE="http://dominia.org/djao/limitipconn2.html" -SRC_URI="http://dominia.org/djao/limit/${P}.tar.bz2" +HOMEPAGE="https://dominia.org/djao/limitipconn2.html" +SRC_URI="https://dominia.org/djao/limit/${P}.tar.bz2" LICENSE="Apache-2.0" SLOT="2" diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest index d6e93f225a78..ad5e6657a881 100644 --- a/www-apache/mod_security/Manifest +++ b/www-apache/mod_security/Manifest @@ -2,6 +2,6 @@ AUX 79_mod_security.conf 729 BLAKE2B 5a415b7890a6d9553ec6e974825adad596a8f6d5c3b AUX modsecurity-2.7.conf 394 BLAKE2B c9d55e8b4419e5b54a364e03dd02e9d0e5609954d1538c77baa33e0abc46110fa8aaf3207490a80a2fedc13d42558632703ee4552ebbaa99d67d929720008dd2 SHA512 ab8c1ee6372249613f853654f115102c7951ea021f47389510bca6c5d1226e7aa9d90bb47649cf4ca62b8d8f926eba9f5c0b02321851ec2e8452de70dd4c1839 DIST modsecurity-2.9.1.tar.gz 4261212 BLAKE2B c47c7934d8da870e629c5733cc8c37452e4d90351269a14b99483188e8e3161891bd63bfd70e0723648c8daf51f1c33d900bd90ab0157332f826eab772f09f62 SHA512 374733cbfc26e53d95b78c8f268a4e465d838163e9893fc24e33a9d272b114f1b287147bab6d0289575074cbbd94f48983e23fa59832cbcb32950046cea59269 DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd -EBUILD mod_security-2.9.1-r1.ebuild 2768 BLAKE2B a278a8138efb52c23378fc561adcb2e72345bf63d5c628f11e7c2ecf641ce16dcc5d9d018a7fdfd78f95e03783f8700062ab3fc8e78f1ed41ea3a53bb93fbec1 SHA512 09a1dacfa56d0c188976312a0d4786ee712dfba38ca2d280f96945c308d6f2cae54c014edbc6f5c9ea82bb233fba2bca368a3e7c1123bfa9032ca00666f113e8 -EBUILD mod_security-2.9.3.ebuild 2616 BLAKE2B 2bc64259b3cd4ed532812e1b5ceb72a1ea9d16935b6a0f396d14e67a5a0858b1eb1b0829fb9a5892817004bad1a26fcc63a2f4ab46b42bd04e8fad6b3d4bb343 SHA512 38787e38faffbd7c1620bdc777dfdf1e19d3c8c9aca93ef508439266d60c2a05e216ce2be3d8e533d4af4e2dabbdd3c9da58e7f1beea7f102bf4d841c9501056 +EBUILD mod_security-2.9.1-r1.ebuild 2770 BLAKE2B 6366d2b03e9feea20b55629ea0ae5a9febe8e766b252c9a9b65249b34ed15de9787fa56a65164652493b6669cd2e9700aadeade2312965aac4d6130eb86a942c SHA512 802861ffc99eab081221e4d379ed46c53c93ad110dd8c3a62582fb15df51744377c87be0eeb9a373c8a15090ac9528e77720b4565d807bdac2076c76d605efa1 +EBUILD mod_security-2.9.3.ebuild 2618 BLAKE2B fa9fe5da3353e89e3083c705908d020fd7e3ea47fba9731e4a58bf232ad11e7e0604b5b7f4e3ee57df1cb4686d9f536c6b1eab3345530eb436079bac3c3c27ff SHA512 fce129f6138269782b1cd2523c81657bfb9d7332cc2566e22314fdc6c9188a8b0eef4a714e6c388b9d6a274eb204b484e29ad9de0869c66e2f3168a378bacc2a MISC metadata.xml 1009 BLAKE2B a3a9f32a3cebe4447b0ec621c62292f77bb988a3860f6eae63974b794a028f763a5603f35673d9cb82d3836ed24168c12e24ede6109db65dc9521617b293cec9 SHA512 98f9e6ded7565d6d0dbb50804de7fbf9079bc7f8ed2cfe1fe640d09a23fb88e9ef3242557b2418e3c12af747b7b647b29cc950702bbef57050d56d5e5012852d diff --git a/www-apache/mod_security/mod_security-2.9.1-r1.ebuild b/www-apache/mod_security/mod_security-2.9.1-r1.ebuild index bd1f363f6e7a..eb214cbee1c6 100644 --- a/www-apache/mod_security/mod_security-2.9.1-r1.ebuild +++ b/www-apache/mod_security/mod_security-2.9.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,8 +9,8 @@ MY_PN=modsecurity MY_P=${MY_PN}-${PV} DESCRIPTION="Application firewall and intrusion detection for Apache" -HOMEPAGE="http://www.modsecurity.org/" -SRC_URI="http://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz" +HOMEPAGE="https://www.modsecurity.org/" +SRC_URI="https://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" diff --git a/www-apache/mod_security/mod_security-2.9.3.ebuild b/www-apache/mod_security/mod_security-2.9.3.ebuild index f04a0e597d6d..9d48ddc8d7f8 100644 --- a/www-apache/mod_security/mod_security-2.9.3.ebuild +++ b/www-apache/mod_security/mod_security-2.9.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -9,8 +9,8 @@ MY_PN=modsecurity MY_P=${MY_PN}-${PV} DESCRIPTION="Application firewall and intrusion detection for Apache" -HOMEPAGE="http://www.modsecurity.org/" -SRC_URI="http://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz" +HOMEPAGE="https://www.modsecurity.org/" +SRC_URI="https://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest index 230d78826dcd..11ecbc35fc80 100644 --- a/www-apache/passenger/Manifest +++ b/www-apache/passenger/Manifest @@ -2,9 +2,9 @@ AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971ca028df4f8962e4220880361b96c3640475ac537f62d5e7ad198fdfb477fe15f34dbd86db4143b24246d11278eb58 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9 AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d DIST passenger-6.0.2.tar.gz 7204982 BLAKE2B 056f85f88e49ca7dcfe37d1d1003beaa5325259a130b44aa60a319d36987c901b0a8a188998d38b68f3d396a71df0db8b8fc9562e58327b61a712dc39fb7ce1e SHA512 05a1c598588ad96864ef81ff8bc45535b3cb35c0f4840f16b93d39c0ece94378e806d967190a3d69b28b37d463624955bb45970459cf8febb258d8fd135e97f2 -DIST passenger-6.0.3.tar.gz 7347651 BLAKE2B 8f4b95d5f80cae2be05a57a5f125cc37241c9c4e0308ee09ec5b830a7ab5a3055408f043934f21723ac0d247f4d6d11c0f001b964c673efa791d1571aad75357 SHA512 0421255dbaa3992dea9d965ceec9fc9ffb3cf7d1a15f3f9837638e94bc3145e2e8eadeef94069cb8d9d759adeda308d92031f88cfc475b3b13c10b5088087a56 DIST passenger-6.0.4.tar.gz 7347803 BLAKE2B 2e367b8dd0ace6a2773de92b3237821625190f2ae52fd11a1a3c47230d24affe1f9d161ef0346210cc91a21ae3a58f40f796063796399da0d133d6b0a261f52c SHA512 dd3398bece50c9da6029a5a9d98de2bed2e33a92f49fc776fe2b8f80f4a47e36d8a716c12f2f74d9611de5aa04981ddf680fc29a37f5b1860731a6f6e8390c81 +DIST passenger-6.0.5.tar.gz 7347149 BLAKE2B c2a1cb74a0c5d9ea7ea245b1c55413b8d212dc091bc7ad8727ca4cc4249cbc60e92c5313a5a1f8daf5dcea64485b27fbeeae9fada18727aed20dc38779d112ea SHA512 a6c174a52947f3985a0bbed20996e8386efdac6100a6c7ce9994bb6be7617bf810ac04821fae122e569e1883e8a8b1350cdccfa2b02053e5a4fbd13f891716e4 EBUILD passenger-6.0.2.ebuild 3984 BLAKE2B c5510d888f52ea09bc94d630804dfddcaa19ba8a504280fa38e3283cf3b03e18e8aa6e320f76b1a7b127fa4e1530b52eecd27e7e6977dec03bd2935a775e6f55 SHA512 2040af42ca47efe8ed3b51e8c5a2d3cf96cc840bb4c9e0e8cfcda06c150947a8a6bde5563ed3da8bd27b0374f334980802c84d2737c934c78c27fc320bd0b663 -EBUILD passenger-6.0.3.ebuild 3979 BLAKE2B 9ed1cd575c59b2c897b183c81e863685ab1ab992527f0267f3709f31e332ecc373b780593bc7cd0469f252b870159a21eee041d7b22d76601a2f0936d0472da0 SHA512 394ba8a643d00912031cfc1b2169d2cfca29d374ed10195eda3340b4f995cd0a3da08d2c98122ae86e9d78b72b549b1af9a08ac8934d5223faa0c8cf417db17a -EBUILD passenger-6.0.4.ebuild 3979 BLAKE2B 9ed1cd575c59b2c897b183c81e863685ab1ab992527f0267f3709f31e332ecc373b780593bc7cd0469f252b870159a21eee041d7b22d76601a2f0936d0472da0 SHA512 394ba8a643d00912031cfc1b2169d2cfca29d374ed10195eda3340b4f995cd0a3da08d2c98122ae86e9d78b72b549b1af9a08ac8934d5223faa0c8cf417db17a +EBUILD passenger-6.0.4.ebuild 3977 BLAKE2B 136797a63538618616ce49f3b2a1082f7155b88934b38d3c9118216ee43490f4a336164def33741ac072612fff9b96bc3bb897e2d76080e7eb030a2c180159e2 SHA512 584b578239cbe18ea1866d91231f92c5b1892d9481e3c52dbf768ab81396dfb17e5b861f956e33de81ba8c3365f61e06bd1ba785f966bc74e226a453478d3c54 +EBUILD passenger-6.0.5.ebuild 4066 BLAKE2B 8cbaf653657746db6ce0e92beda4600862c6e7cae12c85ecdcb189fa2b1cd337070fb38767b903e9ae6cf96a308c8121af7d7effa5d4e19c6a3784943d8913e2 SHA512 e03ff853dca4f3115cb11e548d807c2feb6f8946a76fbef2a81a8fa52f150284dcefe91d4adba302005812a5570ecfd86a4109cd3633e7cc82f28ff3a6330ef3 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8 diff --git a/www-apache/passenger/passenger-6.0.3.ebuild b/www-apache/passenger/passenger-6.0.3.ebuild deleted file mode 100644 index cca1985ecf44..000000000000 --- a/www-apache/passenger/passenger-6.0.3.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby24 ruby25 ruby26" - -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs - -DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze" -HOMEPAGE="https://www.phusionpassenger.com/" -SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="apache2 debug" - -ruby_add_bdepend "dev-ruby/rake" - -ruby_add_rdepend " - >=dev-ruby/rack-1.0.0:* - >=dev-ruby/rake-0.8.1" - -# libev is bundled but with adapations that do not seem to be accepted -# upstream, so we must use the bundled version :-( -CDEPEND=" - >=dev-libs/libuv-1.8.0 - net-misc/curl[ssl] - apache2? ( www-servers/apache[apache2_modules_unixd(+)] )" - -RDEPEND="${RDEPEND} ${CDEPEND}" -DEPEND="${DEPEND} ${CDEPEND}" - -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" -APACHE2_MOD_DEFINE="PASSENGER" - -want_apache2 - -pkg_setup() { - use debug && append-flags -DPASSENGER_DEBUG - depend.apache_pkg_setup -} - -all_ruby_prepare() { - eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch - eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch - - # Change these with sed instead of a patch so that we can easily use - # the toolchain-funcs methods. - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ - -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \ - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die - - # Avoid fixed debugging CFLAGs. - sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die - - # Use sed here so that we can dynamically set the documentation directory. - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ - src/ruby_supportlib/phusion_passenger.rb || die - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die - - # Don't install a tool that won't work in our setup. - sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." - - # Make sure we use the system-provided version where possible - rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code." - - # Avoid building documentation to avoid a dependency on mizuho. - #sed -i -e 's/, :doc//' build/packaging.rb || die - touch doc/*.html || die - - # Fix hard-coded use of AR - sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die - - # Make sure apache support is not attempted with -apache2 - if ! use apache2 ; then - sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die - fi -} - -all_ruby_compile() { - if use apache2 ; then - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - ruby -S rake apache2 || die "rake failed" - fi -} - -each_ruby_compile() { - append-flags -fno-strict-aliasing - - V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - ${RUBY} -S rake native_support || die "rake failed" -} - -all_ruby_install() { - if use apache2 ; then - APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" - apache-module_src_install - - # Patch in the correct libdir - sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die - fi - - dodoc CHANGELOG README.md -} - -each_ruby_install() { - DISTDIR="${D}" \ - RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ - RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ - APXS2="${APXS}" \ - HTTPD="${APACHE_BIN}" \ - FS_LIBDIR='/usr/'$(get_libdir) \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ - ${RUBY} -S rake fakeroot || die "rake failed" -} diff --git a/www-apache/passenger/passenger-6.0.4.ebuild b/www-apache/passenger/passenger-6.0.4.ebuild index cca1985ecf44..3ec3b0b2167e 100644 --- a/www-apache/passenger/passenger-6.0.4.ebuild +++ b/www-apache/passenger/passenger-6.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="apache2 debug" ruby_add_bdepend "dev-ruby/rake" diff --git a/www-apache/passenger/passenger-6.0.5.ebuild b/www-apache/passenger/passenger-6.0.5.ebuild new file mode 100644 index 000000000000..62621a5f00d0 --- /dev/null +++ b/www-apache/passenger/passenger-6.0.5.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby24 ruby25 ruby26 ruby27" + +inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs + +DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze" +HOMEPAGE="https://www.phusionpassenger.com/" +SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="apache2 debug" + +ruby_add_bdepend "dev-ruby/rake" + +ruby_add_rdepend " + >=dev-ruby/rack-1.0.0:* + >=dev-ruby/rake-0.8.1" + +# libev is bundled but with adapations that do not seem to be accepted +# upstream, so we must use the bundled version :-( +CDEPEND=" + >=dev-libs/libuv-1.8.0 + net-misc/curl[ssl] + apache2? ( www-servers/apache[apache2_modules_unixd(+)] )" + +RDEPEND="${RDEPEND} ${CDEPEND}" +DEPEND="${DEPEND} ${CDEPEND}" + +APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" +APACHE2_MOD_DEFINE="PASSENGER" + +want_apache2 + +pkg_setup() { + use debug && append-flags -DPASSENGER_DEBUG + depend.apache_pkg_setup +} + +all_ruby_prepare() { + eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch + eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch + + # Change these with sed instead of a patch so that we can easily use + # the toolchain-funcs methods. + sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ + -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \ + -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die + + # Avoid fixed debugging CFLAGs. + sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die + + # Use sed here so that we can dynamically set the documentation directory. + sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ + -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ + src/ruby_supportlib/phusion_passenger.rb || die + sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die + + # Don't install a tool that won't work in our setup. + sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die + rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." + + # Make sure we use the system-provided version where possible + rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code." + + # Avoid building documentation to avoid a dependency on mizuho. + #sed -i -e 's/, :doc//' build/packaging.rb || die + touch doc/*.html || die + + # Fix hard-coded use of AR + sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die + + # Make sure apache support is not attempted with -apache2 + if ! use apache2 ; then + sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die + fi +} + +all_ruby_compile() { + if use apache2 ; then + V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ + APXS2="${APXS}" \ + HTTPD="${APACHE_BIN}" \ + FS_LIBDIR='/usr/'$(get_libdir) \ + USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ + RANLIB=$(tc-getRANLIB) \ + ruby -S rake apache2 || die "rake failed" + fi +} + +each_ruby_compile() { + append-flags -fno-strict-aliasing + + V=1 EXTRA_LDFLAGS="${LDFLAGS}" \ + APXS2="${APXS}" \ + HTTPD="${APACHE_BIN}" \ + FS_LIBDIR='/usr/'$(get_libdir) \ + USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ + RANLIB=$(tc-getRANLIB) \ + ${RUBY} -S rake native_support || die "rake failed" +} + +all_ruby_install() { + if use apache2 ; then + APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so" + apache-module_src_install + + # Patch in the correct libdir + sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die + fi + + dodoc CHANGELOG README.md +} + +each_ruby_install() { + DISTDIR="${D}" \ + RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \ + RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \ + APXS2="${APXS}" \ + HTTPD="${APACHE_BIN}" \ + FS_LIBDIR='/usr/'$(get_libdir) \ + EXTRA_LDFLAGS="${LDFLAGS}" \ + USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \ + RANLIB=$(tc-getRANLIB) \ + ${RUBY} -S rake fakeroot || die "rake failed" +} -- cgit v1.2.3