diff options
| -rw-r--r-- | sysutils/consolekit/Makefile | 13 | ||||
| -rw-r--r-- | sysutils/consolekit/PLIST | 24 | ||||
| -rw-r--r-- | sysutils/consolekit/distinfo | 14 | ||||
| -rw-r--r-- | sysutils/consolekit/patches/patch-src_ck-sysdeps-netbsd.c | 20 |
4 files changed, 50 insertions, 21 deletions
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile index b5d57e863b2..29210b96f56 100644 --- a/sysutils/consolekit/Makefile +++ b/sysutils/consolekit/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.37 2018/03/17 01:11:12 ryoon Exp $ +# $NetBSD: Makefile,v 1.38 2018/05/16 11:30:36 youri Exp $ -CONSOLEKIT_VER= 1.0.2 +CONSOLEKIT_VER= 1.2.1 DISTNAME= ConsoleKit2-${CONSOLEKIT_VER} PKGNAME= consolekit-${CONSOLEKIT_VER} -PKGREVISION= 1 CATEGORIES= sysutils -GITHUB_RELEASE= ${CONSOLEKIT_VER} +GITHUB_RELEASE= ${CONSOLEKIT_VER} GITHUB_PROJECT= ConsoleKit2 MASTER_SITES= ${MASTER_SITE_GITHUB:=ConsoleKit2/} EXTRACT_SUFX= .tar.bz2 @@ -45,10 +44,12 @@ GNU_CONFIGURE= YES USE_TOOLS+= gmake intltool msgfmt perl pkg-config automake USE_LIBTOOL= YES +CONFIGURE_ARGS+= --enable-debug=full CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFBASE} \ --localstatedir=${VARBASE} \ - --enable-pam-module \ - --with-pam-module-dir=${PREFIX}/lib/security \ + --disable-pam-module + #--enable-pam-module \ + #--with-pam-module-dir=${PREFIX}/lib/security \ CONFIGURE_ARGS.SunOS+= --enable-rbac-shutdown=solaris.system.shutdown diff --git a/sysutils/consolekit/PLIST b/sysutils/consolekit/PLIST index 2b03c62970d..ba3aa8068d0 100644 --- a/sysutils/consolekit/PLIST +++ b/sysutils/consolekit/PLIST @@ -1,24 +1,26 @@ -@comment $NetBSD: PLIST,v 1.7 2016/06/18 10:23:16 youri Exp $ +@comment $NetBSD: PLIST,v 1.8 2018/05/16 11:30:36 youri Exp $ bin/ck-history bin/ck-launch-session bin/ck-list-sessions include/ConsoleKit/ck-connector/ck-connector.h +include/ConsoleKit/libconsolekit.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/libconsolekit.la lib/pkgconfig/ck-connector.pc -lib/security/pam_ck_connector.la +lib/pkgconfig/libconsolekit.pc libexec/ck-collect-session-info libexec/ck-get-x11-display-device libexec/ck-get-x11-server-pid +libexec/ck-remove-directory 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 @@ -31,6 +33,22 @@ 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 diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo index 932462735a6..18b601bc223 100644 --- a/sysutils/consolekit/distinfo +++ b/sysutils/consolekit/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.15 2017/06/22 22:09:17 kamil Exp $ +$NetBSD: distinfo,v 1.16 2018/05/16 11:30:36 youri Exp $ -SHA1 (ConsoleKit2-1.0.2.tar.bz2) = 57b5fc3eae0391105e4933e79e6aeda943e6da81 -RMD160 (ConsoleKit2-1.0.2.tar.bz2) = 7b151e8d25dedb6961d2d83b934d79d9411147ff -SHA512 (ConsoleKit2-1.0.2.tar.bz2) = a6d1c876aafe3cb102d916c6b6086283eff77d2f35fbda460196cb71daf16d21a6713096bfc9e1b6ccef9719b2fcb25b6124024f3245f9410d0e503087c479f7 -Size (ConsoleKit2-1.0.2.tar.bz2) = 622723 bytes -SHA1 (patch-data_Makefile.am) = 5de63a98459914c7fda185d71fefd553b82107d3 -SHA1 (patch-data_Makefile.in) = a1861d2b80cc45ec6e4d625b635d1fb3c8b90122 -SHA1 (patch-src_ck-sysdeps-netbsd.c) = 889fdc11b096d290028572b673533f97a14c7984 +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) = 4b8cabcd47bef0b8edaf6dd292686aa3297794bc diff --git a/sysutils/consolekit/patches/patch-src_ck-sysdeps-netbsd.c b/sysutils/consolekit/patches/patch-src_ck-sysdeps-netbsd.c index d1021fcc313..4e8cd680857 100644 --- a/sysutils/consolekit/patches/patch-src_ck-sysdeps-netbsd.c +++ b/sysutils/consolekit/patches/patch-src_ck-sysdeps-netbsd.c @@ -1,8 +1,8 @@ -$NetBSD: patch-src_ck-sysdeps-netbsd.c,v 1.1 2017/06/22 22:09:17 kamil Exp $ +$NetBSD: patch-src_ck-sysdeps-netbsd.c,v 1.2 2018/05/16 11:30:36 youri Exp $ -Don't include <sys/user.h> on NetBSD. +Fix NetBSD build. ---- src/ck-sysdeps-netbsd.c.orig 2016-03-19 15:14:24.000000000 +0000 +--- 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> @@ -11,4 +11,16 @@ Don't include <sys/user.h> on NetBSD. -#include <sys/user.h> #include <sys/ioctl.h> - #include <dev/wscons/wsdisplay_usl_io.h> + #ifdef HAVE_SYS_MOUNT_H +@@ -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); + |