[arch-commits] Commit in zabbix/repos (63 files)
Florian Pritz
bluewind at archlinux.org
Tue Oct 17 16:21:08 UTC 2017
Date: Tuesday, October 17, 2017 @ 16:21:07
Author: bluewind
Revision: 308155
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
zabbix/repos/testing-i686/PKGBUILD
(from rev 308154, zabbix/trunk/PKGBUILD)
zabbix/repos/testing-i686/ceph.sysusers
(from rev 308154, zabbix/trunk/ceph.sysusers)
zabbix/repos/testing-i686/zabbix-agent.service
(from rev 308154, zabbix/trunk/zabbix-agent.service)
zabbix/repos/testing-i686/zabbix-agent.sysusers
(from rev 308154, zabbix/trunk/zabbix-agent.sysusers)
zabbix/repos/testing-i686/zabbix-agent.tmpfiles
(from rev 308154, zabbix/trunk/zabbix-agent.tmpfiles)
zabbix/repos/testing-i686/zabbix-proxy-mysql.service
(from rev 308154, zabbix/trunk/zabbix-proxy-mysql.service)
zabbix/repos/testing-i686/zabbix-proxy-pgsql.service
(from rev 308154, zabbix/trunk/zabbix-proxy-pgsql.service)
zabbix/repos/testing-i686/zabbix-proxy-sqlite.service
(from rev 308154, zabbix/trunk/zabbix-proxy-sqlite.service)
zabbix/repos/testing-i686/zabbix-proxy.sysusers
(from rev 308154, zabbix/trunk/zabbix-proxy.sysusers)
zabbix/repos/testing-i686/zabbix-proxy.tmpfiles
(from rev 308154, zabbix/trunk/zabbix-proxy.tmpfiles)
zabbix/repos/testing-i686/zabbix-server-mysql.service
(from rev 308154, zabbix/trunk/zabbix-server-mysql.service)
zabbix/repos/testing-i686/zabbix-server-pgsql.service
(from rev 308154, zabbix/trunk/zabbix-server-pgsql.service)
zabbix/repos/testing-i686/zabbix-server.install
(from rev 308154, zabbix/trunk/zabbix-server.install)
zabbix/repos/testing-i686/zabbix-server.sysusers
(from rev 308154, zabbix/trunk/zabbix-server.sysusers)
zabbix/repos/testing-i686/zabbix-server.tmpfiles
(from rev 308154, zabbix/trunk/zabbix-server.tmpfiles)
zabbix/repos/testing-x86_64/PKGBUILD
(from rev 308154, zabbix/trunk/PKGBUILD)
zabbix/repos/testing-x86_64/ceph.sysusers
(from rev 308154, zabbix/trunk/ceph.sysusers)
zabbix/repos/testing-x86_64/zabbix-agent.service
(from rev 308154, zabbix/trunk/zabbix-agent.service)
zabbix/repos/testing-x86_64/zabbix-agent.sysusers
(from rev 308154, zabbix/trunk/zabbix-agent.sysusers)
zabbix/repos/testing-x86_64/zabbix-agent.tmpfiles
(from rev 308154, zabbix/trunk/zabbix-agent.tmpfiles)
zabbix/repos/testing-x86_64/zabbix-proxy-mysql.service
(from rev 308154, zabbix/trunk/zabbix-proxy-mysql.service)
zabbix/repos/testing-x86_64/zabbix-proxy-pgsql.service
(from rev 308154, zabbix/trunk/zabbix-proxy-pgsql.service)
zabbix/repos/testing-x86_64/zabbix-proxy-sqlite.service
(from rev 308154, zabbix/trunk/zabbix-proxy-sqlite.service)
zabbix/repos/testing-x86_64/zabbix-proxy.sysusers
(from rev 308154, zabbix/trunk/zabbix-proxy.sysusers)
zabbix/repos/testing-x86_64/zabbix-proxy.tmpfiles
(from rev 308154, zabbix/trunk/zabbix-proxy.tmpfiles)
zabbix/repos/testing-x86_64/zabbix-server-mysql.service
(from rev 308154, zabbix/trunk/zabbix-server-mysql.service)
zabbix/repos/testing-x86_64/zabbix-server-pgsql.service
(from rev 308154, zabbix/trunk/zabbix-server-pgsql.service)
zabbix/repos/testing-x86_64/zabbix-server.install
(from rev 308154, zabbix/trunk/zabbix-server.install)
zabbix/repos/testing-x86_64/zabbix-server.sysusers
(from rev 308154, zabbix/trunk/zabbix-server.sysusers)
zabbix/repos/testing-x86_64/zabbix-server.tmpfiles
(from rev 308154, zabbix/trunk/zabbix-server.tmpfiles)
Deleted:
zabbix/repos/testing-i686/PKGBUILD
zabbix/repos/testing-i686/zabbix-agent.service
zabbix/repos/testing-i686/zabbix-agent.sysusers
zabbix/repos/testing-i686/zabbix-agent.tmpfiles
zabbix/repos/testing-i686/zabbix-proxy-mysql.service
zabbix/repos/testing-i686/zabbix-proxy-pgsql.service
zabbix/repos/testing-i686/zabbix-proxy-sqlite.service
zabbix/repos/testing-i686/zabbix-proxy.sysusers
zabbix/repos/testing-i686/zabbix-proxy.tmpfiles
zabbix/repos/testing-i686/zabbix-server-mysql.service
zabbix/repos/testing-i686/zabbix-server-pgsql.service
zabbix/repos/testing-i686/zabbix-server.install
zabbix/repos/testing-i686/zabbix-server.sysusers
zabbix/repos/testing-i686/zabbix-server.tmpfiles
zabbix/repos/testing-x86_64/PKGBUILD
zabbix/repos/testing-x86_64/ceph.sysusers
zabbix/repos/testing-x86_64/fix-ceph_disk-python-interpreter.patch
zabbix/repos/testing-x86_64/fix-or-disable-broken-tests.patch
zabbix/repos/testing-x86_64/fix-python2-paths.patch
zabbix/repos/testing-x86_64/remove-distro-version-detection.patch
zabbix/repos/testing-x86_64/zabbix-agent.service
zabbix/repos/testing-x86_64/zabbix-agent.sysusers
zabbix/repos/testing-x86_64/zabbix-agent.tmpfiles
zabbix/repos/testing-x86_64/zabbix-proxy-mysql.service
zabbix/repos/testing-x86_64/zabbix-proxy-pgsql.service
zabbix/repos/testing-x86_64/zabbix-proxy-sqlite.service
zabbix/repos/testing-x86_64/zabbix-proxy.sysusers
zabbix/repos/testing-x86_64/zabbix-proxy.tmpfiles
zabbix/repos/testing-x86_64/zabbix-server-mysql.service
zabbix/repos/testing-x86_64/zabbix-server-pgsql.service
zabbix/repos/testing-x86_64/zabbix-server.install
zabbix/repos/testing-x86_64/zabbix-server.sysusers
zabbix/repos/testing-x86_64/zabbix-server.tmpfiles
-------------------------------------------------------+
/PKGBUILD | 330 ++++++++++++++++
/ceph.sysusers | 1
/zabbix-agent.service | 22 +
/zabbix-agent.sysusers | 2
/zabbix-agent.tmpfiles | 2
/zabbix-proxy-mysql.service | 24 +
/zabbix-proxy-pgsql.service | 24 +
/zabbix-proxy-sqlite.service | 24 +
/zabbix-proxy.sysusers | 2
/zabbix-proxy.tmpfiles | 2
/zabbix-server-mysql.service | 24 +
/zabbix-server-pgsql.service | 24 +
/zabbix-server.install | 24 +
/zabbix-server.sysusers | 2
/zabbix-server.tmpfiles | 2
testing-i686/PKGBUILD | 181 --------
testing-i686/ceph.sysusers | 1
testing-i686/zabbix-agent.service | 11
testing-i686/zabbix-agent.sysusers | 1
testing-i686/zabbix-agent.tmpfiles | 1
testing-i686/zabbix-proxy-mysql.service | 12
testing-i686/zabbix-proxy-pgsql.service | 12
testing-i686/zabbix-proxy-sqlite.service | 12
testing-i686/zabbix-proxy.sysusers | 1
testing-i686/zabbix-proxy.tmpfiles | 1
testing-i686/zabbix-server-mysql.service | 12
testing-i686/zabbix-server-pgsql.service | 12
testing-i686/zabbix-server.install | 12
testing-i686/zabbix-server.sysusers | 1
testing-i686/zabbix-server.tmpfiles | 1
testing-x86_64/PKGBUILD | 182 --------
testing-x86_64/ceph.sysusers | 1
testing-x86_64/fix-ceph_disk-python-interpreter.patch | 8
testing-x86_64/fix-or-disable-broken-tests.patch | 313 ---------------
testing-x86_64/fix-python2-paths.patch | 52 --
testing-x86_64/remove-distro-version-detection.patch | 21 -
testing-x86_64/zabbix-agent.service | 11
testing-x86_64/zabbix-agent.sysusers | 1
testing-x86_64/zabbix-agent.tmpfiles | 1
testing-x86_64/zabbix-proxy-mysql.service | 12
testing-x86_64/zabbix-proxy-pgsql.service | 12
testing-x86_64/zabbix-proxy-sqlite.service | 12
testing-x86_64/zabbix-proxy.sysusers | 1
testing-x86_64/zabbix-proxy.tmpfiles | 1
testing-x86_64/zabbix-server-mysql.service | 12
testing-x86_64/zabbix-server-pgsql.service | 12
testing-x86_64/zabbix-server.install | 12
testing-x86_64/zabbix-server.sysusers | 1
testing-x86_64/zabbix-server.tmpfiles | 1
49 files changed, 510 insertions(+), 936 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-i686/PKGBUILD 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,181 +0,0 @@
-# $Id$
-# 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=3.4.3
-pkgrel=1
-arch=(i686 x86_64)
-url='http://www.zabbix.com/'
-license=(GPL)
-makedepends=(postgresql-libs libxml2 unixodbc net-snmp libmariadbclient 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})
-
-sha256sums=('00e87db503d332a1e3905d13f36b6ddad32c2514f03060361168655a8d4fd8cf'
- '484fa9969eab61eaf20043ae08e2615c0569982dff869c985f2e2065da698c6a'
- 'ef23133aae2340945e621c9725094a3458d9089d3de15f641afcdabdf7c5a39c'
- 'c38a871d237b00dd6310dfb02e5a8e1b930e445204e73dde8305bed8baf380ec'
- '7b14586f5b418de6a174c35d466e25ee42c5e4d8190eea4663f4b3e905f91216'
- '6e49cd520604745aa0febd76d582a2936ad8ab7374c3c9f353ac8c7b1adbbf61'
- '9fe22526327a0573652c65ff374eba7c36a00b85f8e72d32643d1cc68a07ebbb'
- '879a7553040d652d1c34044c0ce1e57b809c647b3b037247a5819892a7622a65'
- 'd06775ebc27cec623d94a3134b4abfb8ddd8e74e3c3483fa1f57f542590e9113'
- '3394dc819a9915f4710cc3ba1ab24c5f1df1547736d2d40b04eec873e8619e8c'
- '7592b3b5b66583a57eec83afed3450bae74f6332125396c1dbeeb46f911cb631'
- 'd8929b2e78b5b178c7eebc32ae00a05b7c9d798cf25950a8745ea4b23734e226'
- 'f842ea0a229513e918ff9641391605d436b7d57cb53d932cdd02e4e8b13c95d9')
-
-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)
- optdepends=('postgresql-libs: for PostgreSQL support'
- 'libmariadbclient: 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)
- optdepends=('libmariadbclient: 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/testing-i686/PKGBUILD (from rev 308154, zabbix/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1,165 @@
+# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+# Contributor: Thore Bödecker <foxxx0 at archlinux.org>
+
+pkgbase=zabbix
+pkgname=(zabbix-server zabbix-agent zabbix-proxy zabbix-frontend-php)
+pkgver=3.4.2
+pkgrel=1
+arch=(i686 x86_64)
+url='http://www.zabbix.com/'
+license=(GPL)
+makedepends=(postgresql-libs libxml2 unixodbc net-snmp libmariadbclient 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})
+
+sha256sums=('54c21e04da4ef43380af647c6a0ddff67614337386fa318da021117efe5b334f'
+ '484fa9969eab61eaf20043ae08e2615c0569982dff869c985f2e2065da698c6a'
+ 'ef23133aae2340945e621c9725094a3458d9089d3de15f641afcdabdf7c5a39c'
+ 'c38a871d237b00dd6310dfb02e5a8e1b930e445204e73dde8305bed8baf380ec'
+ '7b14586f5b418de6a174c35d466e25ee42c5e4d8190eea4663f4b3e905f91216'
+ '6e49cd520604745aa0febd76d582a2936ad8ab7374c3c9f353ac8c7b1adbbf61'
+ '9fe22526327a0573652c65ff374eba7c36a00b85f8e72d32643d1cc68a07ebbb'
+ '879a7553040d652d1c34044c0ce1e57b809c647b3b037247a5819892a7622a65'
+ 'd06775ebc27cec623d94a3134b4abfb8ddd8e74e3c3483fa1f57f542590e9113'
+ '3394dc819a9915f4710cc3ba1ab24c5f1df1547736d2d40b04eec873e8619e8c'
+ '7592b3b5b66583a57eec83afed3450bae74f6332125396c1dbeeb46f911cb631'
+ 'd8929b2e78b5b178c7eebc32ae00a05b7c9d798cf25950a8745ea4b23734e226'
+ 'f842ea0a229513e918ff9641391605d436b7d57cb53d932cdd02e4e8b13c95d9')
+
+ # remove tests that require root privileges
+ rm src/test/cli/ceph-authtool/cap*.t
+
+ # remove broken tests
+ rm src/test/cli/crushtool/build.t
+ rm -rf qa/btrfs
+ rm src/btrfs_ioc_test.c
+
+ # this test will try to perform btrfs operations when a btrfs mount
+ # is active on the build host, which will fail
+ if mount | grep 'type btrfs' &>/dev/null; then
+ sed -i '/run-tox-ceph-disk/d' src/test/CMakeLists.txt
+ fi
+}
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ mkdir -p build
+ cd build
+
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+ -DCMAKE_INSTALL_SBINDIR=/usr/bin \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib \
+ -DWITH_BABELTRACE=ON \
+ -DWITH_CEPHFS=ON \
+ -DWITH_FUSE=ON \
+ -DWITH_LTTNG=ON \
+ -DWITH_LZ4=ON \
+ -DWITH_MGR=ON \
+ -DWITH_NSS=ON \
+ -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
+ -DWITH_RADOSGW=ON \
+ -DWITH_RADOSGW_BEAST_FRONTEND=ON \
+ -DWITH_RDMA=OFF \
+ -DWITH_SSL=ON \
+ -DWITH_SYSTEM_BOOST=ON \
+ -DWITH_SYSTEMD=ON \
+ -DWITH_TESTS=ON \
+ -DWITH_XFS=ON \
+ -DENABLE_SHARED=ON \
+ ..
+
+ make all
+}
+
+check() {
+ cd "${srcdir}/${pkgbase}-${pkgver}/build"
+
+ export CTEST_PARALLEL_LEVEL="$(nproc)"
+ make check
+
+ # sometimes processes are not properly terminated...
+ for process in ceph-mon ceph-mgr ceph-osd; do
+ pkill -9 "$process" || true
+ done
+}
+
+package_ceph-libs() {
+ depends=('boost-libs' 'curl' 'glibc' 'keyutils' 'leveldb' 'libaio'
+ 'libutil-linux' 'lttng-ust' 'nss' 'python2' 'xfsprogs')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}/build"
+
+ # main install
+ make DESTDIR="$pkgdir" install
+
+ # remove stuff that goes into the ceph package
+ rm -rf "${pkgdir}"/usr/lib/{ceph/mgr,systemd,sysusers.d,tmpfiles.d}
+ rm -rf "${pkgdir}/usr/share"
+ rm -rf "${pkgdir}/usr/sbin"
+ rm -rf "${pkgdir}/usr/bin"
+ rm -rf "${pkgdir}/etc"
+ rm -rf "${pkgdir}/var"
+}
+
+package_ceph() {
+ depends=('ceph-libs' 'babeltrace' 'boost-libs' 'curl' 'fuse2' 'glibc'
+ 'gperftools' 'keyutils' 'leveldb' 'libaio' 'libsystemd' 'libutil-linux'
+ 'lsb-release' 'lttng-ust' 'ncurses' 'nss' 'python2' 'python2-cherrypy'
+ 'python2-jinja' 'python2-pecan' 'python2-prettytable' 'python2-pyopenssl'
+ 'python2-setuptools' 'python2-werkzeug' 'snappy' 'xfsprogs')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}/build"
+
+ # main install
+ make DESTDIR="$pkgdir" install
+
+ # remove stuff that is in the ceph-libs package
+ find "${pkgdir}/usr/lib" -maxdepth 1 -type f -delete
+ find "${pkgdir}/usr/lib" -maxdepth 1 -type l -delete
+ find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type f -delete
+ find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type l -delete
+ rm -rf "${pkgdir}"/usr/lib/{ceph/{compressor,crypto,erasure-code},python2.7,rados-classes}
+ rm -rf "${pkgdir}/usr/include"
+
+ # install tmpfiles.d and sysusers.d stuff
+ install -Dm644 "${srcdir}/${pkgbase}-${pkgver}/systemd/ceph.tmpfiles.d" \
+ "${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}.conf"
+ install -Dm644 "${srcdir}/ceph.sysusers" \
+ "${pkgdir}/usr/lib/sysusers.d/${pkgbase}.conf"
+
+ # remove debian init script
+ rm -rf "${pkgdir}/etc/init.d"
+
+ # fix sbin dir (cmake opt seems to have no effect)
+ mv "${pkgdir}"/usr/sbin/* "${pkgdir}/usr/bin/"
+ rm -rf "${pkgdir}/usr/sbin"
+
+ # remove drop.ceph.com ssh stuff
+ rm -f "${pkgdir}/usr/share/ceph/{{known_hosts,id_rsa}_drop.ceph.com,.pub}"
+
+ # fix bash completions path
+ install -d -m 755 "${pkgdir}/usr/share/bash-completion"
+ mv "$pkgdir"/{etc/bash_completion.d,usr/share/bash-completion/completions}
+
+ # fix EnvironmentFile location in systemd service files
+ sed -i 's|/etc/sysconfig/|/etc/conf.d/|g' "${pkgdir}"/usr/lib/systemd/system/*.service
+
+ # prepare some paths and set correct permissions
+ install -D -d -m750 -o 0 -g 340 "${pkgdir}/etc/ceph"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/log/ceph"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-mds"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-osd"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-rgw"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mon"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mgr"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/osd"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: zabbix/repos/testing-i686/ceph.sysusers (from rev 308154, zabbix/trunk/ceph.sysusers)
===================================================================
--- testing-i686/ceph.sysusers (rev 0)
+++ testing-i686/ceph.sysusers 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1 @@
+u ceph 340 - /run/ceph
Deleted: testing-i686/zabbix-agent.service
===================================================================
--- testing-i686/zabbix-agent.service 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-i686/zabbix-agent.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,11 +0,0 @@
-[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/testing-i686/zabbix-agent.service (from rev 308154, zabbix/trunk/zabbix-agent.service)
===================================================================
--- testing-i686/zabbix-agent.service (rev 0)
+++ testing-i686/zabbix-agent.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -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
Deleted: testing-i686/zabbix-agent.sysusers
===================================================================
--- testing-i686/zabbix-agent.sysusers 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-i686/zabbix-agent.sysusers 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1 +0,0 @@
-u zabbix-agent 172 - /var/lib/zabbix-agent
Copied: zabbix/repos/testing-i686/zabbix-agent.sysusers (from rev 308154, zabbix/trunk/zabbix-agent.sysusers)
===================================================================
--- testing-i686/zabbix-agent.sysusers (rev 0)
+++ testing-i686/zabbix-agent.sysusers 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1 @@
+u zabbix-agent 172 - /var/lib/zabbix-agent
Deleted: testing-i686/zabbix-agent.tmpfiles
===================================================================
--- testing-i686/zabbix-agent.tmpfiles 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-i686/zabbix-agent.tmpfiles 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1 +0,0 @@
-d /var/lib/zabbix-agent 0750 zabbix-agent zabbix-agent -
Copied: zabbix/repos/testing-i686/zabbix-agent.tmpfiles (from rev 308154, zabbix/trunk/zabbix-agent.tmpfiles)
===================================================================
--- testing-i686/zabbix-agent.tmpfiles (rev 0)
+++ testing-i686/zabbix-agent.tmpfiles 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1 @@
+d /var/lib/zabbix-agent 0750 zabbix-agent zabbix-agent -
Deleted: testing-i686/zabbix-proxy-mysql.service
===================================================================
--- testing-i686/zabbix-proxy-mysql.service 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-i686/zabbix-proxy-mysql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,12 +0,0 @@
-[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
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-i686/zabbix-proxy-mysql.service (from rev 308154, zabbix/trunk/zabbix-proxy-mysql.service)
===================================================================
--- testing-i686/zabbix-proxy-mysql.service (rev 0)
+++ testing-i686/zabbix-proxy-mysql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1,12 @@
+[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
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-i686/zabbix-proxy-pgsql.service
===================================================================
--- testing-i686/zabbix-proxy-pgsql.service 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-i686/zabbix-proxy-pgsql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,12 +0,0 @@
-[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
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-i686/zabbix-proxy-pgsql.service (from rev 308154, zabbix/trunk/zabbix-proxy-pgsql.service)
===================================================================
--- testing-i686/zabbix-proxy-pgsql.service (rev 0)
+++ testing-i686/zabbix-proxy-pgsql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1,12 @@
+[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
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-i686/zabbix-proxy-sqlite.service
===================================================================
--- testing-i686/zabbix-proxy-sqlite.service 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-i686/zabbix-proxy-sqlite.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,12 +0,0 @@
-[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
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-i686/zabbix-proxy-sqlite.service (from rev 308154, zabbix/trunk/zabbix-proxy-sqlite.service)
===================================================================
--- testing-i686/zabbix-proxy-sqlite.service (rev 0)
+++ testing-i686/zabbix-proxy-sqlite.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1,12 @@
+[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
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-i686/zabbix-proxy.sysusers
===================================================================
--- testing-i686/zabbix-proxy.sysusers 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-i686/zabbix-proxy.sysusers 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1 +0,0 @@
-u zabbix-proxy 171 - /var/lib/zabbix-proxy
Copied: zabbix/repos/testing-i686/zabbix-proxy.sysusers (from rev 308154, zabbix/trunk/zabbix-proxy.sysusers)
===================================================================
--- testing-i686/zabbix-proxy.sysusers (rev 0)
+++ testing-i686/zabbix-proxy.sysusers 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1 @@
+u zabbix-proxy 171 - /var/lib/zabbix-proxy
Deleted: testing-i686/zabbix-proxy.tmpfiles
===================================================================
--- testing-i686/zabbix-proxy.tmpfiles 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-i686/zabbix-proxy.tmpfiles 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1 +0,0 @@
-d /var/lib/zabbix-proxy 0750 zabbix-proxy zabbix-proxy -
Copied: zabbix/repos/testing-i686/zabbix-proxy.tmpfiles (from rev 308154, zabbix/trunk/zabbix-proxy.tmpfiles)
===================================================================
--- testing-i686/zabbix-proxy.tmpfiles (rev 0)
+++ testing-i686/zabbix-proxy.tmpfiles 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1 @@
+d /var/lib/zabbix-proxy 0750 zabbix-proxy zabbix-proxy -
Deleted: testing-i686/zabbix-server-mysql.service
===================================================================
--- testing-i686/zabbix-server-mysql.service 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-i686/zabbix-server-mysql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,12 +0,0 @@
-[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
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-i686/zabbix-server-mysql.service (from rev 308154, zabbix/trunk/zabbix-server-mysql.service)
===================================================================
--- testing-i686/zabbix-server-mysql.service (rev 0)
+++ testing-i686/zabbix-server-mysql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1,12 @@
+[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
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-i686/zabbix-server-pgsql.service
===================================================================
--- testing-i686/zabbix-server-pgsql.service 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-i686/zabbix-server-pgsql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,12 +0,0 @@
-[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
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-i686/zabbix-server-pgsql.service (from rev 308154, zabbix/trunk/zabbix-server-pgsql.service)
===================================================================
--- testing-i686/zabbix-server-pgsql.service (rev 0)
+++ testing-i686/zabbix-server-pgsql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1,12 @@
+[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
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-i686/zabbix-server.install
===================================================================
--- testing-i686/zabbix-server.install 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-i686/zabbix-server.install 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,12 +0,0 @@
-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/testing-i686/zabbix-server.install (from rev 308154, zabbix/trunk/zabbix-server.install)
===================================================================
--- testing-i686/zabbix-server.install (rev 0)
+++ testing-i686/zabbix-server.install 2017-10-17 16:21:07 UTC (rev 308155)
@@ -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"
+}
Deleted: testing-i686/zabbix-server.sysusers
===================================================================
--- testing-i686/zabbix-server.sysusers 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-i686/zabbix-server.sysusers 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1 +0,0 @@
-u zabbix-server 170 - /var/lib/zabbix-server
Copied: zabbix/repos/testing-i686/zabbix-server.sysusers (from rev 308154, zabbix/trunk/zabbix-server.sysusers)
===================================================================
--- testing-i686/zabbix-server.sysusers (rev 0)
+++ testing-i686/zabbix-server.sysusers 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1 @@
+u zabbix-server 170 - /var/lib/zabbix-server
Deleted: testing-i686/zabbix-server.tmpfiles
===================================================================
--- testing-i686/zabbix-server.tmpfiles 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-i686/zabbix-server.tmpfiles 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1 +0,0 @@
-d /var/lib/zabbix-server 0750 zabbix-server zabbix-server -
Copied: zabbix/repos/testing-i686/zabbix-server.tmpfiles (from rev 308154, zabbix/trunk/zabbix-server.tmpfiles)
===================================================================
--- testing-i686/zabbix-server.tmpfiles (rev 0)
+++ testing-i686/zabbix-server.tmpfiles 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1 @@
+d /var/lib/zabbix-server 0750 zabbix-server zabbix-server -
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/PKGBUILD 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,182 +0,0 @@
-# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
-# Contributor: Thore Bödecker <foxxx0 at archlinux.org>
-
-pkgbase='ceph'
-pkgname=('ceph' 'ceph-libs')
-pkgver=12.2.1
-pkgrel=2
-pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
-arch=('x86_64' 'i686')
-url='https://ceph.com/'
-license=('GPL')
-makedepends=('babeltrace>=1.5.3-1' 'bc' 'boost' 'boost-libs' 'cmake' 'cpio'
- 'crypto++' 'curl' 'cython' 'cython2' 'expat' 'fcgi' 'fuse2' 'gcc-libs' 'git'
- 'glibc' 'gperf' 'gperftools' 'gptfdisk' 'inetutils' 'jq' 'junit' 'keyutils'
- 'leveldb' 'libaio' 'libatomic_ops' 'libedit' 'libsystemd' 'libutil-linux'
- 'libxml2' 'lsb-release' 'lttng-ust>=2.10.0-8' 'lz4' 'ncurses' 'nss' 'parted'
- 'pcre' 'procps-ng' 'python2-cherrypy' 'python2-jinja'
- 'python2-lttngust>=2.10.0-8' 'python2-nose' 'python2-pecan' 'python2-pip'
- 'python2-prettytable' 'python2-pyopenssl' 'python2-setuptools'
- 'python2-sphinx' 'python2-tox' 'python2-virtualenv' 'python2-werkzeug'
- 'sed' 'snappy' 'socat' 'systemd' 'valgrind' 'xfsprogs' 'xmlstarlet' 'yasm'
- 'zlib' 'zstd')
-options=('emptydirs')
-source=("https://download.ceph.com/tarballs/${pkgbase}-${pkgver}.tar.gz"
- 'ceph.sysusers'
- 'fix-ceph_disk-python-interpreter.patch'
- 'fix-or-disable-broken-tests.patch'
- 'fix-python2-paths.patch'
- 'remove-distro-version-detection.patch')
-sha512sums=('ec2623c1f6ab563c6fd0bb5fd046c78528fdbedca7cde347c92a9b15005d2ab2b1a46d7294e93f56933386462f1066750285109aafb6bf94f7d5bcdb7214d8a8'
- '4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
- '7abd94a333fb0d6c9f7156d69ed6d4bf123f0f3030407f4347209d677b282e5023664d43e74a21a27b7856d3493ae469a17ea8a810331c7266018cc34eee4841'
- '43cbd68841758d58d11ab9acfb04800bf8b34321503b8ebc3b02291c5e2de7a60e26dc0d5e99af75dae63aa7d03e3e9322aba7cbe3b4f1dfb5e7d01fc5b40cad'
- 'd5d9e8123833212f6cf0ecef209a5dd9b9a8ec70d780b5140884dc9f87690ec305fb2569c5d1da2b28deb05bd03caecc534acc9dc5ce7ec75e2580df4b5b2063'
- 'e2ed33e2ac37bfdb9597083388e1a87f10051e976033055d440b1a4bc2bd11148c29128fb9841771ca983c12fb36b343bcc04219dea87199321ceea9aa18b3cc')
-
-prepare() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
- # apply patch from the source array (should be a pacman feature)
- local filename
- for filename in "${source[@]}"; do
- if [[ "$filename" =~ \.patch$ ]]; then
- msg2 "Applying patch ${filename##*/}"
- patch -p1 -N -i "$srcdir/${filename##*/}"
- fi
- done
-
- # remove tests that require root privileges
- rm src/test/cli/ceph-authtool/cap*.t
-
- # remove broken tests
- rm src/test/cli/crushtool/build.t
- rm -rf qa/btrfs
- rm src/btrfs_ioc_test.c
-
- # this test will try to perform btrfs operations when a btrfs mount
- # is active on the build host, which will fail
- if mount | grep 'type btrfs' &>/dev/null; then
- sed -i '/run-tox-ceph-disk/d' src/test/CMakeLists.txt
- fi
-}
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- mkdir -p build
- cd build
-
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_SYSCONFDIR=/etc \
- -DCMAKE_INSTALL_SBINDIR=/usr/bin \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib \
- -DWITH_BABELTRACE=ON \
- -DWITH_CEPHFS=ON \
- -DWITH_FUSE=ON \
- -DWITH_LTTNG=ON \
- -DWITH_LZ4=ON \
- -DWITH_MGR=ON \
- -DWITH_NSS=ON \
- -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
- -DWITH_RADOSGW=ON \
- -DWITH_RADOSGW_BEAST_FRONTEND=ON \
- -DWITH_RDMA=OFF \
- -DWITH_SSL=ON \
- -DWITH_SYSTEM_BOOST=ON \
- -DWITH_SYSTEMD=ON \
- -DWITH_TESTS=ON \
- -DWITH_XFS=ON \
- -DENABLE_SHARED=ON \
- ..
-
- make all
-}
-
-check() {
- cd "${srcdir}/${pkgbase}-${pkgver}/build"
-
- export CTEST_PARALLEL_LEVEL="$(nproc)"
- make check
-
- # sometimes processes are not properly terminated...
- for process in ceph-mon ceph-mgr ceph-osd; do
- pkill -9 "$process" || true
- done
-}
-
-package_ceph-libs() {
- depends=('boost-libs' 'curl' 'glibc' 'keyutils' 'leveldb' 'libaio'
- 'libutil-linux' 'lttng-ust' 'nss' 'python2' 'xfsprogs')
-
- cd "${srcdir}/${pkgbase}-${pkgver}/build"
-
- # main install
- make DESTDIR="$pkgdir" install
-
- # remove stuff that goes into the ceph package
- rm -rf "${pkgdir}"/usr/lib/{ceph/mgr,systemd,sysusers.d,tmpfiles.d}
- rm -rf "${pkgdir}/usr/share"
- rm -rf "${pkgdir}/usr/sbin"
- rm -rf "${pkgdir}/usr/bin"
- rm -rf "${pkgdir}/etc"
- rm -rf "${pkgdir}/var"
-}
-
-package_ceph() {
- depends=('ceph-libs' 'babeltrace' 'boost-libs' 'curl' 'fuse2' 'glibc'
- 'gperftools' 'keyutils' 'leveldb' 'libaio' 'libsystemd' 'libutil-linux'
- 'lsb-release' 'lttng-ust' 'ncurses' 'nss' 'python2' 'python2-cherrypy'
- 'python2-jinja' 'python2-pecan' 'python2-prettytable' 'python2-pyopenssl'
- 'python2-setuptools' 'python2-werkzeug' 'snappy' 'xfsprogs')
-
- cd "${srcdir}/${pkgbase}-${pkgver}/build"
-
- # main install
- make DESTDIR="$pkgdir" install
-
- # remove stuff that is in the ceph-libs package
- find "${pkgdir}/usr/lib" -maxdepth 1 -type f -delete
- find "${pkgdir}/usr/lib" -maxdepth 1 -type l -delete
- find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type f -delete
- find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type l -delete
- rm -rf "${pkgdir}"/usr/lib/{ceph/{compressor,crypto,erasure-code},python2.7,rados-classes}
- rm -rf "${pkgdir}/usr/include"
-
- # install tmpfiles.d and sysusers.d stuff
- install -Dm644 "${srcdir}/${pkgbase}-${pkgver}/systemd/ceph.tmpfiles.d" \
- "${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}.conf"
- install -Dm644 "${srcdir}/ceph.sysusers" \
- "${pkgdir}/usr/lib/sysusers.d/${pkgbase}.conf"
-
- # remove debian init script
- rm -rf "${pkgdir}/etc/init.d"
-
- # fix sbin dir (cmake opt seems to have no effect)
- mv "${pkgdir}"/usr/sbin/* "${pkgdir}/usr/bin/"
- rm -rf "${pkgdir}/usr/sbin"
-
- # remove drop.ceph.com ssh stuff
- rm -f "${pkgdir}/usr/share/ceph/{{known_hosts,id_rsa}_drop.ceph.com,.pub}"
-
- # fix bash completions path
- install -d -m 755 "${pkgdir}/usr/share/bash-completion"
- mv "$pkgdir"/{etc/bash_completion.d,usr/share/bash-completion/completions}
-
- # fix EnvironmentFile location in systemd service files
- sed -i 's|/etc/sysconfig/|/etc/conf.d/|g' "${pkgdir}"/usr/lib/systemd/system/*.service
-
- # prepare some paths and set correct permissions
- install -D -d -m750 -o 0 -g 340 "${pkgdir}/etc/ceph"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/log/ceph"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-mds"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-osd"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-rgw"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mon"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mgr"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/osd"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: zabbix/repos/testing-x86_64/PKGBUILD (from rev 308154, zabbix/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1,165 @@
+# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+# Contributor: Thore Bödecker <foxxx0 at archlinux.org>
+
+pkgbase=zabbix
+pkgname=(zabbix-server zabbix-agent zabbix-proxy zabbix-frontend-php)
+pkgver=3.4.2
+pkgrel=1
+arch=(i686 x86_64)
+url='http://www.zabbix.com/'
+license=(GPL)
+makedepends=(postgresql-libs libxml2 unixodbc net-snmp libmariadbclient 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})
+
+sha256sums=('54c21e04da4ef43380af647c6a0ddff67614337386fa318da021117efe5b334f'
+ '484fa9969eab61eaf20043ae08e2615c0569982dff869c985f2e2065da698c6a'
+ 'ef23133aae2340945e621c9725094a3458d9089d3de15f641afcdabdf7c5a39c'
+ 'c38a871d237b00dd6310dfb02e5a8e1b930e445204e73dde8305bed8baf380ec'
+ '7b14586f5b418de6a174c35d466e25ee42c5e4d8190eea4663f4b3e905f91216'
+ '6e49cd520604745aa0febd76d582a2936ad8ab7374c3c9f353ac8c7b1adbbf61'
+ '9fe22526327a0573652c65ff374eba7c36a00b85f8e72d32643d1cc68a07ebbb'
+ '879a7553040d652d1c34044c0ce1e57b809c647b3b037247a5819892a7622a65'
+ 'd06775ebc27cec623d94a3134b4abfb8ddd8e74e3c3483fa1f57f542590e9113'
+ '3394dc819a9915f4710cc3ba1ab24c5f1df1547736d2d40b04eec873e8619e8c'
+ '7592b3b5b66583a57eec83afed3450bae74f6332125396c1dbeeb46f911cb631'
+ 'd8929b2e78b5b178c7eebc32ae00a05b7c9d798cf25950a8745ea4b23734e226'
+ 'f842ea0a229513e918ff9641391605d436b7d57cb53d932cdd02e4e8b13c95d9')
+
+ # remove tests that require root privileges
+ rm src/test/cli/ceph-authtool/cap*.t
+
+ # remove broken tests
+ rm src/test/cli/crushtool/build.t
+ rm -rf qa/btrfs
+ rm src/btrfs_ioc_test.c
+
+ # this test will try to perform btrfs operations when a btrfs mount
+ # is active on the build host, which will fail
+ if mount | grep 'type btrfs' &>/dev/null; then
+ sed -i '/run-tox-ceph-disk/d' src/test/CMakeLists.txt
+ fi
+}
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ mkdir -p build
+ cd build
+
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+ -DCMAKE_INSTALL_SBINDIR=/usr/bin \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib \
+ -DWITH_BABELTRACE=ON \
+ -DWITH_CEPHFS=ON \
+ -DWITH_FUSE=ON \
+ -DWITH_LTTNG=ON \
+ -DWITH_LZ4=ON \
+ -DWITH_MGR=ON \
+ -DWITH_NSS=ON \
+ -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
+ -DWITH_RADOSGW=ON \
+ -DWITH_RADOSGW_BEAST_FRONTEND=ON \
+ -DWITH_RDMA=OFF \
+ -DWITH_SSL=ON \
+ -DWITH_SYSTEM_BOOST=ON \
+ -DWITH_SYSTEMD=ON \
+ -DWITH_TESTS=ON \
+ -DWITH_XFS=ON \
+ -DENABLE_SHARED=ON \
+ ..
+
+ make all
+}
+
+check() {
+ cd "${srcdir}/${pkgbase}-${pkgver}/build"
+
+ export CTEST_PARALLEL_LEVEL="$(nproc)"
+ make check
+
+ # sometimes processes are not properly terminated...
+ for process in ceph-mon ceph-mgr ceph-osd; do
+ pkill -9 "$process" || true
+ done
+}
+
+package_ceph-libs() {
+ depends=('boost-libs' 'curl' 'glibc' 'keyutils' 'leveldb' 'libaio'
+ 'libutil-linux' 'lttng-ust' 'nss' 'python2' 'xfsprogs')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}/build"
+
+ # main install
+ make DESTDIR="$pkgdir" install
+
+ # remove stuff that goes into the ceph package
+ rm -rf "${pkgdir}"/usr/lib/{ceph/mgr,systemd,sysusers.d,tmpfiles.d}
+ rm -rf "${pkgdir}/usr/share"
+ rm -rf "${pkgdir}/usr/sbin"
+ rm -rf "${pkgdir}/usr/bin"
+ rm -rf "${pkgdir}/etc"
+ rm -rf "${pkgdir}/var"
+}
+
+package_ceph() {
+ depends=('ceph-libs' 'babeltrace' 'boost-libs' 'curl' 'fuse2' 'glibc'
+ 'gperftools' 'keyutils' 'leveldb' 'libaio' 'libsystemd' 'libutil-linux'
+ 'lsb-release' 'lttng-ust' 'ncurses' 'nss' 'python2' 'python2-cherrypy'
+ 'python2-jinja' 'python2-pecan' 'python2-prettytable' 'python2-pyopenssl'
+ 'python2-setuptools' 'python2-werkzeug' 'snappy' 'xfsprogs')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}/build"
+
+ # main install
+ make DESTDIR="$pkgdir" install
+
+ # remove stuff that is in the ceph-libs package
+ find "${pkgdir}/usr/lib" -maxdepth 1 -type f -delete
+ find "${pkgdir}/usr/lib" -maxdepth 1 -type l -delete
+ find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type f -delete
+ find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type l -delete
+ rm -rf "${pkgdir}"/usr/lib/{ceph/{compressor,crypto,erasure-code},python2.7,rados-classes}
+ rm -rf "${pkgdir}/usr/include"
+
+ # install tmpfiles.d and sysusers.d stuff
+ install -Dm644 "${srcdir}/${pkgbase}-${pkgver}/systemd/ceph.tmpfiles.d" \
+ "${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}.conf"
+ install -Dm644 "${srcdir}/ceph.sysusers" \
+ "${pkgdir}/usr/lib/sysusers.d/${pkgbase}.conf"
+
+ # remove debian init script
+ rm -rf "${pkgdir}/etc/init.d"
+
+ # fix sbin dir (cmake opt seems to have no effect)
+ mv "${pkgdir}"/usr/sbin/* "${pkgdir}/usr/bin/"
+ rm -rf "${pkgdir}/usr/sbin"
+
+ # remove drop.ceph.com ssh stuff
+ rm -f "${pkgdir}/usr/share/ceph/{{known_hosts,id_rsa}_drop.ceph.com,.pub}"
+
+ # fix bash completions path
+ install -d -m 755 "${pkgdir}/usr/share/bash-completion"
+ mv "$pkgdir"/{etc/bash_completion.d,usr/share/bash-completion/completions}
+
+ # fix EnvironmentFile location in systemd service files
+ sed -i 's|/etc/sysconfig/|/etc/conf.d/|g' "${pkgdir}"/usr/lib/systemd/system/*.service
+
+ # prepare some paths and set correct permissions
+ install -D -d -m750 -o 0 -g 340 "${pkgdir}/etc/ceph"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/log/ceph"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-mds"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-osd"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-rgw"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mon"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mgr"
+ install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/osd"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: testing-x86_64/ceph.sysusers
===================================================================
--- testing-x86_64/ceph.sysusers 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/ceph.sysusers 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1 +0,0 @@
-u ceph 340 - /run/ceph
Copied: zabbix/repos/testing-x86_64/ceph.sysusers (from rev 308154, zabbix/trunk/ceph.sysusers)
===================================================================
--- testing-x86_64/ceph.sysusers (rev 0)
+++ testing-x86_64/ceph.sysusers 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1 @@
+u ceph 340 - /run/ceph
Deleted: testing-x86_64/fix-ceph_disk-python-interpreter.patch
===================================================================
--- testing-x86_64/fix-ceph_disk-python-interpreter.patch 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/fix-ceph_disk-python-interpreter.patch 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,8 +0,0 @@
---- a/src/ceph-disk/ceph_disk/main.py 2017-08-28 18:30:20.000000000 +0200
-+++ b/src/ceph-disk/ceph_disk/main.py 2017-09-21 13:50:39.373573382 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- #
- # Copyright (C) 2015, 2016, 2017 Red Hat <contact at redhat.com>
- # Copyright (C) 2014 Inktank <info at inktank.com>
Deleted: testing-x86_64/fix-or-disable-broken-tests.patch
===================================================================
--- testing-x86_64/fix-or-disable-broken-tests.patch 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/fix-or-disable-broken-tests.patch 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,313 +0,0 @@
---- a/src/test/common/test_util.cc 2017-09-18 23:14:01.782825030 +0200
-+++ b/src/test/common/test_util.cc 2017-09-19 10:27:45.926925114 +0200
-@@ -48,7 +48,7 @@
-
-
- ASSERT_TRUE(sys_info.find("distro") != sys_info.end());
-- ASSERT_TRUE(sys_info.find("distro_version") != sys_info.end());
-+ //ASSERT_TRUE(sys_info.find("distro_version") != sys_info.end());
- ASSERT_TRUE(sys_info.find("distro_description") != sys_info.end());
-
- cct->put();
---- a/src/script/subman 2017-08-28 18:30:20.000000000 +0200
-+++ b/src/script/subman 2017-09-19 13:09:03.417286215 +0200
-@@ -11,7 +11,7 @@
- for disk in disks:
- for partition in disk.get('partition', []):
- if partition.get('type') == 'data':
-- df = subprocess.check_output("df --output=used " + partition['path'], shell=True)
-+ df = subprocess.check_output("df --output=used " + partition['path'], shell=True).decode('utf-8')
- used += int(re.findall('\d+', df)[0])
-
- facts_file = os.environ.get("CEPH_FACTS_FILE", "/etc/rhsm/facts/ceph_usage.facts")
---- a/src/test/CMakeLists.txt 2017-08-28 18:30:20.000000000 +0200
-+++ b/src/test/CMakeLists.txt 2017-09-21 17:50:12.074504293 +0200
-@@ -572,7 +572,6 @@
- #add_ceph_test(test_pidfile.sh ${CMAKE_CURRENT_SOURCE_DIR}/test_pidfile.sh)
-
- add_ceph_test(test_subman.sh ${CMAKE_CURRENT_SOURCE_DIR}/test_subman.sh)
--add_ceph_test(smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/smoke.sh)
- add_ceph_test(unittest_bufferlist.sh ${CMAKE_SOURCE_DIR}/src/unittest_bufferlist.sh)
-
- add_test(NAME run-tox-ceph-disk COMMAND bash ${CMAKE_SOURCE_DIR}/src/ceph-disk/run-tox.sh)
---- a/src/test/common/CMakeLists.txt 2017-08-28 18:30:20.000000000 +0200
-+++ b/src/test/common/CMakeLists.txt 2017-09-21 17:50:30.375079349 +0200
-@@ -42,13 +42,6 @@
- add_ceph_unittest(unittest_prioritized_queue ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_prioritized_queue)
- target_link_libraries(unittest_prioritized_queue global ${BLKID_LIBRARIES})
-
--# unittest_mclock_priority_queue
--add_executable(unittest_mclock_priority_queue EXCLUDE_FROM_ALL
-- test_mclock_priority_queue.cc
-- )
--add_ceph_unittest(unittest_mclock_priority_queue ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_mclock_priority_queue)
--target_link_libraries(unittest_mclock_priority_queue global ${BLKID_LIBRARIES} dmclock)
--
- # unittest_str_map
- add_executable(unittest_str_map
- test_str_map.cc
---- a/src/test/encoding/CMakeLists.txt 2017-08-28 18:30:20.000000000 +0200
-+++ b/src/test/encoding/CMakeLists.txt 2017-09-21 17:50:42.202117682 +0200
-@@ -1,4 +1,3 @@
- # scripts
--add_ceph_test(check-generated.sh ${CMAKE_CURRENT_SOURCE_DIR}/check-generated.sh)
- add_ceph_test(readable.sh ${CMAKE_CURRENT_SOURCE_DIR}/readable.sh)
-
---- a/src/test/run-cli-tests 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/test/run-cli-tests 2017-10-08 16:28:48.574708891 +0200
-@@ -1,7 +1,7 @@
- #!/bin/sh
- set -e
-
--if ! command -v virtualenv >/dev/null; then
-+if ! command -v virtualenv2 >/dev/null; then
- echo "$0: virtualenv not installed, skipping python-using tests." 1>&2
- exit 1
- fi
-@@ -30,7 +30,7 @@
- # patched cram to support that. See upstream ticket at
- # https://bitbucket.org/brodie/cram/issue/9/allow-read-only-directories-for-t
- # -- tv at inktank.com
-- virtualenv "$VENV" && $VENV/bin/pip --log "$VENV"/log.txt install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
-+ virtualenv2 "$VENV" && $VENV/bin/pip --log "$VENV"/log.txt install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
- fi
-
- SRCDIR_ABS="$(readlink -f "$SRCDIR")"
---- a/src/test/pybind/test_ceph_argparse.py 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/test/pybind/test_ceph_argparse.py 2017-10-08 16:50:49.060831801 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env nosetests
-+#!/usr/bin/env nosetests2
- # -*- mode:python; tab-width:4; indent-tabs-mode:t; coding:utf-8 -*-
- # vim: ts=4 sw=4 smarttab expandtab fileencoding=utf-8
- #
---- a/src/test/pybind/test_ceph_daemon.py 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/test/pybind/test_ceph_daemon.py 2017-10-08 16:50:58.341131927 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env nosetests
-+#!/usr/bin/env nosetests2
- # -*- mode:python; tab-width:4; indent-tabs-mode:t -*-
- # vim: ts=4 sw=4 smarttab expandtab
- #
---- a/qa/standalone/ceph-helpers.sh 2017-09-26 18:27:07.000000000 +0200
-+++ b/qa/standalone/ceph-helpers.sh 2017-10-10 16:41:58.095364616 +0200
-@@ -158,7 +158,7 @@
- kill_daemons $dir KILL
- if [ `uname` != FreeBSD ] \
- && [ $(stat -f -c '%T' .) == "btrfs" ]; then
-- __teardown_btrfs $dir
-+ true
- fi
- local cores="no"
- local pattern="$(sysctl -n $KERNCORE)"
-@@ -194,12 +194,7 @@
- }
-
- function __teardown_btrfs() {
-- local btrfs_base_dir=$1
-- local btrfs_root=$(df -P . | tail -1 | awk '{print $NF}')
-- local btrfs_dirs=$(cd $btrfs_base_dir; sudo btrfs subvolume list . -t | awk '/^[0-9]/ {print $4}' | grep "$btrfs_base_dir/$btrfs_dir")
-- for subvolume in $btrfs_dirs; do
-- sudo btrfs subvolume delete $btrfs_root/$subvolume
-- done
-+ true
- }
-
- function test_teardown() {
---- a/src/ceph-disk/run-tox.sh 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/ceph-disk/run-tox.sh 2017-10-10 18:52:33.542561990 +0200
-@@ -30,4 +30,4 @@
- fi
-
- source ${CEPH_DISK_VIRTUALENV}/bin/activate
--tox -c ${TOX_PATH}
-+tox2 -c ${TOX_PATH}
---- a/qa/workunits/rbd/run_devstack_tempest.sh 2017-09-26 18:27:07.000000000 +0200
-+++ b/qa/workunits/rbd/run_devstack_tempest.sh 2017-10-10 18:53:33.564468674 +0200
-@@ -119,4 +119,4 @@
- chmod -R o+rx ${STACK_OPT_PATH}/devstack/files
-
- cd ${STACK_OPT_PATH}/tempest
--sudo -H -u ${TEMPEST_USER} tox -eall-plugin -- '(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario)|(^cinder\.tests.tempest))' --concurrency=3
-+sudo -H -u ${TEMPEST_USER} tox2 -eall-plugin -- '(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario)|(^cinder\.tests.tempest))' --concurrency=3
---- a/src/test/filestore/TestFileStore.cc 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/test/filestore/TestFileStore.cc 2017-10-10 20:31:36.325983555 +0200
-@@ -36,13 +36,6 @@
- ASSERT_EQ(pm["filestore_backend"], "generic");
- }
- #if defined(__linux__)
-- {
-- map<string,string> pm;
-- FileStore fs(g_ceph_context, "a", "b");
-- TestFileStore::create_backend(fs, BTRFS_SUPER_MAGIC);
-- fs.collect_metadata(&pm);
-- ASSERT_EQ(pm["filestore_backend"], "btrfs");
-- }
- # ifdef HAVE_LIBXFS
- {
- map<string,string> pm;
---- a/src/test/cli/osdmaptool/ceph.conf.withracks 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/test/cli/osdmaptool/ceph.conf.withracks 2017-10-10 21:30:49.230389707 +0200
-@@ -42,8 +42,8 @@
- keyring = /mnt/osd.$id/keyring
- osd data = /mnt/osd.$id
- osd journal = /dev/disk/by-label/osd.$id.journal
-- osd mkfs type = btrfs
-- osd mount options btrfs = rw,noatime
-+ osd mkfs type = xfs
-+ osd mount options xfs = rw,noatime
- devs = /dev/disk/by-label/osd.$id.data
- ; temp sage
- debug osd = 20
---- a/src/test/ceph_objectstore_tool.py 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/test/ceph_objectstore_tool.py 2017-10-10 21:31:49.935695666 +0200
-@@ -1970,20 +1970,7 @@
-
-
- def remove_btrfs_subvolumes(path):
-- if platform.system() == "FreeBSD":
-- return
-- result = subprocess.Popen("stat -f -c '%%T' %s" % path, shell=True, stdout=subprocess.PIPE)
-- for line in result.stdout:
-- filesystem = decode(line).rstrip('\n')
-- if filesystem == "btrfs":
-- result = subprocess.Popen("sudo btrfs subvolume list %s" % path, shell=True, stdout=subprocess.PIPE)
-- for line in result.stdout:
-- subvolume = decode(line).split()[8]
-- # extracting the relative volume name
-- m = re.search(".*(%s.*)" % path, subvolume)
-- if m:
-- found = m.group(1)
-- call("sudo btrfs subvolume delete %s" % found, shell=True)
-+ return
-
-
- if __name__ == "__main__":
-@@ -1992,6 +1979,5 @@
- status = main(sys.argv[1:])
- finally:
- kill_daemons()
-- remove_btrfs_subvolumes(CEPH_DIR)
- call("/bin/rm -fr {dir}".format(dir=CEPH_DIR), shell=True)
- sys.exit(status)
---- a/src/spdk/test/iscsi_tgt/filesystem/filesystem.sh 2017-04-13 06:05:24.000000000 +0200
-+++ b/src/spdk/test/iscsi_tgt/filesystem/filesystem.sh 2017-10-10 21:33:09.084930640 +0200
-@@ -61,7 +61,7 @@
- parted -s /dev/$dev mkpart primary '0%' '100%'
- sleep 1
-
--for fstype in "ext4" "btrfs" "xfs"; do
-+for fstype in "ext4" "xfs"; do
-
- if [ "$fstype" == "ext4" ]; then
- mkfs.${fstype} -F /dev/${dev}1
---- a/src/spdk/test/nvmf/filesystem/filesystem.sh 2017-04-13 06:05:24.000000000 +0200
-+++ b/src/spdk/test/nvmf/filesystem/filesystem.sh 2017-10-10 21:33:26.258820759 +0200
-@@ -48,7 +48,7 @@
- timing_exit parted
- sleep 1
-
-- for fstype in "ext4" "btrfs" "xfs"; do
-+ for fstype in "ext4" "xfs"; do
- timing_enter $fstype
- if [ $fstype = ext4 ]; then
- force=-F
---- a/src/ceph.conf.twoosds 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/ceph.conf.twoosds 2017-10-10 21:34:13.160340506 +0200
-@@ -72,8 +72,8 @@
- ; osd journal = /mnt/osd$id/journal
- ; osd journal size = 1000
- osd journal = "/dev/disk/by-path/pci-0000:05:02.0-scsi-6:0:0:0"
-- osd mkfs type = btrfs
-- osd mount options btrfs = "flushoncommit,usertrans"
-+ osd mkfs type = xfs
-+ osd mount options xfs = "flushoncommit,usertrans"
- ; filestore max sync interval = 1
-
- devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0"
---- a/src/ceph-disk/tests/ceph-disk.sh 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/ceph-disk/tests/ceph-disk.sh 2017-10-10 21:35:26.386044372 +0200
-@@ -72,8 +72,7 @@
- kill_daemons $dir
- if [ `uname` != FreeBSD ] && \
- [ $(stat -f -c '%T' .) == "btrfs" ]; then
-- rm -fr $dir/*/*db
-- __teardown_btrfs $dir
-+ true
- fi
- grep " $(pwd)/$dir/" < ${PROCDIR}/proc/mounts | while read mounted rest ; do
- umount $mounted
---- a/qa/run_xfstests.sh 2017-09-26 18:27:07.000000000 +0200
-+++ b/qa/run_xfstests.sh 2017-10-10 22:18:49.663141392 +0200
-@@ -81,7 +81,7 @@
- arg_count 1 $#
-
- case "$1" in
-- xfs|ext4|btrfs) return 0 ;;
-+ xfs|ext4) return 0 ;;
- *) return 1 ;;
- esac
- }
-@@ -120,7 +120,7 @@
- echo " -c or --count" >&2
- echo " iteration count (1 or more)" >&2
- echo " -f or --fs-type" >&2
-- echo " one of: xfs, ext4, btrfs" >&2
-+ echo " one of: xfs, ext4" >&2
- echo " (default fs-type: xfs)" >&2
- echo " -r or --randomize" >&2
- echo " randomize test order" >&2
-@@ -132,7 +132,7 @@
- echo " name of file with list of tests to skip" >&2
- echo " tests:" >&2
- echo " list of test numbers, e.g.:" >&2
-- echo " generic/001 xfs/008 shared/032 btrfs/009" >&2
-+ echo " generic/001 xfs/008 shared/032" >&2
- echo " or possibly an xfstests test group, e.g.:" >&2
- echo " -g quick" >&2
- echo " (default tests: -g auto)" >&2
-@@ -235,7 +235,6 @@
- case "${FSTYP}" in
- xfs) options="-f" ;;
- ext4) options="-F" ;;
-- btrfs) options="-f" ;;
- esac
-
- "mkfs.${FSTYP}" ${options} "${dev}" ||
---- a/qa/run_xfstests-obsolete.sh 2017-09-26 18:27:07.000000000 +0200
-+++ b/qa/run_xfstests-obsolete.sh 2017-10-10 22:19:27.027675395 +0200
-@@ -125,7 +125,7 @@
- arg_count 1 $#
-
- case "$1" in
-- xfs|ext4|btrfs) return 0 ;;
-+ xfs|ext4) return 0 ;;
- *) return 1 ;;
- esac
- }
-@@ -157,7 +157,7 @@
- echo " -c or --count" >&2
- echo " iteration count (1 or more)" >&2
- echo " -f or --fs-type" >&2
-- echo " one of: xfs, ext4, btrfs" >&2
-+ echo " one of: xfs, ext4" >&2
- echo " (default fs-type: xfs)" >&2
- echo " -s or --scratch-dev (REQUIRED)" >&2
- echo " name of device used for scratch filesystem" >&2
-@@ -262,7 +262,7 @@
- # Filesystem-specific mkfs options--set if not supplied
- export XFS_MKFS_OPTIONS="${XFS_MKFS_OPTIONS:--f -l su=65536}"
- export EXT4_MKFS_OPTIONS="${EXT4_MKFS_OPTIONS:--F}"
--export BTRFS_MKFS_OPTION # No defaults
-+unset BTRFS_MKFS_OPTION # No defaults
-
- XFSTESTS_DIR="/var/lib/xfstests" # Where the tests live
-
-@@ -348,7 +348,6 @@
- case "${FSTYP}" in
- xfs) options="${XFS_MKFS_OPTIONS}" ;;
- ext4) options="${EXT4_MKFS_OPTIONS}" ;;
-- btrfs) options="${BTRFS_MKFS_OPTIONS}" ;;
- esac
-
- "mkfs.${FSTYP}" ${options} "${dev}" ||
Deleted: testing-x86_64/fix-python2-paths.patch
===================================================================
--- testing-x86_64/fix-python2-paths.patch 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/fix-python2-paths.patch 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,52 +0,0 @@
---- a/CMakeLists.txt 2017-09-26 18:27:07.000000000 +0200
-+++ b/CMakeLists.txt 2017-10-06 14:10:11.032378659 +0200
-@@ -63,7 +63,7 @@
- option(WITH_MANPAGE "Build man pages." ON)
- if(WITH_MANPAGE)
- find_program(SPHINX_BUILD
-- sphinx-build)
-+ sphinx-build2)
- if(NOT SPHINX_BUILD)
- message(FATAL_ERROR "Can't find sphinx-build.")
- endif(NOT SPHINX_BUILD)
---- a/src/tools/setup-virtualenv.sh 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/tools/setup-virtualenv.sh 2017-10-06 15:02:01.736664556 +0200
-@@ -18,10 +18,10 @@
- DIR=$1
- rm -fr $DIR
- mkdir -p $DIR
--virtualenv --python python2.7 $DIR
-+virtualenv2 --python python2.7 $DIR
- . $DIR/bin/activate
-
--if pip --help | grep -q disable-pip-version-check; then
-+if pip2 --help | grep -q disable-pip-version-check; then
- DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check
- else
- DISABLE_PIP_VERSION_CHECK=
-@@ -29,12 +29,12 @@
-
- # older versions of pip will not install wrap_console scripts
- # when using wheel packages
--pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1'
-+pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1'
-
- # workaround of https://github.com/pypa/setuptools/issues/1042
--pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade "setuptools < 36"
-+pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade "setuptools < 36"
-
--if pip --help | grep -q disable-pip-version-check; then
-+if pip2 --help | grep -q disable-pip-version-check; then
- DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check
- else
- DISABLE_PIP_VERSION_CHECK=
-@@ -44,7 +44,7 @@
- export NO_INDEX=--no-index
- fi
-
--pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse 'tox >=1.9'
-+pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse 'tox >=1.9'
- if test -f requirements.txt ; then
-- pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse -r requirements.txt
-+ pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse -r requirements.txt
- fi
Deleted: testing-x86_64/remove-distro-version-detection.patch
===================================================================
--- testing-x86_64/remove-distro-version-detection.patch 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/remove-distro-version-detection.patch 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,21 +0,0 @@
---- a/src/common/util.cc 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/common/util.cc 2017-10-05 15:58:14.852647976 +0200
-@@ -158,8 +158,7 @@
- {
- static const map<string, string> kvm = {
- { "distro", "ID=" },
-- { "distro_description", "PRETTY_NAME=" },
-- { "distro_version", "VERSION_ID=" }
-+ { "distro_description", "PRETTY_NAME=" }
- };
-
- FILE *fp = fopen("/etc/os-release", "r");
-@@ -182,7 +181,7 @@
- lderr(cct) << "distro_detect - /etc/os-release is required" << dendl;
- }
-
-- for (const char* rk: {"distro", "distro_version"}) {
-+ for (const char* rk: {"distro"}) {
- if (m->find(rk) == m->end())
- lderr(cct) << "distro_detect - can't detect " << rk << dendl;
- }
Deleted: testing-x86_64/zabbix-agent.service
===================================================================
--- testing-x86_64/zabbix-agent.service 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/zabbix-agent.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,11 +0,0 @@
-[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/testing-x86_64/zabbix-agent.service (from rev 308154, zabbix/trunk/zabbix-agent.service)
===================================================================
--- testing-x86_64/zabbix-agent.service (rev 0)
+++ testing-x86_64/zabbix-agent.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -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
Deleted: testing-x86_64/zabbix-agent.sysusers
===================================================================
--- testing-x86_64/zabbix-agent.sysusers 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/zabbix-agent.sysusers 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1 +0,0 @@
-u zabbix-agent 172 - /var/lib/zabbix-agent
Copied: zabbix/repos/testing-x86_64/zabbix-agent.sysusers (from rev 308154, zabbix/trunk/zabbix-agent.sysusers)
===================================================================
--- testing-x86_64/zabbix-agent.sysusers (rev 0)
+++ testing-x86_64/zabbix-agent.sysusers 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1 @@
+u zabbix-agent 172 - /var/lib/zabbix-agent
Deleted: testing-x86_64/zabbix-agent.tmpfiles
===================================================================
--- testing-x86_64/zabbix-agent.tmpfiles 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/zabbix-agent.tmpfiles 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1 +0,0 @@
-d /var/lib/zabbix-agent 0750 zabbix-agent zabbix-agent -
Copied: zabbix/repos/testing-x86_64/zabbix-agent.tmpfiles (from rev 308154, zabbix/trunk/zabbix-agent.tmpfiles)
===================================================================
--- testing-x86_64/zabbix-agent.tmpfiles (rev 0)
+++ testing-x86_64/zabbix-agent.tmpfiles 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1 @@
+d /var/lib/zabbix-agent 0750 zabbix-agent zabbix-agent -
Deleted: testing-x86_64/zabbix-proxy-mysql.service
===================================================================
--- testing-x86_64/zabbix-proxy-mysql.service 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/zabbix-proxy-mysql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,12 +0,0 @@
-[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
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-proxy-mysql.service (from rev 308154, zabbix/trunk/zabbix-proxy-mysql.service)
===================================================================
--- testing-x86_64/zabbix-proxy-mysql.service (rev 0)
+++ testing-x86_64/zabbix-proxy-mysql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1,12 @@
+[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
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-x86_64/zabbix-proxy-pgsql.service
===================================================================
--- testing-x86_64/zabbix-proxy-pgsql.service 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/zabbix-proxy-pgsql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,12 +0,0 @@
-[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
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-proxy-pgsql.service (from rev 308154, zabbix/trunk/zabbix-proxy-pgsql.service)
===================================================================
--- testing-x86_64/zabbix-proxy-pgsql.service (rev 0)
+++ testing-x86_64/zabbix-proxy-pgsql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1,12 @@
+[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
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-x86_64/zabbix-proxy-sqlite.service
===================================================================
--- testing-x86_64/zabbix-proxy-sqlite.service 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/zabbix-proxy-sqlite.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,12 +0,0 @@
-[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
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-proxy-sqlite.service (from rev 308154, zabbix/trunk/zabbix-proxy-sqlite.service)
===================================================================
--- testing-x86_64/zabbix-proxy-sqlite.service (rev 0)
+++ testing-x86_64/zabbix-proxy-sqlite.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1,12 @@
+[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
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-x86_64/zabbix-proxy.sysusers
===================================================================
--- testing-x86_64/zabbix-proxy.sysusers 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/zabbix-proxy.sysusers 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1 +0,0 @@
-u zabbix-proxy 171 - /var/lib/zabbix-proxy
Copied: zabbix/repos/testing-x86_64/zabbix-proxy.sysusers (from rev 308154, zabbix/trunk/zabbix-proxy.sysusers)
===================================================================
--- testing-x86_64/zabbix-proxy.sysusers (rev 0)
+++ testing-x86_64/zabbix-proxy.sysusers 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1 @@
+u zabbix-proxy 171 - /var/lib/zabbix-proxy
Deleted: testing-x86_64/zabbix-proxy.tmpfiles
===================================================================
--- testing-x86_64/zabbix-proxy.tmpfiles 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/zabbix-proxy.tmpfiles 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1 +0,0 @@
-d /var/lib/zabbix-proxy 0750 zabbix-proxy zabbix-proxy -
Copied: zabbix/repos/testing-x86_64/zabbix-proxy.tmpfiles (from rev 308154, zabbix/trunk/zabbix-proxy.tmpfiles)
===================================================================
--- testing-x86_64/zabbix-proxy.tmpfiles (rev 0)
+++ testing-x86_64/zabbix-proxy.tmpfiles 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1 @@
+d /var/lib/zabbix-proxy 0750 zabbix-proxy zabbix-proxy -
Deleted: testing-x86_64/zabbix-server-mysql.service
===================================================================
--- testing-x86_64/zabbix-server-mysql.service 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/zabbix-server-mysql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,12 +0,0 @@
-[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
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-server-mysql.service (from rev 308154, zabbix/trunk/zabbix-server-mysql.service)
===================================================================
--- testing-x86_64/zabbix-server-mysql.service (rev 0)
+++ testing-x86_64/zabbix-server-mysql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1,12 @@
+[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
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-x86_64/zabbix-server-pgsql.service
===================================================================
--- testing-x86_64/zabbix-server-pgsql.service 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/zabbix-server-pgsql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,12 +0,0 @@
-[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
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-server-pgsql.service (from rev 308154, zabbix/trunk/zabbix-server-pgsql.service)
===================================================================
--- testing-x86_64/zabbix-server-pgsql.service (rev 0)
+++ testing-x86_64/zabbix-server-pgsql.service 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1,12 @@
+[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
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-x86_64/zabbix-server.install
===================================================================
--- testing-x86_64/zabbix-server.install 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/zabbix-server.install 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1,12 +0,0 @@
-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/testing-x86_64/zabbix-server.install (from rev 308154, zabbix/trunk/zabbix-server.install)
===================================================================
--- testing-x86_64/zabbix-server.install (rev 0)
+++ testing-x86_64/zabbix-server.install 2017-10-17 16:21:07 UTC (rev 308155)
@@ -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"
+}
Deleted: testing-x86_64/zabbix-server.sysusers
===================================================================
--- testing-x86_64/zabbix-server.sysusers 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/zabbix-server.sysusers 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1 +0,0 @@
-u zabbix-server 170 - /var/lib/zabbix-server
Copied: zabbix/repos/testing-x86_64/zabbix-server.sysusers (from rev 308154, zabbix/trunk/zabbix-server.sysusers)
===================================================================
--- testing-x86_64/zabbix-server.sysusers (rev 0)
+++ testing-x86_64/zabbix-server.sysusers 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1 @@
+u zabbix-server 170 - /var/lib/zabbix-server
Deleted: testing-x86_64/zabbix-server.tmpfiles
===================================================================
--- testing-x86_64/zabbix-server.tmpfiles 2017-10-17 16:20:17 UTC (rev 308154)
+++ testing-x86_64/zabbix-server.tmpfiles 2017-10-17 16:21:07 UTC (rev 308155)
@@ -1 +0,0 @@
-d /var/lib/zabbix-server 0750 zabbix-server zabbix-server -
Copied: zabbix/repos/testing-x86_64/zabbix-server.tmpfiles (from rev 308154, zabbix/trunk/zabbix-server.tmpfiles)
===================================================================
--- testing-x86_64/zabbix-server.tmpfiles (rev 0)
+++ testing-x86_64/zabbix-server.tmpfiles 2017-10-17 16:21:07 UTC (rev 308155)
@@ -0,0 +1 @@
+d /var/lib/zabbix-server 0750 zabbix-server zabbix-server -
More information about the arch-commits
mailing list