mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-07 06:17:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/smokeping: use /etc/smokeping sysconfdir again

Browse Source 
it's configurable- there is no benefit to patch $(sysconfdir)/file to
$(sysconfdir)/dir/file when you can just set it via --sysconfdir .
This commit is contained in:
psykose 2023-02-15 06:07:03 +00:00
parent 2e98c7a369
commit 2c7f47df84
2 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/smokeping/APKBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=smokeping pkgname=smokeping
pkgver=2.8.2 pkgver=2.8.2
pkgrel=1 pkgrel=2
pkgdesc="Smokeping network latency monitoring" pkgdesc="Smokeping network latency monitoring"
pkgusers="smokeping" pkgusers="smokeping"
pkggroups="smokeping" pkggroups="smokeping"
@ -72,7 +72,7 @@ build() {
--prefix=/usr \ --prefix=/usr \
--bindir=/usr/bin \ --bindir=/usr/bin \
--libdir=/usr/lib \ --libdir=/usr/lib \
--sysconfdir=/etc \ --sysconfdir=/etc/smokeping \
--libexecdir=/usr/libexec \ --libexecdir=/usr/libexec \
--datarootdir=/usr/share \ --datarootdir=/usr/share \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
@ -126,5 +126,5 @@ e6bc389d8edbc000f5ad65848308197b3eb1ddb24bfa9df9c05fa027103952484383b7e021bea867
fc54c97977b043174ca26a475154c9f819a2d4b257d02c92a8850651c943da041c2e10d337d96e154f3c320102671b688ab2d9cac11393e0510d3c2b1a48c401 smokeping-config.patch fc54c97977b043174ca26a475154c9f819a2d4b257d02c92a8850651c943da041c2e10d337d96e154f3c320102671b688ab2d9cac11393e0510d3c2b1a48c401 smokeping-config.patch
e8dcb91da86b8ff02a264ec3ef564a15492f6d96c2ca9d15fe15dd913c259801c88bdfb03151a557abeea2b775425da9ee23c3e20e478c426c086637ae706763 smokeping-silence.patch e8dcb91da86b8ff02a264ec3ef564a15492f6d96c2ca9d15fe15dd913c259801c88bdfb03151a557abeea2b775425da9ee23c3e20e478c426c086637ae706763 smokeping-silence.patch
f35c1f793d5765c7060fffd069fb691213f26048308af9bbb908cd6328080f6b1d155bffe60ff0281eb094dbfc28534b37d2ed955f103c9bac91915207c14c58 smokeping-2.8.2-no-3rd-party.patch f35c1f793d5765c7060fffd069fb691213f26048308af9bbb908cd6328080f6b1d155bffe60ff0281eb094dbfc28534b37d2ed955f103c9bac91915207c14c58 smokeping-2.8.2-no-3rd-party.patch
28dab878de4785c3dcc362c0dd7dc9ad7f38d41e8da258e4eaf55c5798d2661c2bc1ae74f22486f6d10d938e2d43d8ab3362e6642d5a078c91e6076033ee0def smokeping-2.8.2-paths.patch acfee65f8b0f66521089ffbd000bf34d7e2c8bf0a23d77b1167288f390e651602621179121573bd0a3dc1129fc9a4dd3aa7c1206500ed92c7825f6625960d60a smokeping-2.8.2-paths.patch
" "

34
main/smokeping/smokeping-2.8.2-paths.patch
View File

@ -94,40 +94,6 @@ index 6b56479..db9ef92 100755
# global variables # global variables
my $cfg; my $cfg;
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f9ad622..8c4c2e7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -119,6 +119,6 @@ iman7_DATA = $(MAN7)
EXAMPLES := $(wildcard examples/config.*)
-etcdir = $(sysconfdir)/examples
+etcdir = $(sysconfdir)/smokeping/examples
etc_DATA = $(EXAMPLES)
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 70f7edd..d7bdb4d 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -17,5 +17,5 @@
EXTRA_DIST = basepage.html.dist config.dist smokemail.dist smokeping_secrets.dist tmail.dist
-etcdir = $(sysconfdir)
+etcdir = $(sysconfdir)/smokeping
etc_DATA = $(EXTRA_DIST)
diff --git a/htdocs/Makefile.am b/htdocs/Makefile.am
index 27b9210..1226aaf 100644
--- a/htdocs/Makefile.am
+++ b/htdocs/Makefile.am
@@ -42,5 +42,5 @@ nobase_js_DATA = $(JS)
install-data-local:
$(MKDIR) -p $(DESTDIR)$(HTDOCSDIR)
$(ECHO) "#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
- $(ECHO) "exec $(bindir)/smokeping_cgi $(sysconfdir)/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
+ $(ECHO) "exec $(bindir)/smokeping_cgi $(sysconfdir)/smokeping/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
diff --git a/lib/Makefile.am b/lib/Makefile.am diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2209134..ab09330 100644 index 2209134..ab09330 100644
--- a/lib/Makefile.am --- a/lib/Makefile.am