| 1 |
chtekk 08/04/21 09:40:48 |
| 2 |
|
| 3 |
Modified: ChangeLog smokeping-2.2.4.ebuild |
| 4 |
Added: smokeping-2.3.5.ebuild |
| 5 |
Removed: smokeping-2.2.3-r1.ebuild smokeping-2.0.9.ebuild |
| 6 |
Log: |
| 7 |
Add smokeping 2.3.5, fixes bug #203945. |
| 8 |
(Portage version: 2.1.5_rc5) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.21 net-analyzer/smokeping/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/smokeping/ChangeLog?rev=1.21&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/smokeping/ChangeLog?rev=1.21&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/smokeping/ChangeLog?r1=1.20&r2=1.21 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v |
| 20 |
retrieving revision 1.20 |
| 21 |
retrieving revision 1.21 |
| 22 |
diff -u -r1.20 -r1.21 |
| 23 |
--- ChangeLog 5 Feb 2008 10:43:50 -0000 1.20 |
| 24 |
+++ ChangeLog 21 Apr 2008 09:40:47 -0000 1.21 |
| 25 |
@@ -1,6 +1,14 @@ |
| 26 |
# ChangeLog for net-analyzer/smokeping |
| 27 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.20 2008/02/05 10:43:50 hollow Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.21 2008/04/21 09:40:47 chtekk Exp $ |
| 30 |
+ |
| 31 |
+*smokeping-2.3.5 (21 Apr 2008) |
| 32 |
+ |
| 33 |
+ 21 Apr 2008; Luca Longinotti <chtekk@g.o> files/smokeping.init, |
| 34 |
+ -smokeping-2.0.9.ebuild, -smokeping-2.2.3-r1.ebuild, |
| 35 |
+ smokeping-2.2.4.ebuild, +smokeping-2.3.5.ebuild: |
| 36 |
+ Add smokeping 2.3.5, fixes bug #203945. Mark smokeping 2.2.4 amd64 stable. |
| 37 |
+ Cleanup old ebuilds. |
| 38 |
|
| 39 |
05 Feb 2008; Benedikt Böhm <hollow@g.o> smokeping-2.0.9.ebuild, |
| 40 |
smokeping-2.2.3-r1.ebuild, smokeping-2.2.4.ebuild: |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.4 net-analyzer/smokeping/smokeping-2.2.4.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/smokeping/smokeping-2.2.4.ebuild?rev=1.4&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/smokeping/smokeping-2.2.4.ebuild?rev=1.4&content-type=text/plain |
| 48 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/smokeping/smokeping-2.2.4.ebuild?r1=1.3&r2=1.4 |
| 49 |
|
| 50 |
Index: smokeping-2.2.4.ebuild |
| 51 |
=================================================================== |
| 52 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.2.4.ebuild,v |
| 53 |
retrieving revision 1.3 |
| 54 |
retrieving revision 1.4 |
| 55 |
diff -u -r1.3 -r1.4 |
| 56 |
--- smokeping-2.2.4.ebuild 5 Feb 2008 10:43:50 -0000 1.3 |
| 57 |
+++ smokeping-2.2.4.ebuild 21 Apr 2008 09:40:47 -0000 1.4 |
| 58 |
@@ -1,10 +1,10 @@ |
| 59 |
# Copyright 1999-2008 Gentoo Foundation |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.2.4.ebuild,v 1.3 2008/02/05 10:43:50 hollow Exp $ |
| 62 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.2.4.ebuild,v 1.4 2008/04/21 09:40:47 chtekk Exp $ |
| 63 |
|
| 64 |
inherit perl-module eutils |
| 65 |
|
| 66 |
-KEYWORDS="~amd64 sparc x86" |
| 67 |
+KEYWORDS="amd64 sparc x86" |
| 68 |
|
| 69 |
DESCRIPTION="A powerful latency measurement tool." |
| 70 |
SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz" |
| 71 |
@@ -43,7 +43,6 @@ |
| 72 |
perlinfo |
| 73 |
insinto ${VENDOR_LIB} |
| 74 |
doins lib/*.pm |
| 75 |
- ### This one kind of concerns me, possible conflict with other software |
| 76 |
insinto ${VENDOR_LIB}/Config |
| 77 |
doins lib/Config/*.pm |
| 78 |
insinto ${VENDOR_LIB}/Smokeping |
| 79 |
@@ -55,7 +54,7 @@ |
| 80 |
insinto ${VENDOR_LIB}/Smokeping/sorters |
| 81 |
doins lib/Smokeping/sorters/*.pm |
| 82 |
|
| 83 |
- # Create the files in var for rrd file storage and the cgi webserver script |
| 84 |
+ # Create the files in /var for rrd file storage |
| 85 |
keepdir /var/lib/${PN}/.simg |
| 86 |
fowners smokeping:smokeping /var/lib/${PN} |
| 87 |
if use apache2 ; then |
| 88 |
@@ -64,10 +63,12 @@ |
| 89 |
fowners smokeping:smokeping /var/lib/${PN}/.simg |
| 90 |
fi |
| 91 |
fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg |
| 92 |
+ |
| 93 |
+ # Install the CGI webserver script |
| 94 |
exeinto /var/www/localhost/perl |
| 95 |
newexe htdocs/${PN}.cgi.dist ${PN}.pl |
| 96 |
dosed 's:^use lib:#use lib:g' /var/www/localhost/perl/${PN}.pl |
| 97 |
- dosed 's:sepp/bin/speedy:bin/perl:' /var/www/localhost/perl/${PN}.pl |
| 98 |
+ dosed 's:/usr/sepp/bin/speedy:/usr/bin/perl:' /var/www/localhost/perl/${PN}.pl |
| 99 |
dosed 's:/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config:/etc/smokeping:' \ |
| 100 |
/var/www/localhost/perl/${PN}.pl |
| 101 |
|
| 102 |
@@ -77,9 +78,8 @@ |
| 103 |
|
| 104 |
# Create the binary |
| 105 |
newbin bin/${PN}.dist ${PN} |
| 106 |
- dosed 's:/usr/sepp/bin/perl-5.8.4:/usr/bin/perl:g' /usr/bin/${PN} |
| 107 |
dosed 's:^use lib:#use lib:g' /usr/bin/${PN} |
| 108 |
- # dosed 's:/sepp::' /usr/bin/${PN} |
| 109 |
+ dosed 's:/usr/sepp/bin/perl-5.8.4:/usr/bin/perl:' /usr/bin/${PN} |
| 110 |
dosed 's:etc/config.dist:/etc/smokeping:' /usr/bin/${PN} |
| 111 |
|
| 112 |
# Create the config files |
| 113 |
@@ -98,7 +98,7 @@ |
| 114 |
chown smokeping:smokeping "${ROOT}/var/lib/${PN}" |
| 115 |
chmod 755 "${ROOT}/var/lib/${PN}" |
| 116 |
elog |
| 117 |
- elog "Four more steps are needed to get ${PN} un&running:" |
| 118 |
+ elog "Four more steps are needed to get ${PN} up&running:" |
| 119 |
elog "1) You need to edit /etc/${PN}" |
| 120 |
elog "2) You need to edit the template at /etc/${PN}.template" |
| 121 |
elog "3) You need to make the fping binary setuid root:" |
| 122 |
|
| 123 |
|
| 124 |
|
| 125 |
1.1 net-analyzer/smokeping/smokeping-2.3.5.ebuild |
| 126 |
|
| 127 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/smokeping/smokeping-2.3.5.ebuild?rev=1.1&view=markup |
| 128 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/smokeping/smokeping-2.3.5.ebuild?rev=1.1&content-type=text/plain |
| 129 |
|
| 130 |
Index: smokeping-2.3.5.ebuild |
| 131 |
=================================================================== |
| 132 |
# Copyright 1999-2008 Gentoo Foundation |
| 133 |
# Distributed under the terms of the GNU General Public License v2 |
| 134 |
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.3.5.ebuild,v 1.1 2008/04/21 09:40:47 chtekk Exp $ |
| 135 |
|
| 136 |
inherit perl-module eutils |
| 137 |
|
| 138 |
KEYWORDS="~amd64 ~sparc ~x86" |
| 139 |
|
| 140 |
DESCRIPTION="A powerful latency measurement tool." |
| 141 |
SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz" |
| 142 |
HOMEPAGE="http://oss.oetiker.ch/smokeping/" |
| 143 |
LICENSE="GPL-2" |
| 144 |
SLOT="0" |
| 145 |
IUSE="apache2" |
| 146 |
|
| 147 |
DEPEND="dev-lang/perl |
| 148 |
virtual/perl-libnet |
| 149 |
>=net-analyzer/rrdtool-1.2 |
| 150 |
net-analyzer/fping |
| 151 |
dev-perl/libwww-perl |
| 152 |
dev-perl/Socket6 |
| 153 |
dev-perl/Net-DNS |
| 154 |
apache2? ( >=www-apache/mod_perl-2.0.1 )" |
| 155 |
RDEPEND="${DEPEND}" |
| 156 |
|
| 157 |
pkg_setup() { |
| 158 |
if ! built_with_use '>=net-analyzer/rrdtool-1.2' perl ; then |
| 159 |
eerror "You must build net-analyzer/rrdtool with the" |
| 160 |
eerror "'perl' USE flag turned on!" |
| 161 |
die "net-analyzer/rrdtool installed with 'perl' USE flag disabled" |
| 162 |
fi |
| 163 |
|
| 164 |
enewgroup smokeping |
| 165 |
enewuser smokeping -1 -1 /var/lib/smokeping smokeping |
| 166 |
} |
| 167 |
|
| 168 |
src_compile() { |
| 169 |
# There is a makefile we don't want to run so leave this here |
| 170 |
einfo "Skip compile." |
| 171 |
} |
| 172 |
|
| 173 |
src_install() { |
| 174 |
# First move all the perl modules into the vendor lib area of Perl |
| 175 |
perlinfo |
| 176 |
insinto ${VENDOR_LIB} |
| 177 |
doins lib/*.pm |
| 178 |
insinto ${VENDOR_LIB}/Config |
| 179 |
doins lib/Config/*.pm |
| 180 |
insinto ${VENDOR_LIB}/Smokeping |
| 181 |
doins lib/Smokeping/*.pm |
| 182 |
insinto ${VENDOR_LIB}/Smokeping/matchers |
| 183 |
doins lib/Smokeping/matchers/*.pm |
| 184 |
insinto ${VENDOR_LIB}/Smokeping/probes |
| 185 |
doins lib/Smokeping/probes/*.pm |
| 186 |
insinto ${VENDOR_LIB}/Smokeping/sorters |
| 187 |
doins lib/Smokeping/sorters/*.pm |
| 188 |
|
| 189 |
# Create the files in /var for rrd file storage |
| 190 |
keepdir /var/lib/${PN}/.simg |
| 191 |
fowners smokeping:smokeping /var/lib/${PN} |
| 192 |
if use apache2 ; then |
| 193 |
fowners apache:apache /var/lib/${PN}/.simg |
| 194 |
else |
| 195 |
fowners smokeping:smokeping /var/lib/${PN}/.simg |
| 196 |
fi |
| 197 |
fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg |
| 198 |
|
| 199 |
# Install the CGI webserver script |
| 200 |
exeinto /var/www/localhost/perl |
| 201 |
newexe htdocs/${PN}.cgi.dist ${PN}.pl |
| 202 |
dosed 's:^use lib:#use lib:g' /var/www/localhost/perl/${PN}.pl |
| 203 |
dosed 's:/usr/sepp/bin/speedy:/usr/bin/perl:' /var/www/localhost/perl/${PN}.pl |
| 204 |
dosed 's:/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config:/etc/smokeping:' \ |
| 205 |
/var/www/localhost/perl/${PN}.pl |
| 206 |
|
| 207 |
# Install AJAX scripts |
| 208 |
insinto /var/www/localhost/perl |
| 209 |
doins -r htdocs/cropper |
| 210 |
|
| 211 |
# Create the binary |
| 212 |
newbin bin/${PN}.dist ${PN} |
| 213 |
dosed 's:^use lib:#use lib:g' /usr/bin/${PN} |
| 214 |
dosed 's:/usr/sepp/bin/perl-5.8.4:/usr/bin/perl:' /usr/bin/${PN} |
| 215 |
dosed 's:etc/config.dist:/etc/smokeping:' /usr/bin/${PN} |
| 216 |
|
| 217 |
# Create the config files |
| 218 |
insinto /etc |
| 219 |
newins "${FILESDIR}/config.dist" ${PN} |
| 220 |
newins etc/basepage.html.dist ${PN}.template |
| 221 |
doins etc/smokemail.dist |
| 222 |
newinitd "${FILESDIR}/${PN}.init" ${PN} |
| 223 |
if use apache2 ; then |
| 224 |
insinto /etc/apache2/modules.d |
| 225 |
doins "${FILESDIR}/78_${PN}.conf" |
| 226 |
fi |
| 227 |
} |
| 228 |
|
| 229 |
pkg_postinst() { |
| 230 |
chown smokeping:smokeping "${ROOT}/var/lib/${PN}" |
| 231 |
chmod 755 "${ROOT}/var/lib/${PN}" |
| 232 |
elog |
| 233 |
elog "Four more steps are needed to get ${PN} up&running:" |
| 234 |
elog "1) You need to edit /etc/${PN}" |
| 235 |
elog "2) You need to edit the template at /etc/${PN}.template" |
| 236 |
elog "3) You need to make the fping binary setuid root:" |
| 237 |
elog " # chmod 4755 /usr/sbin/fping" |
| 238 |
if use apache2 ; then |
| 239 |
elog "4) Make sure to add -D PERL to APACHE2_OPTS in /etc/conf.d/apache2" |
| 240 |
elog " and to restart apache2." |
| 241 |
fi |
| 242 |
elog "You can now start ${PN} with '/etc/init.d/${PN} start'." |
| 243 |
elog |
| 244 |
} |
| 245 |
|
| 246 |
|
| 247 |
|
| 248 |
-- |
| 249 |
gentoo-commits@l.g.o mailing list |
Archives