Attachment 193624 Details for Bug 221984 – Proposed patch (since 470462 revision)

[patch] Proposed patch (since 470462 revision)

xorg-server.diff (text/plain), 1.09 KB, created by lightside on 2018-05-23 01:37:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2018-05-23 01:37:37 UTC

Size: 1.09 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 470462)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=	xorg-server
> PORTVERSION?=	1.18.4
>-PORTREVISION?=	8
>+PORTREVISION?=	9
> PORTEPOCH?=	1
> CATEGORIES=	x11-servers
> MASTER_SITES=	XORG/individual/xserver
>@@ -26,9 +26,16 @@
> OPTIONS_RADIO_CONF=	DEVD HAL
> DEVD_DESC=	Use devd for autoconfiguration of input devices
> HAL_DESC=	Use hald for autoconfiguration of input devices
>+SECURITY_DESC=	Build Security extension
>+SECURITY_CONFIGURE_ENABLE=	xcsecurity
> SUID_DESC=	Install the Xorg server with setuid bit set
> OPTIONS_DEFAULT=DEVD SUID
> 
>+.if ${SLAVE_PORT} == "no"
>+OPTIONS_DEFINE+=	SECURITY
>+OPTIONS_DEFAULT+=	SECURITY
>+.endif
>+
> OPTIONS_EXCLUDE_sparc64=	HAL
> 
> .include <bsd.port.options.mk>
>@@ -59,7 +66,7 @@
> USE_GL+=	gbm
> USE_XORG+=	pciaccess xf86dgaproto xf86vidmodeproto
> CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \
>-		--disable-xwayland --enable-xcsecurity
>+		--disable-xwayland
> SUB_FILES=	pkg-install pkg-deinstall
> .else
> CONFIGURE_ARGS+=--disable-xorg

Flags:

lightside: maintainer-approval? (x11)

Actions: View | Diff

Attachments on bug 221984: 185979 | 193624