diff options
Diffstat (limited to 'meta/recipes-extended/at')
| -rw-r--r-- | meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch | 53 | ||||
| -rw-r--r-- | meta/recipes-extended/at/at_3.1.20.bb (renamed from meta/recipes-extended/at/at_3.1.18.bb) | 7 |
2 files changed, 3 insertions, 57 deletions
diff --git a/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch b/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch deleted file mode 100644 index 389af1e072..0000000000 --- a/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c02354af7f3d9426da31503abfae70952c699a9d Mon Sep 17 00:00:00 2001 -From: Wenzong Fan <wenzong.fan@windriver.com> -Date: Fri, 18 Mar 2016 03:23:11 -0400 -Subject: [PATCH] configure: fix with/without selinux - -Problem: -without-selinux doesn't work since WITH_SELINUX is always be defined no -matter which option is given: with-selinux, without-selinux. - -Fix: -Disable selinux support if without-selinux is given; otherwise check -libselinux to determine if selinux support should be enabled. - -Upstream-Status: Submitted [at@packages.debian.org] - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> ---- - configure.ac | 19 +++++++++++++++---- - 1 file changed, 15 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5a43419..8c9de62 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -240,10 +240,21 @@ AC_ARG_WITH(daemon_username, - AC_SUBST(DAEMON_USERNAME) - - AC_ARG_WITH(selinux, --[ --with-selinux Define to run with selinux], --AC_DEFINE(WITH_SELINUX, 1, [Define if you are building with_selinux]), --) --AC_CHECK_LIB(selinux, is_selinux_enabled, SELINUXLIB=-lselinux) -+[ --with-selinux Define to run with selinux (default=check)], -+[], -+[with_selinux=check]) -+ -+if test "x$with_selinux" != xno; then -+ AC_CHECK_LIB([selinux], [is_selinux_enabled], -+ [SELINUXLIB=-lselinux -+ AC_DEFINE(WITH_SELINUX, 1, [Define if you are building with_selinux]) -+ ], -+ [if test "x$with_selinux" != xcheck; then -+ AC_MSG_FAILURE([--with-selinux is given, but test for selinux failed]) -+ fi -+ ] -+ ) -+fi - AC_SUBST(SELINUXLIB) - AC_SUBST(WITH_SELINUX) - --- -1.9.1 - diff --git a/meta/recipes-extended/at/at_3.1.18.bb b/meta/recipes-extended/at/at_3.1.20.bb index 93044f53e2..1c3eefc828 100644 --- a/meta/recipes-extended/at/at_3.1.18.bb +++ b/meta/recipes-extended/at/at_3.1.20.bb @@ -15,7 +15,7 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" RCONFLICTS_${PN} = "atd" RREPLACES_${PN} = "atd" -SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz;subdir=${BP} \ +SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ file://fix_parallel_build_error.patch \ file://posixtm.c \ file://posixtm.h \ @@ -25,14 +25,13 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz;subdir=${BP} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ file://makefile-fix-parallel.patch \ file://0001-remove-glibc-assumption.patch \ - file://configure-fix-with-without-selinux.patch \ " PAM_SRC_URI = "file://pam.conf.patch \ file://configure-add-enable-pam.patch" -SRC_URI[md5sum] = "f67a7aab557cd5b4a1311079a08acebe" -SRC_URI[sha256sum] = "dbd5c8cb8edd53ef467363c3af0391c08769f1dbbd4d5002c59a4cd4cac11d52" +SRC_URI[md5sum] = "e7bd7b785b2cbb17e133d6bdc0fb099e" +SRC_URI[sha256sum] = "0871923cab73050b98ace020664eb2ddc1e669e4166b5abb64d864d02fcefab9" EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ --with-daemon_username=root \ |