kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

consolekit: Update to 1.2.2

Browse source 
Changes since 1.2.1
Bug Fixes:

    Change the inhibitor lock handling to use the named_pipe_path as a reference to prevent ending with empty "who" inhibitors
    Inhibit: only disconnect the signal handler after the lock is removed to prevent ghost inhibitors

Misc Changes:

    merge all changes from OpenBSD ports
    merge all changes from NetBSD pkgsrc
This commit is contained in:
nia 2021-01-01 15:33:51 +00:00
parent 13de19c5bc
commit d6350a31d6
4 changed files with 15 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sysutils/consolekit/Makefile
View file

@ -1,17 +1,15 @@
# $NetBSD: Makefile,v 1.46 2020/12/04 04:56:13 riastradh Exp $
# $NetBSD: Makefile,v 1.47 2021/01/01 15:33:51 nia Exp $
CONSOLEKIT_VER= 1.2.1
PKGREVISION= 6
CONSOLEKIT_VER= 1.2.2
DISTNAME= ConsoleKit2-${CONSOLEKIT_VER}
PKGNAME= consolekit-${CONSOLEKIT_VER}
CATEGORIES= sysutils
GITHUB_RELEASE= ${CONSOLEKIT_VER}
GITHUB_TAG= ${CONSOLEKIT_VER}
GITHUB_PROJECT= ConsoleKit2
MASTER_SITES= ${MASTER_SITE_GITHUB:=ConsoleKit2/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= youri@NetBSD.org
HOMEPAGE= https://github.com/ConsoleKit2/ConsoleKit2/
HOMEPAGE= https://github.com/ConsoleKit2/ConsoleKit2
COMMENT= Framework for defining and tracking users, login sessions, and seats
LICENSE= gnu-gpl-v2
@ -42,7 +40,8 @@ CONF_FILES+= ${EGDIR}/ConsoleKit/seats.d/00-primary.seat \
${PKG_SYSCONFBASE}/X11/xinit/xinitrc.d/90-consolekit
GNU_CONFIGURE= YES
USE_TOOLS+= gmake intltool msgfmt perl pkg-config automake
USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_TOOLS+= autoconf automake autoreconf
USE_LIBTOOL= YES
CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFBASE} \
@ -64,6 +63,9 @@ post-install:
TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
pre-configure:
cd ${WRKSRC} && NOCONFIGURE=1 ${SH} autogen.sh
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/polkit/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"

18
sysutils/consolekit/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.8 2018/05/16 11:30:36 youri Exp $
@comment $NetBSD: PLIST,v 1.9 2021/01/01 15:33:51 nia Exp $
bin/ck-history
bin/ck-launch-session
bin/ck-list-sessions
@ -33,22 +33,6 @@ 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/gtk-doc/html/libconsolekit-1.0/annotation-glossary.html
share/gtk-doc/html/libconsolekit-1.0/api-index-1.0.html
share/gtk-doc/html/libconsolekit-1.0/api-index-deprecated.html
share/gtk-doc/html/libconsolekit-1.0/api-index-full.html
share/gtk-doc/html/libconsolekit-1.0/ch01.html
share/gtk-doc/html/libconsolekit-1.0/home.png
share/gtk-doc/html/libconsolekit-1.0/index.html
share/gtk-doc/html/libconsolekit-1.0/left-insensitive.png
share/gtk-doc/html/libconsolekit-1.0/left.png
share/gtk-doc/html/libconsolekit-1.0/libconsolekit-1.0.devhelp2
share/gtk-doc/html/libconsolekit-1.0/libconsolekit-libconsolekit.html
share/gtk-doc/html/libconsolekit-1.0/right-insensitive.png
share/gtk-doc/html/libconsolekit-1.0/right.png
share/gtk-doc/html/libconsolekit-1.0/style.css
share/gtk-doc/html/libconsolekit-1.0/up-insensitive.png
share/gtk-doc/html/libconsolekit-1.0/up.png
share/locale/bg/LC_MESSAGES/ConsoleKit2.mo
share/locale/es/LC_MESSAGES/ConsoleKit2.mo
share/locale/es_419/LC_MESSAGES/ConsoleKit2.mo

11
sysutils/consolekit/distinfo
View file

@ -1,7 +1,6 @@
$NetBSD: distinfo,v 1.17 2018/06/04 01:01:23 youri Exp $
$NetBSD: distinfo,v 1.18 2021/01/01 15:33:51 nia Exp $
SHA1 (ConsoleKit2-1.2.1.tar.bz2) = 28869807eed0cc4a7a1d98030be1f2c7e5700d0e
RMD160 (ConsoleKit2-1.2.1.tar.bz2) = 641171ca6e8290924fae4ab2d1ead6b13de88ad5
SHA512 (ConsoleKit2-1.2.1.tar.bz2) = 31befe89f7fa604138bfb0722fc6cf12f0934bac004f98fc331004eb5a7f466ed7bd0dc9adc9869da739974208f9a3bc125068ff8a60d4b2badb58ef70a3eb10
Size (ConsoleKit2-1.2.1.tar.bz2) = 1182946 bytes
SHA1 (patch-src_ck-sysdeps-netbsd.c) = 0f832ec2bb487d5faec0de774449defe4f5721a6
SHA1 (ConsoleKit2-1.2.2.tar.gz) = dd12671c830d6d340785ad20fac38f30afbca393
RMD160 (ConsoleKit2-1.2.2.tar.gz) = 3550c46db232ccfdc12eadd6afe5dfa41602c236
SHA512 (ConsoleKit2-1.2.2.tar.gz) = 7f9a4c77c7991b7a3751605f58f12bb079660fe974aeec385a9753dc4b33241052153b9a9261effc91e86323e8a9dcbc9269c4829b871ab91ef286506ff3b18b
Size (ConsoleKit2-1.2.2.tar.gz) = 254783 bytes

44
sysutils/consolekit/patches/patch-src_ck-sysdeps-netbsd.c
View file

@ -1,44 +0,0 @@
$NetBSD: patch-src_ck-sysdeps-netbsd.c,v 1.3 2018/06/04 01:01:23 youri Exp $
Fix NetBSD build.
--- src/ck-sysdeps-netbsd.c.orig 2017-06-02 01:31:44.000000000 +0000
+++ src/ck-sysdeps-netbsd.c
@@ -36,7 +36,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/sysctl.h>
-#include <sys/user.h>
#include <sys/ioctl.h>
#ifdef HAVE_SYS_MOUNT_H
@@ -121,7 +120,7 @@ ck_process_stat_get_tty (CkProcessStat *
{
g_return_val_if_fail (stat != NULL, NULL);
- if (stat->tty == NODEV){
+ if (stat->tty == ENODEV){
return NULL;
}
@@ -164,7 +163,7 @@ stat2proc (pid_t pid,
}
num = KI_MAXCOMLEN;
- if (num >= sizeof(P->cmd)) {
+ if ((unsigned)num >= sizeof(P->cmd)) {
num = sizeof(P->cmd) - 1;
}
@@ -494,7 +493,11 @@ ck_make_tmpfs (guint uid, guint gid, con
opts = g_strdup_printf ("mode=0700,uid=%d", uid);
+#ifdef __NetBSD__
+ result = mount("tmpfs", dest, 0, opts, strlen(opts));
+#else
result = mount("tmpfs", dest, 0, opts);
+#endif
g_free (opts);