Date: Saturday, August 2, 2014 @ 20:26:02 Author: bluewind Revision: 116756
archrelease: copy trunk to community-any Added: smokeping/repos/community-any/PKGBUILD (from rev 116755, smokeping/trunk/PKGBUILD) smokeping/repos/community-any/htdocs-makefile.patch (from rev 116755, smokeping/trunk/htdocs-makefile.patch) smokeping/repos/community-any/install (from rev 116755, smokeping/trunk/install) smokeping/repos/community-any/service (from rev 116755, smokeping/trunk/service) Deleted: smokeping/repos/community-any/PKGBUILD smokeping/repos/community-any/htdocs-makefile.patch smokeping/repos/community-any/install smokeping/repos/community-any/service -----------------------+ PKGBUILD | 82 ++++++++++++++++++++++++------------------------ htdocs-makefile.patch | 22 ++++++------ install | 30 ++++++++--------- service | 13 ++++--- 4 files changed, 74 insertions(+), 73 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2014-08-02 18:25:59 UTC (rev 116755) +++ PKGBUILD 2014-08-02 18:26:02 UTC (rev 116756) @@ -1,41 +0,0 @@ -# Maintainer: Florian Pritz <bluew...@xinu.at> -# Contributor: Christos Nouskas nous <nous at archlinux.us> - -pkgname=smokeping -pkgver=2.6.9 -pkgrel=2 -pkgdesc="A tool to keep track of your network latency" -arch=('any') -url="http://oss.oetiker.ch/smokeping/" -license=('GPL2') -depends=('perl-config-grammar' 'perl-digest-hmac' 'perl-libwww' 'rrdtool' 'perl-fcgi') -source=(http://oss.oetiker.ch/smokeping/pub/smokeping-${pkgver}.tar.gz - service - htdocs-makefile.patch) -sha256sums=('cd551d4384d8b19879d128ea0566bd680c19bb4ad8664a3c5a304604746f8863' - '312e9c7a9d4a2e56da823bcbfa39c4e38a66bbe1da365dae8d11774d9eb2ee28' - 'd044f421ea9b7fac147b9da69dd16c0e45bb534c500ebac6e011f1cfecc9bb8f') -install=install - -prepare() { - cd "$srcdir"/${pkgname}-${pkgver} - sed -i 's#the master/slave mode|smokeping_master_slave#the masterE<sol>slave mode|smokeping_master_slave#' \ - lib/Smokeping.pm - patch -p1 -i "$srcdir/htdocs-makefile.patch" -} - -build() { - cd "$srcdir"/${pkgname}-${pkgver} - - ./configure --prefix=/usr --sysconfdir=/etc/smokeping --with-htdocs-dir=/srv/http/smokeping - make -} - -package() { - cd "$srcdir"/${pkgname}-${pkgver} - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/smokeping.service" - chmod 700 "$pkgdir/etc/smokeping" -} - Copied: smokeping/repos/community-any/PKGBUILD (from rev 116755, smokeping/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-08-02 18:26:02 UTC (rev 116756) @@ -0,0 +1,41 @@ +# Maintainer: Florian Pritz <bluew...@xinu.at> +# Contributor: Christos Nouskas nous <nous at archlinux.us> + +pkgname=smokeping +pkgver=2.6.9 +pkgrel=4 +pkgdesc="A tool to keep track of your network latency" +arch=('any') +url="http://oss.oetiker.ch/smokeping/" +license=('GPL2') +depends=('perl-config-grammar' 'perl-digest-hmac' 'perl-libwww' 'rrdtool' 'perl-fcgi' 'perl-cgi-fast') +source=(http://oss.oetiker.ch/smokeping/pub/smokeping-${pkgver}.tar.gz + service + htdocs-makefile.patch) +sha256sums=('cd551d4384d8b19879d128ea0566bd680c19bb4ad8664a3c5a304604746f8863' + 'd8269fb14221d679bd4eb7e7028eda47ac5bb24490ecff4ec7e949c6209688be' + 'd044f421ea9b7fac147b9da69dd16c0e45bb534c500ebac6e011f1cfecc9bb8f') +install=install + +prepare() { + cd "$srcdir"/${pkgname}-${pkgver} + sed -i 's#the master/slave mode|smokeping_master_slave#the masterE<sol>slave mode|smokeping_master_slave#' \ + lib/Smokeping.pm + patch -p1 -i "$srcdir/htdocs-makefile.patch" +} + +build() { + cd "$srcdir"/${pkgname}-${pkgver} + + ./configure --prefix=/usr --sysconfdir=/etc/smokeping --with-htdocs-dir=/srv/http/smokeping + make +} + +package() { + cd "$srcdir"/${pkgname}-${pkgver} + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/smokeping.service" + chmod 700 "$pkgdir/etc/smokeping" +} + Deleted: htdocs-makefile.patch =================================================================== --- htdocs-makefile.patch 2014-08-02 18:25:59 UTC (rev 116755) +++ htdocs-makefile.patch 2014-08-02 18:26:02 UTC (rev 116756) @@ -1,11 +0,0 @@ ---- a/htdocs/Makefile.in 2013-03-04 14:07:55.000000000 +0100 -+++ b/htdocs/Makefile.in 2013-09-04 19:00:19.802492714 +0200 -@@ -433,7 +433,7 @@ - install-data-local: - $(MKDIR) -p $(DESTDIR)$(HTDOCSDIR) - $(ECHO) "#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist -- $(ECHO) "exec $(prefix)/bin/smokeping_cgi $(prefix)/etc/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist -+ $(ECHO) "exec $(prefix)/bin/smokeping_cgi $(sysconfdir)/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist - chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist - - # Tell versions [3.59,3.63) of GNU make to not export all variables. Copied: smokeping/repos/community-any/htdocs-makefile.patch (from rev 116755, smokeping/trunk/htdocs-makefile.patch) =================================================================== --- htdocs-makefile.patch (rev 0) +++ htdocs-makefile.patch 2014-08-02 18:26:02 UTC (rev 116756) @@ -0,0 +1,11 @@ +--- a/htdocs/Makefile.in 2013-03-04 14:07:55.000000000 +0100 ++++ b/htdocs/Makefile.in 2013-09-04 19:00:19.802492714 +0200 +@@ -433,7 +433,7 @@ + install-data-local: + $(MKDIR) -p $(DESTDIR)$(HTDOCSDIR) + $(ECHO) "#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist +- $(ECHO) "exec $(prefix)/bin/smokeping_cgi $(prefix)/etc/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist ++ $(ECHO) "exec $(prefix)/bin/smokeping_cgi $(sysconfdir)/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist + chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist + + # Tell versions [3.59,3.63) of GNU make to not export all variables. Deleted: install =================================================================== --- install 2014-08-02 18:25:59 UTC (rev 116755) +++ install 2014-08-02 18:26:02 UTC (rev 116756) @@ -1,15 +0,0 @@ -post_install() { - getent group smokeping &>/dev/null || groupadd -g 181 smokeping >/dev/null - getent passwd smokeping &>/dev/null || useradd -u 181 -d /var/lib/smokeping -g smokeping -s /bin/false smokeping >/dev/null - chown -R smokeping:smokeping /srv/http/smokeping /etc/smokeping -} - -post_upgrade() { - post_install -} - -pre_remove() { - getent passwd smokeping &>/dev/null && userdel smokeping >/dev/null - getent group smokeping &>/dev/null && groupdel smokeping >/dev/null - true -} Copied: smokeping/repos/community-any/install (from rev 116755, smokeping/trunk/install) =================================================================== --- install (rev 0) +++ install 2014-08-02 18:26:02 UTC (rev 116756) @@ -0,0 +1,15 @@ +post_install() { + getent group smokeping &>/dev/null || groupadd -g 181 smokeping >/dev/null + getent passwd smokeping &>/dev/null || useradd -u 181 -d /var/lib/smokeping -g smokeping -s /bin/false smokeping >/dev/null + chown -R smokeping:smokeping /srv/http/smokeping /etc/smokeping +} + +post_upgrade() { + post_install +} + +pre_remove() { + getent passwd smokeping &>/dev/null && userdel smokeping >/dev/null + getent group smokeping &>/dev/null && groupdel smokeping >/dev/null + true +} Deleted: service =================================================================== --- service 2014-08-02 18:25:59 UTC (rev 116755) +++ service 2014-08-02 18:26:02 UTC (rev 116756) @@ -1,6 +0,0 @@ -[Service] -User=smokeping -ExecStart=/usr/bin/smokeping --nodaemon --config=/etc/smokeping/config - -[Install] -WantedBy=multi-user.target Copied: smokeping/repos/community-any/service (from rev 116755, smokeping/trunk/service) =================================================================== --- service (rev 0) +++ service 2014-08-02 18:26:02 UTC (rev 116756) @@ -0,0 +1,7 @@ +[Service] +User=smokeping +ExecStart=/usr/bin/smokeping --nodaemon --config=/etc/smokeping/config +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target