| 1 |
jer 14/04/02 12:59:38 |
| 2 |
|
| 3 |
Modified: ChangeLog smokeping-2.6.9.ebuild |
| 4 |
Log: |
| 5 |
Whitespace. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.55 net-analyzer/smokeping/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/smokeping/ChangeLog?rev=1.55&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/smokeping/ChangeLog?rev=1.55&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/smokeping/ChangeLog?r1=1.54&r2=1.55 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v |
| 19 |
retrieving revision 1.54 |
| 20 |
retrieving revision 1.55 |
| 21 |
diff -u -r1.54 -r1.55 |
| 22 |
--- ChangeLog 2 Apr 2014 00:37:56 -0000 1.54 |
| 23 |
+++ ChangeLog 2 Apr 2014 12:59:38 -0000 1.55 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for net-analyzer/smokeping |
| 26 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.54 2014/04/02 00:37:56 jer Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/ChangeLog,v 1.55 2014/04/02 12:59:38 jer Exp $ |
| 29 |
+ |
| 30 |
+ 02 Apr 2014; Jeroen Roovers <jer@g.o> smokeping-2.6.9.ebuild: |
| 31 |
+ Whitespace. |
| 32 |
|
| 33 |
02 Apr 2014; Jeroen Roovers <jer@g.o> smokeping-2.6.9.ebuild, |
| 34 |
+files/smokeping-2.6.9-pod.patch: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.8 net-analyzer/smokeping/smokeping-2.6.9.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.9.ebuild?rev=1.8&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.9.ebuild?rev=1.8&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.9.ebuild?r1=1.7&r2=1.8 |
| 43 |
|
| 44 |
Index: smokeping-2.6.9.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.9.ebuild,v |
| 47 |
retrieving revision 1.7 |
| 48 |
retrieving revision 1.8 |
| 49 |
diff -u -r1.7 -r1.8 |
| 50 |
--- smokeping-2.6.9.ebuild 2 Apr 2014 00:37:56 -0000 1.7 |
| 51 |
+++ smokeping-2.6.9.ebuild 2 Apr 2014 12:59:38 -0000 1.8 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2014 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.9.ebuild,v 1.7 2014/04/02 00:37:56 jer Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/smokeping/smokeping-2.6.9.ebuild,v 1.8 2014/04/02 12:59:38 jer Exp $ |
| 57 |
|
| 58 |
EAPI=5 |
| 59 |
inherit eutils user systemd |
| 60 |
@@ -18,29 +18,33 @@ |
| 61 |
# removing fcgi useflag as the configure script can't avoid it without patching |
| 62 |
IUSE="apache2 curl dig echoping ipv6 ldap radius ssh telnet" |
| 63 |
|
| 64 |
-DEPEND="!apache2? ( virtual/httpd-cgi ) |
| 65 |
- >=dev-lang/perl-5.8.8-r8 |
| 66 |
- >=dev-perl/SNMP_Session-1.13 |
| 67 |
- >=net-analyzer/fping-2.4_beta2-r2 |
| 68 |
- >=net-analyzer/rrdtool-1.2[perl] |
| 69 |
- apache2? ( >=www-apache/mod_perl-2.0.1 |
| 70 |
- www-apache/mod_fcgid ) |
| 71 |
- curl? ( >=net-misc/curl-7.21.4 ) |
| 72 |
- dev-perl/CGI-Session |
| 73 |
- dev-perl/Config-Grammar |
| 74 |
- dev-perl/Digest-HMAC |
| 75 |
- dev-perl/FCGI |
| 76 |
- dev-perl/IO-Socket-SSL |
| 77 |
- dev-perl/Net-DNS |
| 78 |
- dev-perl/libwww-perl |
| 79 |
- dig? ( net-dns/bind-tools ) |
| 80 |
- echoping? ( >=net-analyzer/echoping-6.0.2 ) |
| 81 |
- ipv6? ( >=dev-perl/Socket6-0.20 ) |
| 82 |
- ldap? ( dev-perl/perl-ldap ) |
| 83 |
- radius? ( dev-perl/RadiusPerl ) |
| 84 |
- ssh? ( dev-perl/Net-OpenSSH ) |
| 85 |
- telnet? ( dev-perl/Net-Telnet ) |
| 86 |
- virtual/perl-libnet" |
| 87 |
+DEPEND=" |
| 88 |
+ !apache2? ( virtual/httpd-cgi ) |
| 89 |
+ apache2? ( |
| 90 |
+ >=www-apache/mod_perl-2.0.1 |
| 91 |
+ www-apache/mod_fcgid |
| 92 |
+ ) |
| 93 |
+ curl? ( >=net-misc/curl-7.21.4 ) |
| 94 |
+ dig? ( net-dns/bind-tools ) |
| 95 |
+ echoping? ( >=net-analyzer/echoping-6.0.2 ) |
| 96 |
+ ipv6? ( >=dev-perl/Socket6-0.20 ) |
| 97 |
+ ldap? ( dev-perl/perl-ldap ) |
| 98 |
+ radius? ( dev-perl/RadiusPerl ) |
| 99 |
+ ssh? ( dev-perl/Net-OpenSSH ) |
| 100 |
+ telnet? ( dev-perl/Net-Telnet ) |
| 101 |
+ >=dev-lang/perl-5.8.8-r8 |
| 102 |
+ >=dev-perl/SNMP_Session-1.13 |
| 103 |
+ >=net-analyzer/fping-2.4_beta2-r2 |
| 104 |
+ >=net-analyzer/rrdtool-1.2[perl] |
| 105 |
+ dev-perl/CGI-Session |
| 106 |
+ dev-perl/Config-Grammar |
| 107 |
+ dev-perl/Digest-HMAC |
| 108 |
+ dev-perl/FCGI |
| 109 |
+ dev-perl/IO-Socket-SSL |
| 110 |
+ dev-perl/Net-DNS |
| 111 |
+ dev-perl/libwww-perl |
| 112 |
+ virtual/perl-libnet |
| 113 |
+" |
| 114 |
|
| 115 |
RDEPEND="${DEPEND}" |
| 116 |
|
| 117 |
@@ -57,8 +61,8 @@ |
| 118 |
|
| 119 |
src_configure() { |
| 120 |
econf \ |
| 121 |
- --sysconfdir=/etc/smokeping \ |
| 122 |
- --with-htdocs-dir=/var/www/localhost/smokeping |
| 123 |
+ --sysconfdir=/etc/smokeping \ |
| 124 |
+ --with-htdocs-dir=/var/www/localhost/smokeping |
| 125 |
} |
| 126 |
|
| 127 |
src_compile() { |
| 128 |
@@ -78,7 +82,8 @@ |
| 129 |
mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets" |
| 130 |
mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail" |
| 131 |
|
| 132 |
- sed -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \ |
| 133 |
+ sed -i \ |
| 134 |
+ -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \ |
| 135 |
-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \ |
| 136 |
-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \ |
| 137 |
-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \ |
| 138 |
@@ -87,17 +92,23 @@ |
| 139 |
-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \ |
| 140 |
-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \ |
| 141 |
-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \ |
| 142 |
- -i "${D}/etc/${PN}/config" || die |
| 143 |
+ "${D}/etc/${PN}/config" || die |
| 144 |
|
| 145 |
- sed -e '/^<script/{s:cropper/:/cropper/:}' -i "${D}/etc/${PN}/basepage.html" |
| 146 |
- |
| 147 |
- sed -e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \ |
| 148 |
- -i "${D}/usr/bin/smokeping" -i "${D}/usr/bin/smokeping_cgi" |
| 149 |
- |
| 150 |
- sed -e 's:etc/config.dist:/etc/smokeping/config:' -i "${D}/usr/bin/tSmoke" |
| 151 |
- |
| 152 |
- sed -e 's:/usr/etc/config:/etc/smokeping/config:' -i \ |
| 153 |
- "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" |
| 154 |
+ sed -i \ |
| 155 |
+ -e '/^<script/{s:cropper/:/cropper/:}' \ |
| 156 |
+ "${D}/etc/${PN}/basepage.html" || die |
| 157 |
+ |
| 158 |
+ sed -i \ |
| 159 |
+ -e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \ |
| 160 |
+ "${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die |
| 161 |
+ |
| 162 |
+ sed -i \ |
| 163 |
+ -e 's:etc/config.dist:/etc/smokeping/config:' \ |
| 164 |
+ "${D}/usr/bin/tSmoke" || die |
| 165 |
+ |
| 166 |
+ sed -i \ |
| 167 |
+ -e 's:/usr/etc/config:/etc/smokeping/config:' \ |
| 168 |
+ "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die |
| 169 |
|
| 170 |
dodir /var/www/localhost/cgi-bin |
| 171 |
mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \ |
Archives