Attachment 172698 Details for Bug 211214 – patch

[patch] patch

wpa_gui.patch (text/plain), 5.20 KB, created by Yuri Victorovich on 2016-07-19 07:18:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2016-07-19 07:18:14 UTC

Size: 5.20 KB

patch

obsolete

>Index: net/wpa_gui/Makefile
>===================================================================
>--- net/wpa_gui/Makefile	(revision 417902)
>+++ net/wpa_gui/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	wpa_gui
> PORTVERSION=	2.5
>+PORTREVISION=	1
> CATEGORIES=	net
> MASTER_SITES=	http://w1.fi/releases/ \
> 		http://partmedia.users.sourceforge.net/dist/:icons \
>@@ -18,19 +19,33 @@
> 
> WRKSRC_SUBDIR=	wpa_supplicant/wpa_gui-qt4
> 
>-PLIST_FILES=	sbin/wpa_gui \
>+PLIST_FILES=	"@mode 4555" \
>+		sbin/wpa_gui \
>+		"@mode" \
> 		share/applications/wpa_gui.desktop \
> 		share/icons/hicolor/16x16/apps/wpa_gui.png \
>-		share/icons/hicolor/scalable/apps/wpa_gui.svg
>+		share/icons/hicolor/scalable/apps/wpa_gui.svgz \
>+		man/man8/wpa_gui.8.gz
> 
>-USE_QT4=	gui moc_build rcc_build uic_build
>+SUB_FILES=	pkg-message
>+SUB_LIST=	LOCALBASE=${LOCALBASE}
>+
>+USE_QT4=	corelib gui moc_build rcc_build uic_build
> USES=		qmake
>+INSTALLS_ICONS=	yes
> 
>+OPTIONS_DEFINE=	DEBUG
>+
> post-patch:
> 	@${REINPLACE_CMD} -e \
> 		'/^Exec/s|=.*|=${PREFIX}/sbin/wpa_gui|' \
> 		${WRKSRC}/wpa_gui.desktop
> 
>+post-patch-DEBUG-on:
>+	@${REINPLACE_CMD} -e \
>+		's| release| debug|' \
>+		${WRKSRC}/wpa_gui.pro
>+
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
> 	${INSTALL_DATA} ${WRKSRC}/wpa_gui.desktop ${STAGEDIR}${PREFIX}/share/applications
>@@ -38,7 +53,9 @@
> 	${INSTALL_DATA} ${WRKDIR}/icons/hicolor/16x16/apps/wpa_gui.png \
> 		${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps
> 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
>-	${INSTALL_DATA} ${WRKSRC}/icons/wpa_gui.svg \
>-		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
>+	@${GZIP_CMD} < ${WRKSRC}/icons/wpa_gui.svg \
>+		> ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wpa_gui.svgz
>+	@${GZIP_CMD} < ${WRKSRC}/../doc/docbook/wpa_gui.8 \
>+		> ${STAGEDIR}${PREFIX}/man/man8/wpa_gui.8.gz
> 
> .include <bsd.port.mk>
>Index: net/wpa_gui/files/patch-wpa_ctrl.c
>===================================================================
>--- net/wpa_gui/files/patch-wpa_ctrl.c	(nonexistent)
>+++ net/wpa_gui/files/patch-wpa_ctrl.c	(working copy)
>@@ -0,0 +1,23 @@
>+--- ../../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;
>
>Property changes on: net/wpa_gui/files/patch-wpa_ctrl.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/wpa_gui/files/patch-wpagui.cpp
>===================================================================
>--- net/wpa_gui/files/patch-wpagui.cpp	(nonexistent)
>+++ net/wpa_gui/files/patch-wpagui.cpp	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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);
>
>Property changes on: net/wpa_gui/files/patch-wpagui.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/wpa_gui/files/pkg-message.in
>===================================================================
>--- net/wpa_gui/files/pkg-message.in	(nonexistent)
>+++ net/wpa_gui/files/pkg-message.in	(working copy)
>@@ -0,0 +1,13 @@
>+======================================================================
>+You installed wpa_gui: Qt frontend for wpa_supplicant.
>+
>+It expects the running wpa_supplicant from the port
>+security/wpa_supplicant. In order to use wpa_gui you need:
>+* to have the functioning wifi network interface
>+* to install the wpa_supplicant port security/wpa_supplicant
>+* to run the wpa_supplicant:
>+  # sysrc wpa_supplicant_enable="YES"
>+  # sysrc wpa_supplicant_program="%%PREFIX%%/sbin/wpa_supplicant"
>+  and possibly
>+  # service wpa_supplicant start wlan0
>+======================================================================
>
>Property changes on: net/wpa_gui/files/pkg-message.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 211214: 172696 | 172697 | 172698