Sun Aug 17 15:59:07 2014 UTC ()
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)


(wiz)
diff -r1.24 -r1.25 pkgsrc/sysutils/consolekit/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/consolekit/PLIST
diff -r1.9 -r1.10 pkgsrc/sysutils/consolekit/distinfo
diff -r1.4 -r1.5 pkgsrc/sysutils/consolekit/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/sysutils/consolekit/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/sysutils/consolekit/patches/patch-ac
diff -r1.2 -r1.3 pkgsrc/sysutils/consolekit/patches/patch-af
diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/consolekit/patches/patch-ad
diff -r1.6 -r1.7 pkgsrc/sysutils/consolekit/patches/patch-ae
cvs diff -r1.24 -r1.25 pkgsrc/sysutils/consolekit/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/consolekit/Makefile 2014/08/06 12:21:03 1.24
+++ pkgsrc/sysutils/consolekit/Makefile 2014/08/17 15:59:07 1.25
@@ -1,20 +1,18 @@ @@ -1,20 +1,18 @@
1# $NetBSD: Makefile,v 1.24 2014/08/06 12:21:03 obache Exp $ 1# $NetBSD: Makefile,v 1.25 2014/08/17 15:59:07 wiz Exp $
2# 
3 2
4CONSOLEKIT_VER= 0.3.0 3CONSOLEKIT_VER= 0.4.5
5DISTNAME= ConsoleKit-${CONSOLEKIT_VER} 4DISTNAME= ConsoleKit-${CONSOLEKIT_VER}
6PKGNAME= consolekit-${CONSOLEKIT_VER} 5PKGNAME= consolekit-${CONSOLEKIT_VER}
7PKGREVISION= 12 
8CATEGORIES= sysutils 6CATEGORIES= sysutils
9MASTER_SITES= http://www.freedesktop.org/software/ConsoleKit/dist/ 7MASTER_SITES= http://www.freedesktop.org/software/ConsoleKit/dist/
10EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
11 9
12MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.freedesktop.org/wiki/Software/ConsoleKit 11HOMEPAGE= http://www.freedesktop.org/wiki/Software/ConsoleKit
14COMMENT= Framework for defining and tracking users, login sessions, and seats 12COMMENT= Framework for defining and tracking users, login sessions, and seats
15LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
16 14
17PKG_SYSCONFSUBDIR= ConsoleKit 15PKG_SYSCONFSUBDIR= ConsoleKit
18 16
19EGDIR= ${PREFIX}/share/examples/consolekit 17EGDIR= ${PREFIX}/share/examples/consolekit
20CONF_FILES+= ${EGDIR}/00-primary.seat ${PKG_SYSCONFDIR}/seats.d/00-primary.seat 18CONF_FILES+= ${EGDIR}/00-primary.seat ${PKG_SYSCONFDIR}/seats.d/00-primary.seat
@@ -38,29 +36,29 @@ CONFIGURE_ARGS+= --localstatedir=${VARBA @@ -38,29 +36,29 @@ CONFIGURE_ARGS+= --localstatedir=${VARBA
38#CONFIGURE_ARGS+= --enable-pam-module 36#CONFIGURE_ARGS+= --enable-pam-module
39#.include "../../mk/pam.buildlink3.mk" 37#.include "../../mk/pam.buildlink3.mk"
40 38
41post-extract: 39post-extract:
42 ${CP} ${FILESDIR}/ck-sysdeps-netbsd.c ${WRKSRC}/src/ 40 ${CP} ${FILESDIR}/ck-sysdeps-netbsd.c ${WRKSRC}/src/
43 ${CP} ${FILESDIR}/ck-sysdeps-openbsd.c ${WRKSRC}/src/ 41 ${CP} ${FILESDIR}/ck-sysdeps-openbsd.c ${WRKSRC}/src/
44 42
45pre-configure: 43pre-configure:
46 cd ${WRKSRC} && autoreconf -vi ${AUTORECONF_ARGS} 44 cd ${WRKSRC} && autoreconf -vi ${AUTORECONF_ARGS}
47 45
48.include "../../mk/bsd.prefs.mk" 46.include "../../mk/bsd.prefs.mk"
49.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" 47.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
50post-install: 48post-install:
51 ${CP} ${FILESDIR}/ck-get-x11-display-device.FreeBSD \ 49 ${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-display-device.FreeBSD \
52 ${DESTDIR}${PREFIX}/libexec/ck-get-x11-display-device 50 ${DESTDIR}${PREFIX}/libexec/ck-get-x11-display-device
53 ${CP} ${FILESDIR}/ck-get-x11-server-pid.FreeBSD \ 51 ${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-server-pid.FreeBSD \
54 ${DESTDIR}${PREFIX}/libexec/ck-get-x11-server-pid 52 ${DESTDIR}${PREFIX}/libexec/ck-get-x11-server-pid
55.endif 53.endif
56 54
57.if ${OPSYS} == "SunOS" 55.if ${OPSYS} == "SunOS"
58CONFIGURE_ARGS+= --enable-rbac-shutdown=solaris.system.shutdown 56CONFIGURE_ARGS+= --enable-rbac-shutdown=solaris.system.shutdown
59.endif 57.endif
60 58
61.include "../../devel/zlib/buildlink3.mk" 59.include "../../devel/zlib/buildlink3.mk"
62.include "../../security/policykit/buildlink3.mk" 60.include "../../security/policykit/buildlink3.mk"
63.include "../../sysutils/dbus/buildlink3.mk" 61.include "../../sysutils/dbus/buildlink3.mk"
64.include "../../sysutils/dbus-glib/buildlink3.mk" 62.include "../../sysutils/dbus-glib/buildlink3.mk"
65.include "../../x11/libX11/buildlink3.mk" 63.include "../../x11/libX11/buildlink3.mk"
66.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/consolekit/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/consolekit/PLIST 2010/04/18 19:51:47 1.4
+++ pkgsrc/sysutils/consolekit/PLIST 2014/08/17 15:59:07 1.5
@@ -1,24 +1,22 @@ @@ -1,24 +1,22 @@
1@comment $NetBSD: PLIST,v 1.4 2010/04/18 19:51:47 jmmv Exp $ 1@comment $NetBSD: PLIST,v 1.5 2014/08/17 15:59:07 wiz Exp $
2bin/ck-history 2bin/ck-history
3bin/ck-launch-session 3bin/ck-launch-session
4bin/ck-list-sessions 4bin/ck-list-sessions
5include/ConsoleKit/ck-connector/ck-connector.h 5include/ConsoleKit/ck-connector/ck-connector.h
6lib/ConsoleKit/scripts/ck-system-restart 6lib/ConsoleKit/scripts/ck-system-restart
7lib/ConsoleKit/scripts/ck-system-stop 7lib/ConsoleKit/scripts/ck-system-stop
8lib/libck-connector.la 8lib/libck-connector.la
9lib/pkgconfig/ck-connector.pc 9lib/pkgconfig/ck-connector.pc
10libexec/ck-collect-session-info 10libexec/ck-collect-session-info
11libexec/ck-get-x11-display-device 11libexec/ck-get-x11-display-device
12libexec/ck-get-x11-server-pid 12libexec/ck-get-x11-server-pid
13sbin/ck-log-system-restart 13sbin/ck-log-system-restart
14sbin/ck-log-system-start 14sbin/ck-log-system-start
15sbin/ck-log-system-stop 15sbin/ck-log-system-stop
16sbin/console-kit-daemon 16sbin/console-kit-daemon
17share/PolicyKit/policy/org.freedesktop.consolekit.policy 
18share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml 17share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml
19share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml 18share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml
20share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml 19share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml
21share/dbus-1/system-services/org.freedesktop.ConsoleKit.service 20share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
22share/examples/consolekit/ConsoleKit.conf 
23share/examples/consolekit/00-primary.seat 21share/examples/consolekit/00-primary.seat
24@pkgdir lib/ConsoleKit/run-session.d 22share/examples/consolekit/ConsoleKit.conf
cvs diff -r1.9 -r1.10 pkgsrc/sysutils/consolekit/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/consolekit/distinfo 2014/05/05 21:19:40 1.9
+++ pkgsrc/sysutils/consolekit/distinfo 2014/08/17 15:59:07 1.10
@@ -1,15 +1,11 @@ @@ -1,15 +1,11 @@
1$NetBSD: distinfo,v 1.9 2014/05/05 21:19:40 ryoon Exp $ 1$NetBSD: distinfo,v 1.10 2014/08/17 15:59:07 wiz Exp $
2 2
3SHA1 (ConsoleKit-0.3.0.tar.bz2) = e3b6156622cc14ebca7382a55b8ed15f2f2bad98 3SHA1 (ConsoleKit-0.4.5.tar.bz2) = 6f090c1ce0d459dd6904854532554323755bdeca
4RMD160 (ConsoleKit-0.3.0.tar.bz2) = 7a1ebd2f4bfb65690e70138c9923c3fd2fcaf671 4RMD160 (ConsoleKit-0.4.5.tar.bz2) = 2eba158e321778a4c17bf765d0106d214b93fe53
5Size (ConsoleKit-0.3.0.tar.bz2) = 393694 bytes 5Size (ConsoleKit-0.4.5.tar.bz2) = 425423 bytes
6SHA1 (patch-aa) = f6b56bcb12d89ad794feaf345bef04e8a2edbfb0 6SHA1 (patch-aa) = baafe5aa4c99279d85edb0e4bc76491e80314950
7SHA1 (patch-ab) = 9ba984009ee9424b35fcb2c3454df4063dbbd953 7SHA1 (patch-ab) = 24036207cc59ccd97f8ed9a53cc588ff94b8c2fe
8SHA1 (patch-ac) = 42a098a1210ad17f992713b03b834ea355c9b06d 8SHA1 (patch-ac) = 3ef09f16ee039da7cea0c020c2aeccfe5d88c57c
9SHA1 (patch-ad) = a1c1a1d0452945550065da3eac2390318c1eb7be 9SHA1 (patch-ad) = c0cf170a85e04e2dadfd490f303a40e8d62cc626
10SHA1 (patch-ae) = 775a3b460db0f2cd305882fcb782d666b8670d8a 10SHA1 (patch-ae) = dcb689861f8ee425b94a8acf1cb344a782b4328b
11SHA1 (patch-af) = e86c63147798d61f7560cfe7547b0d06d18d5583 11SHA1 (patch-af) = 9c7febd3a1e995060e5755b205c5d4a7217bc1b8
12SHA1 (patch-ag) = 724e2eb95f7ca78c5659fde1eec2f2c5c6bc5002 
13SHA1 (patch-ah) = f62d8c661732a4ea47e29b99f883b539fb5c7468 
14SHA1 (patch-ai) = 1cdec78f885adc26ab21deff165ffdf366eaf883 
15SHA1 (patch-aj) = 61538936f3c31f24d8169f4f55d0822d99ed2fbd 
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/consolekit/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/sysutils/consolekit/patches/Attic/patch-aa 2014/05/05 21:19:40 1.4
+++ pkgsrc/sysutils/consolekit/patches/Attic/patch-aa 2014/08/17 15:59:07 1.5
@@ -1,65 +1,38 @@ @@ -1,65 +1,38 @@
1$NetBSD: patch-aa,v 1.4 2014/05/05 21:19:40 ryoon Exp $ 1$NetBSD: patch-aa,v 1.5 2014/08/17 15:59:07 wiz Exp $
2 2
3--- configure.ac.orig 2008-07-31 00:35:53.000000000 +0000 3Add backends for NetBSD, Dragonfly, and OpenBSD.
 4
 5--- configure.ac.orig 2011-02-17 00:37:16.000000000 +0000
4+++ configure.ac 6+++ configure.ac
5@@ -68,10 +68,21 @@ AC_SUBST(HAVE_POLKIT) 7@@ -190,6 +201,21 @@ case "$host" in
6 PKG_CHECK_MODULES(LIBDBUS, 
7 dbus-1 >= $DBUS_REQUIRED_VERSION 
8 ) 
9+PKG_CHECK_MODULES(X11, x11 >= $X11_REQUIRED_VERSION, [HAVE_X11=yes], [HAVE_X11=no]) 
10+if test x$HAVE_X11 = xno; then 
11+ AC_PATH_XTRA 
12+ if test "x$no_x" = xyes; then 
13+ AC_MSG_ERROR(X11 and Xrandr development libraries not found); 
14+ else 
15+ XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" 
16+ XLIB_CFLAGS=$X_CFLAGS 
17+ fi 
18+fi 
19 PKG_CHECK_MODULES(TOOLS, 
20- x11 >= $X11_REQUIRED_VERSION 
21 glib-2.0 >= $GLIB_REQUIRED_VERSION 
22 ) 
23+TOOLS_CFLAGS="$TOOLS_CFLAGS $X11_CFLAGS $XLIB_CFLAGS" 
24+TOOLS_LIBS="$TOOLS_LIBS $X11_LIBS $XLIB_LIBS" 
25  
26 PKG_CHECK_MODULES(HISTORY, 
27 glib-2.0 >= $GLIB_REQUIRED_VERSION 
28@@ -190,13 +201,30 @@ case "$host" in 
29 *-*-solaris*) 8 *-*-solaris*)
30 CK_BACKEND="solaris" 9 CK_BACKEND="solaris"
31 ;; 10 ;;
32+ *-*-netbsd*) 11+ *-*-netbsd*)
33+ CK_BACKEND="netbsd" 12+ CK_BACKEND="netbsd"
34+ ;; 13+ ;;
35+ *-*-dragonfly*) 14+ *-*-dragonfly*)
36+ CK_BACKEND="freebsd" 15+ CK_BACKEND="freebsd"
37+ KVM_LIBS="-lkvm" 16+ KVM_LIBS="-lkvm"
38+ ;; 17+ ;;
39+ *-*-openbsd*) 18+ *-*-openbsd*)
40+ CK_BACKEND="openbsd" 19+ CK_BACKEND="openbsd"
41+ AC_CHECK_LIB(kvm, kvm_openfiles, have_kvm=yes, 20+ AC_CHECK_LIB(kvm, kvm_openfiles, have_kvm=yes,
42+ AC_MSG_ERROR([Unable to find libkvm which is needed on OpenBSD])) 21+ AC_MSG_ERROR([Unable to find libkvm which is needed on OpenBSD]))
43+ if test "x$have_kvm" = "xyes"; then 22+ if test "x$have_kvm" = "xyes"; then
44+ KVM_LIBS="-lkvm" 23+ KVM_LIBS="-lkvm"
45+ fi 24+ fi
46+ ;; 25+ ;;
47 esac 26 *)
48  27 AC_MSG_ERROR([No sysdeps back-end implemented for host $host])
49 AC_SUBST(KVM_LIBS) 28 ;;
 29@@ -199,7 +225,9 @@ AC_SUBST(KVM_LIBS)
