dhcp: fix bad --enable/disable-debug logic

PATCH New Gustavo Zacarias 3 participants 3 messages Nov 11, 2014

Share & tools

Gustavo Zacarias

author

2014-11-11 13:08 UTC #0 lore raw

PATCH 1/1 dhcp: fix bad --enable/disable-debug logic

It interprets disable as enable and wreaks havoc since it changes the behaviour of the build, for instance not using configured leases files paths.
Thanks to Nathaniel Roach for pointing me to this problem.

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/dhcp/0001-fix-configure-debug.patch | 23 +++++++++++++++++++++++
 package/dhcp/dhcp.mk                        |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 package/dhcp/0001-fix-configure-debug.patch

package/dhcp/0001-fix-configure-debug.patch new file +23 -0

new file mode 100644
index 0000000..19c9bfe
@@ -0,0 +1,23 @@
+AC_ARG_ENABLE is passed wrong parameters for action-if-given:
+If someone passed --enable-debug to configure enable_debug was set to 'yes',
+but if --disable-debug was passed the action is also called and debug was
+also set to 'yes' which is wrong.
+Use $enableval for this case.
+
+Reported upstream as ISC-Bugs #37780 (not publicly accesible).
+Thanks to Nathaniel Roach for pointing out the problem.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -Nura dhcp-4.1-ESV-R10.orig/configure.ac dhcp-4.1-ESV-R10/configure.ac
+--- dhcp-4.1-ESV-R10.orig/configure.ac	2014-11-11 09:50:07.719277076 -0300
++++ dhcp-4.1-ESV-R10/configure.ac	2014-11-11 09:51:10.722432148 -0300
+@@ -53,7 +53,7 @@
+ AC_ARG_ENABLE(debug,
+ 	AC_HELP_STRING([--enable-debug],
+ 		[create a debug-only version of the software (default is no).]),
+-		[enable_debug=yes],[enable_debug=no])
++		[enable_debug=$enableval],[enable_debug=no])
+ # This is very much off by default.
+ if test "$enable_debug" = "yes" ; then
+ 	AC_DEFINE([DEBUG], [1],

package/dhcp/dhcp.mk +2 -0

index 8b38fd0..27fb60b 100644
@@ -9,6 +9,8 @@ DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
 DHCP_INSTALL_STAGING = YES
 DHCP_LICENSE = ISC
 DHCP_LICENSE_FILES = LICENSE
+# For 0001-fix-configure-debug.patch
+DHCP_AUTORECONF = YES
 DHCP_CONF_ENV = \
 	CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
 		-D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \

Signature · 1 line

2.0.4

Nathaniel Roach

2014-11-11 14:13 UTC #1 lore raw

PATCH 1/1 dhcp: fix bad --enable/disable-debug logic

Quoted 47 lines · Gustavo Zacarias

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/dhcp/0001-fix-configure-debug.patch | 23 +++++++++++++++++++++++
 package/dhcp/dhcp.mk                        |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 package/dhcp/0001-fix-configure-debug.patch

package/dhcp/0001-fix-configure-debug.patch new file +23 -0

new file mode 100644
index 0000000..19c9bfe
@@ -0,0 +1,23 @@
+AC_ARG_ENABLE is passed wrong parameters for action-if-given:
+If someone passed --enable-debug to configure enable_debug was set to 'yes',
+but if --disable-debug was passed the action is also called and debug was
+also set to 'yes' which is wrong.
+Use $enableval for this case.
+
+Reported upstream as ISC-Bugs #37780 (not publicly accesible).
+Thanks to Nathaniel Roach for pointing out the problem.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -Nura dhcp-4.1-ESV-R10.orig/configure.ac dhcp-4.1-ESV-R10/configure.ac
+--- dhcp-4.1-ESV-R10.orig/configure.ac	2014-11-11 09:50:07.719277076 -0300
++++ dhcp-4.1-ESV-R10/configure.ac	2014-11-11 09:51:10.722432148 -0300
+@@ -53,7 +53,7 @@
+ AC_ARG_ENABLE(debug,
+ 	AC_HELP_STRING([--enable-debug],
+ 		[create a debug-only version of the software (default is no).]),
+-		[enable_debug=yes],[enable_debug=no])
++		[enable_debug=$enableval],[enable_debug=no])
+ # This is very much off by default.
+ if test "$enable_debug" = "yes" ; then
+ 	AC_DEFINE([DEBUG], [1],

package/dhcp/dhcp.mk +0 -0

index 8b38fd0..27fb60b 100644

package/dhcp/dhcp.mk DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) · line 16

Quoted 8 lines

package/dhcp/dhcp.mk +2 -0

@@ -9,6 +9,8 @@ DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
 DHCP_INSTALL_STAGING = YES
 DHCP_LICENSE = ISC
 DHCP_LICENSE_FILES = LICENSE
+# For 0001-fix-configure-debug.patch
+DHCP_AUTORECONF = YES
 DHCP_CONF_ENV = \
 	CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
 		-D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \

Reviewed-by Nathaniel Roach <[email protected]>

Tested-by Nathaniel Roach <[email protected]>

[run tested on cortex-a5 system, BR glibc toolchain]

Thomas Petazzoni

Applied

2014-11-11 14:34 UTC #2 lore raw

PATCH 1/1 dhcp: fix bad --enable/disable-debug logic

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 11 lines · Gustavo Zacarias

It interprets disable as enable and wreaks havoc since it changes the behaviour of the build, for instance not using configured leases files paths.
Thanks to Nathaniel Roach for pointing me to this problem.
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/dhcp/0001-fix-configure-debug.patch | 23 +++++++++++++++++++++++
 package/dhcp/dhcp.mk                        |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 package/dhcp/0001-fix-configure-debug.patch

Applied, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com