Attachment #173376 for bug #211639

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




# $FreeBSD: head/x11/rofi/Makefile 412351 2016-04-01 14:33:55Z mat $

PORTNAME=	rofi
PORTVERSION= 1.1.0
CATEGORIES=	x11
MASTER_SITES =	https://github.com/DaveDavenport/${PORTNAME}/releases/download/${PORTVERSION}/

MAINTAINER=	nomoo@nomoo.ru
COMMENT=	Window switcher, run dialog and dmenu replacement

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
		libxcb-xrm.so:x11/xcb-util-xrm \
		libxcb-icccm.so:x11/xcb-util-wm

GNU_CONFIGURE=  yes
USES= gmake pkgconfig shebangfix
SHEBANG_FILES= ${WRKSRC}/script/rofi-sensible-terminal
SHEBANG_FILES=	${WRKSRC}/script/rofi-sensible-terminal
USE_XORG=	x11 xinerama xft
USE_GNOME=	pango


I3_BUILD_DEPENDS=	i3:x11-wm/i3
I3_CFLAGS=	-I${LOCALBASE}/include

PLIST_FILES=	bin/rofi bin/rofi-sensible-terminal man/man1/rofi.1.gz \
		man/man1/rofi-sensible-terminal.1.gz

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)/root/rofi/distinfo (-2 / +3 lines)
1	SHA256 (DaveDavenport-rofi-0.15.12_GH0.tar.gz) = e5e6b0ed01fd1186652af2488ca2e7780cbde5f0750d9482eb816bae447f4e84	1	TIMESTAMP = 1470534828
2	SIZE (DaveDavenport-rofi-0.15.12_GH0.tar.gz) = 966863	2	SHA256 (rofi-1.1.0.tar.gz) = fdba5ea0b6cf38d5b8771aeb5e83f12823aa6cb097231e13fc27540985b0ff98
		3	SIZE (rofi-1.1.0.tar.gz) = 249579




# Description: Use correct namelen when connecting to i3 socket
# Pull Request: https://github.com/DaveDavenport/rofi/pull/330
--- source/i3-support.c.orig	2015-12-27 18:45:50 UTC
+++ source/i3-support.c
@@ -50,7 +50,7 @@ char *i3_socket_path = NULL;
 void i3_support_focus_window ( Window id )
 {
     i3_ipc_header_t    head;
-    int                s, len;
+    int                s;
     ssize_t            t;
     struct sockaddr_un remote;
     size_t             upm = sizeof ( remote.sun_path );
@@ -68,9 +68,8 @@ void i3_support_focus_window ( Window id
 
     remote.sun_family = AF_UNIX;
     g_strlcpy ( remote.sun_path, i3_socket_path, upm );
-    len = strlen ( remote.sun_path ) + sizeof ( remote.sun_family );
 
-    if ( connect ( s, ( struct sockaddr * ) &remote, len ) == -1 ) {
+    if ( connect ( s, ( struct sockaddr * ) &remote, sizeof ( struct sockaddr_un ) ) == -1 ) {
         fprintf ( stderr, "Failed to connect to I3 (%s): %s\n", i3_socket_path, strerror ( errno ) );
         close ( s );
         return;

Line 0 Link Here

(-)/root/rofi/pkg-plist (+4 lines)
	1	bin/rofi
	2	bin/rofi-sensible-terminal
	3	man/man1/rofi-sensible-terminal.1.gz
	4	man/man1/rofi.1.gz

Return to bug 211639

Lines 1-8 Link Here

(-)/root/rofi/Makefile (-12 / +9 lines)
1	# $FreeBSD: head/x11/rofi/Makefile 412351 2016-04-01 14:33:55Z mat $	1	# $FreeBSD: head/x11/rofi/Makefile 412351 2016-04-01 14:33:55Z mat $
2		2
3	PORTNAME= rofi	3	PORTNAME= rofi
4	PORTVERSION= 0.15.12	4	PORTVERSION= 1.1.0
5	CATEGORIES= x11	5	CATEGORIES= x11
		6	MASTER_SITES = https://github.com/DaveDavenport/${PORTNAME}/releases/download/${PORTVERSION}/
6		7
7	MAINTAINER= nomoo@nomoo.ru	8	MAINTAINER= nomoo@nomoo.ru
8	COMMENT= Window switcher, run dialog and dmenu replacement	9	COMMENT= Window switcher, run dialog and dmenu replacement
Lines 10-23 Link Here
10	LICENSE= MIT	11	LICENSE= MIT
11	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
12		13
13	LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification	14	LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
14		15	libxcb-xrm.so:x11/xcb-util-xrm \
15	USE_GITHUB= yes	16	libxcb-icccm.so:x11/xcb-util-wm
16	GH_ACCOUNT= DaveDavenport	17
17		18	GNU_CONFIGURE= yes
18	GNU_CONFIGURE= yes	19	USES= gmake pkgconfig shebangfix
19	USES= autoreconf gmake pkgconfig shebangfix	20	SHEBANG_FILES= ${WRKSRC}/script/rofi-sensible-terminal
20	SHEBANG_FILES= ${WRKSRC}/script/rofi-sensible-terminal
21	USE_XORG= x11 xinerama xft	21	USE_XORG= x11 xinerama xft
22	USE_GNOME= pango	22	USE_GNOME= pango
23		23
Lines 27-33 Link Here
27	I3_BUILD_DEPENDS= i3:x11-wm/i3	27	I3_BUILD_DEPENDS= i3:x11-wm/i3
28	I3_CFLAGS= -I${LOCALBASE}/include	28	I3_CFLAGS= -I${LOCALBASE}/include
29		29
30	PLIST_FILES= bin/rofi bin/rofi-sensible-terminal man/man1/rofi.1.gz \
31	man/man1/rofi-sensible-terminal.1.gz
32
33	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-24 Link Here

(-)/root/rofi/files/patch-source_i3-support.c (-24 lines)
1	# Description: Use correct namelen when connecting to i3 socket
2	# Pull Request: https://github.com/DaveDavenport/rofi/pull/330
3	--- source/i3-support.c.orig 2015-12-27 18:45:50 UTC
4	+++ source/i3-support.c
5	@@ -50,7 +50,7 @@ char *i3_socket_path = NULL;
6	void i3_support_focus_window ( Window id )
7	{
8	i3_ipc_header_t head;
9	- int s, len;
10	+ int s;
11	ssize_t t;
12	struct sockaddr_un remote;
13	size_t upm = sizeof ( remote.sun_path );
14	@@ -68,9 +68,8 @@ void i3_support_focus_window ( Window id
15
16	remote.sun_family = AF_UNIX;
17	g_strlcpy ( remote.sun_path, i3_socket_path, upm );
18	- len = strlen ( remote.sun_path ) + sizeof ( remote.sun_family );
19
20	- if ( connect ( s, ( struct sockaddr * ) &remote, len ) == -1 ) {
21	+ if ( connect ( s, ( struct sockaddr * ) &remote, sizeof ( struct sockaddr_un ) ) == -1 ) {
22	fprintf ( stderr, "Failed to connect to I3 (%s): %s\n", i3_socket_path, strerror ( errno ) );
23	close ( s );
24	return;