Import of pkgsrc-2015Q1

This commit is contained in:
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions

View File

@@ -1,31 +1,10 @@
$NetBSD: patch-aa,v 1.3 2008/12/23 21:46:14 jmcneill Exp $
$NetBSD: patch-aa,v 1.5 2014/08/17 15:59:07 wiz Exp $
--- configure.ac.orig 2008-07-30 20:35:53.000000000 -0400
+++ configure.ac 2008-12-23 16:40:06.000000000 -0500
@@ -68,10 +68,21 @@
PKG_CHECK_MODULES(LIBDBUS,
dbus-1 >= $DBUS_REQUIRED_VERSION
)
+PKG_CHECK_MODULES(X11, x11 >= $X11_REQUIRED_VERSION, [HAVE_X11=yes], [HAVE_X11=no])
+if test x$HAVE_X11 = xno; then
+ AC_PATH_XTRA
+ if test "x$no_x" = xyes; then
+ AC_MSG_ERROR(X11 and Xrandr development libraries not found);
+ else
+ XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+ XLIB_CFLAGS=$X_CFLAGS
+ fi
+fi
PKG_CHECK_MODULES(TOOLS,
- x11 >= $X11_REQUIRED_VERSION
glib-2.0 >= $GLIB_REQUIRED_VERSION
)
+TOOLS_CFLAGS="$TOOLS_CFLAGS $X11_CFLAGS $XLIB_CFLAGS"
+TOOLS_LIBS="$TOOLS_LIBS $X11_LIBS $XLIB_LIBS"
PKG_CHECK_MODULES(HISTORY,
glib-2.0 >= $GLIB_REQUIRED_VERSION
@@ -190,12 +201,20 @@
Add backends for NetBSD, Dragonfly, and OpenBSD.
--- configure.ac.orig 2011-02-17 00:37:16.000000000 +0000
+++ configure.ac
@@ -190,6 +201,21 @@ case "$host" in
*-*-solaris*)
CK_BACKEND="solaris"
;;
@@ -36,20 +15,24 @@ $NetBSD: patch-aa,v 1.3 2008/12/23 21:46:14 jmcneill Exp $
+ CK_BACKEND="freebsd"
+ KVM_LIBS="-lkvm"
+ ;;
esac
AC_SUBST(KVM_LIBS)
+ *-*-openbsd*)
+ CK_BACKEND="openbsd"
+ AC_CHECK_LIB(kvm, kvm_openfiles, have_kvm=yes,
+ AC_MSG_ERROR([Unable to find libkvm which is needed on OpenBSD]))
+ if test "x$have_kvm" = "xyes"; then
+ KVM_LIBS="-lkvm"
+ fi
+ ;;
*)
AC_MSG_ERROR([No sysdeps back-end implemented for host $host])
;;
@@ -199,7 +225,9 @@ AC_SUBST(KVM_LIBS)
AM_CONDITIONAL(CK_COMPILE_LINUX, test x$CK_BACKEND = xlinux, [Compiling for Linux])
AM_CONDITIONAL(CK_COMPILE_FREEBSD, test x$CK_BACKEND = xfreebsd, [Compiling for FreeBSD])
+AM_CONDITIONAL(CK_COMPILE_NETBSD, test x$CK_BACKEND = xnetbsd, [Compiling for NetBSD])
AM_CONDITIONAL(CK_COMPILE_SOLARIS, test x$CK_BACKEND = xsolaris, [Compiling for Solaris])
+AM_CONDITIONAL(CK_COMPILE_OPENBSD, test x$CK_BACKEND = xopenbsd, [Compiling for OpenBSD])
AC_SUBST(CK_BACKEND)
@@ -441,4 +460,4 @@
echo " a huge SECURITY HOLE. I repeat: YOU NEED TO EDIT THE FILE"
echo " ConsoleKit.conf to match your distro/site to avoid NASTY SECURITY HOLES."
echo ""
-fi
\ No newline at end of file
+fi
dnl ---------------------------------------------------------------------------

View File

