diff options
| author |   Matt Thode <prometheanfire@gentoo.org> | 2013-12-23 02:52:43 +0000 |
|---|---|---|
| committer | Matt Thode <prometheanfire@gentoo.org> | 2013-12-23 02:52:43 +0000 |
| commit | b2295abc86ab23582fc57ed3f350653dea6325ba (patch) | |
| tree | 35bb6fe085e12b685298dd816634ac7bd4f487c0 /net-analyzer | |
| parent | Clean up one more patch. (diff) | |
| download | historical-b2295abc86ab23582fc57ed3f350653dea6325ba.tar.gz historical-b2295abc86ab23582fc57ed3f350653dea6325ba.tar.bz2 historical-b2295abc86ab23582fc57ed3f350653dea6325ba.zip | |
trying to fix bug 493902
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/icinga-web/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/icinga-web/Manifest | 30 | ||||
| -rw-r--r-- | net-analyzer/icinga-web/icinga-web-1.10.0.ebuild | 9 |
3 files changed, 25 insertions, 20 deletions
diff --git a/net-analyzer/icinga-web/ChangeLog b/net-analyzer/icinga-web/ChangeLog index c0c3b6c9ea90..7f21a071e6d6 100644 --- a/net-analyzer/icinga-web/ChangeLog +++ b/net-analyzer/icinga-web/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/icinga-web # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/ChangeLog,v 1.16 2013/12/23 00:14:53 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/ChangeLog,v 1.17 2013/12/23 02:52:36 prometheanfire Exp $ + + 23 Dec 2013; Matthew Thode <prometheanfire@gentoo.org> + icinga-web-1.10.0.ebuild: + trying to fix bug 493902 23 Dec 2013; Matthew Thode <prometheanfire@gentoo.org> icinga-web-1.10.0.ebuild: diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest index 4f9e1d74089b..4e2cbf7350bf 100644 --- a/net-analyzer/icinga-web/Manifest +++ b/net-analyzer/icinga-web/Manifest @@ -3,24 +3,24 @@ Hash: SHA256 DIST icinga-web-1.10.0.tar.gz 14245635 SHA256 fe1b43448bcb6a9e8f565f079122e51283539eb6be214e7001c65653686b7f56 SHA512 90537ea710dd6408349b734b0901918db595d2d7a281e9245a63ba0150a4b7df4fabbb71755966361440ca6096391470d7399ddd5f4b245d1203000b89d8b368 WHIRLPOOL c72004edb2a76efa4ccbea6363fddfa4c6d30c8c368fa57ee0f865d27927bdc5aea691b42c4415b5fe75a12d946768296feffbeb101ff8945377d92da20059bc DIST icinga-web-1.9.1.tar.gz 14635896 SHA256 aa5b1aa6962a727a6760f89ef19845a878b7e06ee723b8f1fd7821b6a6b578aa SHA512 42a3edddae5a287b87fd6d077ac303e7caa0b430af86e9046413e7d04d703cd3de7df881463eebb1e5216315056e06ce9f6dccbef93b6e55d1c3f5fe002447b9 WHIRLPOOL 8b5a6bf78794f722952566c82ae238640a716e61022fead31145bbc6fa40ca3bbf439aa593c5839b09873f7d43469cff28422ecd9b93e51cc7124859d1ae8257 -EBUILD icinga-web-1.10.0.ebuild 6365 SHA256 13de44e7afdb73654f9c659a7a6232753b7eb4aeb75d30ba6545b2e708005575 SHA512 175723637616155aa195b294120391178b23452210661db0d1270d7c784920b88f84cab91d646c466d188df3f0f7175ccbded26f513e1082df902113e114e427 WHIRLPOOL 550012a4c42c3efd2b09f3900cf375611763db474d9c3ab01475417c0aa9b06fb11ea62b73b2d478257198f0a4b98b641dc60672bbb2ea920b0148fe2d9359bc +EBUILD icinga-web-1.10.0.ebuild 6434 SHA256 1464ef900bb49f81ec97645407a371eb8b6b84daf589bdd1705c28ea56e61c00 SHA512 c5edb18bcbbd265f5f45c490d094aebdb439b48fff3506dfdc168cd5529efa4dafe56ee91b2849fc50b3d0eca3b76c91f0c2b3fb6af7802ecd2807435513cc72 WHIRLPOOL 6d42f628623b30bb53db7c5a92694640ea9969320c5efaa06e448c4b6c9518d3319864b7b754a0015c0f80b11c8ecb9392b3fa5c991b6c7824081b8e091c21c7 EBUILD icinga-web-1.9.1-r1.ebuild 6290 SHA256 05917ddc024198c8ea3617747e4f9d4cdea1964df243435e406f44d5b56ea585 SHA512 f64acc8d5cdf4acb43d7207239764061ed6223c39216f9904670b24c71005a82c1b63945e739d8796d8d7984ed2c3b68c041e5fef5d436399409df31571267a7 WHIRLPOOL b58f74c305bd04c85191105d4b600e788aa6c07362e5483ef15bf489aeb67ce14011a12606cbee9124220dc8f9d3864b9a5c5f1b5981c66454592882195937d0 -MISC ChangeLog 3170 SHA256 cdcbcb56a27f06a9130d77d76a550c349914e14fe4738a6ebede2b478cf41b89 SHA512 f5a674f62e6c609a58f7bbdd075e2f2b61b5333d41570c7622687d91d319ec9fb3b0e07163f03b6ec47803ef1d35eab75ff5aaa16b54a920ff3eab876dffeb24 WHIRLPOOL 83b7cbfe249d2b7d2aee9e1c0ae0e3d7bdd74620dd7872ee6e6a4da79cd86e9c2337e02d065caf603b2c9b57d7f2f918b79972b8a99cbfa612bee3a9100f5b23 +MISC ChangeLog 3283 SHA256 c9f9e0a3bdeca5ff4f274fc3c36317aa17856d1515fdb3aec9d3fe38fb07fc97 SHA512 4feb2bdc6431e1607f01b0b5f95e68ffcfa45bfeae5a380415bfd3bef48b28051219905c4bbf04ef67f893226aa47c365abe7aa5900fa484a0d56eca0016a504 WHIRLPOOL d3661633fd290e9c851fa458596b56da13c4a4fe0ffb43ff1e2a41eb61c989abfced519595cf19649eae1efba23ca45f0d6ecae4d38a6e9e8ee6aef09846ca1a MISC metadata.xml 419 SHA256 49679fa6aac480dadb07969911c1ea1fd09b7fd67b28be3ffc121333426dac61 SHA512 31f0c6fe93a928fee82cd8fb970dafdaf7b9f830c44ca33621fac89998ee0ab416ef851ac76a8019dc8fba93db331ba627e2ae42257d80a9615d12b03fbeffe1 WHIRLPOOL 8cbed9673cc9bb5797643e4cdbfc6adc378d5baa3e877614b7b0d55ad4d659e979283d9323c57938a301aa787edd7a66fb3e2882b0eba4ff90c638b0344801e9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJSt4COAAoJECRx6z5ArFrDt1kQAKuXrz8J6FBls5yytCSWx0mg -Wrzxhgdsa3xdxTROsTGhrciS+LZfkQ6SRlXbbCtWs9KF6l8QmRxRwdq5sxdmkw2W -HKJFMHs1Hsvt3ukmXvKf3cCAfytzDZNdvDLMbpxH8va5Fsf6cgbwcJRrpPlthAap -7D2CHsebPDRgmWeZgOBvQCPWJAeVcrY3JQMyNc2/bkPb2yvGk76L0u14ZYEgJirW -DgOl2MtQk2HUQ83w/nv3iotT0E2f4AHhsXoczI4txzMUarCtP28L5aMYSXTnrLr0 -fXtkHgmMIntUP3ScUDli0ojbDo4cqEvhGtoTJpSeTm/DzEYlUPa2MY2I55+LnvLP -cBXhdNJ5hFvSuHVX6zCY5lPBSBV5uZnE5CkfAikGujey++lA7DzzTo7NFwICafNZ -JOcE0pswDqBN5KYDldXNKhHYca3nZ6uoe/ZTFan+8Bjc51o2/ANXqmgEtCj6aDjr -a6exGDJTprwCMDZHZWFAWdKxT9hI4Lfuc0fZ9qs1hzdA2I8f2mnjgFH4hkkVLsSe -QquxR9sjo6uPcbNMBrEtbVdtjFQUw+Uk2unx7ErziXozncTOAyt6NbmihSs16RT4 -ZjLjkgHluDwiG+Q5ljz0Fh4TK4yZu7bbbzYnALgUy2Uq8fEaH7Zx5CCpjuIz1Az0 -Hb1ahve250GxFke/BxDi -=N8+z +iQIcBAEBCAAGBQJSt6WEAAoJECRx6z5ArFrDvngP/2ri/bfDocYG7MalpmwW/l3W +VU75RYBntwbPuXt6aM+ph6VncuRC7U4VKvQHWU+ZRdVSe54ApkLMC+l6kjXWFU19 +hGZ7KnweyTOvHlpTt8NTWGhx8wcknMXL/Y0aqF0R3w6MsWtsyVk+1ff9tiAGQndO +0P04fJE6Zni/UNNDI45JuFOLgW/iwWSvOTo5l/l3i2MkVuDcG5t6fFAbVjt4xWlX +zk5rTy3O1czG30qbXC9q0d5KEDgGBkSziBMjTZBd4YHC07chrAEDi5Ofxy7UXsbQ +mXer1xbi8bIbsfq2w4+Fo21f5TKmrO1UE24a+Yt4cwtkc+54MGdg614jdGcNeYa7 +jRmE+BMe2XGOMX38mj96QlSenmtxrxDg6VMn08qwONsTUxkllXSgnbz8cfM16Emn +YcYPmn/cfxtvjgRVAULUYsnLkJFY4AbOneUW4h4ML5MSgytcgx+1iA1gAUKp4JGo +TSEVSL5pUGv0fuQCxnV9zOGllxJErrW213lDTPr8dRlMFiYkl8aLihJJ8CJ8plYz +LuKOnrLYn7ZK6QmkIJ1iYKClbjLNpX0HLfpsOZXv4+VQ2mf87eax7VwjuVuBYYZn +Fx2XAcy80Uh+RoLJ6VMH2DqeX5AYs0v8njPC2I7oJshWN0tO9oMGeV7gyqJtX6+I +690qEn9l3e08c3Wxhbmy +=V28J -----END PGP SIGNATURE----- diff --git a/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild b/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild index d3061d5384b5..85766918aebe 100644 --- a/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild +++ b/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild,v 1.2 2013/12/23 00:14:53 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild,v 1.3 2013/12/23 02:52:36 prometheanfire Exp $ EAPI="5" @@ -80,7 +80,7 @@ src_install() { dodoc README rm -f README - emake -j1 DESTDIR="${D}" install + emake -j5 DESTDIR="${D}" install emake DESTDIR="${D}" install-javascript @@ -88,7 +88,8 @@ src_install() { dodir ${APACHE_MODULES_CONFDIR} emake DESTDIR="${D}" install-apache-config echo '<IfDefine ICINGA_WEB>' > "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" - cat "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" + cat "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" + rm "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" || die "rm failed" echo '</IfDefine>' >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" fi @@ -191,7 +192,7 @@ pkg_postinst() { if use apache2 ; then einfo einfo "apache config was installed into" - einfo "/etc/apache2/modules.d//99_icinga-web.conf" + einfo "/etc/apache2/modules.d/99_icinga-web.conf" einfo einfo "The apache config value for \'ServerTokens\' must be set to at" einfo "least \'Min\'." |