summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-08-17 15:59:07 +0000
committerwiz <wiz@pkgsrc.org>2014-08-17 15:59:07 +0000
commit350b6b12537acf117968acd023499424a22cd8eb (patch)
treec5471e964d211eadb8ebe8e7627511eee625dd8a /sysutils
parenta080e997c495761976b011a918dac9fead913c72 (diff)
downloadpkgsrc-350b6b12537acf117968acd023499424a22cd8eb.tar.gz
Update to 0.4.5. Add comments to patches.
============== Version 0.4.4 ============== * systemd fixes (Lennart Poettering) ============== Version 0.4.3 ============== * Revert VT_WAITEVENT usage, since it is racy (Lennart Poettering) * systemd fixes (Lennart Poettering) ============== Version 0.4.2 ============== * Ensure we only care for seat files ending in .seat (William Jon McCann) * Various Solaris improvements (Halton Huo) * Make build silent (Ray Strode) * Don't take bus name until ready (Ray Strode) * systemd hookup (Lennart Poettering) * add --since option to ck-history (William Jon McCann) * Reduce number of threads on Linux (Kan-Ru Chen) * Other fixes (Anders Kaseor, Frederic Crozat, Matthias Clasen, Michael Biebl, William Jon McCann) ============== Version 0.4.1 ============== * Fix a crasher (William Jon McCann) * fix a small memory leak (Matthias Clasen) * update email address (William Jon McCann) ============== Version 0.4.0 ============== * Starting with this release we will not do session.d/ 'session_active_changed' callouts anymore. (Lennart Poettering) * get rid of session.d's session_active_changed callout (Lennart Poettering) * close file descriptors before exit func (Halton Huo) * log the kernel release and boot arguments at start time (William Jon McCann) * show display in host field if the host isn't set (William Jon McCann) * print the uptime for the reboot items in the report (William Jon McCann) * fix logic for finding session remove events (William Jon McCann) * fix a few small leaks (William Jon McCann) * Add seat.d/ callout directory and guarantee we dump the database before call * database: write the console database to disk before signalling via dbus (Len * Enforce that the env array has the right size (Lennart Poettering) * when printing size_t use %z format string (Lennart Poettering) * make CK database world readable (Lennart Poettering) * get rid of ck_seat_set_active_session() prototype since no such function exi * Move ck_session_run_programs() from ck-run-programs.h to ck-session.h (Lenna * post release version bump (Ray Strode) ============== Version 0.3.1 ============== * port to PolicyKit 1.0 (Matthias Clasen) * D-Bus policy updates (Colin Walters, Martin Pitt, Vincent Untz, William Jon McCann) * better diagnostic information for unimplemented backends (Daniel Macks) * file monitoring fixes (James Westby) * get VT from X display if no controlling tty is available (Ray Strode) * add "nox11" option to PAM module (Martin Pitt) * parse log entries with no body correctly (William Jon McCann) * fix zero-sized struct/unions (William Jon McCann) * solaris build fixes (Halton Huo) * parse gecos field for real name (William Jon McCann) * leak fixes (James Westby, Steve Langasek) * compile warning fixes (Matthias Clasen) * fix doc xml validation errors (William Jon McCann) * fix doc generation when srcdir != builddir (Ray Strode) * add example upstart events for logging (William Jon McCann, Ray Strode) * fix ChangeLog generation script to work with git-log moved to libexecdir (Ray Strode)
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/consolekit/Makefile10
-rw-r--r--sysutils/consolekit/PLIST6
-rw-r--r--sysutils/consolekit/distinfo24
-rw-r--r--sysutils/consolekit/patches/patch-aa45
-rw-r--r--sysutils/consolekit/patches/patch-ab4
-rw-r--r--sysutils/consolekit/patches/patch-ac4
-rw-r--r--sysutils/consolekit/patches/patch-ad4
-rw-r--r--sysutils/consolekit/patches/patch-ae4
-rw-r--r--sysutils/consolekit/patches/patch-af20
9 files changed, 48 insertions, 73 deletions
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index 6dab8725e99..67595c623b9 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2014/08/06 12:21:03 obache Exp $
-#
+# $NetBSD: Makefile,v 1.25 2014/08/17 15:59:07 wiz Exp $
-CONSOLEKIT_VER= 0.3.0
+CONSOLEKIT_VER= 0.4.5
DISTNAME= ConsoleKit-${CONSOLEKIT_VER}
PKGNAME= consolekit-${CONSOLEKIT_VER}
-PKGREVISION= 12
CATEGORIES= sysutils
MASTER_SITES= http://www.freedesktop.org/software/ConsoleKit/dist/
EXTRACT_SUFX= .tar.bz2
@@ -48,9 +46,9 @@ pre-configure:
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
post-install:
- ${CP} ${FILESDIR}/ck-get-x11-display-device.FreeBSD \
+ ${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-display-device.FreeBSD \
${DESTDIR}${PREFIX}/libexec/ck-get-x11-display-device
- ${CP} ${FILESDIR}/ck-get-x11-server-pid.FreeBSD \
+ ${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-server-pid.FreeBSD \
${DESTDIR}${PREFIX}/libexec/ck-get-x11-server-pid
.endif
diff --git a/sysutils/consolekit/PLIST b/sysutils/consolekit/PLIST
index caeb4d9068c..21c38426138 100644
--- a/sysutils/consolekit/PLIST
+++ b/sysutils/consolekit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2010/04/18 19:51:47 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/08/17 15:59:07 wiz Exp $
bin/ck-history
bin/ck-launch-session
bin/ck-list-sessions
@@ -14,11 +14,9 @@ sbin/ck-log-system-restart
sbin/ck-log-system-start
sbin/ck-log-system-stop
sbin/console-kit-daemon
-share/PolicyKit/policy/org.freedesktop.consolekit.policy
share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml
share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml
share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml
share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
-share/examples/consolekit/ConsoleKit.conf
share/examples/consolekit/00-primary.seat
-@pkgdir lib/ConsoleKit/run-session.d
+share/examples/consolekit/ConsoleKit.conf
diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo
index 7084f4146b1..2e137c915dc 100644
--- a/sysutils/consolekit/distinfo
+++ b/sysutils/consolekit/distinfo
@@ -1,15 +1,11 @@
-$NetBSD: distinfo,v 1.9 2014/05/05 21:19:40 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2014/08/17 15:59:07 wiz Exp $
-SHA1 (ConsoleKit-0.3.0.tar.bz2) = e3b6156622cc14ebca7382a55b8ed15f2f2bad98
-RMD160 (ConsoleKit-0.3.0.tar.bz2) = 7a1ebd2f4bfb65690e70138c9923c3fd2fcaf671
-Size (ConsoleKit-0.3.0.tar.bz2) = 393694 bytes
-SHA1 (patch-aa) = f6b56bcb12d89ad794feaf345bef04e8a2edbfb0
-SHA1 (patch-ab) = 9ba984009ee9424b35fcb2c3454df4063dbbd953
-SHA1 (patch-ac) = 42a098a1210ad17f992713b03b834ea355c9b06d
-SHA1 (patch-ad) = a1c1a1d0452945550065da3eac2390318c1eb7be
-SHA1 (patch-ae) = 775a3b460db0f2cd305882fcb782d666b8670d8a
-SHA1 (patch-af) = e86c63147798d61f7560cfe7547b0d06d18d5583
-SHA1 (patch-ag) = 724e2eb95f7ca78c5659fde1eec2f2c5c6bc5002
-SHA1 (patch-ah) = f62d8c661732a4ea47e29b99f883b539fb5c7468
-SHA1 (patch-ai) = 1cdec78f885adc26ab21deff165ffdf366eaf883
-SHA1 (patch-aj) = 61538936f3c31f24d8169f4f55d0822d99ed2fbd
+SHA1 (ConsoleKit-0.4.5.tar.bz2) = 6f090c1ce0d459dd6904854532554323755bdeca
+RMD160 (ConsoleKit-0.4.5.tar.bz2) = 2eba158e321778a4c17bf765d0106d214b93fe53
+Size (ConsoleKit-0.4.5.tar.bz2) = 425423 bytes
+SHA1 (patch-aa) = baafe5aa4c99279d85edb0e4bc76491e80314950
+SHA1 (patch-ab) = 24036207cc59ccd97f8ed9a53cc588ff94b8c2fe
+SHA1 (patch-ac) = 3ef09f16ee039da7cea0c020c2aeccfe5d88c57c
+SHA1 (patch-ad) = c0cf170a85e04e2dadfd490f303a40e8d62cc626
+SHA1 (patch-ae) = dcb689861f8ee425b94a8acf1cb344a782b4328b
+SHA1 (patch-af) = 9c7febd3a1e995060e5755b205c5d4a7217bc1b8
diff --git a/sysutils/consolekit/patches/patch-aa b/sysutils/consolekit/patches/patch-aa
index 2ed0796bb07..bbaa6133ad8 100644
--- a/sysutils/consolekit/patches/patch-aa
+++ b/sysutils/consolekit/patches/patch-aa
@@ -1,31 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2014/05/05 21:19:40 ryoon Exp $
+$NetBSD: patch-aa,v 1.5 2014/08/17 15:59:07 wiz Exp $
---- configure.ac.orig 2008-07-31 00:35:53.000000000 +0000
+Add backends for NetBSD, Dragonfly, and OpenBSD.
+
+--- configure.ac.orig 2011-02-17 00:37:16.000000000 +0000
+++ configure.ac
-@@ -68,10 +68,21 @@ AC_SUBST(HAVE_POLKIT)
- 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,13 +201,30 @@ case "$host" in
+@@ -190,6 +201,21 @@ case "$host" in
*-*-solaris*)
CK_BACKEND="solaris"
;;
@@ -44,9 +23,10 @@ $NetBSD: patch-aa,v 1.4 2014/05/05 21:19:40 ryoon Exp $
+ KVM_LIBS="-lkvm"
+ fi
+ ;;
- esac
-
- AC_SUBST(KVM_LIBS)
+ *)
+ 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])
@@ -56,10 +36,3 @@ $NetBSD: patch-aa,v 1.4 2014/05/05 21:19:40 ryoon Exp $
AC_SUBST(CK_BACKEND)
dnl ---------------------------------------------------------------------------
-@@ -441,4 +469,4 @@ if test x${have_polkit} = xno -a x${msg_
- 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
diff --git a/sysutils/consolekit/patches/patch-ab b/sysutils/consolekit/patches/patch-ab
index bc578b59b99..aaba25dd497 100644
--- a/sysutils/consolekit/patches/patch-ab
+++ b/sysutils/consolekit/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2014/05/05 21:19:40 ryoon Exp $
+$NetBSD: patch-ab,v 1.3 2014/08/17 15:59:07 wiz Exp $
+
+Add backends for NetBSD and OpenBSD.
--- src/Makefile.am.orig 2008-07-25 18:38:56.000000000 +0000
+++ src/Makefile.am
diff --git a/sysutils/consolekit/patches/patch-ac b/sysutils/consolekit/patches/patch-ac
index 318799f7dfa..12cb81e2482 100644
--- a/sysutils/consolekit/patches/patch-ac
+++ b/sysutils/consolekit/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2014/05/05 21:19:40 ryoon Exp $
+$NetBSD: patch-ac,v 1.3 2014/08/17 15:59:07 wiz Exp $
+
+Add backends for NetBSD and OpenBSD.
--- tools/Makefile.am.orig 2008-02-13 03:46:39.000000000 +0000
+++ tools/Makefile.am
diff --git a/sysutils/consolekit/patches/patch-ad b/sysutils/consolekit/patches/patch-ad
index 2f7a36e07cc..d82c22b020c 100644
--- a/sysutils/consolekit/patches/patch-ad
+++ b/sysutils/consolekit/patches/patch-ad
@@ -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
diff --git a/sysutils/consolekit/patches/patch-ae b/sysutils/consolekit/patches/patch-ae
index 0c3d08c03cf..32acd71ef6f 100644
--- a/sysutils/consolekit/patches/patch-ae
+++ b/sysutils/consolekit/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.6 2014/05/05 21:19:40 ryoon Exp $
+$NetBSD: patch-ae,v 1.7 2014/08/17 15:59:07 wiz Exp $
+
+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
diff --git a/sysutils/consolekit/patches/patch-af b/sysutils/consolekit/patches/patch-af
index de435e7568a..4c26b185e2a 100644
--- a/sysutils/consolekit/patches/patch-af
+++ b/sysutils/consolekit/patches/patch-af
@@ -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;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-02 23:31:06 +0000