From 885967b882322c84a1b4c483a7d93adc9259bf11 Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 9 Sep 2013 09:19:39 +0000 Subject: [PATCH] Update to 1.3.3: This release contains a number of fixes for the integration with launchd on MacOS/darwin, some general code cleanups, and build configuration improvements. Packagers should note that this release expands the use of the openssl program for xauth cookie generation to any platform which has openssl but not mcookie discoverable by configure. It assumes the presence of the rand -hex flag originally added for OpenBSD, but now carried in the upstream OpenSSL. The configure script will output a notice such as: configure: startx will depend on "/usr/bin/openssl rand -hex 16" to generate xauth cookies in order to inform you which was chosen so you may set your package dependencies appropriately. Alan Coopersmith (7): Add printf attributes suggested by gcc If we have to forcibly kill the Xserver on Solaris, reset kbd_mode Declare processTimeout() as taking a const string arg Check for openssl as mkcookie fallback on all platforms, not just OpenBSD Use pid_t instead of int for type of pids Add Apple copyright/license notice from launchd files to COPYING xinit 1.3.3 Egbert Eich (2): man: Set correct config file location in man page install: Use sysconfdir instead of libdir for config files. Jeremy Huddleston (9): launchd/privileged_startx: Improved error resolution launchd: Don't provide the LaunchAgent on Tiger launchd: Provide more verbose error reporting for launchd checkin failures launchd: Load privileged_startx properly on Tiger launchd: Fix the destination of moved-aside directories in privileged_startx darwin: Silence a syslog message from defaults laucnhd: Silence some syslog spam Annotate Fatal and Fatalx as _X_NORETURN XQuartz: Fix an issue where -dpi was not being passed to the server despite being set Jeremy Huddleston Sequoia (1): privileged_startx: use root:wheel instead of 0:0 Thomas Klausner (1): Use xinitrc.d/?*.sh as the matching pattern instead of needing a fragile sed substitution XSLASHGLOB to produce xinitrc.d/*.sh. (If that were used literally the slash-star would confuse cpp.) --- x11/xinit/Makefile | 9 ++++++--- x11/xinit/PLIST | 4 ++-- x11/xinit/distinfo | 8 ++++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile index ee51655c0e65..4f35511e7790 100644 --- a/x11/xinit/Makefile +++ b/x11/xinit/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.19 2013/06/16 13:34:30 obache Exp $ -# +# $NetBSD: Makefile,v 1.20 2013/09/09 09:19:39 wiz Exp $ -DISTNAME= xinit-1.3.2 +DISTNAME= xinit-1.3.3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -18,5 +17,9 @@ USE_TOOLS+= pkg-config xauth:run TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" +INSTALL_MAKE_FLAGS+= xinitrcdir=${PREFIX}/share/examples/xinit +CONF_FILES= ${PREFIX}/share/examples/xinit/xinitrc ${PREFIX}/etc/X11/xinit/xinitrc +MAKE_DIRS= ${PREFIX}/etc/X11/xinit + .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xinit/PLIST b/x11/xinit/PLIST index 719b8429e5cf..af5ac920e215 100644 --- a/x11/xinit/PLIST +++ b/x11/xinit/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:25:16 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4 2013/09/09 09:19:39 wiz Exp $ bin/startx bin/xinit -lib/X11/xinit/xinitrc man/man1/startx.1 man/man1/xinit.1 +share/examples/xinit/xinitrc diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo index 0bc123e14f23..a4f4f95e0fdc 100644 --- a/x11/xinit/distinfo +++ b/x11/xinit/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.10 2012/06/03 18:16:51 wiz Exp $ +$NetBSD: distinfo,v 1.11 2013/09/09 09:19:39 wiz Exp $ -SHA1 (xinit-1.3.2.tar.bz2) = 1c287ac016d277f973652fa3707eef6db8353d5a -RMD160 (xinit-1.3.2.tar.bz2) = 097cd409e829255c328d1d87d69fb8206482f5d5 -Size (xinit-1.3.2.tar.bz2) = 148443 bytes +SHA1 (xinit-1.3.3.tar.bz2) = c3c01c8c6012317f995669894d9e7b2838b61e58 +RMD160 (xinit-1.3.3.tar.bz2) = 3514c083aad625a2b331eb704114fc2c392c6441 +Size (xinit-1.3.3.tar.bz2) = 163905 bytes