aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-07-03 19:11:55 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-07-03 19:11:55 +0200
commit781ef771f046a43335ee054e32645643a5ac39f8 (patch)
treebba048bd1e97154e3cd98c3400111d670598b03d
parente37588e17ef5a23ecae6417767988c2884dd1afe (diff)
downloadAUR-781ef771f046a43335ee054e32645643a5ac39f8.tar.gz
AUR-781ef771f046a43335ee054e32645643a5ac39f8.tar.zst
AUR-781ef771f046a43335ee054e32645643a5ac39f8.zip
Upgrade naemon and naemon-livestatus
upgpkg: naemon-livestatus 1.0.10-1 upstream release upgpkg: naemon 1.0.10-1 upstream release
Diffstat
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD22
-rw-r--r--overflow.patch137
3 files changed, 156 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4611350..cb32b77 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
1pkgbase = naemon 1pkgbase = naemon
2 pkgdesc = System and network monitoring application 2 pkgdesc = System and network monitoring application
3 pkgver = 1.0.9 3 pkgver = 1.0.10
4 pkgrel = 2 4 pkgrel = 1
5 url = http://naemon.org 5 url = http://naemon.org
6 install = naemon.install 6 install = naemon.install
7 arch = i686 7 arch = i686
@@ -18,12 +18,14 @@ pkgbase = naemon
18 backup = etc/logrotate.d/naemon 18 backup = etc/logrotate.d/naemon
19 backup = etc/naemon/naemon.cfg 19 backup = etc/naemon/naemon.cfg
20 backup = etc/naemon/resource.cfg 20 backup = etc/naemon/resource.cfg
21 source = http://labs.consol.de/naemon/release/v1.0.9/src/naemon-1.0.9.tar.gz 21 source = naemon-git::git+https://github.com/naemon/naemon-core.git#commit=c2a8730538846f342911764cd7731015f1a6f284
22 source = naemon-tmpfiles.conf 22 source = naemon-tmpfiles.conf
23 source = naemon.service 23 source = naemon.service
24 sha512sums = cf2a359a7fcf95a7668f8db35ccd23ad607c05cd85f51a9488cc183a2683da1ba9c7b0a7303d9f03825fbd13103372944267f2a99c10280004c51669e6343793 24 source = overflow.patch
25 sha512sums = SKIP
25 sha512sums = 756e61e4da56ce614824c3b289d2ee0f4464bf5bcd868dcadbf31c3320967e0179aa6c5aedc16e4bb40c480ab2da8ab08c43e750168e86963a9cd552db01ea1d 26 sha512sums = 756e61e4da56ce614824c3b289d2ee0f4464bf5bcd868dcadbf31c3320967e0179aa6c5aedc16e4bb40c480ab2da8ab08c43e750168e86963a9cd552db01ea1d
26 sha512sums = 28944f2bd918c0718496ce490d0c2da97a127f71cfb23348620cb6c86fc88e206a07409d32dc8c9a9b5b2d1a8106b400c3e1edf3a6b7aca30ac125a38ebed3b2 27 sha512sums = 28944f2bd918c0718496ce490d0c2da97a127f71cfb23348620cb6c86fc88e206a07409d32dc8c9a9b5b2d1a8106b400c3e1edf3a6b7aca30ac125a38ebed3b2
28 sha512sums = ec1ccf09f8c02e8f6dfdf2f6b80eed4b3e07df85703d89bdfdefe0bd9380b832a7f9a1c2976f17f55d74dbb3b1888ae28bf0551c78cb8bbc3acb08cd1e4a85da
27 29
28pkgname = naemon 30pkgname = naemon
29 31
diff --git a/PKGBUILD b/PKGBUILD
index 8bdb6bf..63aa98c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
2# Contributor: Jonathan Steel <jsteel at archlinux.org> 2# Contributor: Jonathan Steel <jsteel at archlinux.org>
3 3
4pkgname=naemon 4pkgname=naemon
5pkgver=1.0.9 5pkgver=1.0.10
6pkgrel=2 6pkgrel=1
7pkgdesc="System and network monitoring application" 7pkgdesc="System and network monitoring application"
8arch=('i686' 'x86_64') 8arch=('i686' 'x86_64')
9url="http://naemon.org" 9url="http://naemon.org"
@@ -14,20 +14,24 @@ optdepends=('logrotate'
14 'naemon-livestatus: Event broker' 14 'naemon-livestatus: Event broker'
15 'monitoring-plugins') 15 'monitoring-plugins')
16makedepends=('gperf' 'help2man') 16makedepends=('gperf' 'help2man')
17source=(http://labs.consol.de/naemon/release/v$pkgver/src/$pkgname-$pkgver.tar.gz 17source=("naemon-git::git+https://github.com/naemon/naemon-core.git#commit=c2a8730538846f342911764cd7731015f1a6f284"
18 $pkgname-tmpfiles.conf 18 $pkgname-tmpfiles.conf
19 $pkgname.service) 19 $pkgname.service
20sha512sums=('cf2a359a7fcf95a7668f8db35ccd23ad607c05cd85f51a9488cc183a2683da1ba9c7b0a7303d9f03825fbd13103372944267f2a99c10280004c51669e6343793' 20 overflow.patch)
21sha512sums=('SKIP'
21 '756e61e4da56ce614824c3b289d2ee0f4464bf5bcd868dcadbf31c3320967e0179aa6c5aedc16e4bb40c480ab2da8ab08c43e750168e86963a9cd552db01ea1d' 22 '756e61e4da56ce614824c3b289d2ee0f4464bf5bcd868dcadbf31c3320967e0179aa6c5aedc16e4bb40c480ab2da8ab08c43e750168e86963a9cd552db01ea1d'
22 '28944f2bd918c0718496ce490d0c2da97a127f71cfb23348620cb6c86fc88e206a07409d32dc8c9a9b5b2d1a8106b400c3e1edf3a6b7aca30ac125a38ebed3b2') 23 '28944f2bd918c0718496ce490d0c2da97a127f71cfb23348620cb6c86fc88e206a07409d32dc8c9a9b5b2d1a8106b400c3e1edf3a6b7aca30ac125a38ebed3b2'
24 'ec1ccf09f8c02e8f6dfdf2f6b80eed4b3e07df85703d89bdfdefe0bd9380b832a7f9a1c2976f17f55d74dbb3b1888ae28bf0551c78cb8bbc3acb08cd1e4a85da')
23backup=('etc/logrotate.d/naemon' 25backup=('etc/logrotate.d/naemon'
24 'etc/naemon/naemon.cfg' 26 'etc/naemon/naemon.cfg'
25 'etc/naemon/resource.cfg') 27 'etc/naemon/resource.cfg')
26install=$pkgname.install 28install=$pkgname.install
27 29
28build() { 30build() {
29 cd "$srcdir/$pkgname-$pkgver" 31 cd "$srcdir/$pkgname-git"
30 32
33 patch -p1 < $srcdir/overflow.patch
34 ./autogen.sh
31 ./configure --prefix=/usr \ 35 ./configure --prefix=/usr \
32 --bindir=/usr/bin \ 36 --bindir=/usr/bin \
33 --datadir="/usr/share/naemon" \ 37 --datadir="/usr/share/naemon" \
@@ -50,14 +54,14 @@ build() {
50} 54}
51 55
52check() { 56check() {
53 cd "$srcdir/$pkgname-$pkgver" 57 cd "$srcdir/$pkgname-git"
54 58
55 # One of the tests fail for some reason, upstream notified. 59 # One of the tests fail for some reason, upstream notified.
56 make check || true 60 make check || true
57} 61}
58 62
59package() { 63package() {
60 cd "$srcdir/$pkgname-$pkgver" 64 cd "$srcdir/$pkgname-git"
61 65
62 make DESTDIR="$pkgdir" install 66 make DESTDIR="$pkgdir" install
63 67
diff --git a/overflow.patch b/overflow.patch
new file mode 100644
index 0000000..a700266
--- /dev/null
+++ b/overflow.patch
@@ -0,0 +1,137 @@
1--- a/src/naemon/xodtemplate.c 2019-07-03 18:34:13.795379190 +0200
2+++ b/src/naemon/xodtemplate.c 2019-07-03 18:33:37.079085158 +0200
3@@ -7488,7 +7488,7 @@
4 } else if (!strcmp(temp_ptr, "a") || !strcmp(temp_ptr, "all")) {
5 temp_host->flap_detection_options = OPT_ALL;
6 } else {
7- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid flap detection option '%s' in host definition.\n", temp_ptr);
8+ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid flap detection option '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)"));
9 result = ERROR;
10 }
11 }
12@@ -7510,7 +7510,7 @@
13 } else if (!strcmp(temp_ptr, "a") || !strcmp(temp_ptr, "all")) {
14 temp_host->notification_options = OPT_ALL;
15 } else {
16- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid notification option '%s' in host definition.\n", temp_ptr);
17+ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid notification option '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)"));
18 result = ERROR;
19 }
20 }
21@@ -7537,7 +7537,7 @@
22 } else if (!strcmp(temp_ptr, "a") || !strcmp(temp_ptr, "all")) {
23 temp_host->stalking_options = OPT_ALL;
24 } else {
25- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid stalking option '%s' in host definition.\n", temp_ptr);
26+ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid stalking option '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)"));
27 result = ERROR;
28 }
29 }
30@@ -7549,29 +7549,29 @@
31 xodtemplate_obsoleted(variable, temp_host->_start_line);
32 } else if (!strcmp(variable, "2d_coords")) {
33 if ((temp_ptr = strtok(value, ", ")) == NULL) {
34- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in host definition.\n", temp_ptr);
35+ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)"));
36 return ERROR;
37 }
38 temp_host->x_2d = atoi(temp_ptr);
39 if ((temp_ptr = strtok(NULL, ", ")) == NULL) {
40- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in host definition.\n", temp_ptr);
41+ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)"));
42 return ERROR;
43 }
44 temp_host->y_2d = atoi(temp_ptr);
45 temp_host->have_2d_coords = TRUE;
46 } else if (!strcmp(variable, "3d_coords")) {
47 if ((temp_ptr = strtok(value, ", ")) == NULL) {
48- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in host definition.\n", temp_ptr);
49+ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)"));
50 return ERROR;
51 }
52 temp_host->x_3d = strtod(temp_ptr, NULL);
53 if ((temp_ptr = strtok(NULL, ", ")) == NULL) {
54- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in host definition.\n", temp_ptr);
55+ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)"));
56 return ERROR;
57 }
58 temp_host->y_3d = strtod(temp_ptr, NULL);
59 if ((temp_ptr = strtok(NULL, ", ")) == NULL) {
60- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in host definition.\n", temp_ptr);
61+ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)"));
62 return ERROR;
63 }
64 temp_host->z_3d = strtod(temp_ptr, NULL);
65@@ -8176,13 +8176,13 @@
66 } else if (!strcmp(variable, "2d_coords")) {
67 temp_ptr = strtok(value, ", ");
68 if (temp_ptr == NULL) {
69- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in extended host info definition.\n", temp_ptr);
70+ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in extended host info definition.\n", (temp_ptr ? temp_ptr : "(null)"));
71 return ERROR;
72 }
73 temp_hostextinfo->x_2d = atoi(temp_ptr);
74 temp_ptr = strtok(NULL, ", ");
75 if (temp_ptr == NULL) {
76- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in extended host info definition.\n", temp_ptr);
77+ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in extended host info definition.\n", (temp_ptr ? temp_ptr : "(null)"));
78 return ERROR;
79 }
80 temp_hostextinfo->y_2d = atoi(temp_ptr);
81@@ -8190,19 +8190,19 @@
82 } else if (!strcmp(variable, "3d_coords")) {
83 temp_ptr = strtok(value, ", ");
84 if (temp_ptr == NULL) {
85- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in extended host info definition.\n", temp_ptr);
86+ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in extended host info definition.\n", (temp_ptr ? temp_ptr : "(null)"));
87 return ERROR;
88 }
89 temp_hostextinfo->x_3d = strtod(temp_ptr, NULL);
90 temp_ptr = strtok(NULL, ", ");
91 if (temp_ptr == NULL) {
92- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in extended host info definition.\n", temp_ptr);
93+ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in extended host info definition.\n", (temp_ptr ? temp_ptr : "(null)"));
94 return ERROR;
95 }
96 temp_hostextinfo->y_3d = strtod(temp_ptr, NULL);
97 temp_ptr = strtok(NULL, ", ");
98 if (temp_ptr == NULL) {
99- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in extended host info definition.\n", temp_ptr);
100+ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in extended host info definition.\n", (temp_ptr ? temp_ptr : "(null)"));
101 return ERROR;
102 }
103 temp_hostextinfo->z_3d = strtod(temp_ptr, NULL);
104@@ -8369,21 +8369,21 @@
105
106 /* make sure an object type is specified... */
107 if (input[0] == '\x0') {
108- nm_log(NSLOG_CONFIG_ERROR, "Error: No object type specified in file '%s' on line %d.\n", filename, current_line);
109+ nm_log(NSLOG_CONFIG_ERROR, "Error: No object type specified in file '%s' on line %d.\n", filename, (current_line ? current_line : -1));
110 result = ERROR;
111 break;
112 }
113
114 /* we're already in an object definition... */
115 if (in_definition == TRUE) {
116- nm_log(NSLOG_CONFIG_ERROR, "Error: Unexpected start of object definition in file '%s' on line %d. Make sure you close preceding objects before starting a new one.\n", filename, current_line);
117+ nm_log(NSLOG_CONFIG_ERROR, "Error: Unexpected start of object definition in file '%s' on line %d. Make sure you close preceding objects before starting a new one.\n", filename, (current_line ? current_line : -1));
118 result = ERROR;
119 break;
120 }
121
122 /* start a new definition */
123 if (xodtemplate_begin_object_definition(input, xodtemplate_current_config_file, current_line) == ERROR) {
124- nm_log(NSLOG_CONFIG_ERROR, "Error: Could not add object definition in file '%s' on line %d.\n", filename, current_line);
125+ nm_log(NSLOG_CONFIG_ERROR, "Error: Could not add object definition in file '%s' on line %d.\n", filename, (current_line ? current_line : -1));
126 result = ERROR;
127 break;
128 }
129@@ -8401,7 +8401,7 @@
130
131 /* close out current definition */
132 if (xodtemplate_end_object_definition() == ERROR) {
133- nm_log(NSLOG_CONFIG_ERROR, "Error: Could not complete object definition in file '%s' on line %d. Have you named all your objects?\n", filename, current_line);
134+ nm_log(NSLOG_CONFIG_ERROR, "Error: Could not complete object definition in file '%s' on line %d. Have you named all your objects?\n", filename, (current_line ? current_line : -1));
135 result = ERROR;
136 break;
137 }
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 23:41:32 +0000