50  30
51 AM_CONDITIONAL(CK_COMPILE_LINUX, test x$CK_BACKEND = xlinux, [Compiling for Linux]) 31 AM_CONDITIONAL(CK_COMPILE_LINUX, test x$CK_BACKEND = xlinux, [Compiling for Linux])
52 AM_CONDITIONAL(CK_COMPILE_FREEBSD, test x$CK_BACKEND = xfreebsd, [Compiling for FreeBSD]) 32 AM_CONDITIONAL(CK_COMPILE_FREEBSD, test x$CK_BACKEND = xfreebsd, [Compiling for FreeBSD])
53+AM_CONDITIONAL(CK_COMPILE_NETBSD, test x$CK_BACKEND = xnetbsd, [Compiling for NetBSD]) 33+AM_CONDITIONAL(CK_COMPILE_NETBSD, test x$CK_BACKEND = xnetbsd, [Compiling for NetBSD])
54 AM_CONDITIONAL(CK_COMPILE_SOLARIS, test x$CK_BACKEND = xsolaris, [Compiling for Solaris]) 34 AM_CONDITIONAL(CK_COMPILE_SOLARIS, test x$CK_BACKEND = xsolaris, [Compiling for Solaris])
55+AM_CONDITIONAL(CK_COMPILE_OPENBSD, test x$CK_BACKEND = xopenbsd, [Compiling for OpenBSD]) 35+AM_CONDITIONAL(CK_COMPILE_OPENBSD, test x$CK_BACKEND = xopenbsd, [Compiling for OpenBSD])
56 AC_SUBST(CK_BACKEND) 36 AC_SUBST(CK_BACKEND)
57  37
58 dnl --------------------------------------------------------------------------- 38 dnl ---------------------------------------------------------------------------
59@@ -441,4 +469,4 @@ if test x${have_polkit} = xno -a x${msg_ 
60 echo " a huge SECURITY HOLE. I repeat: YOU NEED TO EDIT THE FILE" 
61 echo " ConsoleKit.conf to match your distro/site to avoid NASTY SECURITY HOLES." 
62 echo "" 
63-fi 
64\ No newline at end of file 
65+fi 
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/consolekit/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/sysutils/consolekit/patches/Attic/patch-ab 2014/05/05 21:19:40 1.2
+++ pkgsrc/sysutils/consolekit/patches/Attic/patch-ab 2014/08/17 15:59:07 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ab,v 1.2 2014/05/05 21:19:40 ryoon Exp $ 1$NetBSD: patch-ab,v 1.3 2014/08/17 15:59:07 wiz Exp $
 2
 3Add backends for NetBSD and OpenBSD.
2 4
3--- src/Makefile.am.orig 2008-07-25 18:38:56.000000000 +0000 5--- src/Makefile.am.orig 2008-07-25 18:38:56.000000000 +0000
4+++ src/Makefile.am 6+++ src/Makefile.am
5@@ -56,11 +56,25 @@ libck_la_SOURCES += \ 7@@ -56,11 +56,25 @@ libck_la_SOURCES += \
6 $(NULL) 8 $(NULL)
7 libck_la_LIBADD = $(KVM_LIBS) 9 libck_la_LIBADD = $(KVM_LIBS)
8 endif 10 endif
9+if CK_COMPILE_NETBSD 11+if CK_COMPILE_NETBSD
10+libck_la_SOURCES += \ 12+libck_la_SOURCES += \
11+ ck-sysdeps-netbsd.c \ 13+ ck-sysdeps-netbsd.c \
12+ $(NULL) 14+ $(NULL)
13+libck_la_LIBADD = -lkvm 15+libck_la_LIBADD = -lkvm
14+endif 16+endif
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/consolekit/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/sysutils/consolekit/patches/Attic/patch-ac 2014/05/05 21:19:40 1.2
+++ pkgsrc/sysutils/consolekit/patches/Attic/patch-ac 2014/08/17 15:59:07 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ac,v 1.2 2014/05/05 21:19:40 ryoon Exp $ 1$NetBSD: patch-ac,v 1.3 2014/08/17 15:59:07 wiz Exp $
 2
 3Add backends for NetBSD and OpenBSD.
2 4
3--- tools/Makefile.am.orig 2008-02-13 03:46:39.000000000 +0000 5--- tools/Makefile.am.orig 2008-02-13 03:46:39.000000000 +0000
4+++ tools/Makefile.am 6+++ tools/Makefile.am
5@@ -18,6 +18,14 @@ if CK_COMPILE_SOLARIS 7@@ -18,6 +18,14 @@ if CK_COMPILE_SOLARIS
6 SUBDIRS += solaris 8 SUBDIRS += solaris
7 endif 9 endif
8  10
9+if CK_COMPILE_NETBSD 11+if CK_COMPILE_NETBSD
10+SUBDIRS += freebsd 12+SUBDIRS += freebsd
11+endif 13+endif
12+ 14+
13+if CK_COMPILE_OPENBSD 15+if CK_COMPILE_OPENBSD
14+SUBDIRS += freebsd 16+SUBDIRS += freebsd
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/consolekit/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/sysutils/consolekit/patches/Attic/patch-af 2008/12/26 20:05:56 1.2
+++ pkgsrc/sysutils/consolekit/patches/Attic/patch-af 2014/08/17 15:59:07 1.3
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1$NetBSD: patch-af,v 1.2 2008/12/26 20:05:56 hasso Exp $ 1$NetBSD: patch-af,v 1.3 2014/08/17 15:59:07 wiz Exp $
2 2
3--- src/ck-sysdeps-freebsd.c.orig 2008-11-27 05:12:41 +0200 3Adapt FreeBSD backend for DragonFly.
4+++ src/ck-sysdeps-freebsd.c 2008-11-27 05:08:28 +0200 4
 5--- src/ck-sysdeps-freebsd.c.orig 2010-09-03 13:54:31.000000000 +0000
 6+++ src/ck-sysdeps-freebsd.c
5@@ -27,6 +27,7 @@ 7@@ -27,6 +27,7 @@
6 #include <unistd.h> 8 #include <unistd.h>
7 #include <string.h> 9 #include <string.h>
8 #include <errno.h> 10 #include <errno.h>
9+#include <glob.h> 11+#include <glob.h>
10 #include <paths.h> 12 #include <paths.h>
11 #include <ttyent.h> 13 #include <ttyent.h>
12 #include <kvm.h> 14 #include <kvm.h>
13@@ -151,14 +152,38 @@ stat2proc (pid_t pid, 15@@ -151,14 +152,38 @@ stat2proc (pid_t pid,
14 return FALSE; 16 return FALSE;
15 } 17 }
16  18
17+#ifdef __DragonFly__ 19+#ifdef __DragonFly__
@@ -159,71 +161,71 @@ $NetBSD: patch-af,v 1.2 2008/12/26 20:05 @@ -159,71 +161,71 @@ $NetBSD: patch-af,v 1.2 2008/12/26 20:05
159- ret = TRUE; 161- ret = TRUE;
160- 162-
161- endttyent (); 163- endttyent ();
162- 164-
163-done: 165-done:
164 if (num != NULL) { 166 if (num != NULL) {
165 *num = max_consoles; 167 *num = max_consoles;
166 } 168 }
167  169
168- return ret; 170- return ret;
169+ return TRUE; 171+ return TRUE;
170 } 172 }
171  173
172 char * 174 gboolean
173@@ -369,7 +412,12 @@ ck_get_console_device_for_num (guint num 175@@ -375,7 +418,12 @@ ck_get_console_device_for_num (guint num
174 /* The device number is always one less than the VT number. */ 176 /* The device number is always one less than the VT number. */
175 num--; 177 num--;
176  178
177- device = g_strdup_printf ("/dev/ttyv%u", num); 179- device = g_strdup_printf ("/dev/ttyv%u", num);
178+ if (num < 10) 180+ if (num < 10)
179+ device = g_strdup_printf ("/dev/ttyv%i", num); 181+ device = g_strdup_printf ("/dev/ttyv%i", num);
180+ else if (num < 32) 182+ else if (num < 32)
181+ device = g_strdup_printf ("/dev/ttyv%c", num - 10 + 'a'); 183+ device = g_strdup_printf ("/dev/ttyv%c", num - 10 + 'a');
182+ else 184+ else
183+ device = NULL; 185+ device = NULL;
184  186
185 return device; 187 return device;
186 } 188 }
187@@ -379,6 +427,7 @@ ck_get_console_num_from_device (const ch 189@@ -385,6 +433,7 @@ ck_get_console_num_from_device (const ch
188 guint *num) 190 guint *num)
189 { 191 {
190 guint n; 192 guint n;
191+ char c; 193+ char c;
192 gboolean ret; 194 gboolean ret;
193  195
194 n = 0; 196 n = 0;
195@@ -388,7 +437,11 @@ ck_get_console_num_from_device (const ch 197@@ -394,7 +443,11 @@ ck_get_console_num_from_device (const ch
196 return FALSE; 198 return FALSE;
197 } 199 }
198  200
199- if (sscanf (device, "/dev/ttyv%u", &n) == 1) { 201- if (sscanf (device, "/dev/ttyv%u", &n) == 1) {
200+ if (sscanf (device, "/dev/ttyv%c", &c) == 1) { 202+ if (sscanf (device, "/dev/ttyv%c", &c) == 1) {
201+ if (c < 58) 203+ if (c < 58)
202+ n = c - 48; 204+ n = c - 48;
203+ else 205+ else
204+ n = c - 'a' + 10; 206+ n = c - 'a' + 10;
205 /* The VT number is always one more than the device number. */ 207 /* The VT number is always one more than the device number. */
206 n++; 208 n++;
207 ret = TRUE; 209 ret = TRUE;
208@@ -408,6 +461,7 @@ ck_get_active_console_num (int consol 210@@ -414,6 +467,7 @@ ck_get_active_console_num (int consol
209 gboolean ret; 211 gboolean ret;
210 int res; 212 int res;
211 int active; 213 int active;
212+ char ttyn; 214+ char ttyn;
213  215
214 g_assert (console_fd != -1); 216 g_assert (console_fd != -1);
215  217
216@@ -420,7 +474,12 @@ ck_get_active_console_num (int consol 218@@ -426,7 +480,12 @@ ck_get_active_console_num (int consol
217 goto out; 219 goto out;
218 } 220 }
219  221
220- g_debug ("Active VT is: %d (ttyv%d)", active, active - 1); 222- g_debug ("Active VT is: %d (ttyv%d)", active, active - 1);
221+ if (active - 1 < 10) 223+ if (active - 1 < 10)
222+ ttyn = active - 1 + '0'; 224+ ttyn = active - 1 + '0';
223+ else 225+ else
224+ ttyn = active - 11 + 'a'; 226+ ttyn = active - 11 + 'a';
225+ 227+
226+ g_debug ("Active VT is: %d (ttyv%c)", active, ttyn); 228+ g_debug ("Active VT is: %d (ttyv%c)", active, ttyn);
227 ret = TRUE; 229 ret = TRUE;
228  230
229 out: 231 out:
cvs diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/consolekit/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/sysutils/consolekit/patches/Attic/patch-ad 2008/11/22 03:32:22 1.1.1.1
+++ pkgsrc/sysutils/consolekit/patches/Attic/patch-ad 2014/08/17 15:59:07 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ad,v 1.1.1.1 2008/11/22 03:32:22 jmcneill Exp $ 1$NetBSD: patch-ad,v 1.2 2014/08/17 15:59:07 wiz Exp $
 2
 3Install config files into pkgsrc example path.
2 4
3--- data/Makefile.am.orig 2008-02-29 15:23:02.000000000 -0500 5--- data/Makefile.am.orig 2008-02-29 15:23:02.000000000 -0500
4+++ data/Makefile.am 6+++ data/Makefile.am
5@@ -1,9 +1,9 @@ 7@@ -1,9 +1,9 @@
6 NULL = 8 NULL =
7  9
8-dbusconfdir = $(DBUS_SYS_DIR) 10-dbusconfdir = $(DBUS_SYS_DIR)
9+dbusconfdir = $(PREFIX)/share/examples/consolekit 11+dbusconfdir = $(PREFIX)/share/examples/consolekit
10 dbusconf_DATA = ConsoleKit.conf 12 dbusconf_DATA = ConsoleKit.conf
11  13
12-seatdir = $(sysconfdir)/ConsoleKit/seats.d 14-seatdir = $(sysconfdir)/ConsoleKit/seats.d
13+seatdir = $(PREFIX)/share/examples/consolekit 15+seatdir = $(PREFIX)/share/examples/consolekit
14 seat_DATA = 00-primary.seat 16 seat_DATA = 00-primary.seat
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/consolekit/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/sysutils/consolekit/patches/Attic/patch-ae 2014/05/05 21:19:40 1.6
+++ pkgsrc/sysutils/consolekit/patches/Attic/patch-ae 2014/08/17 15:59:07 1.7
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ae,v 1.6 2014/05/05 21:19:40 ryoon Exp $ 1$NetBSD: patch-ae,v 1.7 2014/08/17 15:59:07 wiz Exp $
 2
 3Fix UNIX backend for NetBSD, DragonFly, and OpenBSD.
2 4
3--- src/ck-sysdeps-unix.c.orig 2008-01-23 14:30:44.000000000 +0000 5--- src/ck-sysdeps-unix.c.orig 2008-01-23 14:30:44.000000000 +0000
4+++ src/ck-sysdeps-unix.c 6+++ src/ck-sysdeps-unix.c
5@@ -35,6 +35,11 @@ 7@@ -35,6 +35,11 @@
6 #include <linux/kd.h> 8 #include <linux/kd.h>
7 #endif 9 #endif
8  10
9+#ifdef __NetBSD__ 11+#ifdef __NetBSD__
10+#include <dev/wscons/wsdisplay_usl_io.h> 12+#include <dev/wscons/wsdisplay_usl_io.h>
11+#include <sys/un.h> 13+#include <sys/un.h>
12+#endif 14+#endif
13+ 15+
14 #ifdef HAVE_SYS_VT_H 16 #ifdef HAVE_SYS_VT_H