diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-04-27 17:32:16 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-04-27 17:32:33 +0200 |
| commit | b16f1f6b8bdd7b0cef4aad3a6714798b66d8b0a5 (patch) | |
| tree | 61c5df69bed7810e988b06434e8efc7ab9071acd /meta-security/recipes-security/audit/audit/disable-ldap.patch | |
| parent | 40213738bcd84fc542cda3ec6336b0e394b28dcc (diff) | |
| parent | c24cdffea9dfa3904fc3ea9da0bc80e5515b078d (diff) | |
Merge branch 'next'
* next:
Temporary workarounds for h3ulcb and bbe
[RCAR] use omx-user-module as libomxil provider
meta-agl-bsp: dra7xx-evm/beaglebone updates for dunfell
meta-agl-bsp: remove obsolete linux-fslc-imx bbappend
meta-agl-profile-graphical-qt5: remove Chromium specific bits from SDK
meta-agl-profile-graphical: disable memfd usage in weston
meta-agl-bsp: update raspberrypi configuration for dunfell
meta-agl-{bsp,distro}: update kernel configuration for dunfell
meta-agl-profile-core: update psplash for dunfell
meta-agl-profile-core: update systemd for dunfell
meta-app-framework: set DISTRO_FEATURES_NATIVE
meta-agl-profile-core: update bluez5 for dunfell
meta-agl-profile-graphical: update weston for dunfell
meta-agl-profile-graphical: update wayland-ivi-extension for dunfell
meta-agl-profile-graphical: update wayland for dunfell
meta-agl-profile-core: update pulseaudio for dunfell
meta-security: update to audit 2.8.5
Update distro_features_check usage
meta-agl-bsp: remove vboxguestdrivers recipe
Declare layer compatibility for dunfell
Change-Id: I879ad3040ed6f2fca3f21d189ccce7f1614013b5
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-security/recipes-security/audit/audit/disable-ldap.patch')
| -rw-r--r-- | meta-security/recipes-security/audit/audit/disable-ldap.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/meta-security/recipes-security/audit/audit/disable-ldap.patch b/meta-security/recipes-security/audit/audit/disable-ldap.patch deleted file mode 100644 index 1d683c29e..000000000 --- a/meta-security/recipes-security/audit/audit/disable-ldap.patch +++ /dev/null @@ -1,59 +0,0 @@ -Disable LDAP support - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> - -Disable LDAP support - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> - -Index: audit-2.3.2/audisp/plugins/Makefile.am -=================================================================== ---- audit-2.3.2.orig/audisp/plugins/Makefile.am -+++ audit-2.3.2/audisp/plugins/Makefile.am -@@ -22,8 +22,10 @@ - - CONFIG_CLEAN_FILES = *.loT *.rej *.orig - --SUBDIRS = builtins zos-remote remote --#SUBDIRS = builtins zos-remote -+SUBDIRS = builtins remote -+if HAVE_LDAP -+SUBDIRS += zos-remote -+endif - if HAVE_PRELUDE - SUBDIRS += prelude - endif -Index: audit-2.3.2/configure.ac -=================================================================== ---- audit-2.3.2.orig/configure.ac -+++ audit-2.3.2/configure.ac -@@ -241,6 +241,12 @@ else - fi - AM_CONDITIONAL(HAVE_PRELUDE, test x$have_prelude = xyes) - -+AC_ARG_WITH(ldap, -+AS_HELP_STRING([--with-ldap],[enable zos-remote plugin, which requires ldap]), -+use_ldap=$withval, -+use_ldap=no) -+AM_CONDITIONAL(HAVE_LDAP, test x$have_ldap = xyes) -+ - AC_MSG_CHECKING(whether to use libwrap) - AC_ARG_WITH(libwrap, - [ --with-libwrap[=PATH] Compile in libwrap (tcp_wrappers) support.], -Index: audit-2.3.2/docs/Makefile.am -=================================================================== ---- audit-2.3.2.orig/docs/Makefile.am -+++ audit-2.3.2/docs/Makefile.am -@@ -53,7 +53,9 @@ ausearch_add_expression.3 ausearch_add_t - ausearch_clear.3 \ - ausearch_next_event.3 ausearch_set_stop.3 \ - autrace.8 get_auditfail_action.3 set_aumessage_mode.3 \ --audispd.8 audispd.conf.5 audispd-zos-remote.8 libaudit.conf.5 \ --augenrules.8 \ --zos-remote.conf.5 -+audispd.8 audispd.conf.5 libaudit.conf.5 \ -+augenrules.8 - -+if HAVE_LDAP -+man_MANS += audispd-zos-remote.8 zos-remote.conf.5 -+endif |