commit: 1388126a51519fd0a2d1aea3e32499f0938c44f1 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Mon Feb 13 22:32:08 2023 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Mon Feb 13 22:42:41 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1388126a
app-admin/rsyslog: remove configure bashisms Closes: https://bugs.gentoo.org/881381 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> .../files/rsyslog-8.2112.0-pr5024-configure.patch | 44 ++++++++++++++++++++++ app-admin/rsyslog/rsyslog-8.2112.0-r1.ebuild | 2 + app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild | 2 + app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild | 2 + app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild | 7 +++- app-admin/rsyslog/rsyslog-8.2212.0.ebuild | 2 + 6 files changed, 57 insertions(+), 2 deletions(-) diff --git a/app-admin/rsyslog/files/rsyslog-8.2112.0-pr5024-configure.patch b/app-admin/rsyslog/files/rsyslog-8.2112.0-pr5024-configure.patch new file mode 100644 index 000000000000..eae9fbc4d024 --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.2112.0-pr5024-configure.patch @@ -0,0 +1,44 @@ +From e3c750b98564bc66b50ae35e91f5222c441f8b75 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Bar=C4=87?= <[email protected]> +Date: Wed, 16 Nov 2022 15:17:31 +0100 +Subject: [PATCH] configure.ac: remove bashisms +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +replace [[ ]] with test and == with = + +Signed-off-by: Maciej Barć <[email protected]> +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3a43681d72..6e66ec904b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1138,13 +1138,13 @@ AC_ARG_ENABLE(gnutls-tests, + no) enable_gnutls_tests="no" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-gnutls-tests) ;; + esac], +- [if [[ "$enable_gnutls" == "yes" ]]; then ++ [if test "x$enable_gnutls" = "xyes"; then + enable_gnutls_tests=yes + else + enable_gnutls_tests=no + fi] + ) +-if [[ "$enable_gnutls_tests" == "yes" ]] && [[ "$enable_gnutls" != "yes" ]]; then ++if test "x$enable_gnutls_tests" = "xyes" && test "x$enable_gnutls" != "xyes"; then + AC_MSG_WARN([gnutls-tests can not be enabled without gnutls support. Disabling gnutls tests...]) + enable_gnutls_tests="no" + fi +@@ -1852,7 +1852,7 @@ AC_ARG_ENABLE(imfile-tests, + esac], + [enable_imfile_tests=yes] + ) +-if [[ "$enable_imfile_tests" == "yes" ]] && [[ "$enable_imfile" != "yes" ]]; then ++if test "x$enable_imfile_tests" = "xyes" && test "x$enable_imfile" != "xyes"; then + AC_MSG_WARN([imfile-tests can not be enabled without imfile support. Disabling imfile tests...]) + enable_imfile_tests="no" + fi diff --git a/app-admin/rsyslog/rsyslog-8.2112.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2112.0-r1.ebuild index 966d7a160de0..dc51fa17b90d 100644 --- a/app-admin/rsyslog/rsyslog-8.2112.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2112.0-r1.ebuild @@ -115,6 +115,8 @@ fi CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" +PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch ) + pkg_setup() { use test && python-any-r1_pkg_setup } diff --git a/app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild index a3a544366833..db90e08def7a 100644 --- a/app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild @@ -117,6 +117,8 @@ fi CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" +PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch ) + pkg_setup() { use test && python-any-r1_pkg_setup } diff --git a/app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild index 5bb2f9c0d333..47f4429d19fc 100644 --- a/app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild @@ -117,6 +117,8 @@ fi CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" +PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch ) + pkg_setup() { use test && python-any-r1_pkg_setup } diff --git a/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild index c8b36f38a08a..fddffc4ef68c 100644 --- a/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild @@ -114,11 +114,14 @@ if [[ ${PV} == "9999" ]]; then BDEPEND+=" >=dev-python/docutils-0.12" fi -PATCHES=( "${FILESDIR}"/${P}-5004-hostname.patch ) - CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" +PATCHES=( + "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch + "${FILESDIR}"/${P}-5004-hostname.patch +) + pkg_setup() { use test && python-any-r1_pkg_setup } diff --git a/app-admin/rsyslog/rsyslog-8.2212.0.ebuild b/app-admin/rsyslog/rsyslog-8.2212.0.ebuild index 52db3cff05f8..f28fabbba2c3 100644 --- a/app-admin/rsyslog/rsyslog-8.2212.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2212.0.ebuild @@ -117,6 +117,8 @@ fi CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" +PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch ) + pkg_setup() { use test && python-any-r1_pkg_setup }
