diff options
author | Alexey Shpakovsky | 2020-04-02 14:11:16 +0200 |
---|---|---|
committer | Alexey Shpakovsky | 2020-04-02 14:11:16 +0200 |
commit | 340d7d6a77e8debb0bdf0b10f24801536ff72a87 (patch) | |
tree | a2d72ad8617e375b4a0c92927882f9b70a17849d | |
parent | d8e71bdfebc9623141a315d4e06b35d7639b0b92 (diff) | |
download | aur-340d7d6a77e8debb0bdf0b10f24801536ff72a87.tar.gz |
Update to version 3.15.1
-rw-r--r-- | CFE-3302.patch | 21 | ||||
-rw-r--r-- | PKGBUILD | 26 |
2 files changed, 40 insertions, 7 deletions
diff --git a/CFE-3302.patch b/CFE-3302.patch new file mode 100644 index 000000000000..a7a35888db80 --- /dev/null +++ b/CFE-3302.patch @@ -0,0 +1,21 @@ +commit 660e8d6c713c3a9c71d29568d2c14a49fafc12b2 +Author: Aleksei Shpakovskii <aleksei.shpakovskii@cfengine.com> +Date: Fri Mar 27 08:55:53 2020 +0100 + + CFE-3302 Also pass cf-execd path to core/../testall script + + Without testall in core was updated recently and requires this + executable now, too. + +diff --git a/tests/acceptance/testall b/tests/acceptance/testall +index 848a3df2..b5172378 100755 +--- a/tests/acceptance/testall ++++ b/tests/acceptance/testall +@@ -90,6 +90,7 @@ else + --cfserverd="$CORE/cf-serverd/cf-serverd" \ + --cfrunagent="$CORE/cf-runagent/cf-runagent" \ + --cfkey="$CORE/cf-key/cf-key" \ ++ --cfexecd="$CORE/cf-execd/cf-execd" \ + --cfnet="$CORE/cf-net/cf-net" \ + --cfcheck="$CORE/cf-check/cf-check" \ + --rpmvercmp="$CORE/ext/rpmvercmp" \ @@ -1,4 +1,5 @@ # Maintainer: Vanush Misha Paturyan <ektich+cfengine-aur@gmail.com> +# Maintainer: Alexey Shpakovsky <alexey at shpakovsky dot ru> # https://aur.archlinux.org/cfengine.git # # Contributor: Kuba Serafinowski <zizzfizzix AT gmail DOT com> @@ -6,14 +7,14 @@ # Contributor: Christian Berendt <christian@thorlin.de> pkgname=cfengine -pkgver=3.10.4 +pkgver=3.15.1 pkgrel=1 pkgdesc='Automated suite of programs for configuring and maintaining Unix-like computers.' url='http://www.cfengine.org' license=('GPL3') arch=('i686' 'x86_64') -depends=('lmdb' 'pcre' 'libxml2' 'pam' 'libyaml' 'curl' 'openssl-1.0') -makedepends=('which') +depends=('lmdb' 'pcre' 'libxml2' 'pam' 'libyaml' 'curl' 'openssl') +makedepends=('which' 'inetutils') optdepends=('libvirt' 'postgresql-libs' 'libmariadbclient' 'acl') install=${pkgname}.install source=("${pkgname}-${pkgver}.tar.gz::https://cfengine-package-repos.s3.amazonaws.com/tarballs/${pkgname}-${pkgver}.tar.gz" @@ -23,18 +24,21 @@ source=("${pkgname}-${pkgver}.tar.gz::https://cfengine-package-repos.s3.amazonaw 'cf-serverd.service' 'cfengine3.service') -md5sums=('198f1a1c0dfb28b67afc1b95bd9cf82a' - '7aa0ad539584201a7ef462be44d24898' +md5sums=('f45e3eefa6449ef44c60b5b7c8dbe257' + 'd2876ef406e4f16d2eb93c74a2df7265' '6edac71eaac0a19fc5b8129f17d82bb2' '199a7867b60a3e4013da4ac42343e22e' 'f8783637895f6f3dd19a6ba689181d41' '4b89518da032b45073e46a993fd7fe26') +prepare() { + cd ${srcdir}/${pkgname}-masterfiles-${pkgver} + patch -p1 <../../CFE-3302.patch +} + build() { cd ${srcdir}/${pkgname}-${pkgver} - export CFLAGS=-I/usr/include/openssl-1.0 - export LDFLAGS=-L/usr/lib/openssl-1.0 ./configure \ --prefix=/usr \ --with-workdir=/var/${pkgname} \ @@ -55,6 +59,14 @@ build() { --with-core=../cfengine-${pkgver} } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check + + cd ${srcdir}/${pkgname}-masterfiles-${pkgver} + make check +} + package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=$pkgdir install |