libnl: bump to version 3.2.3
PATCH 1/1 libnl: bump to version 3.2.3
This newer version splits the library code into libnl, libnl-route, libnl-genl and libnl-nf, each individually selectable via pkgconfig.
--- package/libnl/libnl.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/libnl/libnl.mk +1 -1
@@ -4,7 +4,7 @@ # ############################################################# -LIBNL_VERSION = 3.0 +LIBNL_VERSION = 3.2.3 LIBNL_SOURCE = libnl-$(LIBNL_VERSION).tar.gz LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files/ LIBNL_INSTALL_STAGING = YES
Signature · 1 line
1.7.7.3
PATCH 1/1 hostapd: fix build with new libnl-3
The CFLAGS have to be augmented for the include dir and a small patch will make the binary link to libnl-3 and libnl-genl-3 instead of libnl and libnl-gen.
--- package/hostapd/hostapd-0.7.3-libnl3.patch | 15 +++++++++++++++ package/hostapd/hostapd.mk | 1 + 2 files changed, 16 insertions(+), 0 deletions(-) create mode 100644 package/hostapd/hostapd-0.7.3-libnl3.patch
package/hostapd/hostapd-0.7.3-libnl3.patch new file +15 -0
@@ -0,0 +1,15 @@ +--- a/src/drivers/drivers.mak 2011-11-29 19:09:23.889942913 +0100 ++++ b/src/drivers/drivers.mak 2011-11-29 19:09:40.637381428 +0100 +@@ -31,10 +31,10 @@ + NEED_AP_MLME=y + NEED_NETLINK=y + NEED_LINUX_IOCTL=y +-DRV_LIBS += -lnl ++DRV_LIBS += -lnl-3 + + ifdef CONFIG_LIBNL20 +-DRV_LIBS += -lnl-genl ++DRV_LIBS += -lnl-genl-3 + DRV_CFLAGS += -DCONFIG_LIBNL20 + endif + endif
package/hostapd/hostapd.mk +1 -0
@@ -18,6 +18,7 @@ endif define HOSTAPD_LIBNL_CONFIG echo "CONFIG_LIBNL20=y" >>$(HOSTAPD_CONFIG) + echo "CFLAGS += -I$(TARGET_DIR)/usr/include/libnl3/" >>$(HOSTAPD_CONFIG) endef define HOSTAPD_CRYPTO_CONFIG
Signature · 1 line
1.7.7.3
PATCH 1/1 hostapd: fix build with new libnl-3
Quoted 3 lines · Daniel Mack
The CFLAGS have to be augmented for the include dir and a small patch will make the binary link to libnl-3 and libnl-genl-3 instead of libnl and libnl-gen.
There might be more patches like this necessary, and unfortunately, the approach is a nasty hack which don't like either. But don't see any cleaner way to make this work.
The root cause for touching all this is that I need libnl-3 with libnl-route3 support for another package I'm working on.
Daniel
Quoted 41 lines
Signed-off-by Daniel Mack <[email protected]>--- package/hostapd/hostapd-0.7.3-libnl3.patch | 15 +++++++++++++++ package/hostapd/hostapd.mk | 1 + 2 files changed, 16 insertions(+), 0 deletions(-) create mode 100644 package/hostapd/hostapd-0.7.3-libnl3.patchpackage/hostapd/hostapd-0.7.3-libnl3.patch new file +15
-0@@ -0,0 +1,15 @@ +--- a/src/drivers/drivers.mak 2011-11-29 19:09:23.889942913 +0100 ++++ b/src/drivers/drivers.mak 2011-11-29 19:09:40.637381428 +0100 +@@ -31,10 +31,10 @@ + NEED_AP_MLME=y + NEED_NETLINK=y + NEED_LINUX_IOCTL=y +-DRV_LIBS += -lnl ++DRV_LIBS += -lnl-3 + + ifdef CONFIG_LIBNL20 +-DRV_LIBS += -lnl-genl ++DRV_LIBS += -lnl-genl-3 + DRV_CFLAGS += -DCONFIG_LIBNL20 + endif + endifpackage/hostapd/hostapd.mk +1
-0@@ -18,6 +18,7 @@ endif define HOSTAPD_LIBNL_CONFIG echo "CONFIG_LIBNL20=y" >>$(HOSTAPD_CONFIG) + echo "CFLAGS += -I$(TARGET_DIR)/usr/include/libnl3/" >>$(HOSTAPD_CONFIG) endef define HOSTAPD_CRYPTO_CONFIG
PATCH 1/1 wpa_supplicant: fix build with new libnl-3
In reply to Daniel MackThe CFLAGS have to be augmented for the include dir and a small patch will make the binary link to libnl-3 and libnl-genl-3 instead of libnl and libnl-gen.
--- .../wpa_supplicant-0.7.3-libnl-3.patch | 15 +++++++++++++++ package/wpa_supplicant/wpa_supplicant.mk | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-) create mode 100644 package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch
package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch new file +15 -0
@@ -0,0 +1,15 @@ +--- a/src/drivers/drivers.mak 2011-11-29 19:19:56.684221050 +0100 ++++ b/src/drivers/drivers.mak 2011-11-29 19:20:12.199609246 +0100 +@@ -31,10 +31,10 @@ + NEED_AP_MLME=y + NEED_NETLINK=y + NEED_LINUX_IOCTL=y +-DRV_LIBS += -lnl ++DRV_LIBS += -lnl-3 + + ifdef CONFIG_LIBNL20 +-DRV_LIBS += -lnl-genl ++DRV_LIBS += -lnl-genl-3 + DRV_CFLAGS += -DCONFIG_LIBNL20 + endif + endif
package/wpa_supplicant/wpa_supplicant.mk +1 -1
@@ -56,7 +56,7 @@ endif define WPA_SUPPLICANT_CONFIGURE_CMDS cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG) - echo "CFLAGS += $(TARGET_CFLAGS)" >>$(WPA_SUPPLICANT_CONFIG) + echo "CFLAGS += $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include/libnl3/" >>$(WPA_SUPPLICANT_CONFIG) echo "LDFLAGS += $(TARGET_LDFLAGS)" >>$(WPA_SUPPLICANT_CONFIG) echo "CC = $(TARGET_CC)" >>$(WPA_SUPPLICANT_CONFIG) $(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(WPA_SUPPLICANT_CONFIG)
Signature · 1 line
1.7.7.3
PATCH 1/1 libnl: bump to version 3.2.3
In reply to Daniel MackQuoted 18 lines · Daniel Mack
This newer version splits the library code into libnl, libnl-route, libnl-genl and libnl-nf, each individually selectable via pkgconfig.
Signed-off-by Daniel Mack <[email protected]>---
?package/libnl/libnl.mk | ? ?2 +-
?1 files changed, 1 insertions(+), 1 deletions(-)package/libnl/libnl.mk +0
-0@@ -4,7 +4,7 @@?# ?#############################################################
package/libnl/libnl.mk +1
-1-LIBNL_VERSION = 3.0 +LIBNL_VERSION = 3.2.3
Quoted 5 lines
?LIBNL_SOURCE = libnl-$(LIBNL_VERSION).tar.gz ?LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files/
?LIBNL_INSTALL_STAGING = YES
--
1.7.7.3
The only package I know that is prepared for libnl 3.2.3 is iw (latest git version). Other packages like wpa_supplicant, hostapd, kismet are not prepared for the new version of libnl.
Yegor
PATCH 1/1 libnl: bump to version 3.2.3
Quoted 17 lines · Yegor Yefremov
Quoted 16 lines · Daniel Mack
This newer version splits the library code into libnl, libnl-route, libnl-genl and libnl-nf, each individually selectable via pkgconfig.
Signed-off-by Daniel Mack <[email protected]>---
?package/libnl/libnl.mk | ? ?2 +-
?1 files changed, 1 insertions(+), 1 deletions(-)package/libnl/libnl.mk +0
-0@@ -4,7 +4,7 @@?# ?#############################################################
Quoted 11 lines
Quoted 7 lines
package/libnl/libnl.mk +1
-1-LIBNL_VERSION = 3.0 +LIBNL_VERSION = 3.2.3?LIBNL_SOURCE = libnl-$(LIBNL_VERSION).tar.gz ?LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files/
?LIBNL_INSTALL_STAGING = YES
--
1.7.7.3The only package I know that is prepared for libnl 3.2.3 is iw (latest git version). Other packages like
wpa_supplicant, hostapd, kismet are not prepared for the new version of libnl.
I've seen your patches for wpa_supplicant, hostapd. So kismet and iw are left.
Yegor
PATCH 1/2 iw: fix build with new libnl-3
The CFLAGS have to be augmented for the include dir and the patch needs to be tweaked to make the binary link to libnl-3 instead of libnl-gen.
--- package/iw/iw-libnl-30-support.patch | 2 +- package/iw/iw.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/iw/iw-libnl-30-support.patch +1 -1
@@ -20,7 +20,7 @@ Index: b/Makefile +ifeq ($(NL3FOUND),Y) +CFLAGS += -DCONFIG_LIBNL20 -+LIBS += -lnl-genl ++LIBS += -lnl-genl-3 +NLLIBNAME = libnl-3.0 +endif +
package/iw/iw.mk +1 -1
@@ -15,7 +15,7 @@ IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ define IW_CONFIGURE_CMDS echo "CC = $(TARGET_CC)" >$(IW_CONFIG) - echo "CFLAGS = $(TARGET_CFLAGS)" >>$(IW_CONFIG) + echo "CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/" >>$(IW_CONFIG) echo "LDFLAGS = $(TARGET_LDFLAGS)" >>$(IW_CONFIG) endef
Signature · 1 line
1.7.7.3
PATCH 2/2 kismet: fix build with new libnl-3
The CFLAGS have to be augmented, so configure finds the correct include dir, and the patch needs to be tweaked to make the binary link to libnl-3 instead of libnl-gen.
--- package/kismet/kismet-libnl-30-support.patch | 10 +++++++--- package/kismet/kismet.mk | 1 + 2 files changed, 8 insertions(+), 3 deletions(-)
package/kismet/kismet-libnl-30-support.patch +7 -3
@@ -111,13 +111,17 @@ Index: b/configure pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl20" >&5 $as_echo_n "checking for libnl20... " >&6; } -@@ -6897,7 +6974,7 @@ +@@ -6897,7 +6974,11 @@ $as_echo "yes" >&6; } libnl1=yes fi - if test "$libnl20" = "yes"; then -+ if test "$libnl20" = "yes" -o "$libnl30" = "yes"; then - ++ if test "$libnl30" = "yes"; then ++$as_echo "#define HAVE_LIBNL 1" >>confdefs.h ++$as_echo "#define HAVE_LIBNL20 1" >>confdefs.h ++ NLLIBS="-lnl-genl-3 -lnl-3" ++ elif test "$libnl20" = "yes"; then + $as_echo "#define HAVE_LIBNL 1" >>confdefs.h
package/kismet/kismet.mk +1 -0
@@ -10,6 +10,7 @@ KISMET_DEPENDENCIES = libpcap ncurses ifeq ($(BR2_PACKAGE_LIBNL),y) KISMET_DEPENDENCIES += libnl + KISMET_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/" endif ifeq ($(BR2_PACKAGE_PCRE),y) KISMET_DEPENDENCIES += pcre
Signature · 1 line
1.7.7.3
PATCH 1/2 iw: fix build with new libnl-3
In reply to Daniel Mackpackage/iw/iw-libnl-30-support.patch
Quoted 11 lines · Daniel Mack
The CFLAGS have to be augmented for the include dir and the patch needs to be tweaked to make the binary link to libnl-3 instead of libnl-gen.
Signed-off-by Daniel Mack <[email protected]>---
?package/iw/iw-libnl-30-support.patch | ? ?2 +-
?package/iw/iw.mk ? ? ? ? ? ? ? ? ? ? | ? ?2 +-
?2 files changed, 2 insertions(+), 2 deletions(-)package/iw/iw-libnl-30-support.patch +0
-0
this file has gone in next. Please rebase your patches on the next branch and try to get iw from git with this commit
http://git.sipsolutions.net/?p=iw.git;a=commit;h=a82abc2cac9dea7def53070565201145c76c8c6c.
Yegor
PATCH 1/2 iw: fix build with new libnl-3
Hi Yegor,
Quoted 11 lines · Yegor Yefremov
Quoted 10 lines · Daniel Mack
The CFLAGS have to be augmented for the include dir and the patch needs to be tweaked to make the binary link to libnl-3 instead of libnl-gen.
Signed-off-by Daniel Mack <[email protected]>--- package/iw/iw-libnl-30-support.patch | 2 +- package/iw/iw.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Quoted 3 lines
package/iw/iw-libnl-30-support.patch
Quoted 1 line
package/iw/iw-libnl-30-support.patch +0
-0this file has gone in next. Please rebase your patches on the next
I can do this. I wasn't even aware of this branch, and part of the reason is that it doesn't show up on the cgit web interface
(http://git.buildroot.net/buildroot) when there's no trailing slash in the URI, which is unfortunately the location the website
(http://buildroot.uclibc.org/git.html) points visitors to. You can click on "refs" and back on "summary" which will add the "/" suffix, and then cgit will show the existance of the "next" branch. Very odd.
Quoted 2 lines
branch and try to get iw from git with this commit
http://git.sipsolutions.net/?p=iw.git;a=commit;h=a82abc2cac9dea7def53070565201145c76c8c6c.
Not sure whether I follow you here. Do you suggest writing package definitions for sources that are not released yet officially? If that is the case, what is the reason?
Also, I fail to see how the commit you pointed me to is related to the changed location of libnl-3. Is this not something that should be addressed independently?
All my other libnl-related patches still seem to apply fine on the -next branch, though.
Daniel
PATCH 1/2 iw: fix build with new libnl-3
Quoted 8 lines · Daniel Mack
I can do this. I wasn't even aware of this branch, and part of the reason is that it doesn't show up on the cgit web interface
(http://git.buildroot.net/buildroot) when there's no trailing slash in the URI, which is unfortunately the location the website
(http://buildroot.uclibc.org/git.html) points visitors to. You can click on "refs" and back on "summary" which will add the "/" suffix, and then cgit will show the existance of the "next" branch. Very odd.
Confirmed here also.
Just adding the "/" to the URI in the browser bar and hitting "enter" fixes the display of the "next" branch also.
Mike
PATCH 1/2 iw: fix build with new libnl-3
Quoted 10 lines · Michael S. Zick
Quoted 8 lines · Daniel Mack
I can do this. I wasn't even aware of this branch, and part of the reason is that it doesn't show up on the cgit web interface
(http://git.buildroot.net/buildroot) when there's no trailing slash in the URI, which is unfortunately the location the website
(http://buildroot.uclibc.org/git.html) points visitors to. You can click on "refs" and back on "summary" which will add the "/" suffix, and then cgit will show the existance of the "next" branch. Very odd.
Quoted 5 lines
Confirmed here also.
Just adding the "/" to the URI in the browser bar and hitting "enter" fixes the display of the "next" branch also.
I haven't checked if the command line shown under the "Clone" section is effected by this strange behavior.
Mike
Quoted 7 lines
Mike
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH 1/2 iw: fix build with new libnl-3
In reply to Daniel MackHi Daniel,
Quoted 22 lines
Quoted 10 lines
Quoted 10 lines
The CFLAGS have to be augmented for the include dir and the patch needs to be tweaked to make the binary link to libnl-3 instead of libnl-gen.
Signed-off-by Daniel Mack <[email protected]>---
?package/iw/iw-libnl-30-support.patch | ? ?2 +-
?package/iw/iw.mk ? ? ? ? ? ? ? ? ? ? | ? ?2 +-
?2 files changed, 2 insertions(+), 2 deletions(-)Quoted 3 lines
package/iw/iw-libnl-30-support.patch
Quoted 1 line
package/iw/iw-libnl-30-support.patch +0
-0this file has gone in next. Please rebase your patches on the next
I can do this. I wasn't even aware of this branch, and part of the reason is that it doesn't show up on the cgit web interface
(http://git.buildroot.net/buildroot) when there's no trailing slash in the URI, which is unfortunately the location the website
(http://buildroot.uclibc.org/git.html) points visitors to. You can click on "refs" and back on "summary" which will add the "/" suffix, and then cgit will show the existance of the "next" branch. Very odd.
Quoted 6 lines
Quoted 2 lines
branch and try to get iw from git with this commit
http://git.sipsolutions.net/?p=iw.git;a=commit;h=a82abc2cac9dea7def53070565201145c76c8c6c.Not sure whether I follow you here. Do you suggest writing package definitions for sources that are not released yet officially? If that is the case, what is the reason?
I see here 3 possibilities:
1. replace official release with git one
2. wait for iw 3.3
3. apply related patches (from iw repo) only
the first way is simpler and quicker to implement
Quoted 3 lines
Also, I fail to see how the commit you pointed me to is related to the changed location of libnl-3. Is this not something that should be addressed independently?
I just pointed to the latest commit. You can choose the one with related changes
Quoted 2 lines
All my other libnl-related patches still seem to apply fine on the -next branch, though.
ACK
Yegor
PATCH 1/2 iw: fix build with new libnl-3
Quoted 31 lines · Yegor Yefremov
Hi Daniel,
Quoted 22 lines
Quoted 10 lines
Quoted 10 lines
The CFLAGS have to be augmented for the include dir and the patch needs to be tweaked to make the binary link to libnl-3 instead of libnl-gen.
Signed-off-by Daniel Mack <[email protected]>--- package/iw/iw-libnl-30-support.patch | 2 +- package/iw/iw.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)Quoted 3 lines
package/iw/iw-libnl-30-support.patch
Quoted 1 line
package/iw/iw-libnl-30-support.patch +0
-0this file has gone in next. Please rebase your patches on the next
I can do this. I wasn't even aware of this branch, and part of the reason is that it doesn't show up on the cgit web interface
(http://git.buildroot.net/buildroot) when there's no trailing slash in the URI, which is unfortunately the location the website
(http://buildroot.uclibc.org/git.html) points visitors to. You can click on "refs" and back on "summary" which will add the "/" suffix, and then cgit will show the existance of the "next" branch. Very odd.Quoted 6 lines
Quoted 2 lines
branch and try to get iw from git with this commit
http://git.sipsolutions.net/?p=iw.git;a=commit;h=a82abc2cac9dea7def53070565201145c76c8c6c.Not sure whether I follow you here. Do you suggest writing package definitions for sources that are not released yet officially? If that is the case, what is the reason?
Quoted 7 lines
I see here 3 possibilities:
1. replace official release with git one
2. wait for iw 3.3
3. apply related patches (from iw repo) onlythe first way is simpler and quicker to implement
Ok, fine. I did that and the git version seems to cope well with nibnl-3. Nice.
Quoted 5 lines
Quoted 3 lines
Also, I fail to see how the commit you pointed me to is related to the changed location of libnl-3. Is this not something that should be addressed independently?
I just pointed to the latest commit. You can choose the one with related changes
Ok. I rebased all patches and will repost them all. Thanks for your review!
Dainel
PATCH 1/2 iw: fix build with new libnl-3
In reply to Daniel MackQuoted 3 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Daniel" == Daniel Mack <[email protected]> writes:
this file has gone in next. Please rebase your patches on the next
Daniel> I can do this. I wasn't even aware of this branch, and part of the Daniel> reason is that it doesn't show up on the cgit web interface Daniel> (http://git.buildroot.net/buildroot) when there's no trailing slash in Daniel> the URI, which is unfortunately the location the website Daniel> (http://buildroot.uclibc.org/git.html) points visitors to. You can click Daniel> on "refs" and back on "summary" which will add the "/" suffix, and then Daniel> cgit will show the existance of the "next" branch. Very odd.
Yes, I know. I've reported it to the osuosl.org guys a while back, and they are looking into it, but so far without any luck.
I've now fixed the website link.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 iw: fix build with new libnl-3
Am 24.12.2011 16:24, schrieb Peter Korsgaard:
Quoted 10 lines
Quoted 2 lines
Quoted 2 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Daniel" == Daniel Mack <[email protected]> writes:
this file has gone in next. Please rebase your patches on the next
Daniel> I can do this. I wasn't even aware of this branch, and part of the Daniel> reason is that it doesn't show up on the cgit web interface Daniel> (http://git.buildroot.net/buildroot) when there's no trailing slash in Daniel> the URI, which is unfortunately the location the website Daniel> (http://buildroot.uclibc.org/git.html) points visitors to. You can click Daniel> on "refs" and back on "summary" which will add the "/" suffix, and then Daniel> cgit will show the existance of the "next" branch. Very odd.
Even more strange:
http://git.buildroot.net/buildroot
Branch Commit message
Author Age
master <http://git.buildroot.net/buildroot/log/>hostapd: fix libnl linking with BR2_PREFER_STATIC_LIB
<http://git.buildroot.net/buildroot/commit/>Peter Korsgaard91 min.
manually adding a "/" at the end of the URL gives:
http://git.buildroot.net/buildroot/:
Branch Commit message
Author Age
master <http://git.buildroot.net/buildroot/log/>xapp_xman: fix dependencies
<http://git.buildroot.net/buildroot/commit/>Peter Korsgaard29 hours
next <http://git.buildroot.net/buildroot/log/?h=next> libroxml: bump
version to 2.1.2
<http://git.buildroot.net/buildroot/commit/?h=next>Tristan Lelong 4 weeks
A nice time to all
Stephan
Quoted 5 lines
Yes, I know. I've reported it to the osuosl.org guys a while back, and they are looking into it, but so far without any luck.
I've now fixed the website link.
Signature · 9 lines
reLinux - Stephan Hoffmann Am Schmidtgrund 124 50765 K?ln Tel. +49.221.95595-19 Fax: -64 www.reLinux.de sho at reLinux.de -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20111224/9774ded9/attachment.html>
PATCH 1/1 libnl: bump to version 3.2.3
In reply to Yegor YefremovQuoted 31 lines · Yegor Yefremov
Quoted 17 lines · Yegor Yefremov
Quoted 16 lines · Daniel Mack
This newer version splits the library code into libnl, libnl-route, libnl-genl and libnl-nf, each individually selectable via pkgconfig.
Signed-off-by Daniel Mack <[email protected]>--- package/libnl/libnl.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)package/libnl/libnl.mk +0
-0@@ -4,7 +4,7 @@ # #############################################################Quoted 11 lines
Quoted 7 lines
package/libnl/libnl.mk +1
-2-LIBNL_VERSION = 3.0 +LIBNL_VERSION = 3.2.3 LIBNL_SOURCE = libnl-$(LIBNL_VERSION).tar.gz LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files/ LIBNL_INSTALL_STAGING = YES --1.7.7.3
The only package I know that is prepared for libnl 3.2.3 is iw (latest git version). Other packages like
wpa_supplicant, hostapd, kismet are not prepared for the new version of libnl.
Quoted 1 line
I've seen your patches for
wpa_supplicant, hostapd. So kismet and iw are left.
Ok, I've sent patches for these, too. Thanks for the heads-up.
Daniel