Bug#601803: patch for wireless support
2011/6/19 Timo Juhani Lindfors : > This fails to build with Grmf. Ok, I made a squeeze chroot, fixed the build issues and finally built a package for squeeze. Please test: http://people.debian.org/~rmh/wireless/freebsd-utils_8.1-4.dsc http://people.debian.org/~rmh/wireless/freebsd-net-tools_8.1-4_kfreebsd-amd64.deb http://people.debian.org/~rmh/wireless/wireless_squeeze.diff -- Robert Millan -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/banlktikk1iyzodfonnz7me8ek0_en7m...@mail.gmail.com
Bug#601803: patch for wireless support
Robert Millan writes: > Just get it from http://people.debian.org/~rmh/wireless/ This fails to build with In file included from regdomain.c:32: /usr/include/sys/sbuf.h:68: error: expected declaration specifiers or ‘...’ before ‘va_list’ The sbuf.h is from # dpkg-query -W kfreebsd-kernel-headers kfreebsd-kernel-headers 0.53 and the full build log is at http://lindi.iki.fi/lindi/kfreebsd/wireless/freebsd-utils_8.1-4.1_kfreebsd-i386.build -Timo -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/848vsyf3tt@sauna.l.org
Bug#601803: patch for wireless support
2011/6/19 Timo Juhani Lindfors : > What am I missing now? Just get it from http://people.debian.org/~rmh/wireless/ -- Robert Millan -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/banlktikfsp7ujefp2hpqn8rzjcfe0xu...@mail.gmail.com
Bug#601803: patch for wireless support
Robert Millan writes: > It's no good if you just copy the patch instead of appliing it: > > rmh@thorin:/tmp/freebsd-utils-8.1$ patch -p0 < wireless.diff > patching file debian/control > patching file debian/patches/002_ifconfig.diff > patching file debian/rules Yes sorry about that. I'm obviously trying to triage too many bugs at once :-) I'm filing a bug on a boot problem soon, it kind of adds extra difficulty to testing this bug too. Anyways: # dpkg-source -x freebsd-utils_8.1-4.dsc dpkg-source: warning: extracting unsigned source package (freebsd-utils_8.1-4.dsc) dpkg-source: info: extracting freebsd-utils in freebsd-utils-8.1 dpkg-source: info: unpacking freebsd-utils_8.1.orig.tar.gz dpkg-source: info: applying freebsd-utils_8.1-4.diff.gz root@debian:/build/debian# cd freebsd-utils-8.1/ root@debian:/build/debian/freebsd-utils-8.1# patch -p0 < ../wireless.diff patching file debian/control patching file debian/patches/002_ifconfig.diff patching file debian/rules root@debian:/build/debian/freebsd-utils-8.1# quilt applied No patches applied root@debian:/build/debian/freebsd-utils-8.1# quilt push -a Applying patch 001_dmesg.diff patching file sbin/dmesg/dmesg.c Applying patch 002_ifconfig.diff patching file sbin/ifconfig/Makefile patch: malformed patch at line 53: SRCS+= af_ipx.c# IPX support Patch 002_ifconfig.diff does not apply (enforce with -f) What am I missing now? -Timo -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/84mxheg1rp@sauna.l.org
Bug#601803: patch for wireless support
2011/6/18 Timo Juhani Lindfors : > but I still get > > # ifconfig wlan0 create wlandev ath0 > ifconfig: SIOCIFCREATE2: Bad address > > Sources and binaries are at > > http://iki.fi/lindi/kfreebsd/wireless/ It's no good if you just copy the patch instead of appliing it: rmh@thorin:/tmp/freebsd-utils-8.1$ patch -p0 < wireless.diff patching file debian/control patching file debian/patches/002_ifconfig.diff patching file debian/rules -- Robert Millan -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/BANLkTi=iuyxq7t_v7sloh_etaeitt4u...@mail.gmail.com
Bug#601803: patch for wireless support
Hi, Robert Millan writes: > Here's a backport of the wireless patch to freebsd-utils 8.1 (version used > in squeeze). Hopefully this helps you getting it tested. # debdiff freebsd-utils_8.1-4.dsc freebsd-utils_8.1-4lindi1.dsc diff -u freebsd-utils-8.1/debian/changelog freebsd-utils-8.1/debian/changelog --- freebsd-utils-8.1/debian/changelog +++ freebsd-utils-8.1/debian/changelog @@ -1,3 +1,10 @@ +freebsd-utils (8.1-4lindi1) unstable; urgency=low + + * Apply Robert Millan's patch from #601803 to fix +wireless support. + + -- Timo Juhani Lindfors Fri, 17 Jun 2011 18:53:26 +0300 + freebsd-utils (8.1-4) unstable; urgency=low [ Petr Salinger ] only in patch2: unchanged: --- freebsd-utils-8.1.orig/wireless.diff +++ freebsd-utils-8.1/wireless.diff @@ -0,0 +1,68 @@ +Index: debian/control +=== +--- debian/control (revision 3465) debian/control (working copy) +@@ -7,7 +7,7 @@ + libkvm-dev (>= 8.1), libbsd-dev (>= 0.2.0), libc0.1-dev (>= 2.11.2), + flex | flex-old, kfreebsd-kernel-headers (>= 0.51), libmemstat-dev, libnetgraph-dev, + libipx-dev, libkiconv-dev, libgeom-dev, libdevstat-dev, libsbuf-dev, libcam-dev (>= 8.1), +- libedit-dev, sharutils ++ libedit-dev, sharutils, libexpat1-dev + # libkvm-dev: dmesg + # libgeom-dev : ccdconfig + # libipx-dev: ifconfig +@@ -17,6 +17,7 @@ + # libsbuf-dev: mdconfig + # libcam-dev: camcontrol + # libedit-dev: pppctl ++# libexpat1-dev: ifconfig + Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-utils/ + Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-utils/ + Standards-Version: 3.9.1 +Index: debian/patches/002_ifconfig.diff +=== +--- debian/patches/002_ifconfig.diff (revision 3465) debian/patches/002_ifconfig.diff (working copy) +@@ -29,21 +29,21 @@ + +#SRCS+= ifgre.c # GRE keys etc + SRCS+= ifgif.c# GIF reversed header workaround + +--SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support ++ SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support + -DPADD+= ${LIBBSDXML} ${LIBSBUF} ${LIBJAIL} + -LDADD+= -lbsdxml -ljail -lsbuf +-- +--SRCS+= ifcarp.c# SIOC[GS]VH support +--SRCS+= ifgroup.c # ... +--SRCS+= ifpfsync.c # pfsync(4) support +-+#SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support + +#DPADD+= ${LIBBSDXML} ${LIBSBUF} ${LIBJAIL} + +#LDADD+= -lbsdxml -ljail -lsbuf +++LDADD+= -lexpat -lsbuf + + + +#SRCS+= ifcarp.c# SIOC[GS]VH support + +#SRCS+= ifgroup.c # ... + +#SRCS+= ifpfsync.c # pfsync(4) support + ++-SRCS+= ifcarp.c# SIOC[GS]VH support ++-SRCS+= ifgroup.c # ... ++-SRCS+= ifpfsync.c # pfsync(4) support ++- + -SRCS+= ifbridge.c # bridge support + -SRCS+= iflagg.c # lagg support + +#SRCS+= ifbridge.c # bridge support +Index: debian/rules +=== +--- debian/rules (revision 3465) debian/rules (working copy) +@@ -5,8 +5,8 @@ + # Uncomment this to turn on verbose mode. + #export DH_VERBOSE=1 + +-CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' +-CXXFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' ++CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D__va_list=__builtin_va_list ++CXXFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D__va_list=__builtin_va_list + + ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 but I still get # ifconfig wlan0 create wlandev ath0 ifconfig: SIOCIFCREATE2: Bad address Sources and binaries are at http://iki.fi/lindi/kfreebsd/wireless/ if somebody else wants to try. -Timo -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/84y60zfcqe@sauna.l.org
Bug#601803: patch for wireless support
2011/6/17 Timo Juhani Lindfors : > root@debian:/build/debian/freebsd-utils-8.1# patch --dry-run -p1 < > wireless.diff > patching file control > Hunk #1 FAILED at 7. > Hunk #2 FAILED at 17. > 2 out of 2 hunks FAILED -- saving rejects to file control.rej Did you mean -p0? ;-) -- Robert Millan -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/banlktinuvtx+nx804zuu_yno5pndg-x...@mail.gmail.com
Bug#601803: patch for wireless support
Hi, Robert Millan writes: > Here's a backport of the wireless patch to freebsd-utils 8.1 (version used > in squeeze). Hopefully this helps you getting it tested. Thanks. I setup a squeeze build environment but at least the attached patch needs some tweaking: root@debian:/build/debian/freebsd-utils-8.1# lsb_release -a No LSB modules are available. Distributor ID:Debian Description: Debian GNU 6.0.1 (squeeze) Release: 6.0.1 Codename: squeeze root@debian:/build/debian/freebsd-utils-8.1# dpkg-architecture DEB_BUILD_ARCH=kfreebsd-i386 DEB_BUILD_ARCH_OS=kfreebsd DEB_BUILD_ARCH_CPU=i386 DEB_BUILD_ARCH_BITS=32 DEB_BUILD_ARCH_ENDIAN=little DEB_BUILD_GNU_CPU=i486 DEB_BUILD_GNU_SYSTEM=kfreebsd-gnu DEB_BUILD_GNU_TYPE=i486-kfreebsd-gnu DEB_HOST_ARCH=kfreebsd-i386 DEB_HOST_ARCH_OS=kfreebsd DEB_HOST_ARCH_CPU=i386 DEB_HOST_ARCH_BITS=32 DEB_HOST_ARCH_ENDIAN=little DEB_HOST_GNU_CPU=i486 DEB_HOST_GNU_SYSTEM=kfreebsd-gnu DEB_HOST_GNU_TYPE=i486-kfreebsd-gnu root@debian:/build/debian/freebsd-utils-8.1# dpkg-parsechangelog Source: freebsd-utils Version: 8.1-4 Distribution: unstable Urgency: low Maintainer: Aurelien Jarno Date: Sat, 22 Jan 2011 23:44:13 +0100 Changes: freebsd-utils (8.1-4) unstable; urgency=low . [ Petr Salinger ] * enhance kbdcontrol.init, related to Debian Policy, 9.8 Keyboard configuration. See: #605777. root@debian:/build/debian/freebsd-utils-8.1# patch --dry-run -p1 < wireless.diff patching file control Hunk #1 FAILED at 7. Hunk #2 FAILED at 17. 2 out of 2 hunks FAILED -- saving rejects to file control.rej patching file patches/002_ifconfig.diff Hunk #1 FAILED at 29. 1 out of 1 hunk FAILED -- saving rejects to file patches/002_ifconfig.diff.rej patching file rules Hunk #1 FAILED at 5. 1 out of 1 hunk FAILED -- saving rejects to file rules.rej I'll try to sort this out :-) Patching patches gets quickly very messy. Especially since some of the patches comment out things instead of just removing them... -Timo -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/84wrgklcah@sauna.l.org
Bug#601803: patch for wireless support
Hi Timo, Here's a backport of the wireless patch to freebsd-utils 8.1 (version used in squeeze). Hopefully this helps you getting it tested. -- Robert Millan Index: debian/control === --- debian/control (revision 3465) +++ debian/control (working copy) @@ -7,7 +7,7 @@ libkvm-dev (>= 8.1), libbsd-dev (>= 0.2.0), libc0.1-dev (>= 2.11.2), flex | flex-old, kfreebsd-kernel-headers (>= 0.51), libmemstat-dev, libnetgraph-dev, libipx-dev, libkiconv-dev, libgeom-dev, libdevstat-dev, libsbuf-dev, libcam-dev (>= 8.1), - libedit-dev, sharutils + libedit-dev, sharutils, libexpat1-dev # libkvm-dev: dmesg # libgeom-dev : ccdconfig # libipx-dev: ifconfig @@ -17,6 +17,7 @@ # libsbuf-dev: mdconfig # libcam-dev: camcontrol # libedit-dev: pppctl +# libexpat1-dev: ifconfig Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-utils/ Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-utils/ Standards-Version: 3.9.1 Index: debian/patches/002_ifconfig.diff === --- debian/patches/002_ifconfig.diff(revision 3465) +++ debian/patches/002_ifconfig.diff(working copy) @@ -29,21 +29,21 @@ +#SRCS+= ifgre.c # GRE keys etc SRCS+=ifgif.c # GIF reversed header workaround --SRCS+=ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support + SRCS+=ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support -DPADD+= ${LIBBSDXML} ${LIBSBUF} ${LIBJAIL} -LDADD+= -lbsdxml -ljail -lsbuf -- --SRCS+=ifcarp.c# SIOC[GS]VH support --SRCS+=ifgroup.c # ... --SRCS+=ifpfsync.c # pfsync(4) support -+#SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support +#DPADD+= ${LIBBSDXML} ${LIBSBUF} ${LIBJAIL} +#LDADD+= -lbsdxml -ljail -lsbuf ++LDADD+= -lexpat -lsbuf + +#SRCS+= ifcarp.c# SIOC[GS]VH support +#SRCS+= ifgroup.c # ... +#SRCS+= ifpfsync.c # pfsync(4) support +-SRCS+=ifcarp.c# SIOC[GS]VH support +-SRCS+=ifgroup.c # ... +-SRCS+=ifpfsync.c # pfsync(4) support +- -SRCS+=ifbridge.c # bridge support -SRCS+=iflagg.c# lagg support +#SRCS+= ifbridge.c # bridge support Index: debian/rules === --- debian/rules(revision 3465) +++ debian/rules(working copy) @@ -5,8 +5,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -CXXFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' +CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D__va_list=__builtin_va_list +CXXFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D__va_list=__builtin_va_list ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0
Bug#601803: patch for wireless support
2011/6/9 Guillem Jover : >> libjail is used for "ifconfig vnet" (see manpage) feature >> which has nothing to do with wireless support. > > We can enable it later on when we've added libjail to freebsd-libs and > it's gotten through NEW. I don't see significant demand for this feature (actually, we don't even have /sbin/jail yet). In any case, when we add it we need to figure out wether we want to provide libjail1-udeb or disable vnet in freebsd-net-tools-udeb. But there's no hurry, adding /sbin/jail is more important IMHO. > The __DECONST one was already on my list of things to add, as I've seen > it used somewhere recently. For the second one, if you mean __va_list, > then yes I've also had that pending. Otherwise if you mean bsdxml.h (but > you mentioned the expat maintainers were going to provide that?) then I > don't think it would be a good idea as libbsd would need to pull > libexpat-dev, which I'd rather not. I agree about bsdxml.h. I was thinking about , on FreeBSD it seems to drag in, but on GNU it doesn't. -- Robert Millan -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/banlktikyhnjqt06beq8vft6sofanzkm...@mail.gmail.com
Bug#601803: patch for wireless support
Hi! On Wed, 2011-06-08 at 13:25:10 +0200, Robert Millan wrote: > As for libjail it's not really necessary; the Makefile layout > is confusing which lead Timo to think it was. Ah perfect will include this for the next upload, then. > libjail is used for "ifconfig vnet" (see manpage) feature > which has nothing to do with wireless support. We can enable it later on when we've added libjail to freebsd-libs and it's gotten through NEW. > Guillem, do you think either of the header kludges I'm > adding with this patch would be suitable for libbsd? The __DECONST one was already on my list of things to add, as I've seen it used somewhere recently. For the second one, if you mean __va_list, then yes I've also had that pending. Otherwise if you mean bsdxml.h (but you mentioned the expat maintainers were going to provide that?) then I don't think it would be a good idea as libbsd would need to pull libexpat-dev, which I'd rather not. thanks, guillem -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20110609035512.ga30...@gaara.hadrons.org
Bug#601803: patch for wireless support
tags 601803 patch unblock 601803 by 629521 thanks Here's a patch to enable wireless support. As for libjail it's not really necessary; the Makefile layout is confusing which lead Timo to think it was. libjail is used for "ifconfig vnet" (see manpage) feature which has nothing to do with wireless support. Guillem, do you think either of the header kludges I'm adding with this patch would be suitable for libbsd? -- Robert Millan diff -Nur a/freebsd-utils-8.2/debian/control b/freebsd-utils-8.2/debian/control --- a/freebsd-utils-8.2/debian/control 2011-05-30 22:33:26.0 +0200 +++ b/freebsd-utils-8.2/debian/control 2011-06-08 13:19:35.632254657 +0200 @@ -26,7 +26,9 @@ # libcam-dev: camcontrol libcam-dev (>= 8.2), # libedit-dev: pppctl - libedit-dev + libedit-dev, +# libexpat1-dev: ifconfig + libexpat1-dev, Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-utils/ Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-utils/ Standards-Version: 3.9.2 diff -Nur a/freebsd-utils-8.2/debian/local/include/bsdxml.h b/freebsd-utils-8.2/debian/local/include/bsdxml.h --- a/freebsd-utils-8.2/debian/local/include/bsdxml.h 1970-01-01 01:00:00.0 +0100 +++ b/freebsd-utils-8.2/debian/local/include/bsdxml.h 2011-06-08 13:19:35.633352283 +0200 @@ -0,0 +1 @@ +#include diff -Nur a/freebsd-utils-8.2/debian/local/include/sys/cdefs.h b/freebsd-utils-8.2/debian/local/include/sys/cdefs.h --- a/freebsd-utils-8.2/debian/local/include/sys/cdefs.h1970-01-01 01:00:00.0 +0100 +++ b/freebsd-utils-8.2/debian/local/include/sys/cdefs.h2011-06-08 13:19:35.635216207 +0200 @@ -0,0 +1,3 @@ +#include_next +#include +#define __DECONST(type, var) ((type) var) diff -Nur a/freebsd-utils-8.2/debian/patches/032_wireless.diff b/freebsd-utils-8.2/debian/patches/032_wireless.diff --- a/freebsd-utils-8.2/debian/patches/032_wireless.diff1970-01-01 01:00:00.0 +0100 +++ b/freebsd-utils-8.2/debian/patches/032_wireless.diff2011-06-08 13:18:32.259527397 +0200 @@ -0,0 +1,14 @@ +--- a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile +@@ -27,9 +27,10 @@ + #SRCS+= ifgre.c # GRE keys etc + SRCS+=ifgif.c # GIF reversed header workaround + +-#SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support ++SRCS+=ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support + #DPADD+= ${LIBBSDXML} ${LIBSBUF} ${LIBJAIL} + #LDADD+= -lbsdxml -ljail -lsbuf ++LDADD+= -lexpat -lsbuf + + #SRCS+= ifcarp.c# SIOC[GS]VH support + #SRCS+= ifgroup.c # ... diff -Nur a/freebsd-utils-8.2/debian/patches/series b/freebsd-utils-8.2/debian/patches/series --- a/freebsd-utils-8.2/debian/patches/series 2011-05-30 22:40:51.0 +0200 +++ b/freebsd-utils-8.2/debian/patches/series 2011-06-08 13:19:08.119469653 +0200 @@ -28,3 +28,4 @@ 029_arp.diff 030_arp_libbsd.diff 031_savecore.diff +032_wireless.diff diff -Nur a/freebsd-utils-8.2/debian/rules b/freebsd-utils-8.2/debian/rules --- a/freebsd-utils-8.2/debian/rules2011-05-30 22:33:26.0 +0200 +++ b/freebsd-utils-8.2/debian/rules2011-06-08 13:19:35.636624766 +0200 @@ -5,8 +5,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -CXXFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' +CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D__va_list=__builtin_va_list +CXXFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D__va_list=__builtin_va_list ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0