1 |
commit: fe5b8b3986e2260e658318eb2b368d17710674b6 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 9 05:21:36 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 9 05:21:36 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe5b8b39 |
7 |
|
8 |
app-admin/monit: Security cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/679808 |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
13 |
|
14 |
app-admin/monit/Manifest | 2 -- |
15 |
app-admin/monit/monit-5.25.1.ebuild | 51 ------------------------------ |
16 |
app-admin/monit/monit-5.25.2-r1.ebuild | 58 ---------------------------------- |
17 |
3 files changed, 111 deletions(-) |
18 |
|
19 |
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest |
20 |
index 585c1ce6f4d..0529e754fbb 100644 |
21 |
--- a/app-admin/monit/Manifest |
22 |
+++ b/app-admin/monit/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST monit-5.25.1.tar.gz 1353855 BLAKE2B 5abef9c97088b12ab376e67f2524534ad1b0e2e3dfa98d5f5fdd8a6fc2331ead57d77aa1d8229a0825cbb36871b063006b74dc98dd780baef8aaca1da5c6c74c SHA512 b21b18302aed602f9371f7dee29f7306dbccd355df333bc6d868acdb6c054cef877dee72e261383938fe1d10121cd07e820e040ea80ed70260fdda8b451f6ab1 |
25 |
-DIST monit-5.25.2.tar.gz 1354704 BLAKE2B 503660146edba988d0c52d1773dc3d3d6f495b3e3f0ae147be6a4297bf118ad6b5f7289868ad4b61226cf499bd8d6e3aed8f5fec91ff8ff699968f4262f1fd01 SHA512 e9b6ce60bf82c2564a084fc42b65ef432ee35855cad038fe6ae209047abaa1c54cabb4cd75c8a85c1102844a1b90c3c5f8ddbbd56711665b9bea616bcc02ec86 |
26 |
DIST monit-5.25.3.tar.gz 1355925 BLAKE2B f1c4775ad82ccea262fa5d9c3c9396e634cb3742c59ff9d8b3c87552501ee749a829932570b8d2836fe77a14fb42fea2ee42cab1aa355ca09df6dccda9aa5f51 SHA512 9030b8e6a02eeaf497382f14f7cf855a96599ab060130f077208edd5db35fee1b74f9166df4deff87b4a1954c8d4fff83b5465166938a3f8aea8d4d4c0371e90 |
27 |
|
28 |
diff --git a/app-admin/monit/monit-5.25.1.ebuild b/app-admin/monit/monit-5.25.1.ebuild |
29 |
deleted file mode 100644 |
30 |
index 0e8c407fcd1..00000000000 |
31 |
--- a/app-admin/monit/monit-5.25.1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,51 +0,0 @@ |
34 |
-# Copyright 1999-2018 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
-inherit pam systemd |
39 |
- |
40 |
-DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system" |
41 |
-HOMEPAGE="http://mmonit.com/monit/" |
42 |
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz" |
43 |
- |
44 |
-LICENSE="AGPL-3" |
45 |
-SLOT="0" |
46 |
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux" |
47 |
-IUSE="libressl pam ssl" |
48 |
- |
49 |
-RDEPEND=" |
50 |
- ssl? ( |
51 |
- !libressl? ( dev-libs/openssl:0= ) |
52 |
- libressl? ( dev-libs/libressl:0= ) |
53 |
- )" |
54 |
-DEPEND="${RDEPEND} |
55 |
- sys-devel/flex |
56 |
- sys-devel/bison |
57 |
- pam? ( virtual/pam )" |
58 |
- |
59 |
-src_prepare() { |
60 |
- default |
61 |
- |
62 |
- sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in" |
63 |
-} |
64 |
- |
65 |
-src_configure() { |
66 |
- econf $(use_with ssl) $(use_with pam) |
67 |
-} |
68 |
- |
69 |
-src_install() { |
70 |
- default |
71 |
- |
72 |
- dodoc README |
73 |
- |
74 |
- insinto /etc; insopts -m600; doins monitrc |
75 |
- newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit |
76 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
77 |
- |
78 |
- use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN} |
79 |
-} |
80 |
- |
81 |
-pkg_postinst() { |
82 |
- elog "Sample configurations are available at:" |
83 |
- elog "http://mmonit.com/monit/documentation/" |
84 |
-} |
85 |
|
86 |
diff --git a/app-admin/monit/monit-5.25.2-r1.ebuild b/app-admin/monit/monit-5.25.2-r1.ebuild |
87 |
deleted file mode 100644 |
88 |
index 8897263d608..00000000000 |
89 |
--- a/app-admin/monit/monit-5.25.2-r1.ebuild |
90 |
+++ /dev/null |
91 |
@@ -1,58 +0,0 @@ |
92 |
-# Copyright 1999-2018 Gentoo Foundation |
93 |
-# Distributed under the terms of the GNU General Public License v2 |
94 |
- |
95 |
-EAPI=6 |
96 |
-inherit bash-completion-r1 pam systemd |
97 |
- |
98 |
-DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system" |
99 |
-HOMEPAGE="http://mmonit.com/monit/" |
100 |
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz" |
101 |
- |
102 |
-LICENSE="AGPL-3" |
103 |
-SLOT="0" |
104 |
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" |
105 |
-IUSE="ipv6 libressl pam ssl" |
106 |
- |
107 |
-RDEPEND=" |
108 |
- ssl? ( |
109 |
- !libressl? ( dev-libs/openssl:0= ) |
110 |
- libressl? ( dev-libs/libressl:0= ) |
111 |
- )" |
112 |
-DEPEND="${RDEPEND} |
113 |
- sys-devel/flex |
114 |
- sys-devel/bison |
115 |
- pam? ( virtual/pam )" |
116 |
- |
117 |
-src_prepare() { |
118 |
- default |
119 |
- |
120 |
- sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in" |
121 |
-} |
122 |
- |
123 |
-src_configure() { |
124 |
- local myeconfargs=( |
125 |
- $(use_with ipv6) |
126 |
- $(use_with pam) |
127 |
- $(use_with ssl) |
128 |
- ) |
129 |
- econf "${myeconfargs[@]}" |
130 |
-} |
131 |
- |
132 |
-src_install() { |
133 |
- default |
134 |
- |
135 |
- dodoc README |
136 |
- |
137 |
- insinto /etc; insopts -m600; doins monitrc |
138 |
- newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit |
139 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
140 |
- |
141 |
- use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN} |
142 |
- |
143 |
- dobashcomp system/bash/monit |
144 |
-} |
145 |
- |
146 |
-pkg_postinst() { |
147 |
- elog "Sample configurations are available at:" |
148 |
- elog "http://mmonit.com/monit/documentation/" |
149 |
-} |