pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/consolekit consolekit: Update to 1.0.2 using ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9a7e3d0db77b
branches: trunk
changeset: 348706:9a7e3d0db77b
user: youri <youri%pkgsrc.org@localhost>
date: Sat Jun 18 10:23:16 2016 +0000
description:
consolekit: Update to 1.0.2 using ConsoleKit2, the continuation of
consolekit.
diffstat:
sysutils/consolekit/MESSAGE | 9 +
sysutils/consolekit/Makefile | 89 +-
sysutils/consolekit/PLIST | 26 +-
sysutils/consolekit/buildlink3.mk | 6 +-
sysutils/consolekit/distinfo | 17 +-
sysutils/consolekit/files/50-shutdown.rules | 9 +
sysutils/consolekit/files/ck-get-x11-display-device.FreeBSD | 35 -
sysutils/consolekit/files/ck-get-x11-server-pid.FreeBSD | 17 -
sysutils/consolekit/files/ck-sysdeps-netbsd.c | 412 ----------
sysutils/consolekit/files/ck-sysdeps-openbsd.c | 471 ------------
sysutils/consolekit/patches/patch-aa | 38 -
sysutils/consolekit/patches/patch-ab | 32 -
sysutils/consolekit/patches/patch-ac | 21 -
sysutils/consolekit/patches/patch-ad | 18 -
sysutils/consolekit/patches/patch-ae | 127 ---
sysutils/consolekit/patches/patch-af | 231 -----
sysutils/consolekit/patches/patch-data_Makefile.am | 15 +
17 files changed, 113 insertions(+), 1460 deletions(-)
diffs (truncated from 1696 to 300 lines):
diff -r be72844dfa42 -r 9a7e3d0db77b sysutils/consolekit/MESSAGE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/consolekit/MESSAGE Sat Jun 18 10:23:16 2016 +0000
@@ -0,0 +1,9 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2016/06/18 10:23:16 youri Exp $
+
+ConsoleKit:
+
+Users in the operator group can stop, restart, suspend, hibernate the
+machine as described in ${PREFIX}/share/polkit-1/rules.d/50-shutdown.rules.
+
+===========================================================================
diff -r be72844dfa42 -r 9a7e3d0db77b sysutils/consolekit/Makefile
--- a/sysutils/consolekit/Makefile Sat Jun 18 10:19:37 2016 +0000
+++ b/sysutils/consolekit/Makefile Sat Jun 18 10:23:16 2016 +0000
@@ -1,63 +1,74 @@
-# $NetBSD: Makefile,v 1.30 2016/06/04 16:28:22 youri Exp $
+# $NetBSD: Makefile,v 1.31 2016/06/18 10:23:16 youri Exp $
-CONSOLEKIT_VER= 0.4.6
-DISTNAME= ConsoleKit-${CONSOLEKIT_VER}
-PKGNAME= consolekit-${CONSOLEKIT_VER}
-PKGREVISION= 2
-CATEGORIES= sysutils
-MASTER_SITES= http://www.freedesktop.org/software/ConsoleKit/dist/
-EXTRACT_SUFX= .tar.xz
+CONSOLEKIT_VER= 1.0.2
+DISTNAME= ${CONSOLEKIT_VER}
+PKGNAME= consolekit-${CONSOLEKIT_VER}
+CATEGORIES= sysutils
+MASTER_SITES= ${MASTER_SITE_GITHUB:=ConsoleKit2/}
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.freedesktop.org/wiki/Software/ConsoleKit
+MAINTAINER= youri%NetBSD.org@localhost
+HOMEPAGE= https://github.com/ConsoleKit2/ConsoleKit2/
COMMENT= Framework for defining and tracking users, login sessions, and seats
LICENSE= gnu-gpl-v2
-PKG_SYSCONFSUBDIR= ConsoleKit
+GITHUB_PROJECT= ConsoleKit2
+GITHUB_TAG= ${CONSOLEKIT_VER}
+
+MESSAGE_SUBST+= PREFIX=${PREFIX}
+
+BUILD_DEFS+= VARBASE \
+ PKG_SYSCONFBASE
-EGDIR= ${PREFIX}/share/examples/consolekit
-CONF_FILES+= ${EGDIR}/00-primary.seat ${PKG_SYSCONFDIR}/run-seat.d/00-primary.seat
-CONF_FILES+= ${EGDIR}/ConsoleKit.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/ConsoleKit.conf
+EGDIR= ${PREFIX}/share/examples/consolekit
+PKG_SYSCONFSUBDIR= ConsoleKit
+RULESDIR= ${PREFIX}/share/polkit-1/rules.d
-MAKE_DIRS= ${PKG_SYSCONFDIR}/run-seat.d
+MAKE_DIRS= ${PKG_SYSCONFDIR}/run-seat.d \
+ ${PKG_SYSCONFDIR}/run-session.d \
+ ${PKG_SYSCONFDIR}/seats.d \
+ ${PKG_SYSCONFBASE}/dbus-1/system.d \
+ ${PKG_SYSCONFBASE}/logrotate.d \
+ ${PKG_SYSCONFBASE}/X11/xinit/xinitrc.d
-BUILD_DEFS+= VARBASE
-BUILD_DEFS+= PKG_SYSCONFBASE
-GNU_CONFIGURE= YES
-USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake intltool msgfmt perl pkg-config
-USE_TOOLS+= autoconf automake autoreconf
-USE_LIBTOOL= YES
+CONF_FILES+= ${EGDIR}/ConsoleKit/seats.d/00-primary.seat \
+ ${PKG_SYSCONFDIR}/seats.d/00-primary.seat \
+ ${EGDIR}/dbus-1/system.d/ConsoleKit.conf \
+ ${PKG_SYSCONFBASE}/dbus-1/system.d/ConsoleKit.conf \
+ ${EGDIR}/logrotate.d/consolekit \
+ ${PKG_SYSCONFBASE}/logrotate.d/consolekit \
+ ${EGDIR}/X11/xinit/xinitrc.d/90-consolekit \
+ ${PKG_SYSCONFBASE}/X11/xinit/xinitrc.d/90-consolekit
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q}
-CONFIGURE_ARGS+= --localstatedir=${VARBASE}
+GNU_CONFIGURE= YES
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config automake
+USE_LIBTOOL= YES
+
+CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFBASE} \
+ --localstatedir=${VARBASE} \
+ --enable-pam-module \
+ --with-pam-module-dir=${PREFIX}/lib/security \
CONFIGURE_ARGS.SunOS+= --enable-rbac-shutdown=solaris.system.shutdown
-# TODO
-#CONFIGURE_ARGS+= --enable-pam-module
-#.include "../../mk/pam.buildlink3.mk"
-
-post-extract:
- ${CP} ${FILESDIR}/ck-sysdeps-netbsd.c ${WRKSRC}/src/
- ${CP} ${FILESDIR}/ck-sysdeps-openbsd.c ${WRKSRC}/src/
+INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR} \
+ DBUS_SYS_DIR=${EGDIR}/dbus-1/system.d \
+ XINITRC_DIR=${EGDIR}/X11/xinit/xinitrc.d
pre-configure:
- cd ${WRKSRC} && autoreconf -vi ${AUTORECONF_ARGS}
+ cd ${WRKSRC} && ./autogen.sh
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
post-install:
- ${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-display-device.FreeBSD \
- ${DESTDIR}${PREFIX}/libexec/ck-get-x11-display-device
- ${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-server-pid.FreeBSD \
- ${DESTDIR}${PREFIX}/libexec/ck-get-x11-server-pid
-.endif
+ ${MKDIR} ${DESTDIR}${RULESDIR} && \
+ ${INSTALL_DATA} ${FILESDIR}/50-shutdown.rules \
+ ${DESTDIR}${RULESDIR}/50-shutdown.rules
+
+BUILD_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/polkit/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
+.include "../../mk/pam.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r be72844dfa42 -r 9a7e3d0db77b sysutils/consolekit/PLIST
--- a/sysutils/consolekit/PLIST Sat Jun 18 10:19:37 2016 +0000
+++ b/sysutils/consolekit/PLIST Sat Jun 18 10:23:16 2016 +0000
@@ -1,15 +1,24 @@
-@comment $NetBSD: PLIST,v 1.6 2016/06/04 16:28:22 youri Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/06/18 10:23:16 youri Exp $
bin/ck-history
bin/ck-launch-session
bin/ck-list-sessions
include/ConsoleKit/ck-connector/ck-connector.h
+lib/ConsoleKit/scripts/ck-system-hibernate
+lib/ConsoleKit/scripts/ck-system-hybridsleep
lib/ConsoleKit/scripts/ck-system-restart
lib/ConsoleKit/scripts/ck-system-stop
+lib/ConsoleKit/scripts/ck-system-suspend
lib/libck-connector.la
lib/pkgconfig/ck-connector.pc
+lib/security/pam_ck_connector.la
libexec/ck-collect-session-info
libexec/ck-get-x11-display-device
libexec/ck-get-x11-server-pid
+man/man1/ck-history.1
+man/man1/ck-launch-session.1
+man/man1/ck-list-sessions.1
+man/man1/console-kit-daemon.1m
+man/man8/pam_ck_connector.8
sbin/ck-log-system-restart
sbin/ck-log-system-start
sbin/ck-log-system-stop
@@ -18,10 +27,17 @@
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/00-primary.seat
-share/examples/consolekit/ConsoleKit.conf
+share/examples/consolekit/ConsoleKit/seats.d/00-primary.seat
+share/examples/consolekit/X11/xinit/xinitrc.d/90-consolekit
+share/examples/consolekit/dbus-1/system.d/ConsoleKit.conf
+share/examples/consolekit/logrotate.d/consolekit
+share/locale/bg/LC_MESSAGES/ConsoleKit2.mo
+share/locale/es/LC_MESSAGES/ConsoleKit2.mo
+share/locale/es_419/LC_MESSAGES/ConsoleKit2.mo
+share/locale/ru/LC_MESSAGES/ConsoleKit2.mo
share/polkit-1/actions/org.freedesktop.consolekit.policy
+share/polkit-1/rules.d/50-shutdown.rules
+@pkgdir share/examples/consolekit/ConsoleKit/run-session.d
+@pkgdir share/examples/consolekit/ConsoleKit/run-seat.d
@pkgdir lib/ConsoleKit/run-session.d
@pkgdir lib/ConsoleKit/run-seat.d
-@pkgdir etc/ConsoleKit/run-session.d
-@pkgdir etc/ConsoleKit/run-seat.d
diff -r be72844dfa42 -r 9a7e3d0db77b sysutils/consolekit/buildlink3.mk
--- a/sysutils/consolekit/buildlink3.mk Sat Jun 18 10:19:37 2016 +0000
+++ b/sysutils/consolekit/buildlink3.mk Sat Jun 18 10:23:16 2016 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2012/09/15 10:06:21 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2016/06/18 10:23:16 youri Exp $
BUILDLINK_TREE+= consolekit
.if !defined(CONSOLEKIT_BUILDLINK3_MK)
CONSOLEKIT_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.consolekit+= consolekit>=0.3.0
-BUILDLINK_ABI_DEPENDS.consolekit+= consolekit>=0.3.0nb9
+BUILDLINK_API_DEPENDS.consolekit+= consolekit>=1.0.2
+BUILDLINK_ABI_DEPENDS.consolekit+= consolekit>=1.0.2
BUILDLINK_PKGSRCDIR.consolekit?= ../../sysutils/consolekit
.include "../../sysutils/dbus/buildlink3.mk"
diff -r be72844dfa42 -r 9a7e3d0db77b sysutils/consolekit/distinfo
--- a/sysutils/consolekit/distinfo Sat Jun 18 10:19:37 2016 +0000
+++ b/sysutils/consolekit/distinfo Sat Jun 18 10:23:16 2016 +0000
@@ -1,12 +1,7 @@
-$NetBSD: distinfo,v 1.12 2015/11/04 01:32:08 agc Exp $
+$NetBSD: distinfo,v 1.13 2016/06/18 10:23:16 youri Exp $
-SHA1 (ConsoleKit-0.4.6.tar.xz) = bde79a4aa1bf3dc69a8e03731c7eb06e2dbda2d3
-RMD160 (ConsoleKit-0.4.6.tar.xz) = 7140db9e26accde56d672330e7045fafbafe6990
-SHA512 (ConsoleKit-0.4.6.tar.xz) = 54955e3e83778a9216846104da8762fd50a37190e209127dd5d211e2227da617e14f6f5c1359905396d299656e526d14e1187b28eaff7d0ae1d7563dc8d9b46d
-Size (ConsoleKit-0.4.6.tar.xz) = 366572 bytes
-SHA1 (patch-aa) = 1c637d4ba3dfbb17d141f6b29140cf1d3d42ed7e
-SHA1 (patch-ab) = c32c8f88a0dd87c9b6d4473bf6526c07fb593404
-SHA1 (patch-ac) = 3ef09f16ee039da7cea0c020c2aeccfe5d88c57c
-SHA1 (patch-ad) = c0cf170a85e04e2dadfd490f303a40e8d62cc626
-SHA1 (patch-ae) = dcb689861f8ee425b94a8acf1cb344a782b4328b
-SHA1 (patch-af) = 9c7febd3a1e995060e5755b205c5d4a7217bc1b8
+SHA1 (1.0.2.tar.gz) = aca2f13f65e77ebffc9fb65d6102cd8edde522ba
+RMD160 (1.0.2.tar.gz) = 1af1cfe8bdfc92215e8393eb4246c0e8667ae5e5
+SHA512 (1.0.2.tar.gz) = a0ce6b3b8eded4ec9fb0774b617cbf6b50aedef16a2bc28ec783e296eb3acc4a250611abb108aaf4f3716f3386ba397644fe55615e516f156982e9102cbb950e
+Size (1.0.2.tar.gz) = 205101 bytes
+SHA1 (patch-data_Makefile.am) = 7d37d6c3b5c0bab2e1e4b7000bd23f72b646cf9c
diff -r be72844dfa42 -r 9a7e3d0db77b sysutils/consolekit/files/50-shutdown.rules
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/consolekit/files/50-shutdown.rules Sat Jun 18 10:23:16 2016 +0000
@@ -0,0 +1,9 @@
+polkit.addRule(function (action, subject) {
+ if (action.id == "org.freedesktop.consolekit.system.restart" ||
+ action.id == "org.freedesktop.consolekit.system.stop" ||
+ action.id == "org.freedesktop.consolekit.system.suspend" ||
+ action.id == "org.freedesktop.consolekit.system.hibernate"
+ && subject.isInGroup("operator")) {
+ return polkit.Result.YES;
+ }
+});
diff -r be72844dfa42 -r 9a7e3d0db77b sysutils/consolekit/files/ck-get-x11-display-device.FreeBSD
--- a/sysutils/consolekit/files/ck-get-x11-display-device.FreeBSD Sat Jun 18 10:19:37 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-FSTAT="/usr/bin/fstat"
-GREP="/usr/bin/grep"
-AWK="/usr/bin/awk"
-SED="/usr/bin/sed"
-CAT="/bin/cat"
-HEAD="/usr/bin/head"
-
-dispnum=0
-if [ x"$1" = x"--display" ]; then
- if [ $# != 2 ]; then
- echo "usage: $0 [--display DISPLAY]"
- exit 1
- fi
- DISPLAY=$2
-fi
-if [ ! -z "${DISPLAY}" ]; then
- dispnum=$(echo ${DISPLAY} | ${SED} -E -e 's|:([0-9]+).*|\1|')
-fi
-
-if [ ! -f "/tmp/.X${dispnum}-lock" ]; then
- echo "ERROR: Failed to find X lock file for display ${dispnum}"
- exit 1
-fi
-pid=$(${CAT} "/tmp/.X${dispnum}-lock")
-
-device=$(${FSTAT} -p ${pid} | ${GREP} ttyv | ${HEAD} -1 | ${AWK} '{print $8}')
-
-if [ -z "${device}" ]; then
- echo "ERROR: Failed to find TTY device for X server on display ${dispnum}"
- exit 1
-fi
-
-echo "/dev/${device}"
diff -r be72844dfa42 -r 9a7e3d0db77b sysutils/consolekit/files/ck-get-x11-server-pid.FreeBSD
--- a/sysutils/consolekit/files/ck-get-x11-server-pid.FreeBSD Sat Jun 18 10:19:37 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-SED="/usr/bin/sed"
-CAT="/bin/cat"
-
-dispnum=0
-if [ ! -z "${DISPLAY}" ]; then
- dispnum=$(echo ${DISPLAY} | ${SED} -E -e 's|:([0-9]+).*|\1|')
-fi
-
-if [ ! -f "/tmp/.X${dispnum}-lock" ]; then
- echo "ERROR: Failed to find X lock file for display ${dispnum}"
- exit 1
-fi
-pid=$(${CAT} "/tmp/.X${dispnum}-lock")
-
-echo ${pid}
diff -r be72844dfa42 -r 9a7e3d0db77b sysutils/consolekit/files/ck-sysdeps-netbsd.c
--- a/sysutils/consolekit/files/ck-sysdeps-netbsd.c Sat Jun 18 10:19:37 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,412 +0,0 @@
-/* $NetBSD: ck-sysdeps-netbsd.c,v 1.3 2008/11/23 19:24:21 jmcneill Exp $ */
Home |
Main Index |
Thread Index |
Old Index