Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/apache/
Date: Tue, 26 Feb 2019 16:02:15
Message-Id: 1551196920.98796e214835653ba469213bec73d31eb2ce5818.polynomial-c@gentoo
1 commit: 98796e214835653ba469213bec73d31eb2ce5818
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 26 15:54:16 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 26 16:02:00 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98796e21
7
8 www-servers/apache: Revbump to fix apache2ctl issues.
9
10 Closes: https://bugs.gentoo.org/676990
11 Package-Manager: Portage-2.3.62, Repoman-2.3.12
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 www-servers/apache/Manifest | 1 +
15 .../apache/{apache-2.4.38.ebuild => apache-2.4.38-r1.ebuild} | 6 +++---
16 2 files changed, 4 insertions(+), 3 deletions(-)
17
18 diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
19 index ea80eadb249..84e72590173 100644
20 --- a/www-servers/apache/Manifest
21 +++ b/www-servers/apache/Manifest
22 @@ -1,6 +1,7 @@
23 DIST gentoo-apache-2.2.34-20170918.tar.bz2 64390 BLAKE2B d3f6d85192706d7c49a38cc36e816b3ae531f8c0d42111c33ec32ed39900d36d8a2a85a5d1b5afca22331137f04fb24fb424a42a21caa7eb4f6906fa39cb8224 SHA512 10b42e50dcc196f60bcaefe90c382d62a61339dd8a56e899d6afb6998be4acdd376e2c3509791f22a0acf99d06add497e32703b6d523f640306a6db5e05f358a
24 DIST gentoo-apache-2.4.27-20170918.tar.bz2 24850 BLAKE2B a832c2c7a575e167b72214f325cb85922c49969ea8cc4b5821ce97b1d4028ab56852bf416cb32c99f2b2b356545b6fea0af0fa4f6e13bf001393b468357cbcfb SHA512 c58a9a0b171188ff163f6b45c47f243797d4050cf461ba1a642115350285879005be6496cee2031bffaccc0d8beda4c27de87afa2ded17cbe559f792eb7c00e8
25 DIST gentoo-apache-2.4.34-20180716.tar.bz2 24773 BLAKE2B 6ff3b711e16a0156f8c5da4c5ee830a6e3d55b1f29c44a81be26decf6611e2680c84ec7779372bc0de775f3aff90fdaec48f5bc7253c8c9317c1308b60bf10e3 SHA512 4b96c2c7cad0aeef070584b64396360acb2ec24139a5af4755fc36b1f3cd2b82b213ebbfc45035f61c49b59ba40870930227b42e0b60042fd1147f34ba5df574
26 +DIST gentoo-apache-2.4.38-20190226.tar.bz2 24810 BLAKE2B 31dc4363c7bdb3dd49287da405541b73e31f251b1b31ecfdffd066a3cd6b838938acf7326a7963a05693e20d6dc34e71223efd1ecd5062a25829d6f6f4721595 SHA512 3dbddedab74e4326b53a9ec3daeb53d727c2789736ae3234d127ccffe873541bd7baa26d5cf9ed064b6e4125fd5a2baee97bccb81e67fdc5674cffe81ca93c40
27 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
28 DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c
29 DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682001bdaa99410b7faad459c4581f8d0878b4840e38e570b1872d549d58743260cb3030c145ae93bef97fc692cc4 SHA512 2bc09213f08a4722e305929fbac5f5060c7a8444704494894bb9b61f17e4d20bb6e3d663bb93fc5b2030b04a43fb12373d260cc291422b210b299725aaf3b5c8
30
31 diff --git a/www-servers/apache/apache-2.4.38.ebuild b/www-servers/apache/apache-2.4.38-r1.ebuild
32 similarity index 98%
33 rename from www-servers/apache/apache-2.4.38.ebuild
34 rename to www-servers/apache/apache-2.4.38-r1.ebuild
35 index d423352ebf6..4aa2c5d6969 100644
36 --- a/www-servers/apache/apache-2.4.38.ebuild
37 +++ b/www-servers/apache/apache-2.4.38-r1.ebuild
38 @@ -4,9 +4,9 @@
39 EAPI=6
40
41 # latest gentoo apache files
42 -GENTOO_PATCHSTAMP="20180716"
43 +GENTOO_PATCHSTAMP="20190226"
44 GENTOO_DEVELOPER="polynomial-c"
45 -GENTOO_PATCHNAME="gentoo-apache-2.4.34"
46 +GENTOO_PATCHNAME="gentoo-apache-2.4.38"
47
48 # IUSE/USE_EXPAND magic
49 IUSE_MPMS_FORK="prefork"
50 @@ -188,7 +188,7 @@ src_install() {
51 /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
52 )
53 for i in ${apache_tools_prune_list[@]} ; do
54 - rm "${ED%/}"/$i || die "Failed to prune apache-tools bits"
55 + rm "${ED%/}"/${i} || die "Failed to prune apache-tools bits"
56 done
57
58 # install apxs in /usr/bin (bug #502384) and put a symlink into the