[111129] trunk/dports/x11/xinit
jeremyhu at macports.org
jeremyhu at macports.org
Sun Sep 15 16:42:45 PDT 2013
Revision: 111129
https://trac.macports.org/changeset/111129
Author: jeremyhu at macports.org
Date: 2013-09-15 16:42:45 -0700 (Sun, 15 Sep 2013)
Log Message:
-----------
xinit: Bump to 1.3.3
Modified Paths:
--------------
trunk/dports/x11/xinit/Portfile
Removed Paths:
-------------
trunk/dports/x11/xinit/files/0001-launchd-privileged_startx-Improved-error-resolution.patch
trunk/dports/x11/xinit/files/0002-launchd-Don-t-provide-the-LaunchAgent-on-Tiger.patch
trunk/dports/x11/xinit/files/0003-launchd-Provide-more-verbose-error-reporting-for-lau.patch
trunk/dports/x11/xinit/files/0004-launchd-Load-privileged_startx-properly-on-Tiger.patch
trunk/dports/x11/xinit/files/0005-launchd-Fix-the-destination-of-moved-aside-directori.patch
trunk/dports/x11/xinit/files/0006-darwin-Silence-a-syslog-message-from-defaults.patch
trunk/dports/x11/xinit/files/0007-laucnhd-Silence-some-syslog-spam.patch
trunk/dports/x11/xinit/files/0008-Annotate-Fatal-and-Fatalx-as-_X_NORETURN.patch
Modified: trunk/dports/x11/xinit/Portfile
===================================================================
--- trunk/dports/x11/xinit/Portfile 2013-09-15 23:40:40 UTC (rev 111128)
+++ trunk/dports/x11/xinit/Portfile 2013-09-15 23:42:45 UTC (rev 111129)
@@ -3,8 +3,7 @@
PortSystem 1.0
name xinit
-version 1.3.2
-revision 5
+version 1.3.3
categories x11
platforms darwin
maintainers jeremyhu openmaintainer
@@ -16,9 +15,9 @@
homepage http://www.x.org
master_sites xorg:individual/app/
-checksums sha1 1c287ac016d277f973652fa3707eef6db8353d5a \
- rmd160 097cd409e829255c328d1d87d69fb8206482f5d5 \
- sha256 a1867fdaa83f68750b12ba4305c3c62f5992d0f52cfeb98e96c27a8e690e0235
+checksums sha1 c3c01c8c6012317f995669894d9e7b2838b61e58 \
+ rmd160 3514c083aad625a2b331eb704114fc2c392c6441 \
+ sha256 74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af
use_bzip2 yes
use_parallel_build yes
@@ -33,26 +32,12 @@
depends_lib port:xorg-libX11
-patchfiles \
- 0001-launchd-privileged_startx-Improved-error-resolution.patch \
- 0002-launchd-Don-t-provide-the-LaunchAgent-on-Tiger.patch \
- 0003-launchd-Provide-more-verbose-error-reporting-for-lau.patch \
- 0004-launchd-Load-privileged_startx-properly-on-Tiger.patch \
- 0005-launchd-Fix-the-destination-of-moved-aside-directori.patch \
- 0006-darwin-Silence-a-syslog-message-from-defaults.patch \
- 0007-laucnhd-Silence-some-syslog-spam.patch \
- 0008-Annotate-Fatal-and-Fatalx-as-_X_NORETURN.patch
-
if {[vercmp ${os.version} 10.3.0] < 0} {
patchfiles-append disable-launchagent.patch
}
patch.pre_args -p1
-use_autoreconf yes
-autoreconf.args -fvi
-depends_build-append port:xorg-util-macros
-
configure.args --with-launchd-id-prefix=org.macports
configure.args-append RAWCPP=${configure.cpp}
Deleted: trunk/dports/x11/xinit/files/0001-launchd-privileged_startx-Improved-error-resolution.patch
===================================================================
--- trunk/dports/x11/xinit/files/0001-launchd-privileged_startx-Improved-error-resolution.patch 2013-09-15 23:40:40 UTC (rev 111128)
+++ trunk/dports/x11/xinit/files/0001-launchd-privileged_startx-Improved-error-resolution.patch 2013-09-15 23:42:45 UTC (rev 111129)
@@ -1,66 +0,0 @@
-From 49cfa8b7253096d24b2ef6a8d0ba32c4bae9ac23 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Fri, 17 Feb 2012 17:35:26 -0800
-Subject: [PATCH 1/8] launchd/privileged_startx: Improved error resolution
-
-Rather than just failing to do anything when directories aren't what we
-want them to be, we now try our best to fix the situation.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- launchd/privileged_startx/10-tmpdirs.cpp | 34 ++++++++++++++++++++++++------
- 1 file changed, 28 insertions(+), 6 deletions(-)
-
-diff --git xinit-1.3.2/launchd/privileged_startx/10-tmpdirs.cpp xinit-1.3.2/launchd/privileged_startx/10-tmpdirs.cpp
-index 8012597..f48033d 100755
---- xinit-1.3.2/launchd/privileged_startx/10-tmpdirs.cpp
-+++ xinit-1.3.2/launchd/privileged_startx/10-tmpdirs.cpp
-@@ -1,5 +1,5 @@
- XCOMM!/bin/sh
--XCOMM Copyright (c) 2008 Apple Inc.
-+XCOMM Copyright (c) 2008-2012 Apple Inc.
- XCOMM
- XCOMM Permission is hereby granted, free of charge, to any person
- XCOMM obtaining a copy of this software and associated documentation files
-@@ -36,11 +36,33 @@ else
- MKTEMP=mktemp
- fi
-
-+STAT=/usr/bin/stat
-+
- for dir in /tmp/.ICE-unix /tmp/.X11-unix /tmp/.font-unix ; do
-- XCOMM Use mktemp rather than mkdir to avoid possible security issue
-- XCOMM if $dir exists and is a symlink
-- if ${MKTEMP} -d ${dir} >& /dev/null ; then
-- chmod 1777 $dir
-- chown root:wheel $dir
-+ success=0
-+ for attempt in 1 2 3 4 5 ; do
-+ check=`${STAT} -f '%#p %u %g' ${dir}`
-+ if [ "${check}" = "041777 0 0" ] ; then
-+ success=1
-+ break
-+ else
-+ saved=$(${MKTEMP} -d /tmp/${dir}-XXXXXXXX)
-+ mv ${dir} ${saved}
-+ echo "${dir} exists but is insecure. It has been moved into ${saved}"
-+ fi
-+
-+ # Use mktemp rather than mkdir to avoid possible security issue
-+ # if $dir exists and is a symlink (ie protect against a race
-+ # against the above check)
-+ if ${MKTEMP} -d ${dir} >& /dev/null ; then
-+ chmod 1777 $dir
-+ chown 0:0 $dir
-+ success=1
-+ break
-+ fi
-+ done
-+
-+ if [ "${success}" -eq 0 ] ; then
-+ echo "Could not successfully create ${dir}" >&2
- fi
- done
---
-1.7.10
-
Deleted: trunk/dports/x11/xinit/files/0002-launchd-Don-t-provide-the-LaunchAgent-on-Tiger.patch
===================================================================
--- trunk/dports/x11/xinit/files/0002-launchd-Don-t-provide-the-LaunchAgent-on-Tiger.patch 2013-09-15 23:40:40 UTC (rev 111128)
+++ trunk/dports/x11/xinit/files/0002-launchd-Don-t-provide-the-LaunchAgent-on-Tiger.patch 2013-09-15 23:42:45 UTC (rev 111129)
@@ -1,77 +0,0 @@
-From 2d9bdc819adbe45ec3ffdc72429fd92b7f613601 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Wed, 18 Apr 2012 09:20:37 -0700
-Subject: [PATCH 2/8] launchd: Don't provide the LaunchAgent on Tiger
-
-Tiger's launchd doesn't support all the features we need from it.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- launchd/Makefile.am | 7 ++++++-
- launchd/user_startx/launchd_startx.c | 23 +----------------------
- 2 files changed, 7 insertions(+), 23 deletions(-)
-
-diff --git xinit-1.3.2/launchd/Makefile.am xinit-1.3.2/launchd/Makefile.am
-index f8781ed..0135b7f 100644
---- xinit-1.3.2/launchd/Makefile.am
-+++ xinit-1.3.2/launchd/Makefile.am
-@@ -1,3 +1,8 @@
--SUBDIRS = privileged_startx user_startx
-+DIST_SUBDIRS = privileged_startx user_startx
-+SUBDIRS = privileged_startx
-+
-+if !TIGER_LAUNCHD
-+SUBDIRS += user_startx
-+endif
-
- EXTRA_DIST = console_redirect.h
-diff --git xinit-1.3.2/launchd/user_startx/launchd_startx.c xinit-1.3.2/launchd/user_startx/launchd_startx.c
-index f83cd61..67419a4 100644
---- xinit-1.3.2/launchd/user_startx/launchd_startx.c
-+++ xinit-1.3.2/launchd/user_startx/launchd_startx.c
-@@ -1,4 +1,4 @@
--/* Copyright (c) 2011 Apple Inc.
-+/* Copyright (c) 2011-2012 Apple Inc.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation files
-@@ -37,15 +37,7 @@
- #include <sys/wait.h>
- #include <string.h>
- #include <stdlib.h>
--
--/* Using MIN_REQUIRED instead of MAX_ALLOWED logic due to posix_spawn not
-- * being marked with availability macros until 10.7
-- */
--#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
- #include <spawn.h>
--#else
--#include <errno.h>
--#endif
-
- #include "console_redirect.h"
-
-@@ -64,20 +56,7 @@ int main(int argc, char **argv, char **envp) {
- xi_asl_capture_fd(aslc, NULL, ASL_LEVEL_INFO, STDOUT_FILENO);
- xi_asl_capture_fd(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO);
-
--#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
- assert(posix_spawnp(&child, argv[1], NULL, NULL, &argv[1], envp) == 0);
--#else
-- switch(child = fork()) {
-- case -1:
-- perror("fork");
-- return errno;
-- case 0:
-- return execvp(argv[1], &argv[1]);
-- default:
-- break;
-- }
--#endif
--
- wait4(child, &pstat, 0, (struct rusage *)0);
-
- return pstat;
---
-1.7.10
-
Deleted: trunk/dports/x11/xinit/files/0003-launchd-Provide-more-verbose-error-reporting-for-lau.patch
===================================================================
--- trunk/dports/x11/xinit/files/0003-launchd-Provide-more-verbose-error-reporting-for-lau.patch 2013-09-15 23:40:40 UTC (rev 111128)
+++ trunk/dports/x11/xinit/files/0003-launchd-Provide-more-verbose-error-reporting-for-lau.patch 2013-09-15 23:42:45 UTC (rev 111129)
@@ -1,40 +0,0 @@
-From 4cd122efcfa47afbe8c2ebeee6d8fd48914839a7 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Wed, 18 Apr 2012 09:47:33 -0700
-Subject: [PATCH 3/8] launchd: Provide more verbose error reporting for
- launchd checkin failures
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- launchd/privileged_startx/server.c | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git xinit-1.3.2/launchd/privileged_startx/server.c xinit-1.3.2/launchd/privileged_startx/server.c
-index cfbb623..a93cae3 100644
---- xinit-1.3.2/launchd/privileged_startx/server.c
-+++ xinit-1.3.2/launchd/privileged_startx/server.c
-@@ -125,9 +125,19 @@ int server_main(const char *dir) {
- aslclient aslc;
-
- checkin = launch_data_new_string(LAUNCH_KEY_CHECKIN);
-+ if (!checkin) {
-+ asl_log(NULL, NULL, ASL_LEVEL_ERR, "unable to create launchd checkin string");
-+ exit(EXIT_FAILURE);
-+ }
-+
- config = launch_msg(checkin);
-- if (!config || launch_data_get_type(config) == LAUNCH_DATA_ERRNO) {
-- asl_log(NULL, NULL, ASL_LEVEL_ERR, "launchd checkin failed");
-+ if (!config) {
-+ asl_log(NULL, NULL, ASL_LEVEL_ERR, "could not send a message to launchd");
-+ exit(EXIT_FAILURE);
-+ }
-+
-+ if (launch_data_get_type(config) == LAUNCH_DATA_ERRNO) {
-+ asl_log(NULL, NULL, ASL_LEVEL_ERR, "launchd checkin failed eith error: %d %s", launch_data_get_errno(config), strerror(launch_data_get_errno(config)));
- exit(EXIT_FAILURE);
- }
-
---
-1.7.10
-
Deleted: trunk/dports/x11/xinit/files/0004-launchd-Load-privileged_startx-properly-on-Tiger.patch
===================================================================
--- trunk/dports/x11/xinit/files/0004-launchd-Load-privileged_startx-properly-on-Tiger.patch 2013-09-15 23:40:40 UTC (rev 111128)
+++ trunk/dports/x11/xinit/files/0004-launchd-Load-privileged_startx-properly-on-Tiger.patch 2013-09-15 23:42:45 UTC (rev 111129)
@@ -1,30 +0,0 @@
-From c781653f956043e0ee476d4e95e0ae93b27aff96 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Wed, 18 Apr 2012 09:52:18 -0700
-Subject: [PATCH 4/8] launchd: Load privileged_startx properly on Tiger
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- launchd/privileged_startx/privileged_startx.plist.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git xinit-1.3.2/launchd/privileged_startx/privileged_startx.plist.cpp xinit-1.3.2/launchd/privileged_startx/privileged_startx.plist.cpp
-index 533fc32..e23e892 100644
---- xinit-1.3.2/launchd/privileged_startx/privileged_startx.plist.cpp
-+++ xinit-1.3.2/launchd/privileged_startx/privileged_startx.plist.cpp
-@@ -11,8 +11,12 @@
- <string>SCRIPTDIR</string>
- </array>
- #ifdef TIGER_LAUNCHD
-+ <key>RunAtLoad</key>
-+ <true/>
- <key>KeepAlive</key>
- <true/>
-+ <key>ServiceIPC</key>
-+ <true/>
- #else
- <key>MachServices</key>
- <dict>
---
-1.7.10
-
Deleted: trunk/dports/x11/xinit/files/0005-launchd-Fix-the-destination-of-moved-aside-directori.patch
===================================================================
--- trunk/dports/x11/xinit/files/0005-launchd-Fix-the-destination-of-moved-aside-directori.patch 2013-09-15 23:40:40 UTC (rev 111128)
+++ trunk/dports/x11/xinit/files/0005-launchd-Fix-the-destination-of-moved-aside-directori.patch 2013-09-15 23:42:45 UTC (rev 111129)
@@ -1,27 +0,0 @@
-From eda973a32552c916e7e7cce8877674106cbda0cb Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Wed, 18 Apr 2012 10:02:07 -0700
-Subject: [PATCH 5/8] launchd: Fix the destination of moved-aside directories
- in privileged_startx
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- launchd/privileged_startx/10-tmpdirs.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git xinit-1.3.2/launchd/privileged_startx/10-tmpdirs.cpp xinit-1.3.2/launchd/privileged_startx/10-tmpdirs.cpp
-index f48033d..7786426 100755
---- xinit-1.3.2/launchd/privileged_startx/10-tmpdirs.cpp
-+++ xinit-1.3.2/launchd/privileged_startx/10-tmpdirs.cpp
-@@ -46,7 +46,7 @@ for dir in /tmp/.ICE-unix /tmp/.X11-unix /tmp/.font-unix ; do
- success=1
- break
- else
-- saved=$(${MKTEMP} -d /tmp/${dir}-XXXXXXXX)
-+ saved=$(${MKTEMP} -d ${dir}-XXXXXXXX)
- mv ${dir} ${saved}
- echo "${dir} exists but is insecure. It has been moved into ${saved}"
- fi
---
-1.7.10
-
Deleted: trunk/dports/x11/xinit/files/0006-darwin-Silence-a-syslog-message-from-defaults.patch
===================================================================
--- trunk/dports/x11/xinit/files/0006-darwin-Silence-a-syslog-message-from-defaults.patch 2013-09-15 23:40:40 UTC (rev 111128)
+++ trunk/dports/x11/xinit/files/0006-darwin-Silence-a-syslog-message-from-defaults.patch 2013-09-15 23:42:45 UTC (rev 111129)
@@ -1,33 +0,0 @@
-From 335937217a51e5e159a14463e0b1e3aedf35c6be Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Sat, 19 May 2012 04:22:14 -0700
-Subject: [PATCH 6/8] darwin: Silence a syslog message from defaults
-
-Unfortunately defaults has no way to check if a preference exists, and it
-prints a message to syslog if we read one that doesn't exist. dpi is one
-that commonly doesn't exist and results in user confusion when they read
-syslog.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- startx.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git xinit-1.3.2/startx.cpp xinit-1.3.2/startx.cpp
-index c92c51c..cd795c7 100644
---- xinit-1.3.2/startx.cpp
-+++ xinit-1.3.2/startx.cpp
-@@ -126,7 +126,9 @@ if [ x`defaults read $X11_PREFS_DOMAIN nolisten_tcp` = x1 ] ; then
- defaultserverargs="$defaultserverargs -nolisten tcp"
- fi
-
--if defaults read $X11_PREFS_DOMAIN dpi > /dev/null 2>&1 ; then
-+XCOMM The second check is the real one. The first is to hopefully avoid
-+XCOMM needless syslog spamming.
-+if defaults read $X11_PREFS_DOMAIN 2> /dev/null | grep -q '"dpi"' && defaults read $X11_PREFS_DOMAIN dpi > /dev/null 2>&1 ; then
- defaultserverargs="$defaultserverargs -dpi `defaults read $X11_PREFS_DOMAIN dpi`"
- fi
-
---
-1.7.10
-
Deleted: trunk/dports/x11/xinit/files/0007-laucnhd-Silence-some-syslog-spam.patch
===================================================================
--- trunk/dports/x11/xinit/files/0007-laucnhd-Silence-some-syslog-spam.patch 2013-09-15 23:40:40 UTC (rev 111128)
+++ trunk/dports/x11/xinit/files/0007-laucnhd-Silence-some-syslog-spam.patch 2013-09-15 23:42:45 UTC (rev 111129)
@@ -1,35 +0,0 @@
-From 641588afe92c803a1231ecf6281115f55b20e62a Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Sat, 19 May 2012 04:30:49 -0700
-Subject: [PATCH 7/8] laucnhd: Silence some syslog spam
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- launchd/privileged_startx/10-tmpdirs.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git xinit-1.3.2/launchd/privileged_startx/10-tmpdirs.cpp xinit-1.3.2/launchd/privileged_startx/10-tmpdirs.cpp
-index 7786426..6ba045f 100755
---- xinit-1.3.2/launchd/privileged_startx/10-tmpdirs.cpp
-+++ xinit-1.3.2/launchd/privileged_startx/10-tmpdirs.cpp
-@@ -41,14 +41,14 @@ STAT=/usr/bin/stat
- for dir in /tmp/.ICE-unix /tmp/.X11-unix /tmp/.font-unix ; do
- success=0
- for attempt in 1 2 3 4 5 ; do
-- check=`${STAT} -f '%#p %u %g' ${dir}`
-+ check=`${STAT} -f '%#p %u %g' ${dir} 2> /dev/null`
- if [ "${check}" = "041777 0 0" ] ; then
- success=1
- break
-- else
-+ elif [ -n "${check}" ] ; then
- saved=$(${MKTEMP} -d ${dir}-XXXXXXXX)
- mv ${dir} ${saved}
-- echo "${dir} exists but is insecure. It has been moved into ${saved}"
-+ echo "${dir} exists but is insecure. It has been moved into ${saved}" >&2
- fi
-
- # Use mktemp rather than mkdir to avoid possible security issue
---
-1.7.10
-
Deleted: trunk/dports/x11/xinit/files/0008-Annotate-Fatal-and-Fatalx-as-_X_NORETURN.patch
===================================================================
--- trunk/dports/x11/xinit/files/0008-Annotate-Fatal-and-Fatalx-as-_X_NORETURN.patch 2013-09-15 23:40:40 UTC (rev 111128)
+++ trunk/dports/x11/xinit/files/0008-Annotate-Fatal-and-Fatalx-as-_X_NORETURN.patch 2013-09-15 23:42:45 UTC (rev 111129)
@@ -1,47 +0,0 @@
-From 8156aad786754499f4636104aa5bd8a27a281448 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Sat, 19 May 2012 04:34:32 -0700
-Subject: [PATCH 8/8] Annotate Fatal and Fatalx as _X_NORETURN
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- configure.ac | 2 +-
- xinit.c | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git xinit-1.3.2/configure.ac xinit-1.3.2/configure.ac
-index d18c4b0..db65b4c 100644
---- xinit-1.3.2/configure.ac
-+++ xinit-1.3.2/configure.ac
-@@ -141,7 +141,7 @@ AM_CONDITIONAL(TIGER_LAUNCHD, [test "x$TIGER_LAUNCHD" = "xyes"])
- AM_CONDITIONAL(LAUNCHAGENT_XSERVER, [test "x$launchagentxserver" != "xno"])
-
- # Checks for pkg-config packages
--PKG_CHECK_MODULES(XINIT, x11)
-+PKG_CHECK_MODULES(XINIT, x11 xproto >= 7.0.17)
-
- case $host_os in
- *bsd*)
-diff --git xinit-1.3.2/xinit.c xinit-1.3.2/xinit.c
-index 2ab817f..46f717a 100644
---- xinit-1.3.2/xinit.c
-+++ xinit-1.3.2/xinit.c
-@@ -653,6 +653,7 @@ verrorx(const char *fmt, va_list ap)
- }
-
- static void
-+_X_NORETURN
- Fatal(const char *fmt, ...)
- {
- va_list ap;
-@@ -663,6 +664,7 @@ Fatal(const char *fmt, ...)
- }
-
- static void
-+_X_NORETURN
- Fatalx(const char *fmt, ...)
- {
- va_list ap;
---
-1.7.10
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130915/31aac0fb/attachment.html>
More information about the macports-changes
mailing list