From 47887b46bf77df0372f7d75880c6ce344047df8e Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Thu, 27 Aug 2020 12:11:20 +0200 Subject: Commit patch queue (exported by git-debrebase) [git-debrebase make-patches: export and commit patches] --- ...NITDIR-in-configure.ac-instead-of-relying.patch | 55 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 56 insertions(+) create mode 100644 debian/patches/0001-Force-set-INITDIR-in-configure.ac-instead-of-relying.patch create mode 100644 debian/patches/series diff --git a/debian/patches/0001-Force-set-INITDIR-in-configure.ac-instead-of-relying.patch b/debian/patches/0001-Force-set-INITDIR-in-configure.ac-instead-of-relying.patch new file mode 100644 index 000000000..20d1e9870 --- /dev/null +++ b/debian/patches/0001-Force-set-INITDIR-in-configure.ac-instead-of-relying.patch @@ -0,0 +1,55 @@ +From: Didier Raboud +Date: Sat, 13 Jun 2020 16:39:07 +0200 +Subject: Force-set INITDIR in configure.ac instead of relying on 'test -d + /etc/init.d', which fails on s390x + +--- + configure.ac | 35 ++--------------------------------- + 1 file changed, 2 insertions(+), 33 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3b879b8..c586bc8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -422,39 +422,8 @@ RCSTART="$rcstart" + RCSTOP="$rcstop" + + if test x$rcdir = x; then +- case "`uname`" in +- FreeBSD* | OpenBSD* | MirBSD* | ekkoBSD*) +- # FreeBSD and OpenBSD +- ;; +- +- Linux | GNU | GNU/k*BSD*) +- # Linux/HURD seems to choose an init.d directory at random... +- if test -d /sbin/init.d; then +- # SuSE +- INITDIR="/sbin/init.d" +- else +- if test -d /etc/init.d; then +- # Others +- INITDIR="/etc" +- else +- # RedHat +- INITDIR="/etc/rc.d" +- fi +- fi +- RCSTART="82" +- RCSTOP="35" +- ;; +- +- NetBSD*) +- # NetBSD +- INITDDIR="/etc/rc.d" +- ;; +- +- *) +- INITDIR="/etc" +- ;; +- +- esac ++ # Debian ++ INITDIR=/etc + elif test "x$rcdir" != xno; then + if test "x$rclevels" = x; then + INITDDIR="$rcdir" diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000000000..41ab5438e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Force-set-INITDIR-in-configure.ac-instead-of-relying.patch -- cgit v1.2.3