aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCraig Comstock <craig@unreasonablefarm.org>2021-01-26 08:26:15 -0600
committerLeo <thinkabit.ukim@gmail.com>2021-01-26 18:23:02 +0000
commit7bd8b6a0c4db6b4ce0dfb1c519126264953ec5e4 (patch)
tree5c8b13635cdb9fb2f738cf1364c02c3f2d727795
parenta9e1d61663ddc8b2c215e2456afaa32dc2dcb28f (diff)
downloadaports-7bd8b6a0c4db6b4ce0dfb1c519126264953ec5e4.tar.gz
aports-7bd8b6a0c4db6b4ce0dfb1c519126264953ec5e4.tar.bz2
aports-7bd8b6a0c4db6b4ce0dfb1c519126264953ec5e4.tar.xz
community/cfengine: fix libntech configure
bootstrapping and agent runs were broken due to this bug https://tracker.mender.io/browse/CFE-3543
-rw-r--r--community/cfengine/0001-libntech-configure.patch19
-rw-r--r--community/cfengine/APKBUILD8
2 files changed, 24 insertions, 3 deletions
diff --git a/community/cfengine/0001-libntech-configure.patch b/community/cfengine/0001-libntech-configure.patch
new file mode 100644
index 0000000000..81c25a76f0
--- /dev/null
+++ b/community/cfengine/0001-libntech-configure.patch
@@ -0,0 +1,19 @@
+diff --git a/libntech/configure b/libntech/configure
+index 97f7e7c..817bde2 100644
+--- a/libntech/configure
++++ b/libntech/configure
+@@ -161,11 +161,11 @@ AC_ARG_ENABLE([fhs],
+
+ AS_IF([test x"$enable_fhs" = xyes], [
+ projlibdir='${pkglibdir}'
+- WORKDIR='${localstatedir}/lib/${PACKAGE}'
++ WORKDIR='${localstatedir}/lib/cfengine'
+ MASTERDIR='default'
+ INPUTDIR='default'
+- LOGDIR='${localstatedir}/log/${PACKAGE}'
+- PIDDIR='${runstatedir:-${localstatedir}/run}/${PACKAGE}'
++ LOGDIR='${localstatedir}/log/cfengine'
++ PIDDIR='${runstatedir:-${localstatedir}/run}/cfengine'
+ STATEDIR='default'
+ ], [
+ if test x"$prefix" = xNONE || test x"$prefix" = x/var/cfengine; then
diff --git a/community/cfengine/APKBUILD b/community/cfengine/APKBUILD
index 7b5e5fc27d..f7a0ffd551 100644
--- a/community/cfengine/APKBUILD
+++ b/community/cfengine/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cfengine
pkgver=3.16.0
-pkgrel=0
+pkgrel=1
pkgdesc="A systems administration tool for networks"
url="https://www.cfengine.com/"
arch="all"
@@ -11,7 +11,8 @@ makedepends="$depends_dev lmdb-dev openssl-dev bison flex-dev
acl-dev pcre-dev linux-headers"
subpackages="$pkgname-doc $pkgname-masterfiles::noarch"
source="https://cfengine-package-repos.s3.amazonaws.com/tarballs/cfengine-$pkgver.tar.gz
- https://cfengine-package-repos.s3.amazonaws.com/tarballs/cfengine-masterfiles-$pkgver.tar.gz"
+ https://cfengine-package-repos.s3.amazonaws.com/tarballs/cfengine-masterfiles-$pkgver.tar.gz
+ 0001-libntech-configure.patch"
_builddirmasterfiles="$srcdir"/cfengine-masterfiles-${pkgver%_p*}
options="!check" # testsuite shows some unknown errors
@@ -66,4 +67,5 @@ masterfiles() {
}
sha512sums="30d4beaf108f8215d24948cf197951af14e551b85698d66f6d1040261ea865e914fe0fefded3f701e2800228f06d3ba90530d42e07058de47d6ef5016577613c cfengine-3.16.0.tar.gz
-b38a2fcb83a381470d5e2b95487939f7028c7798d5bc32606f6d27447e64468f273dbf0cf3f1a460ade51d5693a7fb2c546accb2dbd78285dc753fb232db6bae cfengine-masterfiles-3.16.0.tar.gz"
+b38a2fcb83a381470d5e2b95487939f7028c7798d5bc32606f6d27447e64468f273dbf0cf3f1a460ade51d5693a7fb2c546accb2dbd78285dc753fb232db6bae cfengine-masterfiles-3.16.0.tar.gz
+d67cd2b0f6f94b04d2f4fe3b178ddc0efbe1f3ed4b7432d7e77e4341a77d5ea9ef54b8d463998e939f5f25bb8b89c4aa1b1730f371df7355e9dbc72527e66fa8 0001-libntech-configure.patch"