View | Details | Raw Unified | Return to bug 123728
Collapse All | Expand All

(-)wmwlmon/Makefile (-3 / +3 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	wmwlmon
8
PORTNAME=	wmwlmon
9
PORTVERSION=	0.9
9
PORTVERSION=	1.0
10
PORTREVISION=	4
10
PORTREVISION=	0
11
CATEGORIES=	net windowmaker
11
CATEGORIES=	net windowmaker
12
MASTER_SITES=	http://www.nazgul.ch/dev/ \
12
MASTER_SITES=	http://www.nazgul.ch/dev/ \
13
		http://dougbarton.us/Downloads/
13
		http://dougbarton.us/Downloads/
Lines 29-35 Link Here
29
EXTRA_PATCHES=	${PATCHDIR}/extra-patch-wl.c ${PATCHDIR}/extra-patch-wmwlmon.1
29
EXTRA_PATCHES=	${PATCHDIR}/extra-patch-wl.c ${PATCHDIR}/extra-patch-wmwlmon.1
30
pre-everything::
30
pre-everything::
31
	@${ECHO_CMD} "==========================================================="
31
	@${ECHO_CMD} "==========================================================="
32
	@${ECHO_CMD} "On FreeBSD > 700052 there is no wi(4) support in {PORTNAME}"
32
	@${ECHO_CMD} "On FreeBSD > 700052 there is no wi(4) support in ${PORTNAME}"
33
	@${ECHO_CMD} "==========================================================="
33
	@${ECHO_CMD} "==========================================================="
34
.endif
34
.endif
35
35
(-)wmwlmon/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (wmwlmon-0.9.tar.gz) = 21d58bf93e190d925bd750ff24382405
1
MD5 (wmwlmon-1.0.tar.gz) = f7f3871d7e05388df384922d28ca9cb1
2
SHA256 (wmwlmon-0.9.tar.gz) = 1b3ae38bf6a00ca8c8c73370cda7fce108b754cb1f6757e20714eef70b8d48d2
2
SHA256 (wmwlmon-1.0.tar.gz) = d260828a3eadc39adf487d08384a2226de3e10298acf3e630865d6985edb170e
3
SIZE (wmwlmon-0.9.tar.gz) = 15012
3
SIZE (wmwlmon-1.0.tar.gz) = 15097
(-)wmwlmon/files/extra-patch-wl.c (-5 / +5 lines)
Lines 1-6 Link Here
1
--- ./wl.c.orig 2006-05-10 06:57:57.000000000 +0300
1
--- wl.c.orig	2008-05-12 21:42:17.000000000 -0700
2
+++ ./wl.c      2008-05-10 11:03:57.000000000 +0300
2
+++ wl.c	2008-05-15 21:27:36.000000000 -0700
3
@@ -283,6 +284,7 @@
3
@@ -283,6 +283,7 @@
4
 int
4
 int
5
 get_wi_signal(const char *interface)
5
 get_wi_signal(const char *interface)
6
 {
6
 {
Lines 8-19 Link Here
8
 	int		s;
8
 	int		s;
9
 	struct ifreq	ifr;
9
 	struct ifreq	ifr;
10
 	struct wi_req	wreq;
10
 	struct wi_req	wreq;
11
@@ -319,6 +321,9 @@
11
@@ -319,6 +320,9 @@
12
 #ifdef __FreeBSD__
12
 #ifdef __FreeBSD__
13
 	return (wreq.wi_val[1]);
13
 	return (wreq.wi_val[1]);
14
 #endif
14
 #endif
15
+#else
15
+#else
16
+	return -1;
16
+	return (-1);
17
+#endif
17
+#endif
18
 }
18
 }
19
 
19
 
(-)wmwlmon/files/extra-patch-wmwlmon.1 (-9 / +9 lines)
Lines 1-10 Link Here
1
--- ./wmwlmon.1.orig	2008-05-10 11:04:09.000000000 +0300
1
--- wmwlmon.1.orig	2008-05-13 10:42:02.000000000 -0700
2
+++ ./wmwlmon.1	2008-05-10 11:04:42.000000000 +0300
2
+++ wmwlmon.1	2008-05-15 21:30:56.000000000 -0700
3
@@ -98,6 +98,6 @@
3
@@ -105,7 +105,6 @@
4
 causing troubles, please report me, including a dmesg and a problem
4
 .It iwi(4)
5
 explanation.
5
 .It ral(4)
6
 .It upgt(4)
7
-.It wi(4)
8
 .It wpi(4)
9
 .El
6
 .Pp
10
 .Pp
7
-Full supported devices known yet: ath(4), iwi(4), wi(4)
8
+Full supported devices known yet: ath(4), iwi(4)
9
 .Pp
10
 Partial supported devices known yet: ipw(4)
(-)wmwlmon/files/patch-bitmaps__wmwlmon_mask.xbm (-10 lines)
Lines 1-10 Link Here
1
--- ./bitmaps/wmwlmon_mask.xbm.orig	2005-10-20 15:57:17.000000000 +0300
2
+++ ./bitmaps/wmwlmon_mask.xbm	2008-05-10 11:35:46.000000000 +0300
3
@@ -1,6 +1,6 @@
4
 #define wmwlmon_mask_width 64
5
 #define wmwlmon_mask_height 64
6
-static unsigned char wmwlmon_mask_bits[] = {
7
+static char wmwlmon_mask_bits[] = {
8
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
9
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
10
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff,
(-)wmwlmon/files/patch-wl.c (-13 lines)
Lines 1-13 Link Here
1
--- ./wl.c.orig	2006-05-10 06:57:57.000000000 +0300
2
+++ ./wl.c	2008-05-10 11:03:57.000000000 +0300
3
@@ -261,7 +261,8 @@
4
 		uint8_t *vp;
5
 		sr = (struct ieee80211req_scan_result *)cp;
6
 		vp = (u_int8_t *)(sr + 1);
7
-		strlcpy(network_id, vp, sr->isr_ssid_len + 1);
8
+		memcpy(network_id, vp, sr->isr_ssid_len);
9
+		network_id[sizeof(network_id) - 1] = '\0';
10
 		if (!strcmp(network_id, network))
11
 			return (sr->isr_rssi);
12
 		cp += sr->isr_len;
13

Return to bug 123728