[arch-commits] Commit in zabbix/repos (15 files)

Felix Yan felixonmars at archlinux.org
Wed Jan 16 14:59:12 UTC 2019


    Date: Wednesday, January 16, 2019 @ 14:59:12
  Author: felixonmars
Revision: 344254

archrelease: copy trunk to staging-x86_64

Added:
  zabbix/repos/staging-x86_64/
  zabbix/repos/staging-x86_64/PKGBUILD
    (from rev 344253, zabbix/trunk/PKGBUILD)
  zabbix/repos/staging-x86_64/zabbix-agent.service
    (from rev 344253, zabbix/trunk/zabbix-agent.service)
  zabbix/repos/staging-x86_64/zabbix-agent.sysusers
    (from rev 344253, zabbix/trunk/zabbix-agent.sysusers)
  zabbix/repos/staging-x86_64/zabbix-agent.tmpfiles
    (from rev 344253, zabbix/trunk/zabbix-agent.tmpfiles)
  zabbix/repos/staging-x86_64/zabbix-proxy-mysql.service
    (from rev 344253, zabbix/trunk/zabbix-proxy-mysql.service)
  zabbix/repos/staging-x86_64/zabbix-proxy-pgsql.service
    (from rev 344253, zabbix/trunk/zabbix-proxy-pgsql.service)
  zabbix/repos/staging-x86_64/zabbix-proxy-sqlite.service
    (from rev 344253, zabbix/trunk/zabbix-proxy-sqlite.service)
  zabbix/repos/staging-x86_64/zabbix-proxy.sysusers
    (from rev 344253, zabbix/trunk/zabbix-proxy.sysusers)
  zabbix/repos/staging-x86_64/zabbix-proxy.tmpfiles
    (from rev 344253, zabbix/trunk/zabbix-proxy.tmpfiles)
  zabbix/repos/staging-x86_64/zabbix-server-mysql.service
    (from rev 344253, zabbix/trunk/zabbix-server-mysql.service)
  zabbix/repos/staging-x86_64/zabbix-server-pgsql.service
    (from rev 344253, zabbix/trunk/zabbix-server-pgsql.service)
  zabbix/repos/staging-x86_64/zabbix-server.install
    (from rev 344253, zabbix/trunk/zabbix-server.install)
  zabbix/repos/staging-x86_64/zabbix-server.sysusers
    (from rev 344253, zabbix/trunk/zabbix-server.sysusers)
  zabbix/repos/staging-x86_64/zabbix-server.tmpfiles
    (from rev 344253, zabbix/trunk/zabbix-server.tmpfiles)

-----------------------------+
 PKGBUILD                    |  181 ++++++++++++++++++++++++++++++++++++++++++
 zabbix-agent.service        |   11 ++
 zabbix-agent.sysusers       |    1 
 zabbix-agent.tmpfiles       |    1 
 zabbix-proxy-mysql.service  |   18 ++++
 zabbix-proxy-pgsql.service  |   18 ++++
 zabbix-proxy-sqlite.service |   18 ++++
 zabbix-proxy.sysusers       |    1 
 zabbix-proxy.tmpfiles       |    1 
 zabbix-server-mysql.service |   18 ++++
 zabbix-server-pgsql.service |   18 ++++
 zabbix-server.install       |   12 ++
 zabbix-server.sysusers      |    1 
 zabbix-server.tmpfiles      |    1 
 14 files changed, 300 insertions(+)

