1 |
pva 07/11/18 12:44:52 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: cacti-0.8.6j-r7.ebuild cacti-0.8.7a.ebuild |
5 |
Removed: cacti-0.8.7.ebuild |
6 |
Log: |
7 |
New release 0.8.7a and new patch 0.8.6j-r7. Fixes possible Possible SQL injection issue was resolved, bug #199509. |
8 |
(Portage version: 2.1.3.19) |
9 |
|
10 |
Revision Changes Path |
11 |
1.114 net-analyzer/cacti/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cacti/ChangeLog?rev=1.114&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cacti/ChangeLog?rev=1.114&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cacti/ChangeLog?r1=1.113&r2=1.114 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v |
20 |
retrieving revision 1.113 |
21 |
retrieving revision 1.114 |
22 |
diff -u -r1.113 -r1.114 |
23 |
--- ChangeLog 3 Nov 2007 18:53:22 -0000 1.113 |
24 |
+++ ChangeLog 18 Nov 2007 12:44:52 -0000 1.114 |
25 |
@@ -1,6 +1,14 @@ |
26 |
# ChangeLog for net-analyzer/cacti |
27 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.113 2007/11/03 18:53:22 pva Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.114 2007/11/18 12:44:52 pva Exp $ |
30 |
+ |
31 |
+*cacti-0.8.7a (18 Nov 2007) |
32 |
+*cacti-0.8.6j-r7 (18 Nov 2007) |
33 |
+ |
34 |
+ 18 Nov 2007; <pva@g.o> +cacti-0.8.6j-r7.ebuild, |
35 |
+ -cacti-0.8.7.ebuild, +cacti-0.8.7a.ebuild: |
36 |
+ New release 0.8.7a and new patch 0.8.6j-r7. Fixes possible Possible SQL |
37 |
+ injection issue was resolved, bug #199509. |
38 |
|
39 |
*cacti-0.8.7-r1 (03 Nov 2007) |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.1 net-analyzer/cacti/cacti-0.8.6j-r7.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r7.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r7.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: cacti-0.8.6j-r7.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2007 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r7.ebuild,v 1.1 2007/11/18 12:44:52 pva Exp $ |
54 |
|
55 |
inherit eutils webapp depend.apache depend.php |
56 |
|
57 |
# Support for _p* in version. |
58 |
MY_P=${P/_p*/} |
59 |
HAS_PATCHES=1 |
60 |
|
61 |
DESCRIPTION="Cacti is a complete frontend to rrdtool" |
62 |
HOMEPAGE="http://www.cacti.net/" |
63 |
SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz" |
64 |
|
65 |
# patches |
66 |
if [ $HAS_PATCHES == 1 ] ; then |
67 |
UPSTREAM_PATCHES="ping_php_version4_snmpgetnext |
68 |
tree_console_missing_hosts |
69 |
thumbnail_graphs_not_working |
70 |
graph_debug_lockup_fix |
71 |
snmpwalk_fix |
72 |
sec_sql_injection-0.8.6j" |
73 |
for i in $UPSTREAM_PATCHES ; do |
74 |
SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV/_p*}/${i}.patch" |
75 |
done |
76 |
fi |
77 |
|
78 |
LICENSE="GPL-2" |
79 |
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
80 |
IUSE="snmp bundled-adodb" |
81 |
|
82 |
DEPEND="" |
83 |
|
84 |
want_apache |
85 |
need_php_cli |
86 |
need_php_httpd |
87 |
|
88 |
RDEPEND="!apache2? ( www-servers/lighttpd ) |
89 |
snmp? ( net-analyzer/net-snmp ) |
90 |
net-analyzer/rrdtool |
91 |
!bundled-adodb? ( dev-php/adodb ) |
92 |
virtual/mysql |
93 |
virtual/cron" |
94 |
|
95 |
src_unpack() { |
96 |
if [ $HAS_PATCHES == 1 ] ; then |
97 |
unpack ${MY_P}.tar.gz |
98 |
[ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P} |
99 |
# patches |
100 |
for i in ${UPSTREAM_PATCHES} ; do |
101 |
EPATCH_OPTS="-p1 -d ${S} -N" epatch "${DISTDIR}"/${i}.patch |
102 |
done ; |
103 |
else |
104 |
unpack ${MY_P}.tar.gz |
105 |
fi |
106 |
|
107 |
epatch "${FILESDIR}/${P}"-dos-large-values.patch |
108 |
|
109 |
use bundled-adodb || sed -i -e \ |
110 |
's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \ |
111 |
"${S}"/include/config.php |
112 |
} |
113 |
|
114 |
pkg_setup() { |
115 |
webapp_pkg_setup |
116 |
has_php |
117 |
if [ $PHP_VERSION = 5 ] ; then |
118 |
phpUseFlags="cli mysql xml session pcre" |
119 |
elif [ $PHP_VERSION = 4 ] ; then |
120 |
phpUseFlags="cli mysql xml session pcre expat" |
121 |
fi |
122 |
use bundled-adodb || phpUseFlags="${phpUseFlags} sockets" |
123 |
require_php_with_use ${phpUseFlags} |
124 |
} |
125 |
|
126 |
src_compile() { |
127 |
einfo "Nothing to compile." |
128 |
} |
129 |
|
130 |
src_install() { |
131 |
webapp_src_preinst |
132 |
|
133 |
rm LICENSE README |
134 |
dodoc docs/{CHANGELOG,CONTRIB,INSTALL,README,REQUIREMENTS,UPGRADE} |
135 |
rm -rf docs |
136 |
use bundled-adodb || rm -rf lib/adodb |
137 |
|
138 |
edos2unix `find -type f -name '*.php'` |
139 |
|
140 |
dodir ${MY_HTDOCSDIR} |
141 |
cp -r . "${D}"${MY_HTDOCSDIR} |
142 |
|
143 |
webapp_serverowned ${MY_HTDOCSDIR}/rra |
144 |
webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log |
145 |
webapp_configfile ${MY_HTDOCSDIR}/include/config.php |
146 |
webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt |
147 |
|
148 |
webapp_src_install |
149 |
} |
150 |
|
151 |
|
152 |
|
153 |
1.1 net-analyzer/cacti/cacti-0.8.7a.ebuild |
154 |
|
155 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cacti/cacti-0.8.7a.ebuild?rev=1.1&view=markup |
156 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/cacti/cacti-0.8.7a.ebuild?rev=1.1&content-type=text/plain |
157 |
|
158 |
Index: cacti-0.8.7a.ebuild |
159 |
=================================================================== |
160 |
# Copyright 1999-2007 Gentoo Foundation |
161 |
# Distributed under the terms of the GNU General Public License v2 |
162 |
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7a.ebuild,v 1.1 2007/11/18 12:44:52 pva Exp $ |
163 |
|
164 |
inherit eutils webapp depend.apache depend.php |
165 |
|
166 |
# Support for _p* in version. |
167 |
MY_P=${P/_p*/} |
168 |
HAS_PATCHES=0 |
169 |
|
170 |
DESCRIPTION="Cacti is a complete frontend to rrdtool" |
171 |
HOMEPAGE="http://www.cacti.net/" |
172 |
SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz" |
173 |
|
174 |
# patches |
175 |
if [ $HAS_PATCHES == 1 ] ; then |
176 |
UPSTREAM_PATCHES="" |
177 |
for i in $UPSTREAM_PATCHES ; do |
178 |
SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV/_p*}/${i}.patch" |
179 |
done |
180 |
fi |
181 |
|
182 |
LICENSE="GPL-2" |
183 |
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
184 |
IUSE="snmp bundled-adodb" |
185 |
|
186 |
DEPEND="" |
187 |
|
188 |
want_apache |
189 |
need_php_cli |
190 |
need_php_httpd |
191 |
|
192 |
RDEPEND="!apache2? ( www-servers/lighttpd ) |
193 |
snmp? ( net-analyzer/net-snmp ) |
194 |
net-analyzer/rrdtool |
195 |
!bundled-adodb? ( dev-php/adodb ) |
196 |
virtual/mysql |
197 |
virtual/cron" |
198 |
|
199 |
src_unpack() { |
200 |
if [ $HAS_PATCHES == 1 ] ; then |
201 |
unpack ${MY_P}.tar.gz |
202 |
[ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P} |
203 |
# patches |
204 |
for i in ${UPSTREAM_PATCHES} ; do |
205 |
EPATCH_OPTS="-p1 -d ${S} -N" epatch "${DISTDIR}"/${i}.patch |
206 |
done ; |
207 |
else |
208 |
unpack ${MY_P}.tar.gz |
209 |
fi |
210 |
|
211 |
use bundled-adodb || sed -i -e \ |
212 |
's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \ |
213 |
"${S}"/include/global.php |
214 |
} |
215 |
|
216 |
pkg_setup() { |
217 |
webapp_pkg_setup |
218 |
has_php |
219 |
if [ $PHP_VERSION = 5 ] ; then |
220 |
phpUseFlags="cli mysql xml session pcre" |
221 |
elif [ $PHP_VERSION = 4 ] ; then |
222 |
phpUseFlags="cli mysql xml session pcre expat" |
223 |
fi |
224 |
use bundled-adodb || phpUseFlags="${phpUseFlags} sockets" |
225 |
require_php_with_use ${phpUseFlags} |
226 |
} |
227 |
|
228 |
src_compile() { |
229 |
einfo "Nothing to compile." |
230 |
} |
231 |
|
232 |
src_install() { |
233 |
webapp_src_preinst |
234 |
|
235 |
rm LICENSE README |
236 |
dodoc docs/{CHANGELOG,CONTRIB,INSTALL,README,REQUIREMENTS,UPGRADE} |
237 |
rm -rf docs |
238 |
use bundled-adodb || rm -rf lib/adodb |
239 |
|
240 |
edos2unix `find -type f -name '*.php'` |
241 |
|
242 |
dodir ${MY_HTDOCSDIR} |
243 |
cp -r . "${D}"${MY_HTDOCSDIR} |
244 |
|
245 |
webapp_serverowned ${MY_HTDOCSDIR}/rra |
246 |
webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log |
247 |
webapp_configfile ${MY_HTDOCSDIR}/include/config.php |
248 |
webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt |
249 |
|
250 |
webapp_src_install |
251 |
} |
252 |
|
253 |
|
254 |
|
255 |
-- |
256 |
gentoo-commits@g.o mailing list |