Attachment #172696 for bug #211214

Lines 3-8 Link Here

(-)net/wpa_gui/Makefile (-3 / +16 lines)
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.svg \
		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
28		32
		33	OPTIONS_DEFINE= DEBUG
		34
29	post-patch:	35	post-patch:
30	@${REINPLACE_CMD} -e \	36	@${REINPLACE_CMD} -e \
31	'/^Exec/s\|=.*\|=${PREFIX}/sbin/wpa_gui\|' \	37	'/^Exec/s\|=.*\|=${PREFIX}/sbin/wpa_gui\|' \
32	${WRKSRC}/wpa_gui.desktop	38	${WRKSRC}/wpa_gui.desktop
33		39
		40	post-patch-DEBUG-on:
		41	@${REINPLACE_CMD} -e \
		42	's\| release\| debug\|' \
		43	${WRKSRC}/wpa_gui.pro
		44
34	do-install:	45	do-install:
35	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin	46	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
36	${INSTALL_DATA} ${WRKSRC}/wpa_gui.desktop ${STAGEDIR}${PREFIX}/share/applications	47	${INSTALL_DATA} ${WRKSRC}/wpa_gui.desktop ${STAGEDIR}${PREFIX}/share/applications
Lines 40-44 Link Here
40	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps	51	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
41	${INSTALL_DATA} ${WRKSRC}/icons/wpa_gui.svg \	52	${INSTALL_DATA} ${WRKSRC}/icons/wpa_gui.svg \
42	${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps	53	${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
		54	${GZIP_CMD} < ${WRKSRC}/../doc/docbook/wpa_gui.8 \
		55	> ${STAGEDIR}${PREFIX}/man/man8/wpa_gui.8.gz
43		56
44	.include <bsd.port.mk>	57	.include <bsd.port.mk>




--- ../../src/common/wpa_ctrl.c.orig	2016-07-18 19:31:51.725862000 -0700
+++ ../../src/common/wpa_ctrl.c
@@ -477,6 +477,10 @@
 	char *cmd_buf = NULL;
 	size_t _cmd_len;
 
+#ifndef QT_NO_DEBUG
+	fprintf(stderr, "CMD-SEND: %*s\n", cmd_len, cmd);
+#endif // QT_NO_DEBUG
+
 #ifdef CONFIG_CTRL_IFACE_UDP
 	if (ctrl->cookie) {
 		char *pos;
@@ -554,6 +558,9 @@
 				continue;
 			}
 			*reply_len = res;
+#ifndef QT_NO_DEBUG
+			fprintf(stderr, "CMD-RECV: %*s\n", *reply_len, reply);
+#endif // QT_NO_DEBUG
 			break;
 		} else {
 			return -2;




--- wpagui.cpp.orig	2015-09-27 19:02:05 UTC
+++ wpagui.cpp
@@ -302,7 +302,8 @@ int WpaGui::openCtrlConnection(const cha
 #endif /* _DIRENT_HAVE_D_TYPE */
 
 				if (strcmp(dent->d_name, ".") == 0 ||
-				    strcmp(dent->d_name, "..") == 0)
+				    strcmp(dent->d_name, "..") == 0 ||
+				    (strlen(dent->d_name) > strlen(".pid") && !strcmp(dent->d_name + strlen(dent->d_name) - strlen(".pid"), ".pid")))
 					continue;
 				debug("Selected interface '%s'",
 				      dent->d_name);

Return to bug 211214

Line 0 Link Here

(-)net/wpa_gui/files/patch-wpa_ctrl.c (+23 lines)
	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;

Line 0 Link Here

(-)net/wpa_gui/files/patch-wpagui.cpp (+12 lines)
	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);