nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
sortix-mirror/ports/libdbus/libdbus.patch

190 lines
6.7 KiB
Diff
Raw Blame History

diff --no-dereference -Naur -- libdbus.normalized/bus/activation-helper.c libdbus.srctix/bus/activation-helper.c
--- libdbus.normalized/bus/activation-helper.c 2012-09-28 21:17:25.000000000 +0200
+++ libdbus.srctix/bus/activation-helper.c 2013-04-09 23:03:06.511267145 +0200
@@ -43,6 +43,10 @@
#include <dbus/dbus-shell.h>
#include <dbus/dbus-marshal-validate.h>
+#if defined(__sortix__)
+#define initgroups(a, b) 0
+#endif
+
static BusDesktopFile *
desktop_file_for_name (BusConfigParser *parser,
const char *name,
diff --no-dereference -Naur -- libdbus.normalized/bus/Makefile.in libdbus.srctix/bus/Makefile.in
--- libdbus.normalized/bus/Makefile.in 2012-09-28 21:45:15.000000000 +0200
+++ libdbus.srctix/bus/Makefile.in 2018-05-07 23:58:50.871856426 +0200
@@ -1510,7 +1510,6 @@
/bin/rm *.bb *.bbg *.da *.gcov || true
install-data-hook:
- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
diff --no-dereference -Naur -- libdbus.normalized/config.sub libdbus.srctix/config.sub
--- libdbus.normalized/config.sub 2012-09-18 04:53:51.000000000 +0200
+++ libdbus.srctix/config.sub 2013-04-09 21:25:07.251134290 +0200
@@ -1342,7 +1342,7 @@
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
+ | -aos* | -aros* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
diff --no-dereference -Naur -- libdbus.normalized/dbus/dbus-sysdeps.h libdbus.srctix/dbus/dbus-sysdeps.h
--- libdbus.normalized/dbus/dbus-sysdeps.h 2012-09-28 21:17:25.000000000 +0200
+++ libdbus.srctix/dbus/dbus-sysdeps.h 2013-04-09 21:47:40.403164868 +0200
@@ -50,7 +50,7 @@
* DBusPollFD
*/
#ifdef HAVE_POLL
-#include <sys/poll.h>
+#include <poll.h>
#endif
#ifdef DBUS_WINCE
diff --no-dereference -Naur -- libdbus.normalized/dbus/dbus-sysdeps-unix.c libdbus.srctix/dbus/dbus-sysdeps-unix.c
--- libdbus.normalized/dbus/dbus-sysdeps-unix.c 2012-09-28 21:31:47.000000000 +0200
+++ libdbus.srctix/dbus/dbus-sysdeps-unix.c 2014-01-13 22:41:30.137610652 +0100
@@ -63,7 +63,7 @@
#include <sys/uio.h>
#endif
#ifdef HAVE_POLL
-#include <sys/poll.h>
+#include <poll.h>
#endif
#ifdef HAVE_BACKTRACE
#include <execinfo.h>
@@ -76,6 +76,8 @@
#include <bsm/adt.h>
#endif
+#include <alloca.h>
+
#include "sd-daemon.h"
#ifndef O_BINARY
@@ -276,6 +278,11 @@
*n_fds = 0;
return r;
+#elif defined(__sortix__)
+
+ fprintf(stderr, "%s:%u Warning: Sortix cannot pass fds between processes yet\n", __FILE__, __LINE__);
+ return errno = ENOTSUP, -1;
+
#else
int bytes_read;
int start;
@@ -426,6 +433,12 @@
return _dbus_write_socket_two(fd,
buffer1, start1, len1,
buffer2, start2, len2);
+
+#elif defined(__sortix__)
+
+ fprintf(stderr, "%s:%u Warning: Sortix cannot pass fds between processes yet\n", __FILE__, __LINE__);
+ return errno = ENOTSUP, -1;
+
#else
struct msghdr m;
@@ -734,6 +747,7 @@
#else /* HAVE_WRITEV */
{
int ret1;
+ int ret2;
ret1 = _dbus_write (fd, buffer1, start1, len1);
if (ret1 == len1 && buffer2 != NULL)
diff --no-dereference -Naur -- libdbus.normalized/dbus/dbus-sysdeps-util-unix.c libdbus.srctix/dbus/dbus-sysdeps-util-unix.c
--- libdbus.normalized/dbus/dbus-sysdeps-util-unix.c 2012-09-28 21:17:25.000000000 +0200
+++ libdbus.srctix/dbus/dbus-sysdeps-util-unix.c 2014-06-23 01:34:38.650920853 +0200
@@ -59,6 +59,11 @@
#define O_BINARY 0
#endif
+#if defined(__sortix__)
+#define setsid() getpid()
+#define setgroups(a, b) 0
+#endif
+
/**
* @addtogroup DBusInternalsUtils
* @{
diff --no-dereference -Naur -- libdbus.normalized/dbus/sd-daemon.c libdbus.srctix/dbus/sd-daemon.c
--- libdbus.normalized/dbus/sd-daemon.c 2011-07-13 22:42:21.000000000 +0200
+++ libdbus.srctix/dbus/sd-daemon.c 2013-04-09 21:49:45.043167684 +0200
@@ -32,7 +32,7 @@
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/un.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
#include <netinet/in.h>
#include <stdlib.h>
#include <errno.h>
diff --no-dereference -Naur -- libdbus.normalized/tixbuildinfo libdbus.srctix/tixbuildinfo
--- libdbus.normalized/tixbuildinfo 1970-01-01 01:00:00.000000000 +0100
+++ libdbus.srctix/tixbuildinfo 2014-01-13 22:44:08.217615508 +0100
@@ -0,0 +1,9 @@
+tix.version=1
+tix.class=srctix
+pkg.name=libdbus
+pkg.build-libraries=libexpat
+pkg.build-system=configure
+# TODO: The tests depend on glib, which means we have to disable them, since glib depends on this package.
+pkg.configure.args=--disable-abstract-sockets --without-x --disable-tests
+pkg.make.vars=V=1
+pkg.post-install.cmd=tix-eradicate-libtool-la
diff --no-dereference -Naur -- libdbus.normalized/tools/dbus-launch.c libdbus.srctix/tools/dbus-launch.c
--- libdbus.normalized/tools/dbus-launch.c 2012-09-28 21:17:26.000000000 +0200
+++ libdbus.srctix/tools/dbus-launch.c 2014-03-06 02:01:11.949839173 +0100
@@ -769,7 +769,7 @@
strcpy (envvar, "DBUS_SESSION_BUS_ADDRESS=");
strcat (envvar, bus_address);
- putenv (envvar);
+ setenv ("DBUS_SESSION_BUS_ADDRESS", bus_address, 1);
execvp (runprog, args);
fprintf (stderr, "Couldn't exec %s: %s\n", runprog, strerror (errno));
diff --no-dereference -Naur -- libdbus.normalized/tools/dbus-monitor.c libdbus.srctix/tools/dbus-monitor.c
--- libdbus.normalized/tools/dbus-monitor.c 2012-09-28 21:17:26.000000000 +0200
+++ libdbus.srctix/tools/dbus-monitor.c 2016-02-20 14:41:32.637863944 +0100
@@ -104,11 +104,7 @@
return DBUS_HANDLER_RESULT_HANDLED;
}
-#ifdef __APPLE__
-#define PROFILE_TIMED_FORMAT "%s\t%lu\t%d"
-#else
-#define PROFILE_TIMED_FORMAT "%s\t%lu\t%lu"
-#endif
+#define PROFILE_TIMED_FORMAT "%s\t%lld\t%lu"
#define TRAP_NULL_STRING(str) ((str) ? (str) : "<none>")
typedef enum
@@ -127,7 +123,7 @@
profile_print_with_attrs (const char *type, DBusMessage *message,
struct timeval *t, ProfileAttributeFlags attrs)
{
- printf (PROFILE_TIMED_FORMAT, type, t->tv_sec, t->tv_usec);
+ printf (PROFILE_TIMED_FORMAT, type, (long long)t->tv_sec, t->tv_usec);
if (attrs & PROFILE_ATTRIBUTE_FLAG_SERIAL)
printf ("\t%u", dbus_message_get_serial (message));
@@ -197,7 +193,7 @@
PROFILE_ATTRIBUTE_FLAG_MEMBER);
break;
default:
- printf (PROFILE_TIMED_FORMAT "\n", "tun", t.tv_sec, t.tv_usec);
+ printf (PROFILE_TIMED_FORMAT "\n", "tun", (long long)t.tv_sec, t.tv_usec);
break;
}
}
Reference in New Issue View Git Blame Copy Permalink