Merge pull request #1 from bodsch/feature/icinga-2.13.8

update for icinga-2.13.8
bodsch · Nov 18, 2023 · 7e85f51 · 7e85f51
2 parents 5df88f9 + 09b5691
commit 7e85f51
Show file tree

Hide file tree

Showing 7 changed files with 346 additions and 47 deletions.
diff --git a/.SRCINFO b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = icinga2
 	pkgdesc = An open source host, service and network monitoring program
-	pkgver = 2.10.5
-	pkgrel = 1
+	pkgver = 2.13.8
+	pkgrel = 2
 	url = http://www.icinga.org
 	install = icinga2.install
 	changelog = icinga2.changelog
@@ -12,17 +12,18 @@ pkgbase = icinga2
 	makedepends = cmake
 	makedepends = libmariadbclient
 	makedepends = postgresql-libs
-	makedepends = systemd
 	depends = boost-libs
 	depends = libedit
-	depends = libsystemd
 	depends = openssl
 	depends = yajl
+	depends = bison
+	depends = flex
 	optdepends = monitoring-plugins: plugins needed for icinga checks
 	optdepends = libmariadbclient: for MySQL support
 	optdepends = postgresql-libs: for PostgreSQL support
 	replaces = icinga2-common
-	backup = etc/default/icinga2
+	backup = etc/conf.d/icinga2
+	backup = etc/init.d/icinga2
 	backup = etc/icinga2/features-available/api.conf
 	backup = etc/icinga2/features-available/checker.conf
 	backup = etc/icinga2/features-available/command.conf
@@ -31,9 +32,11 @@ pkgbase = icinga2
 	backup = etc/icinga2/features-available/elasticsearch.conf
 	backup = etc/icinga2/features-available/gelf.conf
 	backup = etc/icinga2/features-available/graphite.conf
+	backup = etc/icinga2/features-available/icingadb.conf
 	backup = etc/icinga2/features-available/ido-mysql.conf
 	backup = etc/icinga2/features-available/ido-pgsql.conf
 	backup = etc/icinga2/features-available/influxdb.conf
+	backup = etc/icinga2/features-available/influxdb2.conf
 	backup = etc/icinga2/features-available/livestatus.conf
 	backup = etc/icinga2/features-available/mainlog.conf
 	backup = etc/icinga2/features-available/notification.conf
@@ -47,12 +50,13 @@ pkgbase = icinga2
 	backup = etc/icinga2/scripts/mail-service-notification.sh
 	backup = etc/icinga2/zones.conf
 	backup = etc/logrotate.d/icinga2
-	source = https://github.com/Icinga/icinga2/archive/v2.10.5.tar.gz
+	source = icinga2-2.13.8-x86_64.tar.gz::https://github.com/Icinga/icinga2/archive/v2.13.8.tar.gz
 	source = icinga2.tmpfiles
 	source = icinga2.sysusers
-	sha256sums = c965c2b6fa697fbb5d87c928798a28f293050a8475b6a46d728dc3f222b1319a
+	source = openrc_icinga2
+	sha256sums = 0b1974eff321141ccc7b6b7bad52070a81d8679674570ebdd2525e6f8443a4e2
 	sha256sums = 1302b333f49ead14f8808a379535971501d3a0c1ba02a7bf7b4406b7d27c754c
 	sha256sums = 2f946a33ea50a3c4400a81acd778e6411ffe5e2257a98004288b84a64f382810
+	sha256sums = 1495238a2248fe2690ce7b186c96b68a28868b76276d2d37e5ae2f1e25cd6dcd
 
 pkgname = icinga2