Copied: zabbix/repos/staging-x86_64/PKGBUILD (from rev 344253, zabbix/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2019-01-16 14:59:12 UTC (rev 344254)
@@ -0,0 +1,181 @@
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+
+pkgbase=zabbix
+pkgname=(zabbix-server zabbix-agent zabbix-proxy zabbix-frontend-php)
+pkgver=4.0.3
+pkgrel=2
+arch=(x86_64)
+url='https://www.zabbix.com/'
+license=(GPL)
+makedepends=(postgresql-libs libxml2 unixodbc net-snmp mariadb-libs libldap libevent)
+source=(https://downloads.sourceforge.net/sourceforge/zabbix/zabbix-${pkgver}.tar.gz
+        zabbix-agent.{service,sysusers,tmpfiles}
+        zabbix-server{-mysql,-pgsql}.service zabbix-server.{sysusers,tmpfiles}
+        zabbix-proxy{-sqlite,-mysql,-pgsql}.service zabbix-proxy.{sysusers,tmpfiles})
+
+sha512sums=('ee8feec85a01c7617d3420529afa59550982c3c51173f8de484a8833099d33cccb84fa4e82f7199bc0ed8af687eb206ae50e4853b824bfbe784f67964cc15e37'
+            '8c1fa2676bc0ef91bc39ec5f97b4d3ba5c365d063420455a3785121a54e120bc5afeacde42a48f4509c115f940dcc3b6c2f43044a7fbfb421182fc93b22a2444'
+            '3ab3ac1acc7e35c8896157aef601ebc30815237ac5252cbd0c1ecb26eeaf9eccf5c49938ae8c85bb79a6f95f607f082f6b80ed660829599ec03aa626cca6d3dc'
+            'ca6b4779de23829dfdd80ee21e924fbe4e2754f4e693bed4b1a2aa846cd87d150e399b1169d7fe58d30c50ed837c1b8254e580de420267d0a1834d6dc409c43d'
+            'b35155a5d151eb7258bca62d53e7099a05605e58adac9d1510e12c2219abc22f931e92ea5d36bf86900e30982e893e429235d983a7823610d76c15082c373d1f'
+            'ac968d9954e5d9523eb7a9b8dcbcef40d4b47c1db3b2ff86d5fbc3f1871fcd03aff14f5b0cfeeeb494fdeb2d95e2e32b8622297c714a90d22c68ab3b3b914475'
+            '4254d3b13ff0d19a8e207f709c10ea59dbb6d4f333d862b1611a0fa4ced199e9a32313e88d8abadc129c1e4001b182c0545bcc84117d218116a8c524de88850e'
+            'b6d548a26f845ef1a39724e3273aa521715272e20a0038144f86d377a26dfec6e3e129404cfda77632cad2f5cd6bab4a33f70a26c8c67b0d0b2abb3678ad2d83'
+            '7b5829caa77c6b5da8c2195ab840f0020f722a94f01a437324afdbe2a4372a594dcca6d63d2fdda5cfad81353ab4e4e0b2c6b67436203266dd44740a5e03b58e'
+            '94701f34fe5df4859c6a4d0459c16062374e8f89f4f51c414e71c9c2db14f61e087721e68dddb3e8d88bf1c097477c1a21e27ba4705fd07d88c60adb41acc1be'
+            'c772a7f7fe5c0715db27a15f8cb1aee7e92677d1fa2d922fae42440cac8c2acc3d3ceba0bb2103fd7907b129618cf50e6a34dd221c8474c9cea9badaeaadf80b'
+            '7c1072a8cd5837095f857b50124cb45d1bdbddbce108f6f067a35c3c9ebb1ad0502ef617dfa10f9c843631220177a6286a97b1c2a46539200be72fa83cb23b99'
+            '64042ddf511b56b2a5a311e34643f4e049c09d909ea65b7343a8a9637f33dc59f2b1342201290ca0774cbcbf616096b3696982047fb622b7d51afb5eceb298dd')
+
+prepare() {
+  cd $pkgbase-$pkgver
+  sed -i \
+    -e '/^LogFile=.*/d' \
+    -e 's/# LogType=file/LogType=system/' \
+    conf/zabbix_{agentd,proxy,server}.conf
+
+  autoreconf -fi
+}
+
+build() {
+  _configure_flags=(
+    --disable-static
+    --prefix=/usr
+    --infodir=/usr/share/info
+    --mandir=/usr/share/man
+    --sysconfdir=/etc/zabbix
+    --enable-agent
+    --enable-ipv6
+    --with-ldap
+    --with-libcurl
+    --with-libxml2
+    --with-net-snmp
+    --with-openssl
+    --with-ssh2
+    --with-unixodbc
+  )
+
+  cd $pkgbase-$pkgver
+
+  for db in postgresql mysql; do
+    ./configure ${_configure_flags[@]} --enable-server --with-$db
+    make clean
+    make
+    mv src/zabbix_server/zabbix_server{,_$db}
+  done
+
+  for db in postgresql mysql sqlite3; do
+    ./configure ${_configure_flags[@]} --enable-proxy --with-$db
+    make clean
+    make
+    mv src/zabbix_proxy/zabbix_proxy{,_$db}
+  done
+}
+
+package_zabbix-server() {
+  pkgdesc='Monitoring software for networks and applications'
+  depends=(net-snmp curl libxml2 unixodbc libldap libevent pcre)
+  optdepends=('postgresql-libs: for PostgreSQL support'
+              'mariadb-libs: for MariaDB support')
+  backup=(etc/zabbix/zabbix_server.conf)
+  install=zabbix-server.install
+
+  cd $pkgbase-$pkgver
+
+  for db in postgresql mysql; do
+    install -Dm755 src/zabbix_server/zabbix_server_$db \
+      "$pkgdir/usr/bin/zabbix_server_$db"
+
+    install -d "$pkgdir/usr/share/$pkgname/$db"
+    install -m644 database/$db/*.sql -t "$pkgdir/usr/share/$pkgname/$db"
+  done
+  install -Dm755 src/zabbix_get/zabbix_get "$pkgdir/usr/bin/zabbix_get"
+
+  install -Dm644 man/zabbix_server.man "$pkgdir/usr/share/man/man8/zabbix_server.8"
+  install -Dm644 man/zabbix_get.man "$pkgdir/usr/share/man/man1/zabbix_get.1"
+
+  install -Dm644 conf/zabbix_server.conf "$pkgdir/etc/zabbix/zabbix_server.conf"
+  chown 170:170 "$pkgdir/etc/zabbix/zabbix_server.conf"
+
+  install -Dm644 "$srcdir/zabbix-server-pgsql.service" \
+    "$pkgdir/usr/lib/systemd/system/zabbix-server-pgsql.service"
+  install -Dm644 "$srcdir/zabbix-server-mysql.service" \
+    "$pkgdir/usr/lib/systemd/system/zabbix-server-mysql.service"
+
+  install -Dm644 "$srcdir/zabbix-server.sysusers" \
+	"$pkgdir/usr/lib/sysusers.d/zabbix-server.conf"
+  install -Dm644 "$srcdir/zabbix-server.tmpfiles" \
+	"$pkgdir/usr/lib/tmpfiles.d/zabbix-server.conf"
+}
+
+package_zabbix-agent() {
+  pkgdesc='Monitoring agent for Zabbix'
+  depends=(curl pcre)
+  backup=(etc/zabbix/zabbix_agentd.conf)
+
+  cd $pkgbase-$pkgver
+  install -Dm755 src/zabbix_agent/zabbix_agentd "$pkgdir/usr/bin/zabbix_agentd"
+  install -Dm755 src/zabbix_sender/zabbix_sender "$pkgdir/usr/bin/zabbix_sender"
+
+  install -Dm644 conf/zabbix_agentd.conf "$pkgdir/etc/zabbix/zabbix_agentd.conf"
+  chown 172:172 "$pkgdir/etc/zabbix/zabbix_agentd.conf"
+
+  install -Dm644 conf/zabbix_agentd/userparameter_examples.conf \
+	"$pkgdir/usr/share/zabbix-agent/userparameter_examples.conf"
+  install -Dm644 conf/zabbix_agentd/userparameter_mysql.conf \
+	"$pkgdir/usr/share/zabbix-agent/userparameter_mysql.conf"
+
+  install -Dm644 man/zabbix_agentd.man \
+	"$pkgdir/usr/share/man/man8/zabbix_agentd.8"
+  install -Dm644 man/zabbix_sender.man \
+	"$pkgdir/usr/share/man/man1/zabbix_sender.1"
+
+  install -Dm644 "$srcdir/zabbix-agent.service" \
+	"$pkgdir/usr/lib/systemd/system/zabbix-agent.service"
+  install -Dm644 "$srcdir/zabbix-agent.sysusers" \
+	"$pkgdir/usr/lib/sysusers.d/zabbix-agent.conf"
+  install -Dm644 "$srcdir/zabbix-agent.tmpfiles" \
+	"$pkgdir/usr/lib/tmpfiles.d/zabbix-agent.conf"
+}
+
+package_zabbix-proxy() {
+  pkgdesc='Data collecting proxy for Zabbix'
+  depends=(net-snmp curl libxml2 sqlite unixodbc libldap pcre)
+  optdepends=('mariadb-libs: for MariaDB support'
+              'postgresql-libs: for PostgreSQL support')
+  backup=(etc/zabbix/zabbix_proxy.conf)
+
+  cd $pkgbase-$pkgver
+  for db in postgresql mysql sqlite3; do
+    install -Dm755 src/zabbix_proxy/zabbix_proxy_$db \
+      "$pkgdir/usr/bin/zabbix_proxy_$db"
+
+    install -d "$pkgdir/usr/share/$pkgname/$db"
+    install -m644 database/$db/schema.sql -t "$pkgdir/usr/share/$pkgname/$db"
+  done
+  install -Dm644 conf/zabbix_proxy.conf "$pkgdir/etc/zabbix/zabbix_proxy.conf"
+  chown 171:171 "$pkgdir/etc/zabbix/zabbix_proxy.conf"
+
+  install -Dm644 "$srcdir/zabbix-proxy-sqlite.service" \
+    "$pkgdir/usr/lib/systemd/system/zabbix-proxy-sqlite.service"
+  install -Dm644 "$srcdir/zabbix-proxy-pgsql.service" \
+    "$pkgdir/usr/lib/systemd/system/zabbix-proxy-pgsql.service"
+  install -Dm644 "$srcdir/zabbix-proxy-mysql.service" \
+    "$pkgdir/usr/lib/systemd/system/zabbix-proxy-mysql.service"
+
+  install -Dm644 "$srcdir/zabbix-proxy.sysusers" \
+	"$pkgdir/usr/lib/sysusers.d/zabbix-proxy.conf"
+  install -Dm644 "$srcdir/zabbix-proxy.tmpfiles" \
+	"$pkgdir/usr/lib/tmpfiles.d/zabbix-proxy.conf"
+}
+
+package_zabbix-frontend-php() {
+  pkgdesc='PHP frontend for Zabbix'
+  depends=(zabbix-server php php-gd)
+
+  cd $pkgbase-$pkgver
+  install -d "$pkgdir/usr/share/webapps/zabbix"
+  cp -a frontends/php/* "$pkgdir/usr/share/webapps/zabbix"
+  chown http:http ${pkgdir}/usr/share/webapps/zabbix/conf/ # write access for http user
+}

Copied: zabbix/repos/staging-x86_64/zabbix-agent.service (from rev 344253, zabbix/trunk/zabbix-agent.service)
===================================================================
--- staging-x86_64/zabbix-agent.service	                        (rev 0)
+++ staging-x86_64/zabbix-agent.service	2019-01-16 14:59:12 UTC (rev 344254)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Zabbix Agent
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_agentd -f
+User=zabbix-agent
+
+[Install]
+WantedBy=multi-user.target

Copied: zabbix/repos/staging-x86_64/zabbix-agent.sysusers (from rev 344253, zabbix/trunk/zabbix-agent.sysusers)
===================================================================
--- staging-x86_64/zabbix-agent.sysusers	                        (rev 0)
+++ staging-x86_64/zabbix-agent.sysusers	2019-01-16 14:59:12 UTC (rev 344254)
@@ -0,0 +1 @@
+u zabbix-agent 172 - /var/lib/zabbix-agent

Copied: zabbix/repos/staging-x86_64/zabbix-agent.tmpfiles (from rev 344253, zabbix/trunk/zabbix-agent.tmpfiles)
===================================================================
--- staging-x86_64/zabbix-agent.tmpfiles	                        (rev 0)
+++ staging-x86_64/zabbix-agent.tmpfiles	2019-01-16 14:59:12 UTC (rev 344254)
@@ -0,0 +1 @@
+d /var/lib/zabbix-agent 0750 zabbix-agent zabbix-agent -

Copied: zabbix/repos/staging-x86_64/zabbix-proxy-mysql.service (from rev 344253, zabbix/trunk/zabbix-proxy-mysql.service)
===================================================================
--- staging-x86_64/zabbix-proxy-mysql.service	                        (rev 0)
+++ staging-x86_64/zabbix-proxy-mysql.service	2019-01-16 14:59:12 UTC (rev 344254)
@@ -0,0 +1,18 @@
+[Unit]
+Description=Zabbix proxy with MySQL
+After=network.target mysql.service
+Conflicts=zabbix-proxy.service zabbix-proxy-pgsql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_proxy_mysql -f
+User=zabbix-proxy
+PrivateDevices=yes
+PrivateTmp=yes
+ProtectSystem=full
+ProtectHome=yes
+CapabilityBoundingSet=cap_net_raw
+AmbientCapabilities=cap_net_raw
+
+[Install]
+WantedBy=multi-user.target

Copied: zabbix/repos/staging-x86_64/zabbix-proxy-pgsql.service (from rev 344253, zabbix/trunk/zabbix-proxy-pgsql.service)
===================================================================
--- staging-x86_64/zabbix-proxy-pgsql.service	                        (rev 0)
+++ staging-x86_64/zabbix-proxy-pgsql.service	2019-01-16 14:59:12 UTC (rev 344254)
@@ -0,0 +1,18 @@
+[Unit]
+Description=Zabbix proxy with PostgreSQL
+After=network.target postgresql.service
+Conflicts=zabbix-proxy.service zabbix-proxy-mysql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_proxy_pgsql -f
+User=zabbix-proxy
+PrivateDevices=yes
+PrivateTmp=yes
+ProtectSystem=full
+ProtectHome=yes
+CapabilityBoundingSet=cap_net_raw
+AmbientCapabilities=cap_net_raw
+
+[Install]
+WantedBy=multi-user.target

Copied: zabbix/repos/staging-x86_64/zabbix-proxy-sqlite.service (from rev 344253, zabbix/trunk/zabbix-proxy-sqlite.service)
===================================================================
--- staging-x86_64/zabbix-proxy-sqlite.service	                        (rev 0)
+++ staging-x86_64/zabbix-proxy-sqlite.service	2019-01-16 14:59:12 UTC (rev 344254)
@@ -0,0 +1,18 @@
+[Unit]
+Description=Zabbix proxy with SQLite
+After=network.target
+Conflicts=zabbix-proxy-mysql.service zabbix-proxy-pgsql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_proxy_sqlite3 -f
+User=zabbix-proxy
+PrivateDevices=yes
+PrivateTmp=yes
+ProtectSystem=full
+ProtectHome=yes
+CapabilityBoundingSet=cap_net_raw
+AmbientCapabilities=cap_net_raw
+
+[Install]
+WantedBy=multi-user.target

Copied: zabbix/repos/staging-x86_64/zabbix-proxy.sysusers (from rev 344253, zabbix/trunk/zabbix-proxy.sysusers)
===================================================================
--- staging-x86_64/zabbix-proxy.sysusers	                        (rev 0)
+++ staging-x86_64/zabbix-proxy.sysusers	2019-01-16 14:59:12 UTC (rev 344254)
@@ -0,0 +1 @@
+u zabbix-proxy 171 - /var/lib/zabbix-proxy

Copied: zabbix/repos/staging-x86_64/zabbix-proxy.tmpfiles (from rev 344253, zabbix/trunk/zabbix-proxy.tmpfiles)
===================================================================
--- staging-x86_64/zabbix-proxy.tmpfiles	                        (rev 0)
+++ staging-x86_64/zabbix-proxy.tmpfiles	2019-01-16 14:59:12 UTC (rev 344254)
@@ -0,0 +1 @@
+d /var/lib/zabbix-proxy 0750 zabbix-proxy zabbix-proxy -

Copied: zabbix/repos/staging-x86_64/zabbix-server-mysql.service (from rev 344253, zabbix/trunk/zabbix-server-mysql.service)
===================================================================
--- staging-x86_64/zabbix-server-mysql.service	                        (rev 0)
+++ staging-x86_64/zabbix-server-mysql.service	2019-01-16 14:59:12 UTC (rev 344254)
@@ -0,0 +1,18 @@
+[Unit]
+Description=Zabbix Server with MySQL
+After=network.target mysql.service
+Conflicts=zabbix-server.service zabbix-server-pgsql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_server_mysql -f
+User=zabbix-server
+PrivateDevices=yes
+PrivateTmp=yes
+ProtectSystem=full
+ProtectHome=yes
+CapabilityBoundingSet=cap_net_raw
+AmbientCapabilities=cap_net_raw
+
+[Install]
+WantedBy=multi-user.target

Copied: zabbix/repos/staging-x86_64/zabbix-server-pgsql.service (from rev 344253, zabbix/trunk/zabbix-server-pgsql.service)
===================================================================
--- staging-x86_64/zabbix-server-pgsql.service	                        (rev 0)
+++ staging-x86_64/zabbix-server-pgsql.service	2019-01-16 14:59:12 UTC (rev 344254)
@@ -0,0 +1,18 @@
+[Unit]
+Description=Zabbix Server with PostgreSQL
+After=network.target postgresql.service
+Conflicts=zabbix-server.service zabbix-server-mysql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_server_postgresql -f
+User=zabbix-server
+PrivateDevices=yes
+PrivateTmp=yes
+ProtectSystem=full
+ProtectHome=yes
+CapabilityBoundingSet=cap_net_raw
+AmbientCapabilities=cap_net_raw
+
+[Install]
+WantedBy=multi-user.target

Copied: zabbix/repos/staging-x86_64/zabbix-server.install (from rev 344253, zabbix/trunk/zabbix-server.install)
===================================================================
--- staging-x86_64/zabbix-server.install	                        (rev 0)
+++ staging-x86_64/zabbix-server.install	2019-01-16 14:59:12 UTC (rev 344254)
@@ -0,0 +1,12 @@
+post_upgrade() {
+	if [[ $(vercmp $2 3.2.4-8) -lt 0 ]]; then
+		post_install
+		echo "Please note that the sqlite service file has been renamed to zabbix-server-sqlite.service in 3.2.4-8"
+	fi
+}
+
+post_install() {
+	# remove this notice after a month or two
+	echo "If you are upgrading from an AUR package, note that you will have to merge the config file (remove PIDFile),"
+	echo "adjust permissions (dedicated users per package) and enable one of zabbix-server-{sqlite,pgsql,mysql}.service"
+}

Copied: zabbix/repos/staging-x86_64/zabbix-server.sysusers (from rev 344253, zabbix/trunk/zabbix-server.sysusers)
===================================================================
--- staging-x86_64/zabbix-server.sysusers	                        (rev 0)
+++ staging-x86_64/zabbix-server.sysusers	2019-01-16 14:59:12 UTC (rev 344254)
@@ -0,0 +1 @@
+u zabbix-server 170 - /var/lib/zabbix-server

Copied: zabbix/repos/staging-x86_64/zabbix-server.tmpfiles (from rev 344253, zabbix/trunk/zabbix-server.tmpfiles)
===================================================================
--- staging-x86_64/zabbix-server.tmpfiles	                        (rev 0)
+++ staging-x86_64/zabbix-server.tmpfiles	2019-01-16 14:59:12 UTC (rev 344254)
@@ -0,0 +1 @@
+d /var/lib/zabbix-server 0750 zabbix-server zabbix-server -



More information about the arch-commits mailing list