[pkg-wpa-devel] r1301 - in /iw/trunk/debian: ./ patches/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Sun Dec 28 13:24:24 UTC 2008
Author: kelmo-guest
Date: Sun Dec 28 13:24:24 2008
New Revision: 1301
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1301
Log:
* Cherry pick patches from upstream, see each patch's description for
details:
- debian/patches/01_fix_sparse_warnings.patch
- debian/patches/02_print_unknown_events.patch
- debian/patches/03_new_nl80211_adjust_for_api.patch
- debian/patches/04_add_sta_bitrate_info.patch
- debian/patches/05_allow_user_defined_ldflags.patch
- debian/patches/06_manual_tweaks.patch
* Activate quilt patch management, add build dependency on quilt package.
Added:
iw/trunk/debian/patches/
iw/trunk/debian/patches/01_fix_sparse_warnings.patch
iw/trunk/debian/patches/02_print_unknown_events.patch
iw/trunk/debian/patches/03_new_nl80211_adjust_for_api.patch
iw/trunk/debian/patches/04_add_sta_bitrate_info.patch
iw/trunk/debian/patches/05_allow_user_defined_ldflags.patch
iw/trunk/debian/patches/06_manual_tweaks.patch
iw/trunk/debian/patches/series
Modified:
iw/trunk/debian/changelog
iw/trunk/debian/control
iw/trunk/debian/rules
Modified: iw/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/changelog?rev=1301&op=diff
==============================================================================
--- iw/trunk/debian/changelog (original)
+++ iw/trunk/debian/changelog Sun Dec 28 13:24:24 2008
@@ -4,8 +4,17 @@
* Update debian/copyright for change from BSD-3 -> ISC license.
* Add ${misc:Depends} to dependency field, as debhelper uses it as
required.
+ * Cherry pick patches from upstream, see each patch's description for
+ details:
+ - debian/patches/01_fix_sparse_warnings.patch
+ - debian/patches/02_print_unknown_events.patch
+ - debian/patches/03_new_nl80211_adjust_for_api.patch
+ - debian/patches/04_add_sta_bitrate_info.patch
+ - debian/patches/05_allow_user_defined_ldflags.patch
+ - debian/patches/06_manual_tweaks.patch
+ * Activate quilt patch management, add build dependency on quilt package.
- -- Kel Modderman <kel at otaku42.de> Wed, 10 Dec 2008 04:04:58 +1000
+ -- Kel Modderman <kel at otaku42.de> Sun, 28 Dec 2008 23:15:57 +1000
iw (0.9.6-1) experimental; urgency=low
Modified: iw/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/control?rev=1301&op=diff
==============================================================================
--- iw/trunk/debian/control (original)
+++ iw/trunk/debian/control Sun Dec 28 13:24:24 2008
@@ -7,7 +7,8 @@
Kel Modderman <kel at otaku42.de>
Build-Depends: debhelper (>= 7),
libnl-dev (>= 1.1),
- pkg-config (>= 0.22)
+ pkg-config (>= 0.22),
+ quilt
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/pkg-wpa/iw/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/
Added: iw/trunk/debian/patches/01_fix_sparse_warnings.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/patches/01_fix_sparse_warnings.patch?rev=1301&op=file
==============================================================================
--- iw/trunk/debian/patches/01_fix_sparse_warnings.patch (added)
+++ iw/trunk/debian/patches/01_fix_sparse_warnings.patch Sun Dec 28 13:24:24 2008
@@ -1,0 +1,108 @@
+From: Johannes Berg <johannes at sipsolutions.net>
+Date: Mon, 8 Dec 2008 17:30:22 +0000 (+0100)
+Subject: fix sparse warnings
+X-Git-Url: http://git.sipsolutions.net/?p=iw.git;a=commitdiff_plain;h=656aa246fc6ea3eddbe233873cde7fcd21febd92
+
+fix sparse warnings
+---
+
+diff --git a/genl.c b/genl.c
+index 8f83d13..e99ea9d 100644
+--- a/genl.c
++++ b/genl.c
+@@ -9,6 +9,8 @@
+ #include <netlink/msg.h>
+ #include <netlink/attr.h>
+
++#include "iw.h"
++
+ static int error_handler(struct sockaddr_nl *nla, struct nlmsgerr *err,
+ void *arg)
+ {
+diff --git a/iw.c b/iw.c
+index 5859180..7396052 100644
+--- a/iw.c
++++ b/iw.c
+@@ -23,7 +23,7 @@
+ #include "iw.h"
+ #include "version.h"
+
+-int debug = 0;
++static int debug = 0;
+
+ static int nl80211_init(struct nl80211_state *state)
+ {
+diff --git a/mesh.c b/mesh.c
+index d116422..d6edf3f 100644
+--- a/mesh.c
++++ b/mesh.c
+@@ -93,32 +93,32 @@ static uint32_t _parse_u32(const char *str, _any *ret)
+ return 0;
+ }
+
+-void _print_u8(struct nlattr *a)
++static void _print_u8(struct nlattr *a)
+ {
+ printf("%d", nla_get_u8(a));
+ }
+
+-void _print_u16(struct nlattr *a)
++static void _print_u16(struct nlattr *a)
+ {
+ printf("%d", nla_get_u16(a));
+ }
+
+-void _print_u16_timeout(struct nlattr *a)
++static void _print_u16_timeout(struct nlattr *a)
+ {
+ printf("%d milliseconds", nla_get_u16(a));
+ }
+
+-void _print_u16_in_TUs(struct nlattr *a)
++static void _print_u16_in_TUs(struct nlattr *a)
+ {
+ printf("%d TUs", nla_get_u16(a));
+ }
+
+-void _print_u32_timeout(struct nlattr *a)
++static void _print_u32_timeout(struct nlattr *a)
+ {
+ printf("%u milliseconds", nla_get_u32(a));
+ }
+
+-void _print_u32_in_TUs(struct nlattr *a)
++static void _print_u32_in_TUs(struct nlattr *a)
+ {
+ printf("%d TUs", nla_get_u32(a));
+ }
+@@ -213,6 +213,7 @@ static int set_interface_meshparam(struct nl_cb *cb,
+ int err;
+ uint32_t ret;
+ const struct mesh_param_descr *mdescr;
++ struct nlattr *container;
+ _any any;
+
+ mdescr = find_mesh_param(argc, argv, "change");
+@@ -233,8 +234,7 @@ static int set_interface_meshparam(struct nl_cb *cb,
+ }
+
+ /* Construct a netlink message */
+- struct nlattr *container =
+- nla_nest_start(msg, NL80211_ATTR_MESH_PARAMS);
++ container = nla_nest_start(msg, NL80211_ATTR_MESH_PARAMS);
+ if (!container)
+ return -ENOBUFS;
+ err = mdescr->nla_put_fn(msg, mdescr->mesh_param_num, &any);
+diff --git a/reg.c b/reg.c
+index e8d46a5..01573d3 100644
+--- a/reg.c
++++ b/reg.c
+@@ -11,7 +11,7 @@
+ #include "nl80211.h"
+ #include "iw.h"
+
+-int isalpha_upper(char letter)
++static int isalpha_upper(char letter)
+ {
+ if (letter >= 65 && letter <= 90)
+ return 1;
Added: iw/trunk/debian/patches/02_print_unknown_events.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/patches/02_print_unknown_events.patch?rev=1301&op=file
==============================================================================
--- iw/trunk/debian/patches/02_print_unknown_events.patch (added)
+++ iw/trunk/debian/patches/02_print_unknown_events.patch Sun Dec 28 13:24:24 2008
@@ -1,0 +1,29 @@
+From: Johannes Berg <johannes at sipsolutions.net>
+Date: Mon, 8 Dec 2008 17:32:43 +0000 (+0100)
+Subject: print unknown events
+X-Git-Url: http://git.sipsolutions.net/?p=iw.git;a=commitdiff_plain;h=03109dcb72ef34be8ca684c77403392156f23335
+
+print unknown events
+---
+
+diff --git a/iw.c b/iw.c
+index 7396052..afae643 100644
+--- a/iw.c
++++ b/iw.c
+@@ -284,12 +284,14 @@ static int print_event(struct nl_msg *msg, void *arg)
+ genlmsg_attrlen(gnlh, 0), NULL);
+
+ switch (gnlh->cmd) {
+- case NL80211_CMD_NEW_WIPHY: {
++ case NL80211_CMD_NEW_WIPHY:
+ printf("wiphy rename: phy #%d to %s\n",
+ nla_get_u32(tb[NL80211_ATTR_WIPHY]),
+ nla_get_string(tb[NL80211_ATTR_WIPHY_NAME]));
+ break;
+- }
++ default:
++ printf("unknown event: %d\n", gnlh->cmd);
++ break;
+ }
+
+ return NL_SKIP;
Added: iw/trunk/debian/patches/03_new_nl80211_adjust_for_api.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/patches/03_new_nl80211_adjust_for_api.patch?rev=1301&op=file
==============================================================================
--- iw/trunk/debian/patches/03_new_nl80211_adjust_for_api.patch (added)
+++ iw/trunk/debian/patches/03_new_nl80211_adjust_for_api.patch Sun Dec 28 13:24:24 2008
@@ -1,0 +1,146 @@
+From: Johannes Berg <johannes at sipsolutions.net>
+Date: Fri, 12 Dec 2008 21:40:45 +0000 (+0100)
+Subject: update nl80211.h, adjust phy.c for new API
+X-Git-Url: http://git.sipsolutions.net/?p=iw.git;a=commitdiff_plain;h=68632dc7b070e1e8d64c36ad28af9fbb9b5dfdd9
+
+update nl80211.h, adjust phy.c for new API
+---
+
+diff --git a/nl80211.h b/nl80211.h
+index 04d4516..e86ed59 100644
+--- a/nl80211.h
++++ b/nl80211.h
+@@ -201,13 +201,13 @@ enum nl80211_commands {
+ * @NL80211_ATTR_WIPHY_NAME: wiphy name (used for renaming)
+ * @NL80211_ATTR_WIPHY_TXQ_PARAMS: a nested array of TX queue parameters
+ * @NL80211_ATTR_WIPHY_FREQ: frequency of the selected channel in MHz
+- * @NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET: included with NL80211_ATTR_WIPHY_FREQ
++ * @NL80211_ATTR_WIPHY_CHANNEL_TYPE: included with NL80211_ATTR_WIPHY_FREQ
+ * if HT20 or HT40 are allowed (i.e., 802.11n disabled if not included):
+- * NL80211_SEC_CHAN_NO_HT = HT not allowed (i.e., same as not including
++ * NL80211_CHAN_NO_HT = HT not allowed (i.e., same as not including
+ * this attribute)
+- * NL80211_SEC_CHAN_DISABLED = HT20 only
+- * NL80211_SEC_CHAN_BELOW = secondary channel is below the primary channel
+- * NL80211_SEC_CHAN_ABOVE = secondary channel is above the primary channel
++ * NL80211_CHAN_HT20 = HT20 only
++ * NL80211_CHAN_HT40MINUS = secondary channel is below the primary channel
++ * NL80211_CHAN_HT40PLUS = secondary channel is above the primary channel
+ *
+ * @NL80211_ATTR_IFINDEX: network interface index of the device to operate on
+ * @NL80211_ATTR_IFNAME: network interface name
+@@ -344,7 +344,7 @@ enum nl80211_attrs {
+
+ NL80211_ATTR_WIPHY_TXQ_PARAMS,
+ NL80211_ATTR_WIPHY_FREQ,
+- NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET,
++ NL80211_ATTR_WIPHY_CHANNEL_TYPE,
+
+ /* add attributes here, update the policy in nl80211.c */
+
+@@ -425,6 +425,32 @@ enum nl80211_sta_flags {
+ };
+
+ /**
++ * enum nl80211_rate_info - bitrate information
++ *
++ * These attribute types are used with %NL80211_STA_INFO_TXRATE
++ * when getting information about the bitrate of a station.
++ *
++ * @__NL80211_RATE_INFO_INVALID: attribute number 0 is reserved
++ * @NL80211_RATE_INFO_BITRATE: total bitrate (u16, 100kbit/s)
++ * @NL80211_RATE_INFO_MCS: mcs index for 802.11n (u8)
++ * @NL80211_RATE_INFO_40_MHZ_WIDTH: 40 Mhz dualchannel bitrate
++ * @NL80211_RATE_INFO_SHORT_GI: 400ns guard interval
++ * @NL80211_RATE_INFO_MAX: highest rate_info number currently defined
++ * @__NL80211_RATE_INFO_AFTER_LAST: internal use
++ */
++enum nl80211_rate_info {
++ __NL80211_RATE_INFO_INVALID,
++ NL80211_RATE_INFO_BITRATE,
++ NL80211_RATE_INFO_MCS,
++ NL80211_RATE_INFO_40_MHZ_WIDTH,
++ NL80211_RATE_INFO_SHORT_GI,
++
++ /* keep last */
++ __NL80211_RATE_INFO_AFTER_LAST,
++ NL80211_RATE_INFO_MAX = __NL80211_RATE_INFO_AFTER_LAST - 1
++};
++
++/**
+ * enum nl80211_sta_info - station information
+ *
+ * These attribute types are used with %NL80211_ATTR_STA_INFO
+@@ -436,6 +462,9 @@ enum nl80211_sta_flags {
+ * @NL80211_STA_INFO_TX_BYTES: total transmitted bytes (u32, to this station)
+ * @__NL80211_STA_INFO_AFTER_LAST: internal
+ * @NL80211_STA_INFO_MAX: highest possible station info attribute
++ * @NL80211_STA_INFO_SIGNAL: signal strength of last received PPDU (u8, dBm)
++ * @NL80211_STA_INFO_TX_BITRATE: current unicast tx rate, nested attribute
++ * containing info as possible, see &enum nl80211_sta_info_txrate.
+ */
+ enum nl80211_sta_info {
+ __NL80211_STA_INFO_INVALID,
+@@ -445,6 +474,8 @@ enum nl80211_sta_info {
+ NL80211_STA_INFO_LLID,
+ NL80211_STA_INFO_PLID,
+ NL80211_STA_INFO_PLINK_STATE,
++ NL80211_STA_INFO_SIGNAL,
++ NL80211_STA_INFO_TX_BITRATE,
+
+ /* keep last */
+ __NL80211_STA_INFO_AFTER_LAST,
+@@ -774,10 +805,10 @@ enum nl80211_txq_q {
+ NL80211_TXQ_Q_BK
+ };
+
+-enum nl80211_sec_chan_offset {
+- NL80211_SEC_CHAN_NO_HT /* No HT */,
+- NL80211_SEC_CHAN_DISABLED /* HT20 only */,
+- NL80211_SEC_CHAN_BELOW /* HT40- */,
+- NL80211_SEC_CHAN_ABOVE /* HT40+ */
++enum nl80211_channel_type {
++ NL80211_CHAN_NO_HT,
++ NL80211_CHAN_HT20,
++ NL80211_CHAN_HT40MINUS,
++ NL80211_CHAN_HT40PLUS
+ };
+ #endif /* __LINUX_NL80211_H */
+diff --git a/phy.c b/phy.c
+index 74cc176..f5850dc 100644
+--- a/phy.c
++++ b/phy.c
+@@ -33,11 +33,11 @@ static int handle_freqchan(struct nl_msg *msg, bool chan,
+ const char *name;
+ unsigned int val;
+ } htmap[] = {
+- { .name = "HT20", .val = NL80211_SEC_CHAN_DISABLED, },
+- { .name = "HT40+", .val = NL80211_SEC_CHAN_ABOVE, },
+- { .name = "HT40-", .val = NL80211_SEC_CHAN_BELOW, },
++ { .name = "HT20", .val = NL80211_CHAN_HT20, },
++ { .name = "HT40+", .val = NL80211_CHAN_HT40PLUS, },
++ { .name = "HT40-", .val = NL80211_CHAN_HT40MINUS, },
+ };
+- unsigned int htval = NL80211_SEC_CHAN_NO_HT;
++ unsigned int htval = NL80211_CHAN_NO_HT;
+ unsigned int freq;
+ int i;
+
+@@ -51,7 +51,7 @@ static int handle_freqchan(struct nl_msg *msg, bool chan,
+ break;
+ }
+ }
+- if (htval == NL80211_SEC_CHAN_NO_HT)
++ if (htval == NL80211_CHAN_NO_HT)
+ return 1;
+ }
+
+@@ -60,7 +60,7 @@ static int handle_freqchan(struct nl_msg *msg, bool chan,
+ freq = ieee80211_channel_to_frequency(freq);
+
+ NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq);
+- NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET, htval);
++ NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE, htval);
+
+ return 0;
+ nla_put_failure:
Added: iw/trunk/debian/patches/04_add_sta_bitrate_info.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/patches/04_add_sta_bitrate_info.patch?rev=1301&op=file
==============================================================================
--- iw/trunk/debian/patches/04_add_sta_bitrate_info.patch (added)
+++ iw/trunk/debian/patches/04_add_sta_bitrate_info.patch Sun Dec 28 13:24:24 2008
@@ -1,0 +1,72 @@
+From: Henning Rogge <hrogge at googlemail.com>
+Date: Fri, 12 Dec 2008 21:45:34 +0000 (+0100)
+Subject: add station bitrate information
+X-Git-Url: http://git.sipsolutions.net/?p=iw.git;a=commitdiff_plain;h=9cd3f1c10bf229c6e2ee92a364119b85b1004fd6
+
+add station bitrate information
+
+cleanups by me (JB)
+---
+
+diff --git a/station.c b/station.c
+index 6503574..7e68de3 100644
+--- a/station.c
++++ b/station.c
+@@ -33,16 +33,26 @@ static int print_sta_handler(struct nl_msg *msg, void *arg)
+ struct nlattr *tb[NL80211_ATTR_MAX + 1];
+ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
+ struct nlattr *sinfo[NL80211_STA_INFO_MAX + 1];
++ struct nlattr *rinfo[NL80211_RATE_INFO_MAX + 1];
+ char mac_addr[20], state_name[10], dev[20];
+ static struct nla_policy stats_policy[NL80211_STA_INFO_MAX + 1] = {
+ [NL80211_STA_INFO_INACTIVE_TIME] = { .type = NLA_U32 },
+ [NL80211_STA_INFO_RX_BYTES] = { .type = NLA_U32 },
+ [NL80211_STA_INFO_TX_BYTES] = { .type = NLA_U32 },
++ [NL80211_STA_INFO_SIGNAL] = { .type = NLA_U8 },
++ [NL80211_STA_INFO_TX_BITRATE] = { .type = NLA_NESTED },
+ [NL80211_STA_INFO_LLID] = { .type = NLA_U16 },
+ [NL80211_STA_INFO_PLID] = { .type = NLA_U16 },
+ [NL80211_STA_INFO_PLINK_STATE] = { .type = NLA_U8 },
+ };
+
++ static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = {
++ [NL80211_RATE_INFO_BITRATE] = { .type = NLA_U16 },
++ [NL80211_RATE_INFO_MCS] = { .type = NLA_U8 },
++ [NL80211_RATE_INFO_40_MHZ_WIDTH] = { .type = NLA_FLAG },
++ [NL80211_RATE_INFO_SHORT_GI] = { .type = NLA_FLAG },
++ };
++
+ nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
+ genlmsg_attrlen(gnlh, 0), NULL);
+
+@@ -76,6 +86,30 @@ static int print_sta_handler(struct nl_msg *msg, void *arg)
+ if (sinfo[NL80211_STA_INFO_TX_BYTES])
+ printf("\n\ttx bytes:\t%d",
+ nla_get_u32(sinfo[NL80211_STA_INFO_TX_BYTES]));
++ if (sinfo[NL80211_STA_INFO_SIGNAL])
++ printf("\n\tsignal: \t%d dBm",
++ (int8_t)nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL]));
++
++ if (sinfo[NL80211_STA_INFO_TX_BITRATE]) {
++ if (nla_parse_nested(rinfo, NL80211_RATE_INFO_MAX,
++ sinfo[NL80211_STA_INFO_TX_BITRATE], rate_policy)) {
++ fprintf(stderr, "failed to parse nested rate attributes!");
++ } else {
++ printf("\n\ttx bitrate:\t");
++ if (rinfo[NL80211_RATE_INFO_BITRATE]) {
++ int rate = nla_get_u16(rinfo[NL80211_RATE_INFO_BITRATE]);
++ printf("%d.%d MBit/s", rate / 10, rate % 10);
++ }
++
++ if (rinfo[NL80211_RATE_INFO_MCS])
++ printf(" MCS %d", nla_get_u8(rinfo[NL80211_RATE_INFO_MCS]));
++ if (rinfo[NL80211_RATE_INFO_40_MHZ_WIDTH])
++ printf(" 40Mhz");
++ if (rinfo[NL80211_RATE_INFO_SHORT_GI])
++ printf(" short GI");
++ }
++ }
++
+ if (sinfo[NL80211_STA_INFO_LLID])
+ printf("\n\tmesh llid:\t%d",
+ nla_get_u16(sinfo[NL80211_STA_INFO_LLID]));
Added: iw/trunk/debian/patches/05_allow_user_defined_ldflags.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/patches/05_allow_user_defined_ldflags.patch?rev=1301&op=file
==============================================================================
--- iw/trunk/debian/patches/05_allow_user_defined_ldflags.patch (added)
+++ iw/trunk/debian/patches/05_allow_user_defined_ldflags.patch Sun Dec 28 13:24:24 2008
@@ -1,0 +1,30 @@
+From: Mike Auty <mike.auty at gmail.com>
+Date: Fri, 12 Dec 2008 21:47:16 +0000 (+0100)
+Subject: allow compilation using --as-needed
+X-Git-Url: http://git.sipsolutions.net/?p=iw.git;a=commitdiff_plain;h=9b2e7e6e695370ae3d01c3f341f4ab9d8d13efcf
+
+allow compilation using --as-needed
+---
+
+diff --git a/Makefile b/Makefile
+index df59b51..8a97bae 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,7 +12,7 @@ CC ?= "gcc"
+
+ CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration `pkg-config --cflags libnl-1`
+ CFLAGS += -O2 -g
+-LDFLAGS += `pkg-config --libs libnl-1`
++LIBS += `pkg-config --libs libnl-1`
+ NLVERSION = 1.0
+
+ OBJS = iw.o info.o phy.o interface.o station.o util.o mpath.o reg.o mesh.o genl.o
+@@ -42,7 +42,7 @@ version.h: version.sh
+
+ iw: $(OBJS)
+ @$(NQ) ' CC ' iw
+- $(Q)$(CC) $(LDFLAGS) $(OBJS) -o iw
++ $(Q)$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o iw
+
+ check:
+ $(Q)$(MAKE) all CC="REAL_CC=$(CC) CHECK=\"sparse -Wall\" cgcc"
Added: iw/trunk/debian/patches/06_manual_tweaks.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/patches/06_manual_tweaks.patch?rev=1301&op=file
==============================================================================
--- iw/trunk/debian/patches/06_manual_tweaks.patch (added)
+++ iw/trunk/debian/patches/06_manual_tweaks.patch Sun Dec 28 13:24:24 2008
@@ -1,0 +1,61 @@
+From: Johannes Berg <johannes at sipsolutions.net>
+Date: Sat, 13 Dec 2008 00:23:18 +0000 (+0100)
+Subject: correct man page a little
+X-Git-Url: http://git.sipsolutions.net/?p=iw.git;a=commitdiff_plain;h=917ce73f3a34b4c5508df5c3a1027daf73712ccb
+
+correct man page a little
+---
+
+diff --git a/iw.8 b/iw.8
+index 0b26b3f..4d13667 100644
+--- a/iw.8
++++ b/iw.8
+@@ -7,8 +7,9 @@ iw \- show / manipulate wireless devices and their configuration
+ .in +8
+ .ti -8
+ .B ip
+-.RI [ " OPTIONS " ] " OBJECT " { " COMMAND " | "
+-.BR help " }"
++.RI [ " OPTIONS " ] " " { "
++.BR help " |"
++.RI ""OBJECT " " COMMAND " }"
+ .sp
+
+ .ti -8
+@@ -17,11 +18,15 @@ iw \- show / manipulate wireless devices and their configuration
+ .sp
+
+ .ti -8
+-.IR OPTIONS " := { --debug }"
++.IR OPTIONS " := { --version | --debug }"
+
+ .SH OPTIONS
+
+ .TP
++.BR " --version"
++print version information and exit.
++
++.TP
+ .BR " --debug"
+ enable netlink message debugging.
+
+@@ -31,13 +36,17 @@ enable netlink message debugging.
+ .I OBJECT
+
+ .TP
+-.B dev
++.B dev <interface name>
+ - network interface.
+
+ .TP
+-.B phy
++.B phy <phy name>
+ - wireless hardware device.
+
++.TP
++.B reg
++- regulatory agent.
++
+ .SS
+ .I COMMAND
+
Added: iw/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/patches/series?rev=1301&op=file
==============================================================================
--- iw/trunk/debian/patches/series (added)
+++ iw/trunk/debian/patches/series Sun Dec 28 13:24:24 2008
@@ -1,0 +1,6 @@
+01_fix_sparse_warnings.patch
+02_print_unknown_events.patch
+03_new_nl80211_adjust_for_api.patch
+04_add_sta_bitrate_info.patch
+05_allow_user_defined_ldflags.patch
+06_manual_tweaks.patch
Modified: iw/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/rules?rev=1301&op=diff
==============================================================================
--- iw/trunk/debian/rules (original)
+++ iw/trunk/debian/rules Sun Dec 28 13:24:24 2008
@@ -1,11 +1,15 @@
#!/usr/bin/make -f
+#export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
+
build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
dh build
touch build-stamp
-clean:
+clean: unpatch
dh clean
install: build install-stamp
More information about the Pkg-wpa-devel
mailing list