From: Ismaël Bouya Date: Wed, 3 Jul 2019 17:11:55 +0000 (+0200) Subject: Upgrade naemon and naemon-livestatus X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FAUR.git;a=commitdiff_plain;h=781ef771f046a43335ee054e32645643a5ac39f8 Upgrade naemon and naemon-livestatus upgpkg: naemon-livestatus 1.0.10-1 upstream release upgpkg: naemon 1.0.10-1 upstream release --- diff --git a/.SRCINFO b/.SRCINFO index 4611350..cb32b77 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = naemon pkgdesc = System and network monitoring application - pkgver = 1.0.9 - pkgrel = 2 + pkgver = 1.0.10 + pkgrel = 1 url = http://naemon.org install = naemon.install arch = i686 @@ -18,12 +18,14 @@ pkgbase = naemon backup = etc/logrotate.d/naemon backup = etc/naemon/naemon.cfg backup = etc/naemon/resource.cfg - source = http://labs.consol.de/naemon/release/v1.0.9/src/naemon-1.0.9.tar.gz + source = naemon-git::git+https://github.com/naemon/naemon-core.git#commit=c2a8730538846f342911764cd7731015f1a6f284 source = naemon-tmpfiles.conf source = naemon.service - sha512sums = cf2a359a7fcf95a7668f8db35ccd23ad607c05cd85f51a9488cc183a2683da1ba9c7b0a7303d9f03825fbd13103372944267f2a99c10280004c51669e6343793 + source = overflow.patch + sha512sums = SKIP sha512sums = 756e61e4da56ce614824c3b289d2ee0f4464bf5bcd868dcadbf31c3320967e0179aa6c5aedc16e4bb40c480ab2da8ab08c43e750168e86963a9cd552db01ea1d sha512sums = 28944f2bd918c0718496ce490d0c2da97a127f71cfb23348620cb6c86fc88e206a07409d32dc8c9a9b5b2d1a8106b400c3e1edf3a6b7aca30ac125a38ebed3b2 + sha512sums = ec1ccf09f8c02e8f6dfdf2f6b80eed4b3e07df85703d89bdfdefe0bd9380b832a7f9a1c2976f17f55d74dbb3b1888ae28bf0551c78cb8bbc3acb08cd1e4a85da pkgname = naemon diff --git a/PKGBUILD b/PKGBUILD index 8bdb6bf..63aa98c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Jonathan Steel pkgname=naemon -pkgver=1.0.9 -pkgrel=2 +pkgver=1.0.10 +pkgrel=1 pkgdesc="System and network monitoring application" arch=('i686' 'x86_64') url="http://naemon.org" @@ -14,20 +14,24 @@ optdepends=('logrotate' 'naemon-livestatus: Event broker' 'monitoring-plugins') makedepends=('gperf' 'help2man') -source=(http://labs.consol.de/naemon/release/v$pkgver/src/$pkgname-$pkgver.tar.gz +source=("naemon-git::git+https://github.com/naemon/naemon-core.git#commit=c2a8730538846f342911764cd7731015f1a6f284" $pkgname-tmpfiles.conf - $pkgname.service) -sha512sums=('cf2a359a7fcf95a7668f8db35ccd23ad607c05cd85f51a9488cc183a2683da1ba9c7b0a7303d9f03825fbd13103372944267f2a99c10280004c51669e6343793' + $pkgname.service + overflow.patch) +sha512sums=('SKIP' '756e61e4da56ce614824c3b289d2ee0f4464bf5bcd868dcadbf31c3320967e0179aa6c5aedc16e4bb40c480ab2da8ab08c43e750168e86963a9cd552db01ea1d' - '28944f2bd918c0718496ce490d0c2da97a127f71cfb23348620cb6c86fc88e206a07409d32dc8c9a9b5b2d1a8106b400c3e1edf3a6b7aca30ac125a38ebed3b2') + '28944f2bd918c0718496ce490d0c2da97a127f71cfb23348620cb6c86fc88e206a07409d32dc8c9a9b5b2d1a8106b400c3e1edf3a6b7aca30ac125a38ebed3b2' + 'ec1ccf09f8c02e8f6dfdf2f6b80eed4b3e07df85703d89bdfdefe0bd9380b832a7f9a1c2976f17f55d74dbb3b1888ae28bf0551c78cb8bbc3acb08cd1e4a85da') backup=('etc/logrotate.d/naemon' 'etc/naemon/naemon.cfg' 'etc/naemon/resource.cfg') install=$pkgname.install build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-git" + patch -p1 < $srcdir/overflow.patch + ./autogen.sh ./configure --prefix=/usr \ --bindir=/usr/bin \ --datadir="/usr/share/naemon" \ @@ -50,14 +54,14 @@ build() { } check() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-git" # One of the tests fail for some reason, upstream notified. make check || true } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-git" make DESTDIR="$pkgdir" install diff --git a/overflow.patch b/overflow.patch new file mode 100644 index 0000000..a700266 --- /dev/null +++ b/overflow.patch @@ -0,0 +1,137 @@ +--- a/src/naemon/xodtemplate.c 2019-07-03 18:34:13.795379190 +0200 ++++ b/src/naemon/xodtemplate.c 2019-07-03 18:33:37.079085158 +0200 +@@ -7488,7 +7488,7 @@ + } else if (!strcmp(temp_ptr, "a") || !strcmp(temp_ptr, "all")) { + temp_host->flap_detection_options = OPT_ALL; + } else { +- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid flap detection option '%s' in host definition.\n", temp_ptr); ++ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid flap detection option '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)")); + result = ERROR; + } + } +@@ -7510,7 +7510,7 @@ + } else if (!strcmp(temp_ptr, "a") || !strcmp(temp_ptr, "all")) { + temp_host->notification_options = OPT_ALL; + } else { +- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid notification option '%s' in host definition.\n", temp_ptr); ++ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid notification option '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)")); + result = ERROR; + } + } +@@ -7537,7 +7537,7 @@ + } else if (!strcmp(temp_ptr, "a") || !strcmp(temp_ptr, "all")) { + temp_host->stalking_options = OPT_ALL; + } else { +- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid stalking option '%s' in host definition.\n", temp_ptr); ++ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid stalking option '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)")); + result = ERROR; + } + } +@@ -7549,29 +7549,29 @@ + xodtemplate_obsoleted(variable, temp_host->_start_line); + } else if (!strcmp(variable, "2d_coords")) { + if ((temp_ptr = strtok(value, ", ")) == NULL) { +- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in host definition.\n", temp_ptr); ++ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)")); + return ERROR; + } + temp_host->x_2d = atoi(temp_ptr); + if ((temp_ptr = strtok(NULL, ", ")) == NULL) { +- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in host definition.\n", temp_ptr); ++ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)")); + return ERROR; + } + temp_host->y_2d = atoi(temp_ptr); + temp_host->have_2d_coords = TRUE; + } else if (!strcmp(variable, "3d_coords")) { + if ((temp_ptr = strtok(value, ", ")) == NULL) { +- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in host definition.\n", temp_ptr); ++ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)")); + return ERROR; + } + temp_host->x_3d = strtod(temp_ptr, NULL); + if ((temp_ptr = strtok(NULL, ", ")) == NULL) { +- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in host definition.\n", temp_ptr); ++ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)")); + return ERROR; + } + temp_host->y_3d = strtod(temp_ptr, NULL); + if ((temp_ptr = strtok(NULL, ", ")) == NULL) { +- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in host definition.\n", temp_ptr); ++ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in host definition.\n", (temp_ptr ? temp_ptr : "(null)")); + return ERROR; + } + temp_host->z_3d = strtod(temp_ptr, NULL); +@@ -8176,13 +8176,13 @@ + } else if (!strcmp(variable, "2d_coords")) { + temp_ptr = strtok(value, ", "); + if (temp_ptr == NULL) { +- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in extended host info definition.\n", temp_ptr); ++ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in extended host info definition.\n", (temp_ptr ? temp_ptr : "(null)")); + return ERROR; + } + temp_hostextinfo->x_2d = atoi(temp_ptr); + temp_ptr = strtok(NULL, ", "); + if (temp_ptr == NULL) { +- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in extended host info definition.\n", temp_ptr); ++ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 2d_coords value '%s' in extended host info definition.\n", (temp_ptr ? temp_ptr : "(null)")); + return ERROR; + } + temp_hostextinfo->y_2d = atoi(temp_ptr); +@@ -8190,19 +8190,19 @@ + } else if (!strcmp(variable, "3d_coords")) { + temp_ptr = strtok(value, ", "); + if (temp_ptr == NULL) { +- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in extended host info definition.\n", temp_ptr); ++ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in extended host info definition.\n", (temp_ptr ? temp_ptr : "(null)")); + return ERROR; + } + temp_hostextinfo->x_3d = strtod(temp_ptr, NULL); + temp_ptr = strtok(NULL, ", "); + if (temp_ptr == NULL) { +- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in extended host info definition.\n", temp_ptr); ++ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in extended host info definition.\n", (temp_ptr ? temp_ptr : "(null)")); + return ERROR; + } + temp_hostextinfo->y_3d = strtod(temp_ptr, NULL); + temp_ptr = strtok(NULL, ", "); + if (temp_ptr == NULL) { +- nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in extended host info definition.\n", temp_ptr); ++ nm_log(NSLOG_CONFIG_ERROR, "Error: Invalid 3d_coords value '%s' in extended host info definition.\n", (temp_ptr ? temp_ptr : "(null)")); + return ERROR; + } + temp_hostextinfo->z_3d = strtod(temp_ptr, NULL); +@@ -8369,21 +8369,21 @@ + + /* make sure an object type is specified... */ + if (input[0] == '\x0') { +- nm_log(NSLOG_CONFIG_ERROR, "Error: No object type specified in file '%s' on line %d.\n", filename, current_line); ++ nm_log(NSLOG_CONFIG_ERROR, "Error: No object type specified in file '%s' on line %d.\n", filename, (current_line ? current_line : -1)); + result = ERROR; + break; + } + + /* we're already in an object definition... */ + if (in_definition == TRUE) { +- 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); ++ 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)); + result = ERROR; + break; + } + + /* start a new definition */ + if (xodtemplate_begin_object_definition(input, xodtemplate_current_config_file, current_line) == ERROR) { +- nm_log(NSLOG_CONFIG_ERROR, "Error: Could not add object definition in file '%s' on line %d.\n", filename, current_line); ++ nm_log(NSLOG_CONFIG_ERROR, "Error: Could not add object definition in file '%s' on line %d.\n", filename, (current_line ? current_line : -1)); + result = ERROR; + break; + } +@@ -8401,7 +8401,7 @@ + + /* close out current definition */ + if (xodtemplate_end_object_definition() == ERROR) { +- 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); ++ 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)); + result = ERROR; + break; + }