-
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,30 @@
+---
+name: Make Repository
+
+on:
+  push:
+    branches:
+      - main
+      - debug
+      - feature/**
+  schedule:
+    - cron: "20 23 * * 0"
+
+jobs:
+  pkgbuild:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Makepkg Build and Check
+      id: makepkg
+      uses: Pinghigh/[email protected]
+      with:
+        makepkgArgs: "--skippgpcheck --noconfirm"
+
+    - name: Print Package Files
+      run: |
+        echo "Successfully created the following package archive"
+        echo "Package: ${{ steps.makepkg.outputs.pkgfile0 }}"
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 /v*.tar.gz
 /*.pkg.tar.xz
+/*.pkg.tar.zst
 /*.log
 /src/
 /pkg/
diff --git a/PKGBUILD b/PKGBUILD
@@ -2,52 +2,76 @@
 # Contributor: Malte Rabenseifner <[email protected]>
 # Contributor: bebehei <[email protected]>
 
-pkgname='icinga2'
-pkgver=2.11.0
-pkgrel=1
+pkgname=icinga2
+pkgver=2.13.8
+pkgrel=2
+
 pkgdesc="An open source host, service and network monitoring program"
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.icinga.org"
-depends=('boost-libs' 'libedit' 'libsystemd' 'openssl' 'yajl')
+depends=('boost-libs' 'libedit' 'openssl' 'yajl' 'bison' 'flex')
 optdepends=('monitoring-plugins: plugins needed for icinga checks'
             'libmariadbclient: for MySQL support'
             'postgresql-libs: for PostgreSQL support')
-makedepends=('boost' 'cmake' 'libmariadbclient' 'postgresql-libs' 'systemd')
+
+makedepends=('boost' 'cmake' 'libmariadbclient' 'postgresql-libs')
+
 replaces=('icinga2-common')
-backup=(etc/default/icinga2
-        etc/icinga2/features-available/api.conf
-        etc/icinga2/features-available/checker.conf
-        etc/icinga2/features-available/command.conf
-        etc/icinga2/features-available/compatlog.conf
-        etc/icinga2/features-available/debuglog.conf
-        etc/icinga2/features-available/elasticsearch.conf
-        etc/icinga2/features-available/gelf.conf
-        etc/icinga2/features-available/graphite.conf
-        etc/icinga2/features-available/ido-mysql.conf
-        etc/icinga2/features-available/ido-pgsql.conf
-        etc/icinga2/features-available/influxdb.conf
-        etc/icinga2/features-available/livestatus.conf
-        etc/icinga2/features-available/mainlog.conf
-        etc/icinga2/features-available/notification.conf
-        etc/icinga2/features-available/opentsdb.conf
-        etc/icinga2/features-available/perfdata.conf
-        etc/icinga2/features-available/statusdata.conf
-        etc/icinga2/features-available/syslog.conf
-        etc/icinga2/constants.conf
-        etc/icinga2/icinga2.conf
-        etc/icinga2/scripts/mail-host-notification.sh
-        etc/icinga2/scripts/mail-service-notification.sh
-        etc/icinga2/zones.conf
-        etc/logrotate.d/icinga2)
+
+backup=(
+    etc/conf.d/icinga2
+    etc/init.d/icinga2
+    etc/icinga2/features-available/api.conf
+    etc/icinga2/features-available/checker.conf
+    etc/icinga2/features-available/command.conf
+    etc/icinga2/features-available/compatlog.conf
+    etc/icinga2/features-available/debuglog.conf
+    etc/icinga2/features-available/elasticsearch.conf
+    etc/icinga2/features-available/gelf.conf
+    etc/icinga2/features-available/graphite.conf
+    etc/icinga2/features-available/icingadb.conf
+    etc/icinga2/features-available/ido-mysql.conf
+    etc/icinga2/features-available/ido-pgsql.conf
+    etc/icinga2/features-available/influxdb.conf
+    etc/icinga2/features-available/influxdb2.conf
+    etc/icinga2/features-available/livestatus.conf
+    etc/icinga2/features-available/mainlog.conf
+    etc/icinga2/features-available/notification.conf
+    etc/icinga2/features-available/opentsdb.conf
+    etc/icinga2/features-available/perfdata.conf
+    etc/icinga2/features-available/statusdata.conf
+    etc/icinga2/features-available/syslog.conf
+    etc/icinga2/constants.conf
+    etc/icinga2/icinga2.conf
+    etc/icinga2/scripts/mail-host-notification.sh
+    etc/icinga2/scripts/mail-service-notification.sh
+    etc/icinga2/zones.conf
+    etc/logrotate.d/icinga2
+)
 install='icinga2.install'
 changelog="icinga2.changelog"
-source=("https://github.com/Icinga/$pkgname/archive/v$pkgver.tar.gz"
-        "$pkgname.tmpfiles"
-        "$pkgname.sysusers")
-sha256sums=('f1702a598aed458cce44668526db8d655a68f270e408f10b859eaac175ccdb51'
-            '1302b333f49ead14f8808a379535971501d3a0c1ba02a7bf7b4406b7d27c754c'
-            '2f946a33ea50a3c4400a81acd778e6411ffe5e2257a98004288b84a64f382810')
+
+source=(
+    "${pkgname}-${pkgver}-${CARCH}.tar.gz::https://github.com/Icinga/$pkgname/archive/v$pkgver.tar.gz"
+    "$pkgname.tmpfiles"
+    "$pkgname.sysusers"
+    "openrc_$pkgname"
+)
+
+sha512sum=(
+    "c16ee7d4876a712da19aaf8c2e85093bd3a4e60bdb29471a33d1e5df3df43c0e9b3afab59f5bbf2b99d06f6c501d52a2759a4b7783f877f3a5c713f43fe683a5"
+    "51811add3f83df870f4b18ad97a6a9ccaf5be7ab4c0614b0d85cfccf5dc3e3debd7df42ecfe08c00a1b4d25e5b4326214f6a9c079fbf2886fc9e5a4c3b8ebbba"
+    "875843000bf40cedffadee9ec0691d88173610befd653da06ea3828e2b1c5c36ddcb308bdba053f72c9311f8f023be044abb9dc41a712381cdf62e0e8434dd2e"
+    "17fd0f63d9fe6f7e947d5f7485c2115dacdc9f2208931d162cb1b4882e33e027ce51d5c67241154c347d4d87f8c67d5f641cfa8d1f687de51d4225fab761cea1"
+)
+
+sha256sums=(
+    '0b1974eff321141ccc7b6b7bad52070a81d8679674570ebdd2525e6f8443a4e2'
+    '1302b333f49ead14f8808a379535971501d3a0c1ba02a7bf7b4406b7d27c754c'
+    '2f946a33ea50a3c4400a81acd778e6411ffe5e2257a98004288b84a64f382810'
+    '1495238a2248fe2690ce7b186c96b68a28868b76276d2d37e5ae2f1e25cd6dcd'
+)
 
 build() {
   mkdir -p "$srcdir/$pkgname-$pkgver/build"
@@ -60,9 +84,11 @@ build() {
     -DCMAKE_INSTALL_SBINDIR=/usr/bin \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
     -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-    -DICINGA2_SYSCONFIGFILE=/etc/default/icinga2 \
+    -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 \
     -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins \
-    -DUSE_SYSTEMD=ON \
+    -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=OFF \
+    -DICINGA2_VERSION=$pkgver-$pkgrel \
+    -DUSE_SYSTEMD=OFF \
     -DLOGROTATE_HAS_SU=OFF
 
   make
@@ -88,6 +114,9 @@ package() {
   install -Dm644 "$srcdir/$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
   install -Dm644 "$srcdir/$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
 
+  # install openrc start-stop script
+  sudo install -Dm755 "$srcdir/../openrc_$pkgname" "/etc/init.d/$pkgname"
+
   # install syntax highlighting for vim and nano
   cd "$srcdir/$pkgname-$pkgver"
   install -Dm644 tools/syntax/vim/ftdetect/icinga2.vim "$pkgdir/usr/share/vim/vimfiles/ftdetect/icinga2.vim"
@@ -100,6 +129,7 @@ package() {
   rm "$pkgdir/etc/icinga2/features-enabled/checker.conf"
   rm "$pkgdir/etc/icinga2/features-enabled/mainlog.conf"
   rm "$pkgdir/etc/icinga2/features-enabled/notification.conf"
+
   # ensure that nothing it left in features enables. make sure to keep the list
   # above in sync with post_install. rmdir && mkdir seems to be the easiest way
   # to check if the directory was actually empty.

diff --git a/icinga2.changelog b/icinga2.changelog
@@ -1,3 +1,49 @@
+2.12.6-1
+  - New upstream version 2.12.6
+
+2.12.3-2
+  - Port for ArtixLinux (systemd-less)
+
+2.12.3-1
+  - New upstream version 2.12.3
+  - Security: Fix that revoked certificates due for renewal will automatically
+    be renewed ignoring the CRL (CVE-2020-29663)
+
+2.12.2-2
+  - Fix build with boost 1.74
+
+2.12.2-1
+  - New upstream version 2.12.2
+
+2.12.1-1
+  - New upstream version 2.12.1
+
+2.12.0-1
+  - New upstream version 2.12.0
+
+2.11.4-1
+  - New upstream version 2.11.4
+
+2.11.3-1
+  - New upstream version 2.11.3
+
+2.11.2-3
+  - Other workaround for the bug in boost 1.72 now that boost 1.69 is gone from
+    the Arch repos
+
+2.11.2-2
+  - Build against boost 1.69 as a workaround for a bug in boost 1.72
+
+2.11.2-1
+  - New upstream version 2.11.2
+
+2.11.0-2
+  - Manually specify boost paths to fix building with boost 1.71.0 and recent
+    cmake versions
+
+2.11.0-1
+  - New upstream version 2.11.0
+
 2.10.5-1
   - New upstream version 2.10.5
 

diff --git a/icinga2.install b/icinga2.install
@@ -1,5 +1,5 @@
 post_install() {
-  /usr/bin/systemd-sysusers icinga2.conf
+  /usr/bin/sysusers icinga2.conf
 
   /usr/bin/chown -R icinga:icinga \
     /etc/icinga2 \