Updated cfengine to version 3.15.2 release (#5365)

This commit is contained in:
Craig Comstock 2020-06-03 17:34:09 -05:00 committed by GitHub
parent ff593aee6a
commit 5d13289ad4
2 changed files with 8 additions and 8 deletions

View File

@ -1,19 +1,19 @@
TERMUX_PKG_HOMEPAGE=https://cfengine.com/
TERMUX_PKG_DESCRIPTION="CFEngine is a configuration management technology."
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_VERSION=3.15.1
TERMUX_PKG_SRCURL=(https://cfengine-package-repos.s3.amazonaws.com/tarballs/cfengine-$TERMUX_PKG_VERSION.tar.gz
https://github.com/cfengine/masterfiles/archive/$TERMUX_PKG_VERSION.tar.gz)
TERMUX_PKG_SHA256=(ab597456f9d44d907bb5a2e82b8ce2af01e9c59641dc828457cd768ef05a831d
1da37b8af293f5c072ed6991f4bb910cc2b387038e4dc7c34ae1763515b558e1)
TERMUX_PKG_VERSION=3.15.2
TERMUX_PKG_SRCURL=(https://cfengine-package-repos.s3.amazonaws.com/tarballs/cfengine-3.15.2.tar.gz
https://cfengine-package-repos.s3.amazonaws.com/tarballs/cfengine-masterfiles-3.15.2.tar.gz)
TERMUX_PKG_SHA256=(d1c570b7a0f47794a92f66e21cccdc86b8f56a7028a389780e705db41bfd3cab
932d882cb6231db0cd9cfcaa8a0130e069355bc1a7307f8038ababd1320d99a8)
TERMUX_PKG_DEPENDS="liblmdb, openssl, libandroid-glob, pcre"
# core doesn't work with out-of-tree builds
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-workdir=$TERMUX_PREFIX/var/lib/cfengine --without-pam --without-selinux-policy --without-systemd-service --with-lmdb=$TERMUX_PREFIX --with-openssl=$TERMUX_PREFIX --with-pcre=$TERMUX_PREFIX"
termux_step_post_extract_package() {
cd masterfiles-${TERMUX_PKG_VERSION}
EXPLICIT_VERSION=${TERMUX_PKG_VERSION} ./autogen.sh --prefix=$TERMUX_PREFIX/var/lib/cfengine --bindir=$TERMUX_PREFIX/bin
cd cfengine-masterfiles-${TERMUX_PKG_VERSION}
EXPLICIT_VERSION=${TERMUX_PKG_VERSION} ./configure --prefix=$TERMUX_PREFIX/var/lib/cfengine --bindir=$TERMUX_PREFIX/bin
make install
}

View File

@ -27,7 +27,7 @@ index 65e359921..905e13c84 100644
if ( strcmp(ifa->ifa_name, ifp->ifr_name) == 0)
{
- if (ifa->ifa_addr->sa_family == AF_LINK)
+ if (ifa->ifa_addr->sa_family == AF_PACKET)
+ if (ifa->ifa_addr != NULL && ifa->ifa_addr->sa_family == AF_PACKET)
{
- sdl = (struct sockaddr_dl *)ifa->ifa_addr;
- m = (char *) LLADDR(sdl);