public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/
@ 2017-04-19 21:32 Andreas Hüttel
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Hüttel @ 2017-04-19 21:32 UTC (permalink / raw
  To: gentoo-commits

commit:     100e9dd3d1f21a1951cd1c95c60a81ac914663d9
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 21:30:52 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 21:32:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=100e9dd3

net-analyzer/smokeping: Drop hppa, bug 597822

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-analyzer/smokeping/smokeping-2.6.10.ebuild | 4 ++--
 net-analyzer/smokeping/smokeping-2.6.11.ebuild | 4 ++--
 net-analyzer/smokeping/smokeping-2.6.9.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/smokeping/smokeping-2.6.10.ebuild b/net-analyzer/smokeping/smokeping-2.6.10.ebuild
index de43dded917..cc533d1bb99 100644
--- a/net-analyzer/smokeping/smokeping-2.6.10.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.6.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # dropping hppa and sparc because of way too may dependencies not having
 # keywords in those architectures.
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~x86"
 
 # removing fcgi useflag as the configure script can't avoid it without patching
 IUSE="apache2 curl dig echoping ipv6 ldap radius ssh telnet"

diff --git a/net-analyzer/smokeping/smokeping-2.6.11.ebuild b/net-analyzer/smokeping/smokeping-2.6.11.ebuild
index e4e552b98ef..6a253fbb7b7 100644
--- a/net-analyzer/smokeping/smokeping-2.6.11.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.6.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # dropping hppa and sparc because of way too may dependencies not having
 # keywords in those architectures.
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~x86"
 
 # removing fcgi useflag as the configure script can't avoid it without patching
 IUSE="apache2 curl dig echoping ipv6 radius"

diff --git a/net-analyzer/smokeping/smokeping-2.6.9.ebuild b/net-analyzer/smokeping/smokeping-2.6.9.ebuild
index b0de9f67c8a..096133b50ea 100644
--- a/net-analyzer/smokeping/smokeping-2.6.9.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # dropping hppa and sparc because of way too may dependencies not having
 # keywords in those architectures.
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 x86"
 
 # removing fcgi useflag as the configure script can't avoid it without patching
 IUSE="apache2 curl dig echoping ipv6 ldap radius ssh telnet"


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/
@ 2017-12-30  2:40 Kent Fredric
  0 siblings, 0 replies; 15+ messages in thread
From: Kent Fredric @ 2017-12-30  2:40 UTC (permalink / raw
  To: gentoo-commits

commit:     7cac80f1d4eef2ef9668ef45f34028f8e8f9f338
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 08:02:33 2017 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 02:38:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cac80f1

net-analyzer/smokeping: Fix dependency on dev-perl/Authen-Radius

-r1 bump for rdep propagation

Package-Manager: Portage-2.3.18, Repoman-2.3.6

 .../smokeping/{smokeping-2.6.10.ebuild => smokeping-2.6.10-r1.ebuild}   | 2 +-
 .../smokeping/{smokeping-2.6.11.ebuild => smokeping-2.6.11-r1.ebuild}   | 2 +-
 .../smokeping/{smokeping-2.6.9.ebuild => smokeping-2.6.9-r1.ebuild}     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/smokeping/smokeping-2.6.10.ebuild b/net-analyzer/smokeping/smokeping-2.6.10-r1.ebuild
similarity index 99%
rename from net-analyzer/smokeping/smokeping-2.6.10.ebuild
rename to net-analyzer/smokeping/smokeping-2.6.10-r1.ebuild
index cc533d1bb99..69850616126 100644
--- a/net-analyzer/smokeping/smokeping-2.6.10.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.6.10-r1.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	echoping? ( >=net-analyzer/echoping-6.0.2 )
 	ipv6? ( >=dev-perl/Socket6-0.20 )
 	ldap? ( dev-perl/perl-ldap )
-	radius? ( dev-perl/RadiusPerl )
+	radius? ( dev-perl/Authen-Radius )
 	ssh? ( dev-perl/Net-OpenSSH )
 	telnet? ( dev-perl/Net-Telnet )
 	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )

diff --git a/net-analyzer/smokeping/smokeping-2.6.11.ebuild b/net-analyzer/smokeping/smokeping-2.6.11-r1.ebuild
similarity index 99%
rename from net-analyzer/smokeping/smokeping-2.6.11.ebuild
rename to net-analyzer/smokeping/smokeping-2.6.11-r1.ebuild
index 6a253fbb7b7..a5f7c689ef1 100644
--- a/net-analyzer/smokeping/smokeping-2.6.11.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.6.11-r1.ebuild
@@ -45,7 +45,7 @@ DEPEND="
 	dig? ( net-dns/bind-tools )
 	echoping? ( >=net-analyzer/echoping-6.0.2 )
 	ipv6? ( >=dev-perl/Socket6-0.20 )
-	radius? ( dev-perl/RadiusPerl )
+	radius? ( dev-perl/Authen-Radius )
 "
 
 RDEPEND="${DEPEND}"

diff --git a/net-analyzer/smokeping/smokeping-2.6.9.ebuild b/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild
similarity index 99%
rename from net-analyzer/smokeping/smokeping-2.6.9.ebuild
rename to net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild
index 096133b50ea..c5e0b1b312c 100644
--- a/net-analyzer/smokeping/smokeping-2.6.9.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	echoping? ( >=net-analyzer/echoping-6.0.2 )
 	ipv6? ( >=dev-perl/Socket6-0.20 )
 	ldap? ( dev-perl/perl-ldap )
-	radius? ( dev-perl/RadiusPerl )
+	radius? ( dev-perl/Authen-Radius )
 	ssh? ( dev-perl/Net-OpenSSH )
 	telnet? ( dev-perl/Net-Telnet )
 	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/
@ 2018-02-04 22:31 Jeroen Roovers
  0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2018-02-04 22:31 UTC (permalink / raw
  To: gentoo-commits

commit:     27831753d973d565f99ab4181e0d6bfc467714ea
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  4 22:25:32 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Feb  4 22:31:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27831753

net-analyzer/smokeping: Old.

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 net-analyzer/smokeping/Manifest                   |   1 -
 net-analyzer/smokeping/smokeping-2.6.10-r1.ebuild | 139 ----------------------
 2 files changed, 140 deletions(-)

diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 47d285bad19..27b1f05ca28 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -1,4 +1,3 @@
-DIST smokeping-2.6.10.tar.gz 415383 BLAKE2B 7a502eddeb634404e379df67470595cf85512d64a5e137f6d7c344ceb606f99275016e1044ec820b2e9217e1d1b567164b636186bfe54e91249d585ef75c646a SHA512 e91ac80ceafccb945ec48cc80020b8cbf2afe29b5f422dc5aaf7c52387eafc498180c293cf82dccc4fdec88ec56f80fb1bd08ebcb2ae9aea563475a069b91f13
 DIST smokeping-2.6.11.tar.gz 417338 BLAKE2B e1ff2fc05fd8d39f42e1cc89831aa36ef0522716d1768dba9bdedf09f6c64cc2b35f30c3b727959dd93ed8922235729a27c85acceb1e1c3ec9c5f60e21455ab9 SHA512 928722832d6e01ffbb7b74542678f7b9d5fc22819c0feae164ce58b8d8a5595800f617c8a672e07cae4b2c4ccbfa4883a11438ba2a172fc2887abc2933388422
 DIST smokeping-2.6.9.tar.gz 427185 BLAKE2B 3b626d852542f5e9e616ce88a8fd2fd773036822f10f548a1cec242f5d420ec67d940ee49c08da99f7e0815921251cb474b103c8c12c364f90651a4e74e9abf3 SHA512 ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d
 DIST smokeping-2.7.0.tar.gz 8914621 BLAKE2B a139fdcaafe37c61695ea2e31e3ddaeb4389f754f28fd41318db120f2ae5f4b5f355ebfb5e0c852b48e2e6872194952bc3733ff5f6bcd2886859a1c276835121 SHA512 17ada10e2cdc7966e81e589dec603fe77bc0a273790734b36342ff2b8ac3d5bca6797f6eb95a6e2e22a576b7bb5d2ca4232b4fb23057b360de9c156d141ed0ca

diff --git a/net-analyzer/smokeping/smokeping-2.6.10-r1.ebuild b/net-analyzer/smokeping/smokeping-2.6.10-r1.ebuild
deleted file mode 100644
index 69850616126..00000000000
--- a/net-analyzer/smokeping/smokeping-2.6.10-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user systemd
-
-DESCRIPTION="A powerful latency measurement tool"
-HOMEPAGE="http://oss.oetiker.ch/smokeping/"
-SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# dropping hppa and sparc because of way too may dependencies not having
-# keywords in those architectures.
-KEYWORDS="~amd64 ~x86"
-
-# removing fcgi useflag as the configure script can't avoid it without patching
-IUSE="apache2 curl dig echoping ipv6 ldap radius ssh telnet"
-
-DEPEND="
-	!apache2? ( virtual/httpd-cgi )
-	apache2? (
-		>=www-apache/mod_perl-2.0.1
-		www-apache/mod_fcgid
-	)
-	curl? ( >=net-misc/curl-7.21.4 )
-	dig? ( net-dns/bind-tools )
-	echoping? ( >=net-analyzer/echoping-6.0.2 )
-	ipv6? ( >=dev-perl/Socket6-0.20 )
-	ldap? ( dev-perl/perl-ldap )
-	radius? ( dev-perl/Authen-Radius )
-	ssh? ( dev-perl/Net-OpenSSH )
-	telnet? ( dev-perl/Net-Telnet )
-	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
-	>=dev-lang/perl-5.8.8-r8
-	>=dev-perl/SNMP_Session-1.13
-	>=net-analyzer/fping-2.4_beta2-r2[suid]
-	>=net-analyzer/rrdtool-1.2[graph,perl]
-	dev-perl/CGI-Session
-	dev-perl/Config-Grammar
-	dev-perl/Digest-HMAC
-	dev-perl/FCGI
-	dev-perl/IO-Socket-SSL
-	dev-perl/Net-DNS
-	dev-perl/libwww-perl
-	virtual/perl-libnet
-"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup smokeping
-	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
-}
-
-src_prepare() {
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/smokeping \
-		--with-htdocs-dir=/var/www/localhost/smokeping
-}
-
-src_compile() {
-	LC_ALL=C emake
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.init.4 ${PN}
-	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
-	systemd_dounit "${FILESDIR}"/"${PN}".service
-
-	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
-	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
-	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
-	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
-	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
-
-	sed -i \
-		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
-		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
-		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
-	    -e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
-		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
-		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-		"${D}/etc/${PN}/config" || die
-
-	sed -i \
-		-e '/^<script/{s:cropper/:/cropper/:}' \
-		"${D}/etc/${PN}/basepage.html" || die
-
-	sed -i \
-		-e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
-		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
-
-	sed -i \
-		-e 's:etc/config.dist:/etc/smokeping/config:' \
-		"${D}/usr/bin/tSmoke" || die
-
-	sed -i \
-		-e 's:/usr/etc/config:/etc/smokeping/config:' \
-		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
-
-	dodir /var/www/localhost/cgi-bin
-		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
-		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
-
-	fperms 700 /etc/${PN}/smokeping_secrets
-
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		doins "${FILESDIR}/79_${PN}.conf"
-	fi
-
-	# Create the files in /var for rrd file storage
-	keepdir /var/lib/${PN}/.simg
-	fowners smokeping:smokeping /var/lib/${PN}
-
-	if use apache2 ; then
-		fowners apache:apache /var/lib/${PN}/.simg
-		fowners -R apache:apache /var/www
-	else
-		fowners smokeping:smokeping /var/lib/${PN}/.simg
-	fi
-
-	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
-}
-
-pkg_postinst() {
-	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
-	chmod 755 "${ROOT}/var/lib/${PN}"
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/
@ 2018-02-04 22:31 Jeroen Roovers
  0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2018-02-04 22:31 UTC (permalink / raw
  To: gentoo-commits

commit:     d0448bdc05cbf803e0b6c26c18d51c765ee6ae7b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  4 22:24:51 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Feb  4 22:31:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0448bdc

net-analyzer/smokeping: Version 2.7.0.

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 net-analyzer/smokeping/Manifest               |   1 +
 net-analyzer/smokeping/smokeping-2.7.0.ebuild | 150 ++++++++++++++++++++++++++
 2 files changed, 151 insertions(+)

diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 4181f2e7ebd..47d285bad19 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -1,3 +1,4 @@
 DIST smokeping-2.6.10.tar.gz 415383 BLAKE2B 7a502eddeb634404e379df67470595cf85512d64a5e137f6d7c344ceb606f99275016e1044ec820b2e9217e1d1b567164b636186bfe54e91249d585ef75c646a SHA512 e91ac80ceafccb945ec48cc80020b8cbf2afe29b5f422dc5aaf7c52387eafc498180c293cf82dccc4fdec88ec56f80fb1bd08ebcb2ae9aea563475a069b91f13
 DIST smokeping-2.6.11.tar.gz 417338 BLAKE2B e1ff2fc05fd8d39f42e1cc89831aa36ef0522716d1768dba9bdedf09f6c64cc2b35f30c3b727959dd93ed8922235729a27c85acceb1e1c3ec9c5f60e21455ab9 SHA512 928722832d6e01ffbb7b74542678f7b9d5fc22819c0feae164ce58b8d8a5595800f617c8a672e07cae4b2c4ccbfa4883a11438ba2a172fc2887abc2933388422
 DIST smokeping-2.6.9.tar.gz 427185 BLAKE2B 3b626d852542f5e9e616ce88a8fd2fd773036822f10f548a1cec242f5d420ec67d940ee49c08da99f7e0815921251cb474b103c8c12c364f90651a4e74e9abf3 SHA512 ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d
+DIST smokeping-2.7.0.tar.gz 8914621 BLAKE2B a139fdcaafe37c61695ea2e31e3ddaeb4389f754f28fd41318db120f2ae5f4b5f355ebfb5e0c852b48e2e6872194952bc3733ff5f6bcd2886859a1c276835121 SHA512 17ada10e2cdc7966e81e589dec603fe77bc0a273790734b36342ff2b8ac3d5bca6797f6eb95a6e2e22a576b7bb5d2ca4232b4fb23057b360de9c156d141ed0ca

diff --git a/net-analyzer/smokeping/smokeping-2.7.0.ebuild b/net-analyzer/smokeping/smokeping-2.7.0.ebuild
new file mode 100644
index 00000000000..47835a3a6b7
--- /dev/null
+++ b/net-analyzer/smokeping/smokeping-2.7.0.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils multilib user systemd
+
+DESCRIPTION="A powerful latency measurement tool"
+HOMEPAGE="http://oss.oetiker.ch/smokeping/"
+SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# dropping hppa and sparc because of way too may dependencies not having
+# keywords in those architectures.
+KEYWORDS="~amd64 ~x86"
+
+# removing fcgi useflag as the configure script can't avoid it without patching
+IUSE="apache2 curl dig echoping ipv6 radius"
+
+DEPEND="
+	>=dev-lang/perl-5.8.8-r8
+	>=dev-perl/SNMP_Session-1.13
+	>=net-analyzer/fping-2.4_beta2-r2[suid]
+	>=net-analyzer/rrdtool-1.2[graph,perl]
+	dev-perl/CGI
+	dev-perl/CGI-Session
+	dev-perl/Config-Grammar
+	dev-perl/Digest-HMAC
+	dev-perl/FCGI
+	dev-perl/IO-Socket-SSL
+	dev-perl/IO-Tty
+	dev-perl/Net-DNS
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SNMP
+	dev-perl/Net-Telnet
+	dev-perl/libwww-perl
+	dev-perl/perl-ldap
+	virtual/perl-libnet
+	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
+	!apache2? ( virtual/httpd-cgi )
+	apache2? (
+		>=www-apache/mod_perl-2.0.1
+		www-apache/mod_fcgid
+	)
+	curl? ( >=net-misc/curl-7.21.4 )
+	dig? ( net-dns/bind-tools )
+	echoping? ( >=net-analyzer/echoping-6.0.2 )
+	ipv6? ( >=dev-perl/Socket6-0.20 )
+	radius? ( dev-perl/Authen-Radius )
+"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup smokeping
+	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
+}
+
+src_prepare() {
+	default
+
+	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
+	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
+	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session
+	echo ${PV} > VERSION
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/smokeping \
+		--with-htdocs-dir=/var/www/localhost/smokeping
+}
+
+src_compile() {
+	LC_ALL=C emake
+}
+
+src_install() {
+	dodir /usr/$(get_libdir)
+	default
+
+	newinitd "${FILESDIR}"/${PN}.init.4 ${PN}
+	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
+	systemd_dounit "${FILESDIR}"/"${PN}".service
+
+	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
+	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
+	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
+	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
+	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
+
+	sed -i \
+		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
+		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
+		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
+		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
+		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
+		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
+		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
+		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
+		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
+		"${D}/etc/${PN}/config" || die
+
+	sed -i \
+		-e '/^<script/{s:cropper/:/cropper/:}' \
+		"${D}/etc/${PN}/basepage.html" || die
+
+	sed -i \
+		-e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
+		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
+
+	sed -i \
+		-e 's:etc/config.dist:/etc/smokeping/config:' \
+		"${D}/usr/bin/tSmoke" || die
+
+	sed -i \
+		-e 's:/usr/etc/config:/etc/smokeping/config:' \
+		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
+
+	dodir /var/www/localhost/cgi-bin
+		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
+		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
+
+	fperms 700 /etc/${PN}/smokeping_secrets
+
+	if use apache2 ; then
+		insinto /etc/apache2/modules.d
+		doins "${FILESDIR}/79_${PN}.conf"
+	fi
+
+	# Create the files in /var for rrd file storage
+	keepdir /var/lib/${PN}/.simg
+	fowners smokeping:smokeping /var/lib/${PN}
+
+	if use apache2 ; then
+		fowners apache:apache /var/lib/${PN}/.simg
+		fowners -R apache:apache /var/www
+	else
+		fowners smokeping:smokeping /var/lib/${PN}/.simg
+	fi
+
+	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
+}
+
+pkg_postinst() {
+	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
+	chmod 755 "${ROOT}/var/lib/${PN}"
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/
@ 2018-02-08 19:45 Jeroen Roovers
  0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2018-02-08 19:45 UTC (permalink / raw
  To: gentoo-commits

commit:     085ef50c391bd2745cbcb223b92b2511ae7548e5
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  8 19:45:26 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Feb  8 19:45:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=085ef50c

net-analyzer/smokeping: Old.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-analyzer/smokeping/Manifest                   |   1 -
 net-analyzer/smokeping/smokeping-2.6.11-r1.ebuild | 141 ----------------------
 2 files changed, 142 deletions(-)

diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 7502e5dc1a6..cb7aea8a2a7 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -1,4 +1,3 @@
-DIST smokeping-2.6.11.tar.gz 417338 BLAKE2B e1ff2fc05fd8d39f42e1cc89831aa36ef0522716d1768dba9bdedf09f6c64cc2b35f30c3b727959dd93ed8922235729a27c85acceb1e1c3ec9c5f60e21455ab9 SHA512 928722832d6e01ffbb7b74542678f7b9d5fc22819c0feae164ce58b8d8a5595800f617c8a672e07cae4b2c4ccbfa4883a11438ba2a172fc2887abc2933388422
 DIST smokeping-2.6.9.tar.gz 427185 BLAKE2B 3b626d852542f5e9e616ce88a8fd2fd773036822f10f548a1cec242f5d420ec67d940ee49c08da99f7e0815921251cb474b103c8c12c364f90651a4e74e9abf3 SHA512 ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d
 DIST smokeping-2.7.0.tar.gz 8914621 BLAKE2B a139fdcaafe37c61695ea2e31e3ddaeb4389f754f28fd41318db120f2ae5f4b5f355ebfb5e0c852b48e2e6872194952bc3733ff5f6bcd2886859a1c276835121 SHA512 17ada10e2cdc7966e81e589dec603fe77bc0a273790734b36342ff2b8ac3d5bca6797f6eb95a6e2e22a576b7bb5d2ca4232b4fb23057b360de9c156d141ed0ca
 DIST smokeping-2.7.1.tar.gz 8919251 BLAKE2B 91f348b573d5a7ce98e8b51c96d9f45bb0af21cae4b049ba113bfc97c60800d8fdea0c05eb5414ec861f07f30170abf64ee34e0e29899528c01283ddab0ecde8 SHA512 c7208a40725e5694813a0545d6f8b663bab49739fe716bed5fd85ed6258c1c0abde4a18a0678988fff067ecc7807c83313abf12c04b935377b0b7158f07d8626

diff --git a/net-analyzer/smokeping/smokeping-2.6.11-r1.ebuild b/net-analyzer/smokeping/smokeping-2.6.11-r1.ebuild
deleted file mode 100644
index a5f7c689ef1..00000000000
--- a/net-analyzer/smokeping/smokeping-2.6.11-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user systemd
-
-DESCRIPTION="A powerful latency measurement tool"
-HOMEPAGE="http://oss.oetiker.ch/smokeping/"
-SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# dropping hppa and sparc because of way too may dependencies not having
-# keywords in those architectures.
-KEYWORDS="~amd64 ~x86"
-
-# removing fcgi useflag as the configure script can't avoid it without patching
-IUSE="apache2 curl dig echoping ipv6 radius"
-
-DEPEND="
-	>=dev-lang/perl-5.8.8-r8
-	>=dev-perl/SNMP_Session-1.13
-	>=net-analyzer/fping-2.4_beta2-r2[suid]
-	>=net-analyzer/rrdtool-1.2[graph,perl]
-	dev-perl/CGI-Session
-	dev-perl/Config-Grammar
-	dev-perl/Digest-HMAC
-	dev-perl/FCGI
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-Tty
-	dev-perl/Net-DNS
-	dev-perl/Net-OpenSSH
-	dev-perl/Net-SNMP
-	dev-perl/Net-Telnet
-	dev-perl/libwww-perl
-	dev-perl/perl-ldap
-	virtual/perl-libnet
-	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
-	!apache2? ( virtual/httpd-cgi )
-	apache2? (
-		>=www-apache/mod_perl-2.0.1
-		www-apache/mod_fcgid
-	)
-	curl? ( >=net-misc/curl-7.21.4 )
-	dig? ( net-dns/bind-tools )
-	echoping? ( >=net-analyzer/echoping-6.0.2 )
-	ipv6? ( >=dev-perl/Socket6-0.20 )
-	radius? ( dev-perl/Authen-Radius )
-"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup smokeping
-	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
-}
-
-src_prepare() {
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/smokeping \
-		--with-htdocs-dir=/var/www/localhost/smokeping
-}
-
-src_compile() {
-	LC_ALL=C emake
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.init.4 ${PN}
-	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
-	systemd_dounit "${FILESDIR}"/"${PN}".service
-
-	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
-	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
-	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
-	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
-	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
-
-	sed -i \
-		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
-		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
-		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
-		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
-		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
-		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-		"${D}/etc/${PN}/config" || die
-
-	sed -i \
-		-e '/^<script/{s:cropper/:/cropper/:}' \
-		"${D}/etc/${PN}/basepage.html" || die
-
-	sed -i \
-		-e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
-		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
-
-	sed -i \
-		-e 's:etc/config.dist:/etc/smokeping/config:' \
-		"${D}/usr/bin/tSmoke" || die
-
-	sed -i \
-		-e 's:/usr/etc/config:/etc/smokeping/config:' \
-		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
-
-	dodir /var/www/localhost/cgi-bin
-		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
-		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
-
-	fperms 700 /etc/${PN}/smokeping_secrets
-
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		doins "${FILESDIR}/79_${PN}.conf"
-	fi
-
-	# Create the files in /var for rrd file storage
-	keepdir /var/lib/${PN}/.simg
-	fowners smokeping:smokeping /var/lib/${PN}
-
-	if use apache2 ; then
-		fowners apache:apache /var/lib/${PN}/.simg
-		fowners -R apache:apache /var/www
-	else
-		fowners smokeping:smokeping /var/lib/${PN}/.simg
-	fi
-
-	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
-}
-
-pkg_postinst() {
-	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
-	chmod 755 "${ROOT}/var/lib/${PN}"
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/
@ 2018-03-27  7:27 Jeroen Roovers
  0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2018-03-27  7:27 UTC (permalink / raw
  To: gentoo-commits

commit:     d65a8ed4a0846586f0c4efb29fecd701e05c124c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 27 07:27:37 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 07:27:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d65a8ed4

net-analyzer/smokeping: Fix configuration directory by epinephrine (bug #648416).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../smokeping/{smokeping-2.7.1.ebuild => smokeping-2.7.1-r1.ebuild}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/smokeping/smokeping-2.7.1.ebuild b/net-analyzer/smokeping/smokeping-2.7.1-r1.ebuild
similarity index 98%
rename from net-analyzer/smokeping/smokeping-2.7.1.ebuild
rename to net-analyzer/smokeping/smokeping-2.7.1-r1.ebuild
index 7f9baf701fe..db22d7afdb2 100644
--- a/net-analyzer/smokeping/smokeping-2.7.1.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.1-r1.ebuild
@@ -105,7 +105,7 @@ src_install() {
 		"${D}/etc/${PN}/basepage.html" || die
 
 	sed -i \
-		-e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
+		-e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
 		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
 
 	sed -i \


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/
@ 2018-04-15  8:55 Jeroen Roovers
  0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2018-04-15  8:55 UTC (permalink / raw
  To: gentoo-commits

commit:     47028316a486409ca8b955e0805868668cb0c5a0
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 08:53:44 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 08:55:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47028316

net-analyzer/smokeping: Version 2.7.2.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 net-analyzer/smokeping/Manifest               |   1 +
 net-analyzer/smokeping/smokeping-2.7.2.ebuild | 147 ++++++++++++++++++++++++++
 2 files changed, 148 insertions(+)

diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index cb7aea8a2a7..5d47dd99cd7 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -1,3 +1,4 @@
 DIST smokeping-2.6.9.tar.gz 427185 BLAKE2B 3b626d852542f5e9e616ce88a8fd2fd773036822f10f548a1cec242f5d420ec67d940ee49c08da99f7e0815921251cb474b103c8c12c364f90651a4e74e9abf3 SHA512 ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d
 DIST smokeping-2.7.0.tar.gz 8914621 BLAKE2B a139fdcaafe37c61695ea2e31e3ddaeb4389f754f28fd41318db120f2ae5f4b5f355ebfb5e0c852b48e2e6872194952bc3733ff5f6bcd2886859a1c276835121 SHA512 17ada10e2cdc7966e81e589dec603fe77bc0a273790734b36342ff2b8ac3d5bca6797f6eb95a6e2e22a576b7bb5d2ca4232b4fb23057b360de9c156d141ed0ca
 DIST smokeping-2.7.1.tar.gz 8919251 BLAKE2B 91f348b573d5a7ce98e8b51c96d9f45bb0af21cae4b049ba113bfc97c60800d8fdea0c05eb5414ec861f07f30170abf64ee34e0e29899528c01283ddab0ecde8 SHA512 c7208a40725e5694813a0545d6f8b663bab49739fe716bed5fd85ed6258c1c0abde4a18a0678988fff067ecc7807c83313abf12c04b935377b0b7158f07d8626
+DIST smokeping-2.7.2.tar.gz 4614968 BLAKE2B 7cf9f4bd47f3a5419549b0a62fbaca664b70d73af0d57dc005d32030e1e86556f5100d00ed43743aa2a3dffa59bbe00129309b473fc261a7dcdc6225d80a8921 SHA512 e912cdf7ec9af871b9a4a90d787bae04feb21e40c1259bb835eb25b098e03023d7424e53d344ed459f8423260b0eb311f4dd12824195da9647554943685f4d07

diff --git a/net-analyzer/smokeping/smokeping-2.7.2.ebuild b/net-analyzer/smokeping/smokeping-2.7.2.ebuild
new file mode 100644
index 00000000000..db22d7afdb2
--- /dev/null
+++ b/net-analyzer/smokeping/smokeping-2.7.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils multilib user systemd
+
+DESCRIPTION="A powerful latency measurement tool"
+HOMEPAGE="http://oss.oetiker.ch/smokeping/"
+SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="apache2 curl dig echoping ipv6 radius"
+
+DEPEND="
+	>=dev-lang/perl-5.8.8-r8
+	>=dev-perl/SNMP_Session-1.13
+	>=net-analyzer/fping-2.4_beta2-r2[suid]
+	>=net-analyzer/rrdtool-1.2[graph,perl]
+	dev-perl/CGI
+	dev-perl/CGI-Session
+	dev-perl/Config-Grammar
+	dev-perl/Digest-HMAC
+	dev-perl/FCGI
+	dev-perl/IO-Socket-SSL
+	dev-perl/IO-Tty
+	dev-perl/Net-DNS
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SNMP
+	dev-perl/Net-Telnet
+	dev-perl/libwww-perl
+	dev-perl/perl-ldap
+	virtual/perl-libnet
+	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
+	!apache2? ( virtual/httpd-cgi )
+	apache2? (
+		>=www-apache/mod_perl-2.0.1
+		www-apache/mod_fcgid
+	)
+	curl? ( >=net-misc/curl-7.21.4 )
+	dig? ( net-dns/bind-tools )
+	echoping? ( >=net-analyzer/echoping-6.0.2 )
+	ipv6? ( >=dev-perl/Socket6-0.20 )
+	radius? ( dev-perl/Authen-Radius )
+"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup smokeping
+	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
+}
+
+src_prepare() {
+	default
+
+	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
+	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
+	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session
+	echo ${PV} > VERSION
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/smokeping \
+		--with-htdocs-dir=/var/www/localhost/smokeping
+}
+
+src_compile() {
+	LC_ALL=C emake
+}
+
+src_install() {
+	dodir /usr/$(get_libdir)
+	default
+
+	newinitd "${FILESDIR}"/${PN}.init.5 ${PN}
+	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
+	systemd_dounit "${FILESDIR}"/"${PN}".service
+
+	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
+	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
+	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
+	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
+	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
+
+	sed -i \
+		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
+		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
+		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
+		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
+		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
+		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
+		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
+		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
+		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
+		"${D}/etc/${PN}/config" || die
+
+	sed -i \
+		-e '/^<script/{s:cropper/:/cropper/:}' \
+		"${D}/etc/${PN}/basepage.html" || die
+
+	sed -i \
+		-e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
+		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
+
+	sed -i \
+		-e 's:etc/config.dist:/etc/smokeping/config:' \
+		"${D}/usr/bin/tSmoke" || die
+
+	sed -i \
+		-e 's:/usr/etc/config:/etc/smokeping/config:' \
+		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
+
+	dodir /var/www/localhost/cgi-bin
+		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
+		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
+
+	fperms 700 /etc/${PN}/smokeping_secrets
+
+	if use apache2 ; then
+		insinto /etc/apache2/modules.d
+		doins "${FILESDIR}/79_${PN}.conf"
+	fi
+
+	# Create the files in /var for rrd file storage
+	keepdir /var/lib/${PN}/.simg
+	fowners smokeping:smokeping /var/lib/${PN}
+
+	if use apache2 ; then
+		fowners apache:apache /var/lib/${PN}/.simg
+		fowners -R apache:apache /var/www
+	else
+		fowners smokeping:smokeping /var/lib/${PN}/.simg
+	fi
+
+	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
+}
+
+pkg_postinst() {
+	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
+	chmod 755 "${ROOT}/var/lib/${PN}"
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/
@ 2018-08-26 17:08 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2018-08-26 17:08 UTC (permalink / raw
  To: gentoo-commits

commit:     a61105cac15166057d7dfe62ae0dc0be87f63b5e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 16:58:19 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 16:58:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a61105ca

net-analyzer/smokeping: Remove support for non-existent deps

 net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild | 2 +-
 net-analyzer/smokeping/smokeping-2.7.1-r1.ebuild | 2 +-
 net-analyzer/smokeping/smokeping-2.7.2.ebuild    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild b/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild
index 8b2e3ee7c26..7a4eb1a1684 100644
--- a/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild
@@ -31,7 +31,7 @@ DEPEND="
 	radius? ( dev-perl/Authen-Radius )
 	ssh? ( dev-perl/Net-OpenSSH )
 	telnet? ( dev-perl/Net-Telnet )
-	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
+	dev-perl/CGI-Fast
 	>=dev-lang/perl-5.8.8-r8
 	>=dev-perl/SNMP_Session-1.13
 	>=net-analyzer/fping-2.4_beta2-r2[suid]

diff --git a/net-analyzer/smokeping/smokeping-2.7.1-r1.ebuild b/net-analyzer/smokeping/smokeping-2.7.1-r1.ebuild
index 2cc5dfca0ca..973327b4df8 100644
--- a/net-analyzer/smokeping/smokeping-2.7.1-r1.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.1-r1.ebuild
@@ -33,7 +33,7 @@ DEPEND="
 	dev-perl/libwww-perl
 	dev-perl/perl-ldap
 	virtual/perl-libnet
-	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
+	dev-perl/CGI-Fast
 	!apache2? ( virtual/httpd-cgi )
 	apache2? (
 		>=www-apache/mod_perl-2.0.1

diff --git a/net-analyzer/smokeping/smokeping-2.7.2.ebuild b/net-analyzer/smokeping/smokeping-2.7.2.ebuild
index 2cc5dfca0ca..973327b4df8 100644
--- a/net-analyzer/smokeping/smokeping-2.7.2.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.2.ebuild
@@ -33,7 +33,7 @@ DEPEND="
 	dev-perl/libwww-perl
 	dev-perl/perl-ldap
 	virtual/perl-libnet
-	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
+	dev-perl/CGI-Fast
 	!apache2? ( virtual/httpd-cgi )
 	apache2? (
 		>=www-apache/mod_perl-2.0.1


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/
@ 2018-12-22 10:30 Jeroen Roovers
  0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2018-12-22 10:30 UTC (permalink / raw
  To: gentoo-commits

commit:     b36af1fc3052ea74d017cb8d1e3f7804d28fc765
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 22 10:28:42 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Dec 22 10:29:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b36af1fc

net-analyzer/smokeping: Version 2.7.3

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/smokeping/Manifest               |   1 +
 net-analyzer/smokeping/smokeping-2.7.3.ebuild | 147 ++++++++++++++++++++++++++
 2 files changed, 148 insertions(+)

diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 95cb291ee80..6f0c7e2f4b8 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -1,3 +1,4 @@
 DIST smokeping-2.6.9.tar.gz 427185 BLAKE2B 3b626d852542f5e9e616ce88a8fd2fd773036822f10f548a1cec242f5d420ec67d940ee49c08da99f7e0815921251cb474b103c8c12c364f90651a4e74e9abf3 SHA512 ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d
 DIST smokeping-2.7.1.tar.gz 8919251 BLAKE2B 91f348b573d5a7ce98e8b51c96d9f45bb0af21cae4b049ba113bfc97c60800d8fdea0c05eb5414ec861f07f30170abf64ee34e0e29899528c01283ddab0ecde8 SHA512 c7208a40725e5694813a0545d6f8b663bab49739fe716bed5fd85ed6258c1c0abde4a18a0678988fff067ecc7807c83313abf12c04b935377b0b7158f07d8626
 DIST smokeping-2.7.2.tar.gz 4614968 BLAKE2B 7cf9f4bd47f3a5419549b0a62fbaca664b70d73af0d57dc005d32030e1e86556f5100d00ed43743aa2a3dffa59bbe00129309b473fc261a7dcdc6225d80a8921 SHA512 e912cdf7ec9af871b9a4a90d787bae04feb21e40c1259bb835eb25b098e03023d7424e53d344ed459f8423260b0eb311f4dd12824195da9647554943685f4d07
+DIST smokeping-2.7.3.tar.gz 6614710 BLAKE2B 7fa10c19487427a3092a1e5591422cb37f66a6eab86b8b43eebbc8af441d5426b99f3c7b54040660f6f150ade99b1ea2555b4fcd6f80d8306d6f86ac9f95974e SHA512 d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830

diff --git a/net-analyzer/smokeping/smokeping-2.7.3.ebuild b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
new file mode 100644
index 00000000000..9dd531b20e1
--- /dev/null
+++ b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils multilib user systemd
+
+DESCRIPTION="A powerful latency measurement tool"
+HOMEPAGE="https://oss.oetiker.ch/smokeping/"
+SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="apache2 curl dig echoping ipv6 radius"
+
+DEPEND="
+	>=dev-lang/perl-5.8.8-r8
+	>=dev-perl/SNMP_Session-1.13
+	>=net-analyzer/fping-2.4_beta2-r2[suid]
+	>=net-analyzer/rrdtool-1.2[graph,perl]
+	dev-perl/CGI
+	dev-perl/CGI-Session
+	dev-perl/Config-Grammar
+	dev-perl/Digest-HMAC
+	dev-perl/FCGI
+	dev-perl/IO-Socket-SSL
+	dev-perl/IO-Tty
+	dev-perl/Net-DNS
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SNMP
+	dev-perl/Net-Telnet
+	dev-perl/libwww-perl
+	dev-perl/perl-ldap
+	virtual/perl-libnet
+	dev-perl/CGI-Fast
+	!apache2? ( virtual/httpd-cgi )
+	apache2? (
+		>=www-apache/mod_perl-2.0.1
+		www-apache/mod_fcgid
+	)
+	curl? ( >=net-misc/curl-7.21.4 )
+	dig? ( net-dns/bind-tools )
+	echoping? ( >=net-analyzer/echoping-6.0.2 )
+	ipv6? ( >=dev-perl/Socket6-0.20 )
+	radius? ( dev-perl/Authen-Radius )
+"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup smokeping
+	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
+}
+
+src_prepare() {
+	default
+
+	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
+	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
+	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session
+	echo ${PV} > VERSION
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/smokeping \
+		--with-htdocs-dir=/var/www/localhost/smokeping
+}
+
+src_compile() {
+	LC_ALL=C emake
+}
+
+src_install() {
+	dodir /usr/$(get_libdir)
+	default
+
+	newinitd "${FILESDIR}"/${PN}.init.5 ${PN}
+	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
+	systemd_dounit "${FILESDIR}"/"${PN}".service
+
+	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
+	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
+	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
+	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
+	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
+
+	sed -i \
+		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
+		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
+		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
+		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
+		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
+		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
+		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
+		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
+		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
+		"${D}/etc/${PN}/config" || die
+
+	sed -i \
+		-e '/^<script/{s:cropper/:/cropper/:}' \
+		"${D}/etc/${PN}/basepage.html" || die
+
+	sed -i \
+		-e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
+		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
+
+	sed -i \
+		-e 's:etc/config.dist:/etc/smokeping/config:' \
+		"${D}/usr/bin/tSmoke" || die
+
+	sed -i \
+		-e 's:/usr/etc/config:/etc/smokeping/config:' \
+		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
+
+	dodir /var/www/localhost/cgi-bin
+		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
+		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
+
+	fperms 700 /etc/${PN}/smokeping_secrets
+
+	if use apache2 ; then
+		insinto /etc/apache2/modules.d
+		doins "${FILESDIR}/79_${PN}.conf"
+	fi
+
+	# Create the files in /var for rrd file storage
+	keepdir /var/lib/${PN}/.simg
+	fowners smokeping:smokeping /var/lib/${PN}
+
+	if use apache2 ; then
+		fowners apache:apache /var/lib/${PN}/.simg
+		fowners -R apache:apache /var/www
+	else
+		fowners smokeping:smokeping /var/lib/${PN}/.simg
+	fi
+
+	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
+}
+
+pkg_postinst() {
+	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
+	chmod 755 "${ROOT}/var/lib/${PN}"
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/
@ 2018-12-22 10:30 Jeroen Roovers
  0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2018-12-22 10:30 UTC (permalink / raw
  To: gentoo-commits

commit:     b4cad9e17691c445016ac70222ca9d75b85bb96d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 22 10:29:38 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Dec 22 10:29:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4cad9e1

net-analyzer/smokeping: Old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/smokeping/Manifest                  |   1 -
 net-analyzer/smokeping/smokeping-2.7.1-r1.ebuild | 147 -----------------------
 2 files changed, 148 deletions(-)

diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 6f0c7e2f4b8..518a916d558 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -1,4 +1,3 @@
 DIST smokeping-2.6.9.tar.gz 427185 BLAKE2B 3b626d852542f5e9e616ce88a8fd2fd773036822f10f548a1cec242f5d420ec67d940ee49c08da99f7e0815921251cb474b103c8c12c364f90651a4e74e9abf3 SHA512 ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d
-DIST smokeping-2.7.1.tar.gz 8919251 BLAKE2B 91f348b573d5a7ce98e8b51c96d9f45bb0af21cae4b049ba113bfc97c60800d8fdea0c05eb5414ec861f07f30170abf64ee34e0e29899528c01283ddab0ecde8 SHA512 c7208a40725e5694813a0545d6f8b663bab49739fe716bed5fd85ed6258c1c0abde4a18a0678988fff067ecc7807c83313abf12c04b935377b0b7158f07d8626
 DIST smokeping-2.7.2.tar.gz 4614968 BLAKE2B 7cf9f4bd47f3a5419549b0a62fbaca664b70d73af0d57dc005d32030e1e86556f5100d00ed43743aa2a3dffa59bbe00129309b473fc261a7dcdc6225d80a8921 SHA512 e912cdf7ec9af871b9a4a90d787bae04feb21e40c1259bb835eb25b098e03023d7424e53d344ed459f8423260b0eb311f4dd12824195da9647554943685f4d07
 DIST smokeping-2.7.3.tar.gz 6614710 BLAKE2B 7fa10c19487427a3092a1e5591422cb37f66a6eab86b8b43eebbc8af441d5426b99f3c7b54040660f6f150ade99b1ea2555b4fcd6f80d8306d6f86ac9f95974e SHA512 d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830

diff --git a/net-analyzer/smokeping/smokeping-2.7.1-r1.ebuild b/net-analyzer/smokeping/smokeping-2.7.1-r1.ebuild
deleted file mode 100644
index 973327b4df8..00000000000
--- a/net-analyzer/smokeping/smokeping-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils multilib user systemd
-
-DESCRIPTION="A powerful latency measurement tool"
-HOMEPAGE="https://oss.oetiker.ch/smokeping/"
-SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="apache2 curl dig echoping ipv6 radius"
-
-DEPEND="
-	>=dev-lang/perl-5.8.8-r8
-	>=dev-perl/SNMP_Session-1.13
-	>=net-analyzer/fping-2.4_beta2-r2[suid]
-	>=net-analyzer/rrdtool-1.2[graph,perl]
-	dev-perl/CGI
-	dev-perl/CGI-Session
-	dev-perl/Config-Grammar
-	dev-perl/Digest-HMAC
-	dev-perl/FCGI
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-Tty
-	dev-perl/Net-DNS
-	dev-perl/Net-OpenSSH
-	dev-perl/Net-SNMP
-	dev-perl/Net-Telnet
-	dev-perl/libwww-perl
-	dev-perl/perl-ldap
-	virtual/perl-libnet
-	dev-perl/CGI-Fast
-	!apache2? ( virtual/httpd-cgi )
-	apache2? (
-		>=www-apache/mod_perl-2.0.1
-		www-apache/mod_fcgid
-	)
-	curl? ( >=net-misc/curl-7.21.4 )
-	dig? ( net-dns/bind-tools )
-	echoping? ( >=net-analyzer/echoping-6.0.2 )
-	ipv6? ( >=dev-perl/Socket6-0.20 )
-	radius? ( dev-perl/Authen-Radius )
-"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup smokeping
-	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
-}
-
-src_prepare() {
-	default
-
-	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
-	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session
-	echo ${PV} > VERSION
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/smokeping \
-		--with-htdocs-dir=/var/www/localhost/smokeping
-}
-
-src_compile() {
-	LC_ALL=C emake
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	default
-
-	newinitd "${FILESDIR}"/${PN}.init.5 ${PN}
-	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
-	systemd_dounit "${FILESDIR}"/"${PN}".service
-
-	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
-	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
-	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
-	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
-	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
-
-	sed -i \
-		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
-		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
-		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
-		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
-		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
-		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-		"${D}/etc/${PN}/config" || die
-
-	sed -i \
-		-e '/^<script/{s:cropper/:/cropper/:}' \
-		"${D}/etc/${PN}/basepage.html" || die
-
-	sed -i \
-		-e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
-		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
-
-	sed -i \
-		-e 's:etc/config.dist:/etc/smokeping/config:' \
-		"${D}/usr/bin/tSmoke" || die
-
-	sed -i \
-		-e 's:/usr/etc/config:/etc/smokeping/config:' \
-		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
-
-	dodir /var/www/localhost/cgi-bin
-		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
-		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
-
-	fperms 700 /etc/${PN}/smokeping_secrets
-
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		doins "${FILESDIR}/79_${PN}.conf"
-	fi
-
-	# Create the files in /var for rrd file storage
-	keepdir /var/lib/${PN}/.simg
-	fowners smokeping:smokeping /var/lib/${PN}
-
-	if use apache2 ; then
-		fowners apache:apache /var/lib/${PN}/.simg
-		fowners -R apache:apache /var/www
-	else
-		fowners smokeping:smokeping /var/lib/${PN}/.simg
-	fi
-
-	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
-}
-
-pkg_postinst() {
-	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
-	chmod 755 "${ROOT}/var/lib/${PN}"
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/
@ 2020-11-26 23:57 Thomas Deutschmann
  0 siblings, 0 replies; 15+ messages in thread
From: Thomas Deutschmann @ 2020-11-26 23:57 UTC (permalink / raw
  To: gentoo-commits

commit:     fc74135087064606a1f3f64f22761c5c766a7b78
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 23:53:33 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 23:57:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc741350

net-analyzer/smokeping: x86 stable (bug #757057)

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-analyzer/smokeping/smokeping-2.7.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/smokeping/smokeping-2.7.3.ebuild b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
index 9dd531b20e1..d28ba3dbe29 100644
--- a/net-analyzer/smokeping/smokeping-2.7.3.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 IUSE="apache2 curl dig echoping ipv6 radius"
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/
@ 2020-11-29 17:40 Aaron Bauman
  0 siblings, 0 replies; 15+ messages in thread
From: Aaron Bauman @ 2020-11-29 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     ce54bd13f96d73bfedbdc9679008c228b6a54753
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 17:38:00 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Nov 29 17:38:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce54bd13

net-analyzer/smokeping: drop old

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 net-analyzer/smokeping/Manifest                  |   2 -
 net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild | 144 ----------------------
 net-analyzer/smokeping/smokeping-2.7.2.ebuild    | 147 -----------------------
 3 files changed, 293 deletions(-)

diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 518a916d558..e02fdf06e63 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -1,3 +1 @@
-DIST smokeping-2.6.9.tar.gz 427185 BLAKE2B 3b626d852542f5e9e616ce88a8fd2fd773036822f10f548a1cec242f5d420ec67d940ee49c08da99f7e0815921251cb474b103c8c12c364f90651a4e74e9abf3 SHA512 ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d
-DIST smokeping-2.7.2.tar.gz 4614968 BLAKE2B 7cf9f4bd47f3a5419549b0a62fbaca664b70d73af0d57dc005d32030e1e86556f5100d00ed43743aa2a3dffa59bbe00129309b473fc261a7dcdc6225d80a8921 SHA512 e912cdf7ec9af871b9a4a90d787bae04feb21e40c1259bb835eb25b098e03023d7424e53d344ed459f8423260b0eb311f4dd12824195da9647554943685f4d07
 DIST smokeping-2.7.3.tar.gz 6614710 BLAKE2B 7fa10c19487427a3092a1e5591422cb37f66a6eab86b8b43eebbc8af441d5426b99f3c7b54040660f6f150ade99b1ea2555b4fcd6f80d8306d6f86ac9f95974e SHA512 d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830

diff --git a/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild b/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild
deleted file mode 100644
index 7a4eb1a1684..00000000000
--- a/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user systemd
-
-DESCRIPTION="A powerful latency measurement tool"
-HOMEPAGE="https://oss.oetiker.ch/smokeping/"
-SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# dropping hppa and sparc because of way too may dependencies not having
-# keywords in those architectures.
-KEYWORDS="amd64 x86"
-
-# removing fcgi useflag as the configure script can't avoid it without patching
-IUSE="apache2 curl dig echoping ipv6 ldap radius ssh telnet"
-
-DEPEND="
-	!apache2? ( virtual/httpd-cgi )
-	apache2? (
-		>=www-apache/mod_perl-2.0.1
-		www-apache/mod_fcgid
-	)
-	curl? ( >=net-misc/curl-7.21.4 )
-	dig? ( net-dns/bind-tools )
-	echoping? ( >=net-analyzer/echoping-6.0.2 )
-	ipv6? ( >=dev-perl/Socket6-0.20 )
-	ldap? ( dev-perl/perl-ldap )
-	radius? ( dev-perl/Authen-Radius )
-	ssh? ( dev-perl/Net-OpenSSH )
-	telnet? ( dev-perl/Net-Telnet )
-	dev-perl/CGI-Fast
-	>=dev-lang/perl-5.8.8-r8
-	>=dev-perl/SNMP_Session-1.13
-	>=net-analyzer/fping-2.4_beta2-r2[suid]
-	>=net-analyzer/rrdtool-1.2[graph,perl]
-	dev-perl/CGI-Session
-	dev-perl/Config-Grammar
-	dev-perl/Digest-HMAC
-	dev-perl/FCGI
-	dev-perl/IO-Socket-SSL
-	dev-perl/Net-DNS
-	dev-perl/libwww-perl
-	virtual/perl-libnet
-"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup smokeping
-	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
-}
-
-src_prepare() {
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session
-
-	epatch "${FILESDIR}"/${P}-pod.patch
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/smokeping \
-		--with-htdocs-dir=/var/www/localhost/smokeping
-}
-
-src_compile() {
-	LC_ALL=C emake
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.init.3" ${PN}
-	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
-	systemd_dounit "${FILESDIR}"/"${PN}".service
-
-	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
-	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
-	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
-	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
-	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
-
-	sed -i \
-		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
-		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
-		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
-	    -e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
-		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
-		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-		"${D}/etc/${PN}/config" || die
-
-	sed -i \
-		-e '/^<script/{s:cropper/:/cropper/:}' \
-		"${D}/etc/${PN}/basepage.html" || die
-
-	sed -i \
-		-e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
-		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
-
-	sed -i \
-		-e 's:etc/config.dist:/etc/smokeping/config:' \
-		"${D}/usr/bin/tSmoke" || die
-
-	sed -i \
-		-e 's:/usr/etc/config:/etc/smokeping/config:' \
-		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
-
-	dodir /var/www/localhost/cgi-bin
-		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
-		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
-
-	fperms 700 /etc/${PN}/smokeping_secrets
-
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		doins "${FILESDIR}/79_${PN}.conf"
-	fi
-
-	dodir /var/cache/smokeping
-	keepdir /var/cache/smokeping
-
-	# Create the files in /var for rrd file storage
-	keepdir /var/lib/${PN}/.simg
-	fowners smokeping:smokeping /var/lib/${PN}
-
-	if use apache2 ; then
-		fowners apache:apache /var/lib/${PN}/.simg
-		fowners -R apache:apache /var/www
-	else
-		fowners smokeping:smokeping /var/lib/${PN}/.simg
-	fi
-
-	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
-}
-
-pkg_postinst() {
-	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
-	chmod 755 "${ROOT}/var/lib/${PN}"
-}

diff --git a/net-analyzer/smokeping/smokeping-2.7.2.ebuild b/net-analyzer/smokeping/smokeping-2.7.2.ebuild
deleted file mode 100644
index 973327b4df8..00000000000
--- a/net-analyzer/smokeping/smokeping-2.7.2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils multilib user systemd
-
-DESCRIPTION="A powerful latency measurement tool"
-HOMEPAGE="https://oss.oetiker.ch/smokeping/"
-SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="apache2 curl dig echoping ipv6 radius"
-
-DEPEND="
-	>=dev-lang/perl-5.8.8-r8
-	>=dev-perl/SNMP_Session-1.13
-	>=net-analyzer/fping-2.4_beta2-r2[suid]
-	>=net-analyzer/rrdtool-1.2[graph,perl]
-	dev-perl/CGI
-	dev-perl/CGI-Session
-	dev-perl/Config-Grammar
-	dev-perl/Digest-HMAC
-	dev-perl/FCGI
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-Tty
-	dev-perl/Net-DNS
-	dev-perl/Net-OpenSSH
-	dev-perl/Net-SNMP
-	dev-perl/Net-Telnet
-	dev-perl/libwww-perl
-	dev-perl/perl-ldap
-	virtual/perl-libnet
-	dev-perl/CGI-Fast
-	!apache2? ( virtual/httpd-cgi )
-	apache2? (
-		>=www-apache/mod_perl-2.0.1
-		www-apache/mod_fcgid
-	)
-	curl? ( >=net-misc/curl-7.21.4 )
-	dig? ( net-dns/bind-tools )
-	echoping? ( >=net-analyzer/echoping-6.0.2 )
-	ipv6? ( >=dev-perl/Socket6-0.20 )
-	radius? ( dev-perl/Authen-Radius )
-"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup smokeping
-	enewuser smokeping -1 -1 /var/lib/smokeping smokeping
-}
-
-src_prepare() {
-	default
-
-	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
-	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session
-	echo ${PV} > VERSION
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/smokeping \
-		--with-htdocs-dir=/var/www/localhost/smokeping
-}
-
-src_compile() {
-	LC_ALL=C emake
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	default
-
-	newinitd "${FILESDIR}"/${PN}.init.5 ${PN}
-	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
-	systemd_dounit "${FILESDIR}"/"${PN}".service
-
-	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
-	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
-	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
-	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
-	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
-
-	sed -i \
-		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
-		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
-		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
-		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
-		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
-		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-		"${D}/etc/${PN}/config" || die
-
-	sed -i \
-		-e '/^<script/{s:cropper/:/cropper/:}' \
-		"${D}/etc/${PN}/basepage.html" || die
-
-	sed -i \
-		-e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
-		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
-
-	sed -i \
-		-e 's:etc/config.dist:/etc/smokeping/config:' \
-		"${D}/usr/bin/tSmoke" || die
-
-	sed -i \
-		-e 's:/usr/etc/config:/etc/smokeping/config:' \
-		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
-
-	dodir /var/www/localhost/cgi-bin
-		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
-		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
-
-	fperms 700 /etc/${PN}/smokeping_secrets
-
-	if use apache2 ; then
-		insinto /etc/apache2/modules.d
-		doins "${FILESDIR}/79_${PN}.conf"
-	fi
-
-	# Create the files in /var for rrd file storage
-	keepdir /var/lib/${PN}/.simg
-	fowners smokeping:smokeping /var/lib/${PN}
-
-	if use apache2 ; then
-		fowners apache:apache /var/lib/${PN}/.simg
-		fowners -R apache:apache /var/www
-	else
-		fowners smokeping:smokeping /var/lib/${PN}/.simg
-	fi
-
-	fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg
-}
-
-pkg_postinst() {
-	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
-	chmod 755 "${ROOT}/var/lib/${PN}"
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/
@ 2020-11-29 17:40 Aaron Bauman
  0 siblings, 0 replies; 15+ messages in thread
From: Aaron Bauman @ 2020-11-29 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     44772bc4ebbabda5adcf67a882e6043a61a75288
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 17:37:27 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Nov 29 17:37:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44772bc4

net-analyzer/smokeping: amd64 stable

Closes: https://bugs.gentoo.org/757057
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 net-analyzer/smokeping/smokeping-2.7.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/smokeping/smokeping-2.7.3.ebuild b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
index d28ba3dbe29..57f3773d61b 100644
--- a/net-analyzer/smokeping/smokeping-2.7.3.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 IUSE="apache2 curl dig echoping ipv6 radius"
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/
@ 2020-11-29 17:40 Aaron Bauman
  0 siblings, 0 replies; 15+ messages in thread
From: Aaron Bauman @ 2020-11-29 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     ad1f4303f395934a9303568f804308cbe6e52f51
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 17:40:08 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Nov 29 17:40:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad1f4303

net-analyzer/smokeping: drop unusedlocal

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 net-analyzer/smokeping/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net-analyzer/smokeping/metadata.xml b/net-analyzer/smokeping/metadata.xml
index e445720edf9..7b436470d4c 100644
--- a/net-analyzer/smokeping/metadata.xml
+++ b/net-analyzer/smokeping/metadata.xml
@@ -8,7 +8,5 @@
 <use>
 <flag name="dig">Install <pkg>net-dns/bind-tools</pkg> for dig functionality</flag>
 <flag name="echoping">Install <pkg>net-analyzer/echoping</pkg> for echoping functionality</flag>
-<flag name="telnet">Install <pkg>dev-perl/Net-Telnet</pkg> for telnet functionality</flag>
-<flag name="ssh">Install ssh functionality</flag>
 </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/
@ 2021-04-03 16:10 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2021-04-03 16:10 UTC (permalink / raw
  To: gentoo-commits

commit:     d99341d0768d900e70b496fd1d6cdae92e5259b2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  2 01:14:19 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  3 16:10:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d99341d0

net-analyzer/smokeping: eutils--, multilib--, QA fixes

* Drop eutils, multilib (unused)
* ${D} -> ${ED}
* Sort inherits
* Fix overquoting
* Missing || dies

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/smokeping/smokeping-2.7.3.ebuild | 42 +++++++++++++--------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/net-analyzer/smokeping/smokeping-2.7.3.ebuild b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
index 1e78c595820..ec397188874 100644
--- a/net-analyzer/smokeping/smokeping-2.7.3.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.3.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils multilib user systemd tmpfiles
+
+inherit autotools systemd tmpfiles user
 
 DESCRIPTION="A powerful latency measurement tool"
 HOMEPAGE="https://oss.oetiker.ch/smokeping/"
@@ -11,7 +12,6 @@ SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-
 IUSE="apache2 curl dig echoping ipv6 radius"
 
 DEPEND="
@@ -45,7 +45,6 @@ DEPEND="
 	ipv6? ( >=dev-perl/Socket6-0.20 )
 	radius? ( dev-perl/Authen-Radius )
 "
-
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -58,8 +57,9 @@ src_prepare() {
 
 	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
 	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session
-	echo ${PV} > VERSION
+	# bundled(?) dev-perl/SNMP_Session
+	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die
+	echo ${PV} > VERSION || die
 
 	eautoreconf
 }
@@ -79,14 +79,14 @@ src_install() {
 	default
 
 	newinitd "${FILESDIR}"/${PN}.init.5 ${PN}
-	dotmpfiles "${FILESDIR}"/"${PN}".conf
-	systemd_dounit "${FILESDIR}"/"${PN}".service
+	dotmpfiles "${FILESDIR}"/${PN}.conf
+	systemd_dounit "${FILESDIR}"/${PN}.service
 
-	mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html"
-	mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config"
-	mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail"
-	mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets"
-	mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail"
+	mv "${ED}/etc/smokeping/basepage.html.dist" "${ED}/etc/smokeping/basepage.html" || die
+	mv "${ED}/etc/smokeping/config.dist" "${ED}/etc/smokeping/config" || die
+	mv "${ED}/etc/smokeping/smokemail.dist" "${ED}/etc/smokeping/smokemail" || die
+	mv "${ED}/etc/smokeping/smokeping_secrets.dist" "${ED}/etc/smokeping/smokeping_secrets" || die
+	mv "${ED}/etc/smokeping/tmail.dist" "${ED}/etc/smokeping/tmail" || die
 
 	sed -i \
 		-e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
@@ -98,27 +98,27 @@ src_install() {
 		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
 		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
 		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-		"${D}/etc/${PN}/config" || die
+		"${ED}/etc/${PN}/config" || die
 
 	sed -i \
 		-e '/^<script/{s:cropper/:/cropper/:}' \
-		"${D}/etc/${PN}/basepage.html" || die
+		"${ED}/etc/${PN}/basepage.html" || die
 
 	sed -i \
 		-e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \
-		"${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die
+		"${ED}/usr/bin/smokeping" "${ED}/usr/bin/smokeping_cgi" || die
 
 	sed -i \
 		-e 's:etc/config.dist:/etc/smokeping/config:' \
-		"${D}/usr/bin/tSmoke" || die
+		"${ED}/usr/bin/tSmoke" || die
 
 	sed -i \
 		-e 's:/usr/etc/config:/etc/smokeping/config:' \
-		"${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
+		"${ED}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die
 
 	dodir /var/www/localhost/cgi-bin
-		mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
-		"${D}/var/www/localhost/cgi-bin/smokeping.fcgi"
+	mv "${ED}/var/www/localhost/smokeping/smokeping.fcgi.dist" \
+		"${ED}/var/www/localhost/cgi-bin/smokeping.fcgi" || die
 
 	fperms 700 /etc/${PN}/smokeping_secrets
 
@@ -142,6 +142,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	chown smokeping:smokeping "${ROOT}/var/lib/${PN}"
-	chmod 755 "${ROOT}/var/lib/${PN}"
+	chown smokeping:smokeping "${EROOT}"/var/lib/${PN} || die
+	chmod 755 "${EROOT}"/var/lib/${PN} || die
 }


^ permalink raw reply related	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2021-04-03 16:10 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-29 17:40 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/smokeping/ Aaron Bauman
  -- strict thread matches above, loose matches on Subject: below --
2021-04-03 16:10 Sam James
2020-11-29 17:40 Aaron Bauman
2020-11-29 17:40 Aaron Bauman
2020-11-26 23:57 Thomas Deutschmann
2018-12-22 10:30 Jeroen Roovers
2018-12-22 10:30 Jeroen Roovers
2018-08-26 17:08 Michał Górny
2018-04-15  8:55 Jeroen Roovers
2018-03-27  7:27 Jeroen Roovers
2018-02-08 19:45 Jeroen Roovers
2018-02-04 22:31 Jeroen Roovers
2018-02-04 22:31 Jeroen Roovers
2017-12-30  2:40 Kent Fredric
2017-04-19 21:32 Andreas Hüttel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox