catatonit: update to 0.1.7.

This commit is contained in:
Justin Bronder 2021-12-16 14:30:39 -05:00 committed by Érico Nogueira Rolim
parent b363e25fef
commit e337c022a7
3 changed files with 41 additions and 31 deletions

View file

@ -0,0 +1,39 @@
From 99bb9048f532257f3a2c3856cfa19fe957ab6cec Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@debian.org>
Date: Thu, 4 Nov 2021 07:37:13 -0300
Subject: [PATCH] configure.ac: call AM_INIT_AUTOMAKE only once
That second call seems to be there since the beginning, and autoconf
2.69 was fine with it. autoconf 2.71 doesn't allow it anymore:
$ ./autogen.sh
autoreconf: export WARNINGS=
autoreconf: Entering directory '.'
autoreconf: configure.ac: not using Gettext
autoreconf: running: aclocal --force
configure.ac:34: error: AM_INIT_AUTOMAKE expanded multiple times
/usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from...
configure.ac:19: the top level
/usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from...
configure.ac:34: the top level
autom4te: error: /usr/bin/m4 failed with exit status: 1
aclocal: error: /usr/bin/autom4te failed with exit status: 1
autoreconf: error: aclocal failed with exit status: 1
Signed-off-by: Antonio Terceiro <terceiro@debian.org>
---
configure.ac | 1 -
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 12c9186..94c5c84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,4 +31,3 @@ AC_FUNC_FORK
AC_CONFIG_FILES([Makefile config.h])
AC_OUTPUT
-AM_INIT_AUTOMAKE
--
2.34.1

View file

@ -1,29 +0,0 @@
From 75014b1c3099245b7d0f44f24d7f6dc4888a45fd Mon Sep 17 00:00:00 2001
From: Andrey Golovizin <ag@sologoc.com>
Date: Mon, 1 Mar 2021 18:41:42 +0100
Subject: [PATCH] Use environ instead of __environ
The `__environ` variable is internal and undocumented. It also breaks
compilation with musl.
Signed-off-by: Andrey Golovizin <ag@sologoc.com>
---
catatonit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catatonit.c b/catatonit.c
index a05451e..fd746bb 100644
--- a/catatonit.c
+++ b/catatonit.c
@@ -216,7 +216,7 @@ static int spawn_pid1(char *file, char **argv, sigset_t *sigmask)
if (sigprocmask(SIG_SETMASK, sigmask, NULL) < 0)
bail("failed to reset sigmask: %m");
- execvpe(file, argv, __environ);
+ execvpe(file, argv, environ);
bail("failed to exec pid1: %m");
}
--
2.31.1

View file

@ -1,6 +1,6 @@
# Template file for 'catatonit'
pkgname=catatonit
version=0.1.5
version=0.1.7
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool"
@ -9,7 +9,7 @@ maintainer="Justin Bronder <jsbronder@cold-front.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/openSUSE/catatonit"
distfiles="https://github.com/openSUSE/catatonit/releases/download/v${version}/catatonit.tar.xz"
checksum=4c45e2230235751731da3daabe130abce70b3ef37d0b1936cbc90a46b475cf08
checksum=6ea6cb8c7feeca2cf101e7f794dab6eeb192cde177ecc7714d2939655d3d8997
pre_configure() {
autoreconf -fi