Skip to contentSkip to conversation

New: misc fixes for dnsmasq package

Buildroot bugzilla at busybox.net 1 participant 20 messages Aug 2, 2009 – Sep 1, 2009

lore
Share & tools
lore
#0 lore raw

https://bugs.busybox.net/show_bug.cgi?id=527

Host: Ubuntu 9.0.4 Server 32 Bit
Target: i686
Build: i686
Summary: misc fixes for dnsmasq package
Product: buildroot
Version: unspecified
Platform: PC
OS/Version: Linux
Status: NEW
Severity: enhancement
Priority: P5
Component: Other
AssignedTo: unassigned at buildroot.uclibc.org
ReportedBy: d.albano at gmail.com
CC: buildroot at uclibc.org
Estimated Hours: 0.0

Hi,

i've fixed some stuff into dnsmasq package:
- paths in dbus support
- dbus dependencies
- make doesn't take into account ldflags

Now it compiles fine, but i haven't yet tested it (actually i can't)

I'm attacching four patches, because the fourth replaces spaces with tabs for dbus path support fix

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#1 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

https://bugs.busybox.net/show_bug.cgi?id=527

--- Comment #1 from Daniele Salvatore Albano <[email protected]> 2009-08-02 13:33:24 UTC --- Created an attachment (id=551)
--> (https://bugs.busybox.net/attachment.cgi?id=551)
Fix dnsmasq compilation with dbus enabled

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#2 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

--- Comment #2 from Daniele Salvatore Albano <[email protected]> 2009-08-02 13:34:15 UTC --- Created an attachment (id=553)
--> (https://bugs.busybox.net/attachment.cgi?id=553)
Fix dnsmasq dependencies if dbus is enabled

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#3 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

--- Comment #3 from Daniele Salvatore Albano <[email protected]> 2009-08-02 13:34:44 UTC --- Created an attachment (id=555)
--> (https://bugs.busybox.net/attachment.cgi?id=555)
dnsmasq doesn't take into account ldflags for target

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#4 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

--- Comment #4 from Daniele Salvatore Albano <[email protected]> 2009-08-02 13:35:21 UTC --- Created an attachment (id=557)
--> (https://bugs.busybox.net/attachment.cgi?id=557)
Replaces spaces in tabs (it's for the first patch)

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#5 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

Daniele Salvatore Albano <[email protected]> changed:

What |Removed |Added
----------------------------------------------------------------------------
Severity|enhancement |normal

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#6 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

--- Comment #5 from Gustavo Zacarias <[email protected]> 2009-08-03 14:40:24 UTC --- Can you try converting it to the new Makefile.autofools.in format?
Thanks.

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#8 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

--- Comment #7 from Daniele Salvatore Albano <[email protected]> 2009-08-03 18:36:22 UTC --- Hi,

i've converted the package to new autotools format, actually it works with and without dbus with my external toolchain.

Can someone check if it works with buildroot toolchain?

The attached file isin't a patch but he entire .mk file

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#9 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

Daniele Salvatore Albano <[email protected]> changed:

What |Removed |Added
----------------------------------------------------------------------------

 Attachment #551 is|0                           |1
           obsolete|                            |
 Attachment #553 is|0                           |1
           obsolete|                            |
 Attachment #555 is|0                           |1
           obsolete|                            |
 Attachment #557 is|0                           |1
           obsolete|                            |

--- Comment #8 from Daniele Salvatore Albano <[email protected]> 2009-08-03 18:36:52 UTC --- Created an attachment (id=569)
--> (https://bugs.busybox.net/attachment.cgi?id=569)
dnsmasq.mk converted to new autotools package format

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#10 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

--- Comment #9 from Gustavo Zacarias <[email protected]> 2009-08-03 19:21:33 UTC --- There's one broken bit:
The old package set the different DNSMASQ_COPTS according to IPV6, LARGEFILE and TFTP settings and then passed a make COPTS="$(DNSMASQ_COPTS)" parameter when building.
You are setting DNSMASQ_MAKE_OPT which doesn't fill up those values into the COPTS parameter for make. So if one of them is true then make gets passed -DWHATEVER which makes it fail.

Then there's the redundant bits:
DNSMASQ_AUTORECONF = NO -> it's default no, so no need to say that again DNSMASQ_INSTALL_TARGET = YES -> again, it's default DNSMASQ_INSTALL_TARGET_OPT .. -> you're using the same DNSMASQ_DEPENDENCIES = uclibc -> default too

And the "why" thing:
DNSMASQ_INSTALL_STAGING = YES -> why?
As far as i know dnsmasq doesn't provide any library so it doesn't get linked to.
It doesn't install any header required by some other package either.

Detail:
It's up to version 2.49, you could bump to the new one while doing this.

Improvements:
dnsmasq doesn't have a proper uninstall, you could write one that does this into dnsmasq.mk
dnsmasq-2.49 introduced an option to disable the dhcp server thus a new option if you want to do something more.

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#11 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

--- Comment #10 from Gustavo Zacarias <[email protected]> 2009-08-03 19:27:25 UTC --- My mistake, DNSMASQ_INSTALL_TARGET_OPT is required since it doesn't understand install-strip.

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#12 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

--- Comment #11 from Daniele Salvatore Albano <[email protected]> 2009-08-03 20:03:17 UTC --- I've used gamin package as base, however, tomorrow i'll fix this stuff

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#13 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

Peter Korsgaard <[email protected]> changed:

What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |ASSIGNED

--- Comment #12 from Peter Korsgaard <[email protected]> 2009-08-26 21:06:31 UTC --- (In reply to comment #11)

Quoted 1 line

I've used gamin package as base, however, tomorrow i'll fix this stuff

Care to send a fixed patch so it can get included in the 2009.08 release?

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#14 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

--- Comment #13 from Daniele Salvatore Albano <[email protected]> 2009-08-27 15:55:59 UTC --- Sorry for the long delay, but i got some troubles with my git copy and being full of work i didn't have the time to fix. I just dropping all the stuff
making a copy of my old tree and reappling patches.

I hope to send patches for this evening

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#15 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

--- Comment #14 from Daniele Salvatore Albano <[email protected]> 2009-08-28 17:18:31 UTC --- Hi,

i've fixed the package, i think.

Could you take a look to it or try to build it using uclibc?

The package is attached

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#16 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

Daniele Salvatore Albano <[email protected]> changed:

What |Removed |Added
----------------------------------------------------------------------------

 Attachment #569 is|0                           |1

obsolete| |

--- Comment #15 from Daniele Salvatore Albano <[email protected]> 2009-08-28 17:19:06 UTC --- Created an attachment (id=613)
--> (https://bugs.busybox.net/attachment.cgi?id=613)
dnsmasq.mk converted to new autotools package format

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#17 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

--- Comment #16 from Peter Korsgaard <[email protected]> 2009-08-30 06:08:41 UTC --- (In reply to comment #15)

Quoted 1 line

Created an attachment (id=613)

--> (https://bugs.busybox.net/attachment.cgi?id=613) [details]

Quoted 1 line

dnsmasq.mk converted to new autotools package format

Thanks. I noticed:

+ $(SED) 's^--ldflags dbus-1^--ldflags dbus-1 \| sed

s\\\#-I/\\\#-I$(STAGING_DIR)/\\\#g^' \
                $(DNSMASQ_DIR)/Makefile

There's no such line in the dnsmasq makefile and afaik pkg-config doesn't even accept the --ldflags option. Did you mean --libs instead?

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#18 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

--- Comment #17 from Gustavo Zacarias <[email protected]> 2009-09-01 15:18:21 UTC --- Created an attachment (id=625)
--> (https://bugs.busybox.net/attachment.cgi?id=625)
dnsmasq 2.50 Makefile.autotools.in plus some other improvements

How do you like this take Daniele / Peter?

* Bump to version 2.50 fixes security issues CVE 2009-2957 and 2009-2958.
* No need for INSTALL_STAGING
* Add uninstall target
* Use PREFIX=/usr to avoid files in /usr/local
* Install manpage conditionally
* Introduce new DHCP server option
* Add Peter's dbus fix (not tested, i don't use dbus)

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
#19 lore raw

[Buildroot] [Bug 527] misc fixes for dnsmasq package

In reply to bugzilla at busybox.net

https://bugs.busybox.net/show_bug.cgi?id=527

Peter Korsgaard <[email protected]> changed:

What |Removed |Added
----------------------------------------------------------------------------

             Status|ASSIGNED                    |RESOLVED
         Resolution|                            |FIXED

--- Comment #18 from Peter Korsgaard <[email protected]> 2009-09-01 21:09:31 UTC --- (In reply to comment #17)

Quoted 1 line

Created an attachment (id=625)

--> (https://bugs.busybox.net/attachment.cgi?id=625) [details]

Quoted 3 lines

dnsmasq 2.50 Makefile.autotools.in plus some other improvements

How do you like this take Daniele / Peter?

Looks good, except that it still tries to edit a line with --ldflags dbus-1, which isn't a valid pkg-config argument, so I left that out.
Why was that line added in the first place?

Committed to git, thanks both of you.

Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.