@@ -1,8 +1,10 @@
$NetBSD: patch-ab,v 1.1.1.1 2008/11/22 03:32:22 jmcneill Exp $
$NetBSD: patch-ab,v 1.3 2014/08/17 15:59:07 wiz Exp $
--- src/Makefile.am.orig 2008-07-25 14:38:56.000000000 -0400
Add backends for NetBSD and OpenBSD.
--- src/Makefile.am.orig 2008-07-25 18:38:56.000000000 +0000
+++ src/Makefile.am
@@ -56,11 +56,18 @@ libck_la_SOURCES += \
@@ -56,11 +56,25 @@ libck_la_SOURCES += \
$(NULL)
libck_la_LIBADD = $(KVM_LIBS)
endif
@@ -11,6 +13,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/11/22 03:32:22 jmcneill Exp $
+ ck-sysdeps-netbsd.c \
+ $(NULL)
+libck_la_LIBADD = -lkvm
+endif
+if CK_COMPILE_OPENBSD
+libck_la_SOURCES += \
+ ck-sysdeps-openbsd.c \
+ $(NULL)
+libck_la_LIBADD = $(KVM_LIBS)
+endif
EXTRA_libck_la_SOURCES = \
@@ -18,6 +26,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/11/22 03:32:22 jmcneill Exp $
ck-sysdeps-solaris.c \
ck-sysdeps-freebsd.c \
+ ck-sysdeps-netbsd.c \
+ ck-sysdeps-openbsd.c \
$(NULL)
sbin_PROGRAMS = \

View File

@@ -1,14 +1,20 @@
$NetBSD: patch-ac,v 1.1.1.1 2008/11/22 03:32:22 jmcneill Exp $
$NetBSD: patch-ac,v 1.3 2014/08/17 15:59:07 wiz Exp $
--- tools/Makefile.am.orig 2008-02-12 22:46:39.000000000 -0500
Add backends for NetBSD and OpenBSD.
--- tools/Makefile.am.orig 2008-02-13 03:46:39.000000000 +0000
+++ tools/Makefile.am
@@ -18,6 +18,10 @@ if CK_COMPILE_SOLARIS
@@ -18,6 +18,14 @@ if CK_COMPILE_SOLARIS
SUBDIRS += solaris
endif
+if CK_COMPILE_NETBSD
+SUBDIRS += freebsd
+endif
+
+if CK_COMPILE_OPENBSD
+SUBDIRS += freebsd
+endif
+
DIST_SUBDIRS = \
linux \

View File

@@ -1,4 +1,6 @@
$NetBSD: patch-ad,v 1.1.1.1 2008/11/22 03:32:22 jmcneill Exp $
$NetBSD: patch-ad,v 1.2 2014/08/17 15:59:07 wiz Exp $
Install config files into pkgsrc example path.
--- data/Makefile.am.orig 2008-02-29 15:23:02.000000000 -0500
+++ data/Makefile.am

View File

