Ah yes I misread that block as 10.1. How about this?
diff --git a/compat/daemon-darwin.c b/compat/daemon-darwin.c new file mode 100644 index 00000000..f3013604 --- /dev/null +++ b/compat/daemon-darwin.c @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2017 Nicholas Marriott <[email protected]> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* + * Copyright (c) 2011-2013, Chris Johnsen <[email protected]> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. +*/ + +#include <sys/types.h> + +#include <mach/mach.h> + +#include <Availability.h> +#include <stdint.h> +#include <unistd.h> + +#ifdef __MAC_10_10 + +void +daemon_darwin(void) +{ + mach_port_t root = MACH_PORT_NULL; + mach_port_t s = MACH_PORT_NULL; + + if (bootstrap_get_root(bootstrap_port, &root) == KERN_SUCCESS && + bootstrap_look_up_per_user(root, NULL, getuid(), &s) == KERN_SUCCESS && + task_set_bootstrap_port(mach_task_self(), s) == KERN_SUCCESS) + mach_port_deallocate(mach_task_self(), bootstrap_port); +} + +#else + +void +daemon_darwin(void) +{ +} + +#endif diff --git a/compat/daemon.c b/compat/daemon.c index 678d78ef..5d0c9d82 100644 --- a/compat/daemon.c +++ b/compat/daemon.c @@ -28,12 +28,18 @@ * SUCH DAMAGE. */ +#include <sys/types.h> + #include <fcntl.h> #include <unistd.h> #include <stdlib.h> #include "compat.h" +#ifdef __APPLE__ +extern void daemon_darwin(void); +#endif + int daemon(int nochdir, int noclose) { @@ -61,5 +67,9 @@ daemon(int nochdir, int noclose) if (fd > 2) (void)close (fd); } + +#ifdef __APPLE__ + daemon_darwin(); +#endif return (0); } diff --git a/configure.ac b/configure.ac index dcf62ab9..ffc022a5 100644 --- a/configure.ac +++ b/configure.ac @@ -569,8 +569,15 @@ case "$host_os" in ;; *darwin*) AC_MSG_RESULT(darwin) - AC_DEFINE(BROKEN_CMSG_FIRSTHDR) PLATFORM=darwin + # + # OS X CMSG_FIRSTHDR is broken, so redefine it with a working + # one. daemon works but has some stupid side effects, so use + # our internal version which has a workaround. + # + AC_DEFINE(BROKEN_CMSG_FIRSTHDR) + AC_LIBOBJ(daemon) + AC_LIBOBJ(daemon-darwin) ;; *dragonfly*) AC_MSG_RESULT(dragonfly) On Mon, Jun 05, 2017 at 06:59:17PM -0400, Enrico Ghirardi wrote: > On macOS 10.12 it doesn't build: > Undefined symbols for architecture x86_64: > A "___vprocmgr_move_subset_to_user", referenced from: > A A A _daemon$1050 in daemon.o > From macOS 10.10 that symbol isn't defined anymore, reference code on how > to do it on 10.10 and > laterA > https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard/blob/master/move_to_user_namespace.c#L42 > Oh and I think #elifdef isn't supported by clang. > --A > Enrico Ghirardi > > On 6 June 2017 at 00:19:10, Nicholas Marriott > ([email protected]) wrote: > > Someone on OS X 10.5 or above able to build tmux from Git with this and > tell me if: > > a) it compiles without any new warnings; > > b) tmux still runs; > > c) it allows them to get rid of reattach-to-user-namespace. > > diff --git a/compat/daemon.c b/compat/daemon.c > index 678d78ef..ddeff02f 100644 > --- a/compat/daemon.c > +++ b/compat/daemon.c > @@ -28,8 +28,15 @@ > * SUCH DAMAGE. > */ > > +#include <sys/types.h> > + > +#ifdef __APPLE__ > +#include <Availability.h> > +#endif > + > #include <fcntl.h> > #include <unistd.h> > +#include <stdint.h> > #include <stdlib.h> > > #include "compat.h" > @@ -61,5 +68,13 @@ daemon(int nochdir, int noclose) > if (fd > 2) > (void)close (fd); > } > + > +#ifdef __MAC_10_6 /* and above */ > + extern void *_vprocmgr_move_subset_to_user(uid_t, const char *, > uint64_t); > + __vprocmgr_move_subset_to_user(getuid(), "Background", 0); > +#elifdef __MAC_10_5 > + extern void *_vprocmgr_move_subset_to_user(uid_t, const char *); > + __vprocmgr_move_subset_to_user(getuid(), "Background"); > +#endif > return (0); > } > diff --git a/configure.ac b/configure.ac > index dcf62ab9..45701b95 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -569,8 +569,14 @@ case "$host_os" in > ;; > *darwin*) > AC_MSG_RESULT(darwin) > - AC_DEFINE(BROKEN_CMSG_FIRSTHDR) > PLATFORM=darwin > + # > + # OS X CMSG_FIRSTHDR is broken, so redefine it with a working > + # one. daemon works but has some stupid side effects, so use > + # our internal version which has a workaround. > + # > + AC_DEFINE(BROKEN_CMSG_FIRSTHDR) > + AC_LIBOBJ(daemon) > ;; > *dragonfly*) > AC_MSG_RESULT(dragonfly) > > -- > You received this message because you are subscribed to the Google > Groups "tmux-users" group. > To unsubscribe from this group and stop receiving emails from it, send > an email to [email protected]. > To post to this group, send an email to [email protected]. > For more options, visit https://groups.google.com/d/optout. -- You received this message because you are subscribed to the Google Groups "tmux-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
