| Message ID | 20191209222746.3440986-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] package/dante: remove --without-pam | expand |
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > --without-pam was wrongly put back by commit > 6d8abc7c1aca00a8ee514b38d88744ccd9ec194f I was a bit confused about that, as that commit is fine. What instead happened was that I made a mistake when I merged next into master for the 2019.02 cycle. So I have updated the commit message to mention this and applied, thanks.
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > --without-pam was wrongly put back by commit > 6d8abc7c1aca00a8ee514b38d88744ccd9ec194f > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2019.02.x and 2019.11.x, thanks.
diff --git a/package/dante/dante.mk b/package/dante/dante.mk index 0bd036d37e..0668042bd8 100644 --- a/package/dante/dante.mk +++ b/package/dante/dante.mk @@ -12,7 +12,7 @@ DANTE_LICENSE_FILES = LICENSE # 0002-compiler.m4-do-not-remove-g-flag.patch touches a m4 file DANTE_AUTORECONF = YES -DANTE_CONF_OPTS += --disable-client --disable-preload --without-pam +DANTE_CONF_OPTS += --disable-client --disable-preload ifeq ($(BR2_PACKAGE_LINUX_PAM),y) DANTE_DEPENDENCIES += linux-pam
--without-pam was wrongly put back by commit 6d8abc7c1aca00a8ee514b38d88744ccd9ec194f Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/dante/dante.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)