@@ -1,7 +1,9 @@
$NetBSD: patch-ae,v 1.5 2008/12/26 20:05:56 hasso Exp $
$NetBSD: patch-ae,v 1.7 2014/08/17 15:59:07 wiz Exp $
--- src/ck-sysdeps-unix.c.orig 2008-11-27 05:10:25 +0200
+++ src/ck-sysdeps-unix.c 2008-11-27 05:09:59 +0200
Fix UNIX backend for NetBSD, DragonFly, and OpenBSD.
--- src/ck-sysdeps-unix.c.orig 2008-01-23 14:30:44.000000000 +0000
+++ src/ck-sysdeps-unix.c
@@ -35,6 +35,11 @@
#include <linux/kd.h>
#endif
@@ -40,7 +42,19 @@ $NetBSD: patch-ae,v 1.5 2008/12/26 20:05:56 hasso Exp $
/* Adapted from dbus-sysdeps-unix.c:_dbus_read_credentials_socket() */
gboolean
ck_get_socket_peer_credentials (int socket_fd,
@@ -99,7 +123,16 @@ ck_get_socket_peer_credentials (int
@@ -69,7 +93,11 @@ ck_get_socket_peer_credentials (int
ret = FALSE;
#ifdef SO_PEERCRED
+#if !defined(__OpenBSD__)
struct ucred cr;
+#else
+ struct sockpeercred cr;
+#endif
socklen_t cr_len;
cr_len = sizeof (cr);
@@ -99,7 +127,16 @@ ck_get_socket_peer_credentials (int
if (ucred != NULL) {
ucred_free (ucred);
}
@@ -58,7 +72,7 @@ $NetBSD: patch-ae,v 1.5 2008/12/26 20:05:56 hasso Exp $
g_warning ("Socket credentials not supported on this OS\n");
#endif
@@ -126,17 +159,17 @@ ck_get_socket_peer_credentials (int
@@ -126,17 +163,17 @@ ck_get_socket_peer_credentials (int
gboolean
ck_fd_is_a_console (int fd)
{
@@ -80,7 +94,7 @@ $NetBSD: patch-ae,v 1.5 2008/12/26 20:05:56 hasso Exp $
kb_ok = (ioctl (fd, CONS_GETVERS, &vers) == 0);
#else
kb_ok = 1;
@@ -172,6 +205,15 @@ ck_get_a_console_fd (void)
@@ -172,6 +209,15 @@ ck_get_a_console_fd (void)
fd = -1;
@@ -96,7 +110,7 @@ $NetBSD: patch-ae,v 1.5 2008/12/26 20:05:56 hasso Exp $
#ifdef __sun
/* On Solaris, first try Sun VT device. */
fd = open_a_console ("/dev/vt/active");
@@ -184,6 +226,14 @@ ck_get_a_console_fd (void)
@@ -184,6 +230,14 @@ ck_get_a_console_fd (void)
}
#endif

View File

@@ -1,7 +1,9 @@
$NetBSD: patch-af,v 1.2 2008/12/26 20:05:56 hasso Exp $
$NetBSD: patch-af,v 1.3 2014/08/17 15:59:07 wiz Exp $
--- src/ck-sysdeps-freebsd.c.orig 2008-11-27 05:12:41 +0200
+++ src/ck-sysdeps-freebsd.c 2008-11-27 05:08:28 +0200
Adapt FreeBSD backend for DragonFly.
--- src/ck-sysdeps-freebsd.c.orig 2010-09-03 13:54:31.000000000 +0000
+++ src/ck-sysdeps-freebsd.c
@@ -27,6 +27,7 @@
#include <unistd.h>
#include <string.h>
@@ -169,8 +171,8 @@ $NetBSD: patch-af,v 1.2 2008/12/26 20:05:56 hasso Exp $
+ return TRUE;
}
char *
@@ -369,7 +412,12 @@ ck_get_console_device_for_num (guint num
gboolean
@@ -375,7 +418,12 @@ ck_get_console_device_for_num (guint num
/* The device number is always one less than the VT number. */
num--;
@@ -184,7 +186,7 @@ $NetBSD: patch-af,v 1.2 2008/12/26 20:05:56 hasso Exp $
return device;
}
@@ -379,6 +427,7 @@ ck_get_console_num_from_device (const ch
@@ -385,6 +433,7 @@ ck_get_console_num_from_device (const ch
guint *num)
{
guint n;
@@ -192,7 +194,7 @@ $NetBSD: patch-af,v 1.2 2008/12/26 20:05:56 hasso Exp $
gboolean ret;
n = 0;
@@ -388,7 +437,11 @@ ck_get_console_num_from_device (const ch
@@ -394,7 +443,11 @@ ck_get_console_num_from_device (const ch
return FALSE;
}
@@ -205,7 +207,7 @@ $NetBSD: patch-af,v 1.2 2008/12/26 20:05:56 hasso Exp $
/* The VT number is always one more than the device number. */
n++;
ret = TRUE;
@@ -408,6 +461,7 @@ ck_get_active_console_num (int consol
@@ -414,6 +467,7 @@ ck_get_active_console_num (int consol
gboolean ret;
int res;
int active;
@@ -213,7 +215,7 @@ $NetBSD: patch-af,v 1.2 2008/12/26 20:05:56 hasso Exp $
g_assert (console_fd != -1);
@@ -420,7 +474,12 @@ ck_get_active_console_num (int consol
@@ -426,7 +480,12 @@ ck_get_active_console_num (int consol
goto out;
}

View File

@@ -1,15 +0,0 @@
$NetBSD: patch-ag,v 1.1 2008/12/26 20:05:57 hasso Exp $
https://bugs.freedesktop.org/show_bug.cgi?id=18330
--- src/ck-session.c.orig 2008-11-27 05:49:11 +0200
+++ src/ck-session.c 2008-11-27 08:51:37 +0200
@@ -1100,6 +1100,8 @@ ck_session_finalize (GObject *object)
session_remove_activity_watch (session);
+ g_object_unref (session->priv->bus_proxy);
+
g_free (session->priv->id);
g_free (session->priv->cookie);
g_free (session->priv->seat_id);

View File

@@ -1,14 +0,0 @@
$NetBSD: patch-ah,v 1.1 2008/12/26 20:05:57 hasso Exp $
https://bugs.freedesktop.org/show_bug.cgi?id=17893
--- src/ck-run-programs.c.orig 2008-11-27 08:52:06 +0200
+++ src/ck-run-programs.c 2008-11-27 08:52:40 +0200
@@ -225,6 +225,7 @@ ck_run_programs (const char *dirpath,
out_loop:
g_free (child_argv[0]);
}
+ g_dir_close (dir);
out:
g_strfreev (env_for_child);
}

View File

@@ -1,27 +0,0 @@
$NetBSD: patch-ai,v 1.1 2009/09/23 09:35:48 sketch Exp $
--- src/ck-log-event.h.orig Wed Sep 23 10:29:34 2009
+++ src/ck-log-event.h Wed Sep 23 10:33:19 2009
@@ -45,18 +45,22 @@
typedef struct
{
+ int dummy;
} CkLogNoneEvent;
typedef struct
{
+ int dummy;
} CkLogSystemStopEvent;
typedef struct
{
+ int dummy;
} CkLogSystemRestartEvent;
typedef struct
{
+ int dummy;
} CkLogSystemStartEvent;
typedef struct

View File

@@ -1,181 +0,0 @@
$NetBSD: patch-aj,v 1.1 2010/12/26 20:53:14 markd Exp $
Fixed rules from ConsoleKit 0.4.x
--- data/ConsoleKit.conf.orig 2008-04-19 05:39:49.000000000 +0000
+++ data/ConsoleKit.conf
@@ -8,89 +8,134 @@
<allow own="org.freedesktop.ConsoleKit"/>
<!-- Allow all methods on interfaces -->
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Seat"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"/>
+ <allow send_destination="org.freedesktop.ConsoleKit"/>
</policy>
<!-- Deny all and then allow some methods on interfaces -->
<policy context="default">
- <deny send_interface="org.freedesktop.ConsoleKit.Manager"/>
- <deny send_interface="org.freedesktop.ConsoleKit.Seat"/>
- <deny send_interface="org.freedesktop.ConsoleKit.Session"/>
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.DBus.Introspectable"/>
+ <deny send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Manager"/>
+ <deny send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Seat"/>
+ <deny send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"/>
<deny send_destination="org.freedesktop.ConsoleKit"
send_interface="org.freedesktop.DBus.Properties" />
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Manager"
send_member="Restart"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Manager"
send_member="Stop"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Manager"
send_member="OpenSession"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Manager"
send_member="CloseSession"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Manager"
send_member="GetSeats"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Manager"
+ send_member="GetSessions"/>
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Manager"
send_member="GetSessionForCookie"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Manager"
send_member="GetSessionForUnixProcess"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Manager"
send_member="GetCurrentSession"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Manager"
send_member="GetSessionsForUnixUser"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Manager"
send_member="GetSessionsForUser"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Manager"
send_member="GetSystemIdleHint"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Manager"
send_member="GetSystemIdleSinceHint"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Seat"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Seat"
send_member="GetId"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Seat"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Seat"
send_member="GetSessions"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Seat"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Seat"
send_member="GetDevices"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Seat"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Seat"
send_member="GetActiveSession"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Seat"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Seat"
send_member="CanActivateSessions"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Seat"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Seat"
send_member="ActivateSession"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="GetId"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="GetSeatId"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="GetLoginSessionId"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="GetSessionType"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="GetUser"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="GetUnixUser"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="GetX11Display"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="GetX11DisplayDevice"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="GetDisplayDevice"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="GetRemoteHostName"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="IsActive"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="IsLocal"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="GetCreationTime"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="Activate"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="GetIdleHint"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
+ send_member="SetIdleHint"/>
+ <allow send_destination="org.freedesktop.ConsoleKit"
+ send_interface="org.freedesktop.ConsoleKit.Session"
send_member="GetIdleSinceHint"/>
+ <allow send_interface="org.freedesktop.ConsoleKit.Session"
+ send_member="SetIdleHint"/>
</policy>
</busconfig>