View | Details | Raw Unified | Return to bug 211214 | Differences between
and this patch

Collapse All | Expand All

(-)net/wpa_gui/Makefile (-5 / +19 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	wpa_gui
4
PORTNAME=	wpa_gui
5
PORTVERSION=	2.5
5
PORTVERSION=	2.5
6
PORTREVISION=	1
6
CATEGORIES=	net
7
CATEGORIES=	net
7
MASTER_SITES=	http://w1.fi/releases/ \
8
MASTER_SITES=	http://w1.fi/releases/ \
8
		http://partmedia.users.sourceforge.net/dist/:icons \
9
		http://partmedia.users.sourceforge.net/dist/:icons \
Lines 18-36 Link Here
18
19
19
WRKSRC_SUBDIR=	wpa_supplicant/wpa_gui-qt4
20
WRKSRC_SUBDIR=	wpa_supplicant/wpa_gui-qt4
20
21
21
PLIST_FILES=	sbin/wpa_gui \
22
PLIST_FILES=	"@mode 4555" \
23
		sbin/wpa_gui \
24
		"@mode" \
22
		share/applications/wpa_gui.desktop \
25
		share/applications/wpa_gui.desktop \
23
		share/icons/hicolor/16x16/apps/wpa_gui.png \
26
		share/icons/hicolor/16x16/apps/wpa_gui.png \
24
		share/icons/hicolor/scalable/apps/wpa_gui.svg
27
		share/icons/hicolor/scalable/apps/wpa_gui.svgz \
28
		man/man8/wpa_gui.8.gz
25
29
26
USE_QT4=	gui moc_build rcc_build uic_build
30
USE_QT4=	corelib gui moc_build rcc_build uic_build
27
USES=		qmake
31
USES=		qmake
32
INSTALLS_ICONS=	yes
28
33
34
OPTIONS_DEFINE=	DEBUG
35
29
post-patch:
36
post-patch:
30
	@${REINPLACE_CMD} -e \
37
	@${REINPLACE_CMD} -e \
31
		'/^Exec/s|=.*|=${PREFIX}/sbin/wpa_gui|' \
38
		'/^Exec/s|=.*|=${PREFIX}/sbin/wpa_gui|' \
32
		${WRKSRC}/wpa_gui.desktop
39
		${WRKSRC}/wpa_gui.desktop
33
40
41
post-patch-DEBUG-on:
42
	@${REINPLACE_CMD} -e \
43
		's| release| debug|' \
44
		${WRKSRC}/wpa_gui.pro
45
34
do-install:
46
do-install:
35
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
47
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
36
	${INSTALL_DATA} ${WRKSRC}/wpa_gui.desktop ${STAGEDIR}${PREFIX}/share/applications
48
	${INSTALL_DATA} ${WRKSRC}/wpa_gui.desktop ${STAGEDIR}${PREFIX}/share/applications
Lines 38-44 Link Here
38
	${INSTALL_DATA} ${WRKDIR}/icons/hicolor/16x16/apps/wpa_gui.png \
50
	${INSTALL_DATA} ${WRKDIR}/icons/hicolor/16x16/apps/wpa_gui.png \
39
		${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps
51
		${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps
40
	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
52
	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
41
	${INSTALL_DATA} ${WRKSRC}/icons/wpa_gui.svg \
53
	@${GZIP_CMD} < ${WRKSRC}/icons/wpa_gui.svg \
42
		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
54
		> ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wpa_gui.svgz
55
	@${GZIP_CMD} < ${WRKSRC}/../doc/docbook/wpa_gui.8 \
56
		> ${STAGEDIR}${PREFIX}/man/man8/wpa_gui.8.gz
43
57
44
.include <bsd.port.mk>
58
.include <bsd.port.mk>
(-)net/wpa_gui/files/patch-wpa_ctrl.c (+23 lines)
Line 0 Link Here
1
--- ../../src/common/wpa_ctrl.c.orig	2016-07-18 19:31:51.725862000 -0700
2
+++ ../../src/common/wpa_ctrl.c
3
@@ -477,6 +477,10 @@
4
 	char *cmd_buf = NULL;
5
 	size_t _cmd_len;
6
 
7
+#ifndef QT_NO_DEBUG
8
+	fprintf(stderr, "CMD-SEND: %*s\n", cmd_len, cmd);
9
+#endif // QT_NO_DEBUG
10
+
11
 #ifdef CONFIG_CTRL_IFACE_UDP
12
 	if (ctrl->cookie) {
13
 		char *pos;
14
@@ -554,6 +558,9 @@
15
 				continue;
16
 			}
17
 			*reply_len = res;
18
+#ifndef QT_NO_DEBUG
19
+			fprintf(stderr, "CMD-RECV: %*s\n", *reply_len, reply);
20
+#endif // QT_NO_DEBUG
21
 			break;
22
 		} else {
23
 			return -2;
(-)net/wpa_gui/files/patch-wpagui.cpp (+12 lines)
Line 0 Link Here
1
--- wpagui.cpp.orig	2015-09-27 19:02:05 UTC
2
+++ wpagui.cpp
3
@@ -302,7 +302,8 @@ int WpaGui::openCtrlConnection(const cha
4
 #endif /* _DIRENT_HAVE_D_TYPE */
5
 
6
 				if (strcmp(dent->d_name, ".") == 0 ||
7
-				    strcmp(dent->d_name, "..") == 0)
8
+				    strcmp(dent->d_name, "..") == 0 ||
9
+				    (strlen(dent->d_name) > strlen(".pid") && !strcmp(dent->d_name + strlen(dent->d_name) - strlen(".pid"), ".pid")))
10
 					continue;
11
 				debug("Selected interface '%s'",
12
 				      dent->d_name);

Return to bug 211214