[Midnightbsd-cvs] mports [24922] trunk/x11: update xorg ports
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Feb 9 11:31:07 EST 2019
Revision: 24922
http://svnweb.midnightbsd.org/mports/?rev=24922
Author: laffer1
Date: 2019-02-09 11:31:07 -0500 (Sat, 09 Feb 2019)
Log Message:
-----------
update xorg ports
Modified Paths:
--------------
trunk/x11/Makefile
trunk/x11/bitmap/Makefile
trunk/x11/gdm/Makefile
trunk/x11/gdm/distinfo
trunk/x11/gdm/files/gdm-password.in
trunk/x11/gdm/files/gdm.in
trunk/x11/gdm/files/patch-config.h.in
trunk/x11/gdm/files/patch-daemon_Makefile.in
trunk/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop
trunk/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings
trunk/x11/gdm/pkg-plist
trunk/x11/iceauth/Makefile
trunk/x11/libICE/Makefile
trunk/x11/libSM/Makefile
trunk/x11/libX11/Makefile
trunk/x11/libX11/distinfo
trunk/x11/libX11/pkg-plist
trunk/x11/libXau/Makefile
trunk/x11/libXcomposite/Makefile
trunk/x11/libXcursor/Makefile
trunk/x11/libXdamage/Makefile
trunk/x11/libXdmcp/Makefile
trunk/x11/libXevie/Makefile
trunk/x11/libXevie/pkg-descr
trunk/x11/libXext/Makefile
trunk/x11/libXfixes/Makefile
trunk/x11/libXi/Makefile
trunk/x11/libXpm/Makefile
trunk/x11/libXprintAppUtil/Makefile
trunk/x11/libXrandr/Makefile
trunk/x11/libXrender/Makefile
trunk/x11/libXres/Makefile
trunk/x11/libXv/Makefile
trunk/x11/libXvMC/Makefile
trunk/x11/libXxf86dga/Makefile
trunk/x11/libXxf86misc/Makefile
trunk/x11/libXxf86vm/Makefile
trunk/x11/libXxf86vm/pkg-plist
trunk/x11/libdmx/Makefile
trunk/x11/libxshmfence/Makefile
trunk/x11/listres/Makefile
trunk/x11/rgb/Makefile
trunk/x11/xdpyinfo/Makefile
trunk/x11/xprehashprinterlist/Makefile
trunk/x11/xrx/Makefile
trunk/x11/xscreensaver/Makefile
trunk/x11/xscreensaver/distinfo
trunk/x11/xscreensaver/files/patch-config.h.in
trunk/x11/xscreensaver/files/patch-configure.in
trunk/x11/xscreensaver/files/patch-driver_Makefile.in
trunk/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
trunk/x11/xscreensaver/files/patch-hacks__config__sonar.xml
trunk/x11/xscreensaver/files/patch-hacks_memscroller.c
trunk/x11/xscreensaver/files/patch-utils_textclient.c
trunk/x11/xscreensaver/pkg-descr
trunk/x11/xscreensaver/pkg-plist
trunk/x11/xscreensaver-gnome/pkg-descr
trunk/x11/xscreensaver-gnome-hacks/pkg-descr
trunk/x11/xscreensaver.app/Makefile
trunk/x11/xsel/Makefile
trunk/x11/xset/Makefile
trunk/x11/xsetroot/Makefile
trunk/x11/xsetroot/distinfo
trunk/x11/xsm/Makefile
trunk/x11/xsm/distinfo
trunk/x11/xterm/Makefile
trunk/x11/xtrap/Makefile
trunk/x11/xwininfo/Makefile
trunk/x11/yelp/Makefile
trunk/x11/yelp/distinfo
trunk/x11/yelp/pkg-plist
Added Paths:
-----------
trunk/x11/gdm/files/Makefile.am
trunk/x11/gdm/files/configure.ac
trunk/x11/gdm/files/daemon_Makefile.am
trunk/x11/gdm/files/patch-Makefile.in
trunk/x11/gdm/files/patch-common_gdm-common.c
trunk/x11/gdm/files/patch-common_gdm-common.h
trunk/x11/gdm/files/patch-common_gdm-log.c
trunk/x11/gdm/files/patch-configure
trunk/x11/gdm/files/patch-daemon_gdm-launch-environment.c
trunk/x11/gdm/files/patch-daemon_gdm-local-display-factory.c
trunk/x11/gdm/files/patch-daemon_gdm-manager.c
trunk/x11/gdm/files/patch-daemon_gdm-server.c
trunk/x11/gdm/files/patch-daemon_gdm-session-worker-job.c
trunk/x11/gdm/files/patch-daemon_gdm-session-worker.c
trunk/x11/gdm/files/patch-daemon_gdm-session-worker.xml
trunk/x11/gdm/files/patch-daemon_gdm-session.c
trunk/x11/gdm/files/patch-daemon_gdm-session.h
trunk/x11/gdm/files/patch-data_Init.in
trunk/x11/gdm/files/patch-data_pam-redhat_gdm-autologin.pam
trunk/x11/gdm/files/patch-data_pam-redhat_gdm-fingerprint.pam
trunk/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam
trunk/x11/gdm/files/patch-data_pam-redhat_gdm-pin.pam
trunk/x11/gdm/files/patch-data_pam-redhat_gdm-smartcard.pam
trunk/x11/gdm/files/patch-libgdm_gdm-user-switching.c
trunk/x11/yelp/files/
trunk/x11/yelp/files/patch-libyelp_yelp-man-parser.c
trunk/x11/yelp/files/yelp-groff
Removed Paths:
-------------
trunk/x11/bigreqsproto/
trunk/x11/compositeproto/
trunk/x11/damageproto/
trunk/x11/dmxproto/
trunk/x11/dri2proto/
trunk/x11/dri3proto/
trunk/x11/evieext/
trunk/x11/fixesproto/
trunk/x11/gdm/files/patch-CVE-2015-7496
trunk/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c
trunk/x11/glproto/
trunk/x11/inputproto/
trunk/x11/kbproto/
trunk/x11/nvidia-driver-173/
trunk/x11/presentproto/
trunk/x11/printproto/
trunk/x11/randrproto/
trunk/x11/recordproto/
trunk/x11/renderproto/
trunk/x11/resourceproto/
trunk/x11/scrnsaverproto/
trunk/x11/trapproto/
trunk/x11/videoproto/
trunk/x11/xcmiscproto/
trunk/x11/xextproto/
trunk/x11/xf86dgaproto/
trunk/x11/xf86driproto/
trunk/x11/xf86miscproto/
trunk/x11/xf86rushproto/
trunk/x11/xf86vidmodeproto/
trunk/x11/xineramaproto/
trunk/x11/xproto/
trunk/x11/xproxymanagementprotocol/
trunk/x11/xscreensaver/files/XScreenSaver
Modified: trunk/x11/Makefile
===================================================================
--- trunk/x11/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -5,21 +5,12 @@
SUBDIR += appres
SUBDIR += babl
SUBDIR += beforelight
-SUBDIR += bigreqsproto
SUBDIR += bitmap
-SUBDIR += compositeproto
-SUBDIR += damageproto
SUBDIR += dgs
SUBDIR += dmenu
-SUBDIR += dmxproto
-SUBDIR += dri2proto
-SUBDIR += dri3proto
SUBDIR += editres
-SUBDIR += evieext
-SUBDIR += fixesproto
SUBDIR += fstobdf
SUBDIR += gdm
-SUBDIR += glproto
SUBDIR += gnome-desktop
SUBDIR += gnome-menus
SUBDIR += gnome-session
@@ -35,8 +26,6 @@
SUBDIR += ico
SUBDIR += idesk
SUBDIR += innerspace
-SUBDIR += inputproto
-SUBDIR += kbproto
SUBDIR += libICE
SUBDIR += libSM
SUBDIR += libX11
@@ -90,27 +79,19 @@
SUBDIR += mlogind
SUBDIR += numlockx
SUBDIR += nvidia-driver
-SUBDIR += nvidia-driver-173
SUBDIR += nvidia-driver-304
SUBDIR += nvidia-settings
SUBDIR += nvidia-xconfig
SUBDIR += pixman
-SUBDIR += presentproto
-SUBDIR += printproto
SUBDIR += qimageblitz
SUBDIR += qt4-graphicssystems-opengl
SUBDIR += qt4-inputmethods
SUBDIR += qt5-qev
SUBDIR += qt5-x11extras
-SUBDIR += randrproto
-SUBDIR += recordproto
-SUBDIR += renderproto
-SUBDIR += resourceproto
SUBDIR += rgb
SUBDIR += rstart
SUBDIR += rxvt
SUBDIR += scripts
-SUBDIR += scrnsaverproto
SUBDIR += sessreg
SUBDIR += setxkbmap
SUBDIR += slim
@@ -117,8 +98,6 @@
SUBDIR += smproxy
SUBDIR += startup-notification
SUBDIR += terminal.app
-SUBDIR += trapproto
-SUBDIR += videoproto
SUBDIR += viewres
SUBDIR += wdm
SUBDIR += windowmaker-desktop
Modified: trunk/x11/bitmap/Makefile
===================================================================
--- trunk/x11/bitmap/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/bitmap/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,13 +2,15 @@
PORTNAME= bitmap
PORTVERSION= 1.0.8
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
COMMENT= Bitmap editor and converter utilities for X
+
LICENSE= mit
XORG_CAT= app
-USE_XORG= x11 xaw xbitmaps xmu xproto
+USE_XORG= x11 xaw xbitmaps xmu xorgproto
.include <bsd.port.mk>
Modified: trunk/x11/gdm/Makefile
===================================================================
--- trunk/x11/gdm/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/gdm/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,51 +1,51 @@
# $MidnightBSD$
PORTNAME= gdm
-PORTVERSION= 3.16.4
-PORTREVISION= 1
+PORTVERSION= 3.28.1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome3
+DIST_SUBDIR= gnome
MAINTAINER= ports at MidnightBSD.org
-COMMENT= GNOME 3 version of xdm display manager
+COMMENT= GNOME 3 display manager
LICENSE= gpl2
-BUILD_DEPENDS= zenity>=3.0.0:${PORTSDIR}/x11/zenity \
- itstool:${PORTSDIR}/textproc/itstool \
- iso-codes>=0:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS= libck-connector.so:${PORTSDIR}/sysutils/consolekit2 \
- libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
- libupower-glib.so:${PORTSDIR}/sysutils/upower \
- libnss3.so:${PORTSDIR}/security/nss \
- libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
- libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice \
- libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
-RUN_DEPENDS= zenity>=3.0.0:${PORTSDIR}/x11/zenity \
- gnome-shell>=3.15.92:${PORTSDIR}/x11/gnome-shell \
- gnome-settings-daemon>=3.0.0:${PORTSDIR}/sysutils/gnome-settings-daemon \
- gnome-keyring-3:${PORTSDIR}/security/gnome-keyring \
- gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \
- gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \
- polkit-gnome>=0.105:${PORTSDIR}/sysutils/polkit-gnome \
- at-spi2-core>=0:${PORTSDIR}/accessibility/at-spi2-core \
- iso-codes>=0:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS= zenity>=3.0.0:x11/zenity \
+ itstool:textproc/itstool \
+ iso-codes>=0:misc/iso-codes
+LIB_DEPENDS= libck-connector.so:sysutils/consolekit2 \
+ libaccountsservice.so:sysutils/accountsservice \
+ libcanberra.so:audio/libcanberra \
+ libcanberra-gtk3.so:audio/libcanberra-gtk3
+RUN_DEPENDS= zenity>=3.0.0:x11/zenity \
+ gnome-shell>=3.15.92:x11/gnome-shell \
+ gnome-settings-daemon>=3.0.0:sysutils/gnome-settings-daemon \
+ gnome-keyring-3:security/gnome-keyring \
+ gnome-session>=3.0.0:x11/gnome-session \
+ gnome-icon-theme-symbolic>=0:x11-themes/gnome-icon-theme-symbolic \
+ polkit-gnome>=0.105:sysutils/polkit-gnome \
+ at-spi2-core>=0:accessibility/at-spi2-core \
+ iso-codes>=0:misc/iso-codes
# used in scripts
-RUN_DEPENDS+= xrdb:${PORTSDIR}/x11/xrdb \
- setxkbmap:${PORTSDIR}/x11/setxkbmap \
- xmodmap:${PORTSDIR}/x11/xmodmap \
- xterm:${PORTSDIR}/x11/xterm
+RUN_DEPENDS+= xrdb:x11/xrdb \
+ setxkbmap:x11/setxkbmap \
+ xsetroot:x11/xsetroot \
+ xhost:x11/xhost \
+ xmodmap:x11/xmodmap \
+ xterm:x11/xterm
USERS= gdm
-GROUPS= gdm
+GROUPS= gdm video
-USES= cpe execinfo gettext gmake libtool pathfix pkgconfig tar:xz
+PORTSCOUT= limitw:1,even
+
+USES= cpe gettext gmake gnome libtool pathfix pkgconfig tar:xz
CPE_VENDOR= gnome
CPE_VENDOR= gnome_display_manager
-USE_GNOME= dconf intlhack introspection librsvg2
+USE_GNOME= cairo dconf gtk30 intltool introspection
USE_LDCONFIG= yes
-USE_XORG= dmx dmxproto
+USE_XORG= x11 xau xcb xdmcp xorgproto
INSTALLS_ICONS= yes
USE_RC_SUBR= gdm
USE_GNOME_SUBR= yes
@@ -59,6 +59,8 @@
--with-dbus-sys=${PREFIX}/etc/dbus-1/system.d \
--with-log-dir=/var/log/gdm \
--localstatedir=/var \
+ --without-selinux \
+ --without-libaudit \
--with-console-kit \
--with-working-directory=${PREFIX}/etc/gdm/home \
--with-sysconfsubdir=gdm \
@@ -67,9 +69,11 @@
--with-screenshot-dir=/var/run/gdm/greeter \
--enable-authentication-scheme=pam \
--without-plymouth \
+ --without-systemd \
--with-user=gdm \
--with-group=gdm \
- --with-initial-vt=09 \
+ --with-initial-vt=09 \
+ --enable-gdm-xsession \
--disable-wayland-support \
--with-systemd=no
@@ -90,37 +94,30 @@
GNOME_LOCALSTATEDIR= /var
-OPTIONS_DEFINE= IPV6 KEYRING
-OPTIONS_DEFAULT=KEYRING
-KEYRING_DESC= Gnomekeyring/PAM integration
-KEYRING_LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+OPTIONS_DEFINE= IPV6
+
IPV6_CONFIGURE_ENABLE= ipv6
-.include <bsd.mport.options.mk>
+.include <bsd.port.options.mk>
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug
.endif
-.if ${PORT_OPTIONS:MKEYRING}
-SUB_LIST+= PAM_KEYRING=
-.else
-SUB_LIST+= PAM_KEYRING=\#
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \
${WRKSRC}/data/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
- -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/daemon/gdm-session-worker.c
+ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ -e 's|/bin/bash|/bin/sh|g' \
+ ${WRKSRC}/daemon/gdm-session-worker.c
@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
-e 's|/usr/bin/X|${LOCALBASE}/bin/X|g' \
-e 's|/usr/bin/Xorg|${LOCALBASE}/bin/Xorg|g' \
${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po
@${REINPLACE_CMD} -e 's|/at-spi-registryd|/at-spi2-registryd|g' \
- ${WRKSRC}/gui/simple-chooser/gdm-host-chooser.c \
- ${WRKSRC}/gui/simple-chooser/chooser-main.c
+ ${WRKSRC}/chooser/gdm-host-chooser.c \
+ ${WRKSRC}/chooser/chooser-main.c
@${REINPLACE_CMD} -e 's|/etc/X11|${LOCALBASE}/etc/X11|g' \
${WRKSRC}/data/Init.in \
${WRKSRC}/data/PostLogin \
@@ -127,7 +124,7 @@
${WRKSRC}/data/PostSession.in \
${WRKSRC}/data/PreSession.in \
${WRKSRC}/data/Xsession.in
- -${RM} ${WRKSRC}/data/applications/gdm-simple-greeter.desktop \
+ @${RM} ${WRKSRC}/data/applications/gdm-simple-greeter.desktop \
${WRKSRC}/data/applications/gdm-simple-greeter.desktop.in \
${WRKSRC}/data/applications/gnome-shell.desktop \
@@ -147,20 +144,24 @@
${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/home
${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
- ${INSTALL_DATA} ${WRKDIR}/gdm-autologin ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-autologin
- ${INSTALL_DATA} ${WRKDIR}/gdm-launch-environment ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-launch-environment
- ${INSTALL_DATA} ${WRKDIR}/gdm-password ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-password
+ ${INSTALL_DATA} ${WRKDIR}/gdm-autologin \
+ ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-autologin
+ ${INSTALL_DATA} ${WRKDIR}/gdm-launch-environment \
+ ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-launch-environment
+ ${INSTALL_DATA} ${WRKDIR}/gdm-password \
+ ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-password
- ${INSTALL_DATA} ${WRKDIR}/client.conf ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
+ ${INSTALL_DATA} ${WRKDIR}/client.conf \
+ ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/client.conf.sample
- ${INSTALL_DATA} ${WRKDIR}/locale.conf ${STAGEDIR}${PREFIX}/etc/gdm/
+ ${INSTALL_DATA} ${WRKDIR}/locale.conf \
+ ${STAGEDIR}${PREFIX}/etc/gdm/locale.conf.sample
+ @${RM} ${STAGEDIR}${PREFIX}/lib/udev/rules.d/61-gdm.rules
+ @${RMDIR} ${STAGEDIR}${PREFIX}/lib/udev/rules.d
+ @${RMDIR} ${STAGEDIR}${PREFIX}/lib/udev
+
@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
-# logwtmp lives here.
-.if ${OSVERSION} < 4015
-CONFIGLIBS+= -lutil
-.endif
-
.include <bsd.port.mk>
Modified: trunk/x11/gdm/distinfo
===================================================================
--- trunk/x11/gdm/distinfo 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/gdm/distinfo 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gdm-3.16.4.tar.xz) = 281dd28d729eaab2f67e450b5b162299dec537b6f7e81fa1124e35c89d3942fd
-SIZE (gnome3/gdm-3.16.4.tar.xz) = 1535580
+TIMESTAMP = 1525503166
+SHA256 (gnome/gdm-3.28.1.tar.xz) = 77068fa775bc2c002e85883c250103f6a77361d32ba0cb8a60997b70b397b2fb
+SIZE (gnome/gdm-3.28.1.tar.xz) = 1122164
Added: trunk/x11/gdm/files/Makefile.am
===================================================================
--- trunk/x11/gdm/files/Makefile.am (rev 0)
+++ trunk/x11/gdm/files/Makefile.am 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,18 @@
+$OpenBSD: patch-Makefile_am,v 1.1 2016/10/31 16:15:46 ajacoutot Exp $
+
+REVERT - Linux-PAM
+From 714b6af29b916ac7da0cdab6f83460574ed49cf2 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Mon, 15 Aug 2016 13:48:00 -0400
+Subject: pam_gdm: add stub pam module
+
+--- Makefile.am.orig 2017-10-30 16:21:02.000000000 +0100
++++ Makefile.am 2018-01-14 12:30:07.298406000 +0100
+@@ -7,7 +7,6 @@ SUBDIRS = \
+ daemon \
+ libgdm \
+ utils \
+- pam_gdm \
+ po \
+ tests \
+ $(NULL)
Property changes on: trunk/x11/gdm/files/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/configure.ac
===================================================================
--- trunk/x11/gdm/files/configure.ac (rev 0)
+++ trunk/x11/gdm/files/configure.ac 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,154 @@
+$OpenBSD: patch-configure_ac,v 1.12 2017/04/17 13:17:07 ajacoutot Exp $
+
+REVERT - Linux-PAM
+From 714b6af29b916ac7da0cdab6f83460574ed49cf2 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Mon, 15 Aug 2016 13:48:00 -0400
+Subject: pam_gdm: add stub pam module
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 13:28:01 -0400
+Subject: drop consolekit support
+
+https://bugzilla.gnome.org/show_bug.cgi?id=722482
+
+--- configure.ac.orig 2017-10-30 16:21:11.000000000 +0100
++++ configure.ac 2018-01-14 13:01:16.646216000 +0100
+@@ -232,12 +232,6 @@ AM_CONDITIONAL(ENABLE_EXHERBO_PAM_CONFIG, test x$with_
+ AM_CONDITIONAL(ENABLE_LFS_PAM_CONFIG, test x$with_default_pam_config = xlfs)
+ AM_CONDITIONAL(ENABLE_ARCH_PAM_CONFIG, test x$with_default_pam_config = xarch)
+
+-AC_CHECK_HEADERS([security/pam_modules.h security/pam_modutil.h security/pam_ext.h],
+- [have_pam=yes],
+- [if test "x$have_pam" = xyes ; then
+- AC_MSG_ERROR([PAM development files not found.])
+- fi])
+-
+ AC_ARG_ENABLE(console-helper,
+ AS_HELP_STRING([--enable-console-helper],
+ [Enable PAM console helper @<:@default=auto@:>@]),,
+@@ -263,7 +257,15 @@ AC_ARG_WITH(tcp-wrappers,
+ [Use TCP Wrappers @<:@default=auto@:>@]),,
+ with_tcp_wrappers=auto)
+
++AC_ARG_WITH(console-kit,
++ AS_HELP_STRING([--with-console-kit],
++ [Add ConsoleKit support @<:@default=auto@:>@]),,
++ with_console_kit=no)
+
++AC_ARG_WITH(systemd,
++ AS_HELP_STRING([--with-systemd],
++ [Add systemd support @<:@default=auto@:>@]),
++ [with_systemd=$withval], [with_systemd=auto])
+ AC_ARG_WITH([systemdsystemunitdir],
+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
+ [Directory for systemd service files]),
+@@ -548,6 +550,8 @@ fi
+ if test "x$supports_pam_extensions" = "xyes" ; then
+ AM_CONDITIONAL(SUPPORTS_PAM_EXTENSIONS, true)
+ AC_DEFINE(SUPPORTS_PAM_EXTENSIONS, 1, [Define if PAM supports GDMs custom extensions])
++else
++ AM_CONDITIONAL(SUPPORTS_PAM_EXTENSIONS, false)
+ fi
+
+ AC_CHECK_LIB(keyutils, keyctl_read, [
+@@ -655,14 +659,8 @@ dnl --------------------------------------------------
+ dnl - Check for utmp stuff
+ dnl ---------------------------------------------------------------------------
+
+-AC_CHECK_HEADERS(utmp.h utmpx.h libutil.h sys/param.h)
+-AC_CHECK_FUNCS([getutxent updwtmpx updwtmp])
+-AC_CHECK_LIB(util, login, [
+- AC_DEFINE(HAVE_LOGIN, 1, [Define if have login])
+- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil" ])
+-AC_CHECK_LIB(util, logout, [
+- AC_DEFINE(HAVE_LOGOUT, 1, [Define if have logout])
+- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil" ])
++AC_CHECK_HEADERS(utmp.h utmpx.h util.h sys/param.h)
++AC_CHECK_FUNCS([getutxent getttyent updwtmpx updwtmp])
+ AC_CHECK_LIB(util, logwtmp, [
+ AC_DEFINE(HAVE_LOGWTMP, 1, [Define if have logwtmp])
+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil" ])
+@@ -911,12 +909,42 @@ AC_SUBST(XINERAMA_LIBS)
+ CPPFLAGS="$xinerama_save_cppflags"
+
+ dnl ---------------------------------------------------------------------------
++dnl - Check for ConsoleKit support
++dnl ---------------------------------------------------------------------------
++
++use_console_kit=no
++if test "x$with_console_kit" != "xno" ; then
++ use_console_kit=yes
++ AC_DEFINE(WITH_CONSOLE_KIT, 1, [Define to enable ConsoleKit support])
++fi
++AM_CONDITIONAL(WITH_CONSOLE_KIT, test x$use_console_kit = xyes)
++AC_SUBST(WITH_CONSOLE_KIT)
++
++dnl ---------------------------------------------------------------------------
+ dnl - Check for systemd support
+ dnl ---------------------------------------------------------------------------
+
+ PKG_CHECK_MODULES(SYSTEMD,
+- [libsystemd])
++ [libsystemd-login >= 186 libsystemd-daemon],
++ [have_systemd=yes], [have_systemd=no])
+
++if test "x$with_systemd" = "xauto" ; then
++ if test x$have_systemd = xno ; then
++ use_systemd=no
++ else
++ use_systemd=yes
++ fi
++else
++ use_systemd="$with_systemd"
++fi
++
++if test "x$use_systemd" != "xno" ; then
++ if test "x$have_systemd" = "xno"; then
++ AC_MSG_ERROR([Systemd support explicitly required, but systemd not found])
++ fi
++
++ AC_DEFINE(WITH_SYSTEMD, 1, [Define to enable systemd support])
++fi
+ AC_SUBST(SYSTEMD_CFLAGS)
+ AC_SUBST(SYSTEMD_LIBS)
+
+@@ -1111,6 +1139,14 @@ fi
+ AC_SUBST(GDM_CUSTOM_CONF)
+ AC_SUBST(GDM_OLD_CONF, '${gdmconfdir}/gdm.conf')
+
++AC_ARG_WITH(consolekit-directory,
++ [AC_HELP_STRING([--with-consolekit-directory],
++ [Specify the directory of ck-get-x11-display-device @<:@default=libexecdir@:>@])],,
++ [with_consolekit_directory="\${libexecdir}"])
++
++CONSOLEKIT_DIR=$with_consolekit_directory
++AC_SUBST(CONSOLEKIT_DIR)
++
+ AC_ARG_WITH(gnome-settings-daemon-directory,
+ [AC_HELP_STRING([--with-gnome-settings-daemon-directory],
+ [Specify the directory of gnome-settings-daemon used by the chooser @<:@default=libexecdir@:>@])],,
+@@ -1601,6 +1637,7 @@ echo "
+ dmconfdir: ${dmconfdir}
+ localstatedir: ${localstatedir}
+ datadir: ${datadir}
++ consolekit location: ${with_consolekit_directory}
+ gnome-settings-daemon location: ${with_gnome_settings_daemon_directory}
+ gnome-session-check-accel location: ${with_check_accelerated_directory}
+ source code location: ${srcdir}
+@@ -1631,6 +1668,8 @@ echo \
+ " Xinerama support: ${XINERAMA_SUPPORT}
+ XDMCP support: ${XDMCP_SUPPORT}
+ SELinux support: ${use_selinux}
++ ConsoleKit support: ${use_console_kit}
++ systemd support: ${use_systemd}
+ systemd unit dir: ${with_systemdsystemunitdir}
+ plymouth support: ${use_plymouth}
+ wayland support: ${enable_wayland_support}
+@@ -1639,3 +1678,4 @@ echo \
+ Enable documentation: ${enable_documentation}
+ Install GDM's Xsession: ${enable_gdm_xsession}
+ "
++
Property changes on: trunk/x11/gdm/files/configure.ac
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/daemon_Makefile.am
===================================================================
--- trunk/x11/gdm/files/daemon_Makefile.am (rev 0)
+++ trunk/x11/gdm/files/daemon_Makefile.am 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,33 @@
+--- daemon/Makefile.am.orig 2017-10-30 16:21:02.000000000 +0100
++++ daemon/Makefile.am 2018-01-14 12:30:11.501517000 +0100
+@@ -21,6 +21,7 @@ AM_CPPFLAGS = \
+ -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \
+ -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
+ -DGDM_SESSION_DEFAULT_PATH=\"$(GDM_SESSION_DEFAULT_PATH)\" \
++ -DCONSOLEKIT_DIR=\"$(CONSOLEKIT_DIR)\" \
+ $(DISABLE_DEPRECATED_CFLAGS) \
+ $(DAEMON_CFLAGS) \
+ $(XLIB_CFLAGS) \
+@@ -267,6 +268,11 @@ EXTRA_gdm_SOURCES = \
+ $(XDMCP_SOURCES) \
+ $(NULL)
+
++CONSOLE_KIT_SOURCES = \
++ $(NULL)
++
++EXTRA_gdm_SOURCES += $(CONSOLE_KIT_SOURCES)
++
+ gdm_LDADD = \
+ $(top_builddir)/common/libgdmcommon.la \
+ $(XLIB_LIBS) \
+@@ -277,6 +283,10 @@ gdm_LDADD = \
+ $(JOURNALD_LIBS) \
+ $(EXTRA_DAEMON_LIBS) \
+ $(NULL)
++
++if WITH_CONSOLE_KIT
++gdm_SOURCES += $(CONSOLE_KIT_SOURCES)
++endif
+
+ CLEANFILES = \
+ gdm-display-glue.c \
Property changes on: trunk/x11/gdm/files/daemon_Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11/gdm/files/gdm-password.in
===================================================================
--- trunk/x11/gdm/files/gdm-password.in 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/gdm/files/gdm-password.in 2019-02-09 16:31:07 UTC (rev 24922)
@@ -3,8 +3,8 @@
# gdm-password settings for pam(3)
auth include system
-auth optional /usr/local/lib/pam_ck_connector.so
-%%PAM_KEYRING%%auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so
+auth optional %%LOCALBASE%%/lib/pam_ck_connector.so
+auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so
account required pam_nologin.so
account include system
@@ -12,4 +12,4 @@
password include system
session include system
-%%PAM_KEYRING%%session optional %%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start
+session optional %%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start
Modified: trunk/x11/gdm/files/gdm.in
===================================================================
--- trunk/x11/gdm/files/gdm.in 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/gdm/files/gdm.in 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,4 +1,5 @@
#!/bin/sh
+# $FreeBSD: head/x11/gdm/files/gdm.in 480951 2018-09-30 11:58:29Z kwm $
# $MCom: ports/trunk/x11/gdm3/files/gdm.in 18610 2013-06-30 16:33:05Z marcus $
# PROVIDE: gdm
@@ -51,14 +52,6 @@
sleep 1
iter=$(expr ${iter} + 1)
done
- iter=0
- while ! %%LOCALBASE%%/bin/lshal >/dev/null 2>&1 ; do
- if [ ${iter} -eq 60 ]; then
- break
- fi
- sleep 1
- iter=$(expr ${iter} + 1)
- done
LANG=${gdm_lang} ${command} ${gdm_flags} ) &
}
Deleted: trunk/x11/gdm/files/patch-CVE-2015-7496
===================================================================
--- trunk/x11/gdm/files/patch-CVE-2015-7496 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/gdm/files/patch-CVE-2015-7496 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,207 +0,0 @@
-From 05e5fc24b0f803098c1d05dae86f5eb05bd0c2a4 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos at gmail.com>
-Date: Sun, 15 Nov 2015 14:07:53 -0500
-Subject: session: Cancel worker proxy async ops when freeing conversations
-
-We need to cancel ongoing async ops for worker proxies when freeing
-conversations or we'll crash when the completion handler runs and we
-access free'd memory.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=758032
-
----
-
-From 5ac224602f1d603aac5eaa72e1760d3e33a26f0a Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Fri, 13 Nov 2015 11:14:59 -0500
-Subject: session: disconnect signals from worker proxy when conversation is
- freed
-
-We don't want an outstanding reference on the worker proxy to lead to
-signal handlers getting dispatched after the conversation is freed.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=758032
-
----
-
-
---- daemon/gdm-session.c.orig 2015-11-18 10:47:55.522178000 +0100
-+++ daemon/gdm-session.c 2015-11-18 10:48:00.450095000 +0100
-@@ -73,6 +73,7 @@ typedef struct
- GDBusMethodInvocation *pending_invocation;
- GdmDBusWorkerManager *worker_manager_interface;
- GdmDBusWorker *worker_proxy;
-+ GCancellable *worker_cancellable;
- char *session_id;
- guint32 is_stopping : 1;
-
-@@ -1031,6 +1032,8 @@ register_worker (GdmDBusWorkerManager *
-
- g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (conversation->worker_proxy), G_MAXINT);
-
-+ conversation->worker_cancellable = g_cancellable_new ();
-+
- g_signal_connect (conversation->worker_proxy,
- "username-changed",
- G_CALLBACK (worker_on_username_changed), conversation);
-@@ -1666,7 +1669,28 @@ free_conversation (GdmSessionConversatio
- g_free (conversation->starting_username);
- g_free (conversation->session_id);
- g_clear_object (&conversation->worker_manager_interface);
-- g_clear_object (&conversation->worker_proxy);
-+
-+ if (conversation->worker_proxy != NULL) {
-+ g_signal_handlers_disconnect_by_func (conversation->worker_proxy,
-+ G_CALLBACK (worker_on_username_changed),
-+ conversation);
-+ g_signal_handlers_disconnect_by_func (conversation->worker_proxy,
-+ G_CALLBACK (worker_on_session_exited),
-+ conversation);
-+ g_signal_handlers_disconnect_by_func (conversation->worker_proxy,
-+ G_CALLBACK (worker_on_reauthenticated),
-+ conversation);
-+ g_signal_handlers_disconnect_by_func (conversation->worker_proxy,
-+ G_CALLBACK (worker_on_saved_language_name_read),
-+ conversation);
-+ g_signal_handlers_disconnect_by_func (conversation->worker_proxy,
-+ G_CALLBACK (worker_on_saved_session_name_read),
-+ conversation);
-+ g_signal_handlers_disconnect_by_func (conversation->worker_proxy,
-+ G_CALLBACK (worker_on_cancel_pending_query),
-+ conversation);
-+ g_clear_object (&conversation->worker_proxy);
-+ }
- g_clear_object (&conversation->session);
- g_free (conversation);
- }
-@@ -1828,6 +1852,9 @@ close_conversation (GdmSessionConversati
- g_clear_object (&conversation->worker_manager_interface);
- }
-
-+ g_cancellable_cancel (conversation->worker_cancellable);
-+ g_clear_object (&conversation->worker_cancellable);
-+
- if (conversation->worker_proxy != NULL) {
- GDBusConnection *connection = g_dbus_proxy_get_connection (G_DBUS_PROXY (conversation->worker_proxy));
- g_dbus_connection_close_sync (connection, NULL, NULL);
-@@ -1996,7 +2023,7 @@ send_setup (GdmSession *self,
- display_hostname,
- self->priv->display_is_local,
- self->priv->display_is_initial,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_setup_complete_cb,
- conversation);
- }
-@@ -2062,7 +2089,7 @@ send_setup_for_user (GdmSession *self,
- display_hostname,
- self->priv->display_is_local,
- self->priv->display_is_initial,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_setup_complete_cb,
- conversation);
- }
-@@ -2124,7 +2151,7 @@ send_setup_for_program (GdmSession *self
- self->priv->display_is_local,
- self->priv->display_is_initial,
- log_file,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_setup_complete_cb,
- conversation);
- }
-@@ -2182,7 +2209,7 @@ gdm_session_authenticate (GdmSession *se
- conversation = find_conversation_by_name (self, service_name);
- if (conversation != NULL) {
- gdm_dbus_worker_call_authenticate (conversation->worker_proxy,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_authenticate_cb,
- conversation);
- }
-@@ -2199,7 +2226,7 @@ gdm_session_authorize (GdmSession *self,
- conversation = find_conversation_by_name (self, service_name);
- if (conversation != NULL) {
- gdm_dbus_worker_call_authorize (conversation->worker_proxy,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_authorize_cb,
- conversation);
- }
-@@ -2216,7 +2243,7 @@ gdm_session_accredit (GdmSession *self,
- conversation = find_conversation_by_name (self, service_name);
- if (conversation != NULL) {
- gdm_dbus_worker_call_establish_credentials (conversation->worker_proxy,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_establish_credentials_cb,
- conversation);
- }
-@@ -2230,7 +2257,8 @@ send_environment_variable (const char
- {
- gdm_dbus_worker_call_set_environment_variable (conversation->worker_proxy,
- key, value,
-- NULL, NULL, NULL);
-+ conversation->worker_cancellable,
-+ NULL, NULL);
- }
-
- static void
-@@ -2418,7 +2446,8 @@ send_display_mode (GdmSession *self,
- mode = gdm_session_get_display_mode (self);
- gdm_dbus_worker_call_set_session_display_mode (conversation->worker_proxy,
- gdm_session_display_mode_to_string (mode),
-- NULL, NULL, NULL);
-+ conversation->worker_cancellable,
-+ NULL, NULL);
- }
-
- static void
-@@ -2434,7 +2463,8 @@ send_session_type (GdmSession *self,
- gdm_dbus_worker_call_set_environment_variable (conversation->worker_proxy,
- "XDG_SESSION_TYPE",
- session_type,
-- NULL, NULL, NULL);
-+ conversation->worker_cancellable,
-+ NULL, NULL);
- }
-
- void
-@@ -2452,7 +2482,7 @@ gdm_session_open_session (GdmSession *se
- send_session_type (self, conversation);
-
- gdm_dbus_worker_call_open (conversation->worker_proxy,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_opened, conversation);
- }
- }
-@@ -2638,7 +2668,7 @@ gdm_session_start_session (GdmSession *s
-
- gdm_dbus_worker_call_start_program (conversation->worker_proxy,
- program,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_start_program_cb,
- conversation);
- g_free (program);
-@@ -2770,7 +2800,7 @@ gdm_session_start_reauthentication (GdmS
- gdm_dbus_worker_call_start_reauthentication (conversation->worker_proxy,
- (int) pid_of_caller,
- (int) uid_of_caller,
-- NULL,
-+ conversation->worker_cancellable,
- (GAsyncReadyCallback) on_reauthentication_started_cb,
- conversation);
- }
-@@ -3032,7 +3062,8 @@ gdm_session_select_session (GdmSession *
-
- gdm_dbus_worker_call_set_session_name (conversation->worker_proxy,
- get_session_name (self),
-- NULL, NULL, NULL);
-+ conversation->worker_cancellable,
-+ NULL, NULL);
- }
- }
-
Added: trunk/x11/gdm/files/patch-Makefile.in
===================================================================
--- trunk/x11/gdm/files/patch-Makefile.in (rev 0)
+++ trunk/x11/gdm/files/patch-Makefile.in 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,20 @@
+--- Makefile.in.orig 2018-01-14 11:27:57.277621000 +0100
++++ Makefile.in 2018-01-14 11:28:53.422079000 +0100
+@@ -162,7 +162,7 @@
+ ETAGS = etags
+ CTAGS = ctags
+ CSCOPE = cscope
+-DIST_SUBDIRS = data common pam-extensions daemon libgdm utils pam_gdm \
++DIST_SUBDIRS = data common pam-extensions daemon libgdm utils \
+ po tests chooser docs
+ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/data/dconf/gdm.in AUTHORS COPYING ChangeLog \
+@@ -472,7 +472,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ NULL =
+-SUBDIRS = data common pam-extensions daemon libgdm utils pam_gdm po \
++SUBDIRS = data common pam-extensions daemon libgdm utils po \
+ tests $(NULL) $(am__append_1) $(am__append_2)
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ EXTRA_DIST = \
Property changes on: trunk/x11/gdm/files/patch-Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-common_gdm-common.c
===================================================================
--- trunk/x11/gdm/files/patch-common_gdm-common.c (rev 0)
+++ trunk/x11/gdm/files/patch-common_gdm-common.c 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,413 @@
+$OpenBSD: patch-common_gdm-common_c,v 1.4 2015/10/18 13:25:54 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 13:28:01 -0400
+Subject: drop consolekit support
+
+--- common/gdm-common.c.orig Sun Oct 18 14:26:27 2015
++++ common/gdm-common.c Sun Oct 18 14:24:34 2015
+@@ -39,12 +39,25 @@
+ #include "mkdtemp.h"
+ #endif
+
++#ifdef WITH_SYSTEMD
+ #include <systemd/sd-login.h>
++#endif
+
+ #define GDM_DBUS_NAME "org.gnome.DisplayManager"
+ #define GDM_DBUS_LOCAL_DISPLAY_FACTORY_PATH "/org/gnome/DisplayManager/LocalDisplayFactory"
+ #define GDM_DBUS_LOCAL_DISPLAY_FACTORY_INTERFACE "org.gnome.DisplayManager.LocalDisplayFactory"
+
++#ifdef WITH_CONSOLE_KIT
++#define CK_NAME "org.freedesktop.ConsoleKit"
++#define CK_PATH "/org/freedesktop/ConsoleKit"
++#define CK_INTERFACE "org.freedesktop.ConsoleKit"
++
++#define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager"
++#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
++#define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat"
++#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
++#endif
++
+ G_DEFINE_QUARK (gdm-common-error, gdm_common_error);
+
+ const char *
+@@ -343,15 +356,306 @@ create_transient_display (GDBusConnection *connection,
+ return TRUE;
+ }
+
++#ifdef WITH_CONSOLE_KIT
++
+ static gboolean
+-activate_session_id (GDBusConnection *connection,
+- const char *seat_id,
+- const char *session_id)
++get_current_session_id (GDBusConnection *connection,
++ char **session_id)
+ {
+ GError *local_error = NULL;
+ GVariant *reply;
+
+ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ CK_MANAGER_PATH,
++ CK_MANAGER_INTERFACE,
++ "GetCurrentSession",
++ NULL, /* parameters */
++ G_VARIANT_TYPE ("(o)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine session: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(o)", session_id);
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++
++static gboolean
++get_seat_id_for_session (GDBusConnection *connection,
++ const char *session_id,
++ char **seat_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ session_id,
++ CK_SESSION_INTERFACE,
++ "GetSeatId",
++ NULL, /* parameters */
++ G_VARIANT_TYPE ("(o)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine seat: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(o)", seat_id);
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++
++static char *
++get_current_seat_id (GDBusConnection *connection)
++{
++ gboolean res;
++ char *session_id;
++ char *seat_id;
++
++ session_id = NULL;
++ seat_id = NULL;
++
++ res = get_current_session_id (connection, &session_id);
++ if (res) {
++ res = get_seat_id_for_session (connection, session_id, &seat_id);
++ }
++ g_free (session_id);
++
++ return seat_id;
++}
++
++static gboolean
++activate_session_id_for_ck (GDBusConnection *connection,
++ const char *seat_id,
++ const char *session_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ seat_id,
++ CK_SEAT_INTERFACE,
++ "ActivateSession",
++ g_variant_new ("(o)", session_id),
++ NULL,
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to activate session: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++
++static gboolean
++session_is_login_window (GDBusConnection *connection,
++ const char *session_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++ const char *value;
++ gboolean ret;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ session_id,
++ CK_SESSION_INTERFACE,
++ "GetSessionType",
++ NULL,
++ G_VARIANT_TYPE ("(s)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine session type: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(&s)", &value);
++
++ if (value == NULL || value[0] == '\0' || strcmp (value, "LoginWindow") != 0) {
++ ret = FALSE;
++ } else {
++ ret = TRUE;
++ }
++
++ g_variant_unref (reply);
++
++ return ret;
++}
++
++static gboolean
++seat_can_activate_sessions (GDBusConnection *connection,
++ const char *seat_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++ gboolean ret;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ seat_id,
++ CK_SEAT_INTERFACE,
++ "CanActivateSessions",
++ NULL,
++ G_VARIANT_TYPE ("(b)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine if can activate sessions: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(b)", &ret);
++ g_variant_unref (reply);
++
++ return ret;
++}
++
++static const char **
++seat_get_sessions (GDBusConnection *connection,
++ const char *seat_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++ const char **value;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ seat_id,
++ CK_SEAT_INTERFACE,
++ "GetSessions",
++ NULL,
++ G_VARIANT_TYPE ("(ao)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to list sessions: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(^ao)", &value);
++ g_variant_unref (reply);
++
++ return value;
++}
++
++static gboolean
++get_login_window_session_id_for_ck (GDBusConnection *connection,
++ const char *seat_id,
++ char **session_id)
++{
++ gboolean can_activate_sessions;
++ const char **sessions;
++ int i;
++
++ *session_id = NULL;
++ sessions = NULL;
++
++ g_debug ("checking if seat can activate sessions");
++
++ can_activate_sessions = seat_can_activate_sessions (connection, seat_id);
++ if (! can_activate_sessions) {
++ g_debug ("seat is unable to activate sessions");
++ return FALSE;
++ }
++
++ sessions = seat_get_sessions (connection, seat_id);
++ for (i = 0; sessions [i] != NULL; i++) {
++ const char *ssid;
++
++ ssid = sessions [i];
++
++ if (session_is_login_window (connection, ssid)) {
++ *session_id = g_strdup (ssid);
++ break;
++ }
++ }
++ g_free (sessions);
++
++ return TRUE;
++}
++
++static gboolean
++goto_login_session_for_ck (GDBusConnection *connection,
++ GError **error)
++{
++ gboolean ret;
++ gboolean res;
++ char *session_id;
++ char *seat_id;
++
++ ret = FALSE;
++
++ /* First look for any existing LoginWindow sessions on the seat.
++ If none are found, create a new one. */
++
++ seat_id = get_current_seat_id (connection);
++ if (seat_id == NULL || seat_id[0] == '\0') {
++ g_debug ("seat id is not set; can't switch sessions");
++ g_set_error (error, GDM_COMMON_ERROR, 0, _("Could not identify the current session."));
++
++ return FALSE;
++ }
++
++ res = get_login_window_session_id_for_ck (connection, seat_id, &session_id);
++ if (! res) {
++ g_set_error (error, GDM_COMMON_ERROR, 1, _("User unable to switch sessions."));
++ return FALSE;
++ }
++
++ if (session_id != NULL) {
++ res = activate_session_id_for_ck (connection, seat_id, session_id);
++ if (res) {
++ ret = TRUE;
++ }
++ }
++
++ if (! ret && g_strcmp0 (seat_id, "/org/freedesktop/ConsoleKit/Seat1") == 0) {
++ res = create_transient_display (connection, error);
++ if (res) {
++ ret = TRUE;
++ }
++ }
++
++ return ret;
++}
++#endif
++
++#ifdef WITH_SYSTEMD
++
++static gboolean
++activate_session_id_for_systemd (GDBusConnection *connection,
++ const char *seat_id,
++ const char *session_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++
++ reply = g_dbus_connection_call_sync (connection,
+ "org.freedesktop.login1",
+ "/org/freedesktop/login1",
+ "org.freedesktop.login1.Manager",
+@@ -373,8 +677,8 @@ activate_session_id (GDBusConnection *connection,
+ }
+
+ static gboolean
+-get_login_window_session_id (const char *seat_id,
+- char **session_id)
++get_login_window_session_id_for_systemd (const char *seat_id,
++ char **session_id)
+ {
+ gboolean ret;
+ int res, i;
+@@ -442,8 +746,8 @@ out:
+ }
+
+ static gboolean
+-goto_login_session (GDBusConnection *connection,
+- GError **error)
++goto_login_session_for_systemd (GDBusConnection *connection,
++ GError **error)
+ {
+ gboolean ret;
+ int res;
+@@ -497,9 +801,9 @@ goto_login_session (GDBusConnection *connection,
+ return FALSE;
+ }
+
+- res = get_login_window_session_id (seat_id, &session_id);
++ res = get_login_window_session_id_for_systemd (seat_id, &session_id);
+ if (res && session_id != NULL) {
+- res = activate_session_id (connection, seat_id, session_id);
++ res = activate_session_id_for_systemd (connection, seat_id, session_id);
+
+ if (res) {
+ ret = TRUE;
+@@ -518,6 +822,7 @@ goto_login_session (GDBusConnection *connection,
+
+ return ret;
+ }
++#endif
+
+ gboolean
+ gdm_goto_login_session (GError **error)
+@@ -533,7 +838,17 @@ gdm_goto_login_session (GError **error)
+ return FALSE;
+ }
+
+- return goto_login_session (connection, error);
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return goto_login_session_for_systemd (connection, error);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return goto_login_session_for_ck (connection, error);
++#else
++ return FALSE;
++#endif
+ }
+
+ static void
Property changes on: trunk/x11/gdm/files/patch-common_gdm-common.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-common_gdm-common.h
===================================================================
--- trunk/x11/gdm/files/patch-common_gdm-common.h (rev 0)
+++ trunk/x11/gdm/files/patch-common_gdm-common.h 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,20 @@
+$OpenBSD: patch-common_gdm-common_h,v 1.2 2016/04/15 14:11:09 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+--- common/gdm-common.h.orig Thu Apr 14 07:27:26 2016
++++ common/gdm-common.h Fri Apr 15 15:05:26 2016
+@@ -31,6 +31,9 @@
+ expr; \
+ } while G_UNLIKELY (errno == EINTR);
+
++/* check if logind is running */
++#define LOGIND_RUNNING() (access("/run/systemd/seats/", F_OK) >= 0)
++
+ GQuark gdm_common_error_quark (void);
+ #define GDM_COMMON_ERROR gdm_common_error_quark()
+
Property changes on: trunk/x11/gdm/files/patch-common_gdm-common.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-common_gdm-log.c
===================================================================
--- trunk/x11/gdm/files/patch-common_gdm-log.c (rev 0)
+++ trunk/x11/gdm/files/patch-common_gdm-log.c 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,56 @@
+$OpenBSD: patch-common_gdm-log_c,v 1.1 2015/10/18 13:25:54 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+--- common/gdm-log.c.orig 2018-02-19 19:16:32.000000000 +0100
++++ common/gdm-log.c 2018-04-05 21:59:25.290775000 +0200
+@@ -30,7 +30,9 @@
+ #include <unistd.h>
+
+ #include <syslog.h>
++#ifdef WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
++#endif
+
+ #include <glib.h>
+ #include <glib/gstdio.h>
+@@ -125,12 +127,35 @@ gdm_log_set_debug (gboolean debug)
+ void
+ gdm_log_init (void)
+ {
++ const char *prg_name;
++ int options;
++
+ if (initialized)
+ return;
+
+ initialized = TRUE;
+
++#ifdef WITH_SYSTEMD
++ is_sd_booted = sd_booted () > 0;
++#endif
++
+ g_log_set_default_handler (gdm_log_default_handler, NULL);
++
++ /* Only set up syslog if !systemd, otherwise with systemd
++ * enabled, we keep the default GLib log handler which goes to
++ * stderr, which is routed to the appropriate place in the
++ * systemd service file.
++ */
++ if (!is_sd_booted) {
++ prg_name = g_get_prgname ();
++
++ options = LOG_PID;
++#ifdef LOG_PERROR
++ options |= LOG_PERROR;
++#endif
++
++ openlog (prg_name, options, LOG_DAEMON);
++ }
+ }
+
+ void
Property changes on: trunk/x11/gdm/files/patch-common_gdm-log.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11/gdm/files/patch-config.h.in
===================================================================
--- trunk/x11/gdm/files/patch-config.h.in 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/gdm/files/patch-config.h.in 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,12 +1,69 @@
---- config.h.in.orig 2007-11-02 20:48:28.000000000 -0400
-+++ config.h.in 2007-11-02 20:49:39.000000000 -0400
-@@ -23,6 +23,9 @@
- #undef HAVE_LC_MESSAGES
- #undef HAVE_LIBSM
+--- config.h.in.orig 2018-01-14 13:03:01.638908000 +0100
++++ config.h.in 2018-01-14 13:03:20.000000000 +0100
+@@ -113,6 +113,9 @@
+ /* Define to 1 if you have the <execinfo.h> header file. */
+ #undef HAVE_EXECINFO_H
+
++/* Define to 1 if you have the `getttyent' function. */
++#undef HAVE_GETTTYENT
++
+ /* Define to 1 if you have the `getutxent' function. */
+ #undef HAVE_GETUTXENT
+
+@@ -128,21 +131,12 @@
+ /* Define if we have libgen.h */
+ #undef HAVE_LIBGEN_H
+
+-/* Define to 1 if you have the <libutil.h> header file. */
+-#undef HAVE_LIBUTIL_H
+-
+ /* Define if have libxdmcp */
#undef HAVE_LIBXDMCP
-+#undef HAVE_LOGIN
-+#undef HAVE_LOGOUT
-+#undef HAVE_LOGWTMP
+
+-/* Define if have login */
+-#undef HAVE_LOGIN
+-
+ /* Define if we have logincap */
#undef HAVE_LOGINCAP
- #undef HAVE_LOGINDEVPERM
- #undef HAVE_LOGINRESTRICTIONS
+
+-/* Define if have logout */
+-#undef HAVE_LOGOUT
+-
+ /* Define if have logwtmp */
+ #undef HAVE_LOGWTMP
+
+@@ -167,9 +161,6 @@
+ /* Define to 1 if you have the <security/pam_ext.h> header file. */
+ #undef HAVE_SECURITY_PAM_EXT_H
+
+-/* Define to 1 if you have the <security/pam_modules.h> header file. */
+-#undef HAVE_SECURITY_PAM_MODULES_H
+-
+ /* Define to 1 if you have the <security/pam_modutil.h> header file. */
+ #undef HAVE_SECURITY_PAM_MODUTIL_H
+
+@@ -239,6 +230,9 @@
+ /* Define to 1 if you have the `updwtmpx' function. */
+ #undef HAVE_UPDWTMPX
+
++/* Define to 1 if you have the <util.h> header file. */
++#undef HAVE_UTIL_H
++
+ /* Define to 1 if you have the <utmpx.h> header file. */
+ #undef HAVE_UTMPX_H
+
+@@ -372,8 +366,14 @@
+ /* Version number of package */
+ #undef VERSION
+
++/* Define to enable ConsoleKit support */
++#undef WITH_CONSOLE_KIT
++
+ /* Define to enable plymouth support */
+ #undef WITH_PLYMOUTH
++
++/* Define to enable systemd support */
++#undef WITH_SYSTEMD
+
+ /* Define xevie option */
+ #undef XEVIE_OPTION
Added: trunk/x11/gdm/files/patch-configure
===================================================================
--- trunk/x11/gdm/files/patch-configure (rev 0)
+++ trunk/x11/gdm/files/patch-configure 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,431 @@
+--- configure.orig 2018-01-14 13:01:10.629609000 +0100
++++ configure 2018-01-14 13:02:06.272152000 +0100
+@@ -677,6 +677,7 @@ HAVE_ADT_TRUE
+ XEVIE_OPTION
+ CHECK_ACCELERATED_DIR
+ GNOME_SETTINGS_DAEMON_DIR
++CONSOLEKIT_DIR
+ GDM_OLD_CONF
+ GDM_CUSTOM_CONF
+ GDM_DEFAULTS_CONF
+@@ -697,6 +698,9 @@ JOURNALD_LIBS
+ JOURNALD_CFLAGS
+ SYSTEMD_LIBS
+ SYSTEMD_CFLAGS
++WITH_CONSOLE_KIT
++WITH_CONSOLE_KIT_FALSE
++WITH_CONSOLE_KIT_TRUE
+ XINERAMA_LIBS
+ LIBWRAP_LIBS
+ OS_SOLARIS_FALSE
+@@ -983,6 +987,8 @@ enable_authentication_scheme
+ with_xinerama
+ with_xdmcp
+ with_tcp_wrappers
++with_console_kit
++with_systemd
+ with_systemdsystemunitdir
+ enable_systemd_journal
+ enable_wayland_support
+@@ -1002,6 +1008,7 @@ with_log_dir
+ with_at_bindir
+ with_defaults_conf
+ with_custom_conf
++with_consolekit_directory
+ with_gnome_settings_daemon_directory
+ with_check_accelerated_directory
+ with_xevie
+@@ -1748,6 +1755,8 @@ Optional Packages:
+ --with-xinerama Add Xinerama support [default=auto]
+ --with-xdmcp Add XDMCP (remote login) support [default=auto]
+ --with-tcp-wrappers Use TCP Wrappers [default=auto]
++ --with-console-kit Add ConsoleKit support [default=auto]
++ --with-systemd Add systemd support [default=auto]
+ --with-systemdsystemunitdir=DIR
+ Directory for systemd service files
+ --with-plymouth Add plymouth support [default=yes]
+@@ -1776,6 +1785,9 @@ Optional Packages:
+ --with-custom-conf=<FILENAME>
+ FILENAME to give to custom configuration file
+ [default=GDMCONFDIR/custom.conf]
++ --with-consolekit-directory
++ Specify the directory of ck-get-x11-display-device
++ [default=libexecdir]
+ --with-gnome-settings-daemon-directory
+ Specify the directory of gnome-settings-daemon used
+ by the chooser [default=libexecdir]
+@@ -20860,24 +20872,6 @@ else
+ fi
+
+
+-for ac_header in security/pam_modules.h security/pam_modutil.h security/pam_ext.h
+-do :
+- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+- have_pam=yes
+-else
+- if test "x$have_pam" = xyes ; then
+- as_fn_error $? "PAM development files not found." "$LINENO" 5
+- fi
+-fi
+-
+-done
+-
+-
+ # Check whether --enable-console-helper was given.
+ if test "${enable_console_helper+set}" = set; then :
+ enableval=$enable_console_helper;
+@@ -20922,7 +20916,23 @@ fi
+
+
+
++# Check whether --with-console-kit was given.
++if test "${with_console_kit+set}" = set; then :
++ withval=$with_console_kit;
++else
++ with_console_kit=no
++fi
+
++
++
++# Check whether --with-systemd was given.
++if test "${with_systemd+set}" = set; then :
++ withval=$with_systemd; with_systemd=$withval
++else
++ with_systemd=auto
++fi
++
++
+ # Check whether --with-systemdsystemunitdir was given.
+ if test "${with_systemdsystemunitdir+set}" = set; then :
+ withval=$with_systemdsystemunitdir; with_systemdsystemunitdir=$withval
+@@ -21764,8 +21774,17 @@ fi
+
+ $as_echo "#define SUPPORTS_PAM_EXTENSIONS 1" >>confdefs.h
+
++else
++ if false; then
++ SUPPORTS_PAM_EXTENSIONS_TRUE=
++ SUPPORTS_PAM_EXTENSIONS_FALSE='#'
++else
++ SUPPORTS_PAM_EXTENSIONS_TRUE='#'
++ SUPPORTS_PAM_EXTENSIONS_FALSE=
+ fi
+
++fi
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for keyctl_read in -lkeyutils" >&5
+ $as_echo_n "checking for keyctl_read in -lkeyutils... " >&6; }
+ if ${ac_cv_lib_keyutils_keyctl_read+:} false; then :
+@@ -22008,7 +22027,7 @@ fi
+
+
+
+-for ac_header in utmp.h utmpx.h libutil.h sys/param.h
++for ac_header in utmp.h utmpx.h util.h sys/param.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+@@ -22021,7 +22040,7 @@ fi
+
+ done
+
+-for ac_func in getutxent updwtmpx updwtmp
++for ac_func in getutxent getttyent updwtmpx updwtmp
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+@@ -22033,94 +22052,6 @@ _ACEOF
+ fi
+ done
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for login in -lutil" >&5
+-$as_echo_n "checking for login in -lutil... " >&6; }
+-if ${ac_cv_lib_util_login+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lutil $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char login ();
+-int
+-main ()
+-{
+-return login ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_util_login=yes
+-else
+- ac_cv_lib_util_login=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_login" >&5
+-$as_echo "$ac_cv_lib_util_login" >&6; }
+-if test "x$ac_cv_lib_util_login" = xyes; then :
+-
+-
+-$as_echo "#define HAVE_LOGIN 1" >>confdefs.h
+-
+- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for logout in -lutil" >&5
+-$as_echo_n "checking for logout in -lutil... " >&6; }
+-if ${ac_cv_lib_util_logout+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lutil $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char logout ();
+-int
+-main ()
+-{
+-return logout ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_util_logout=yes
+-else
+- ac_cv_lib_util_logout=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_logout" >&5
+-$as_echo "$ac_cv_lib_util_logout" >&6; }
+-if test "x$ac_cv_lib_util_logout" = xyes; then :
+-
+-
+-$as_echo "#define HAVE_LOGOUT 1" >>confdefs.h
+-
+- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+-fi
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for logwtmp in -lutil" >&5
+ $as_echo_n "checking for logwtmp in -lutil... " >&6; }
+ if ${ac_cv_lib_util_logwtmp+:} false; then :
+@@ -23207,7 +23138,25 @@ fi
+ CPPFLAGS="$xinerama_save_cppflags"
+
+
++use_console_kit=no
++if test "x$with_console_kit" != "xno" ; then
++ use_console_kit=yes
+
++$as_echo "#define WITH_CONSOLE_KIT 1" >>confdefs.h
++
++fi
++ if test x$use_console_kit = xyes; then
++ WITH_CONSOLE_KIT_TRUE=
++ WITH_CONSOLE_KIT_FALSE='#'
++else
++ WITH_CONSOLE_KIT_TRUE='#'
++ WITH_CONSOLE_KIT_FALSE=
++fi
++
++
++
++
++
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
+ $as_echo_n "checking for SYSTEMD... " >&6; }
+@@ -23216,12 +23165,12 @@ if test -n "$SYSTEMD_CFLAGS"; then
+ pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 186 libsystemd-daemon\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 186 libsystemd-daemon") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null`
++ pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login >= 186 libsystemd-daemon" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -23233,12 +23182,12 @@ if test -n "$SYSTEMD_LIBS"; then
+ pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 186 libsystemd-daemon\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 186 libsystemd-daemon") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null`
++ pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-login >= 186 libsystemd-daemon" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -23259,50 +23208,49 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
++ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login >= 186 libsystemd-daemon" 2>&1`
+ else
+- SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
++ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login >= 186 libsystemd-daemon" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SYSTEMD_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (libsystemd) were not met:
+-
+-$SYSTEMD_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables SYSTEMD_CFLAGS
+-and SYSTEMD_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
++ have_systemd=no
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables SYSTEMD_CFLAGS
+-and SYSTEMD_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++ have_systemd=no
+ else
+ SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
+ SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
++ have_systemd=yes
++fi
+
++if test "x$with_systemd" = "xauto" ; then
++ if test x$have_systemd = xno ; then
++ use_systemd=no
++ else
++ use_systemd=yes
++ fi
++else
++ use_systemd="$with_systemd"
+ fi
+
++if test "x$use_systemd" != "xno" ; then
++ if test "x$have_systemd" = "xno"; then
++ as_fn_error $? "Systemd support explicitly required, but systemd not found" "$LINENO" 5
++ fi
+
+
++$as_echo "#define WITH_SYSTEMD 1" >>confdefs.h
+
++fi
+
++
++
++
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JOURNALD" >&5
+ $as_echo_n "checking for JOURNALD... " >&6; }
+@@ -23727,6 +23675,18 @@ GDM_OLD_CONF='${gdmconfdir}/gdm.conf'
+
+
+
++# Check whether --with-consolekit-directory was given.
++if test "${with_consolekit_directory+set}" = set; then :
++ withval=$with_consolekit_directory;
++else
++ with_consolekit_directory="\${libexecdir}"
++fi
++
++
++CONSOLEKIT_DIR=$with_consolekit_directory
++
++
++
+ # Check whether --with-gnome-settings-daemon-directory was given.
+ if test "${with_gnome_settings_daemon_directory+set}" = set; then :
+ withval=$with_gnome_settings_daemon_directory;
+@@ -24829,6 +24789,10 @@ if test -z "${SUPPORTS_PAM_EXTENSIONS_TRUE}" && test -
+ as_fn_error $? "conditional \"SUPPORTS_PAM_EXTENSIONS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${SUPPORTS_PAM_EXTENSIONS_TRUE}" && test -z "${SUPPORTS_PAM_EXTENSIONS_FALSE}"; then
++ as_fn_error $? "conditional \"SUPPORTS_PAM_EXTENSIONS\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${XDMCP_SUPPORT_TRUE}" && test -z "${XDMCP_SUPPORT_FALSE}"; then
+ as_fn_error $? "conditional \"XDMCP_SUPPORT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -24841,6 +24805,10 @@ if test -z "${OS_SOLARIS_TRUE}" && test -z "${OS_SOLAR
+ as_fn_error $? "conditional \"OS_SOLARIS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${WITH_CONSOLE_KIT_TRUE}" && test -z "${WITH_CONSOLE_KIT_FALSE}"; then
++ as_fn_error $? "conditional \"WITH_CONSOLE_KIT\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${INSTALL_SYSTEMD_UNITS_TRUE}" && test -z "${INSTALL_SYSTEMD_UNITS_FALSE}"; then
+ as_fn_error $? "conditional \"INSTALL_SYSTEMD_UNITS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -27325,6 +27293,7 @@ echo "
+ dmconfdir: ${dmconfdir}
+ localstatedir: ${localstatedir}
+ datadir: ${datadir}
++ consolekit location: ${with_consolekit_directory}
+ gnome-settings-daemon location: ${with_gnome_settings_daemon_directory}
+ gnome-session-check-accel location: ${with_check_accelerated_directory}
+ source code location: ${srcdir}
+@@ -27354,6 +27323,8 @@ echo \
+ " Xinerama support: ${XINERAMA_SUPPORT}
+ XDMCP support: ${XDMCP_SUPPORT}
+ SELinux support: ${use_selinux}
++ ConsoleKit support: ${use_console_kit}
++ systemd support: ${use_systemd}
+ systemd unit dir: ${with_systemdsystemunitdir}
+ plymouth support: ${use_plymouth}
+ wayland support: ${enable_wayland_support}
+@@ -27362,3 +27333,4 @@ echo \
+ Enable documentation: ${enable_documentation}
+ Install GDM's Xsession: ${enable_gdm_xsession}
+ "
++
Property changes on: trunk/x11/gdm/files/patch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11/gdm/files/patch-daemon_Makefile.in
===================================================================
--- trunk/x11/gdm/files/patch-daemon_Makefile.in 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/gdm/files/patch-daemon_Makefile.in 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,10 +1,94 @@
---- daemon/Makefile.in.orig 2013-04-12 00:53:59.667693353 +0000
-+++ daemon/Makefile.in 2013-04-12 00:54:27.682691596 +0000
-@@ -752,6 +752,7 @@
- gdm_session_worker_LDFLAGS = \
- $(XLIB_LIBS) \
- $(PAM_LIBS) \
-+ $(EXTRA_DAEMON_LIBS) \
+--- daemon/Makefile.in.orig 2018-01-14 12:25:16.930784000 +0100
++++ daemon/Makefile.in 2018-01-14 12:25:17.007460000 +0100
+@@ -101,6 +101,7 @@ libexec_PROGRAMS = gdm-session-worker$(EXEEXT) \
+
+ sbin_PROGRAMS = gdm$(EXEEXT) $(am__EXEEXT_1)
+ @XDMCP_SUPPORT_TRUE at am__append_4 = $(XDMCP_SOURCES)
++ at WITH_CONSOLE_KIT_TRUE@am__append_5 = $(CONSOLE_KIT_SOURCES)
+ subdir = daemon
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+@@ -139,6 +140,8 @@ am__objects_2 = gdm-xdmcp-display-factory.$(OBJEXT) \
+ gdm-xdmcp-display.$(OBJEXT) \
+ gdm-xdmcp-chooser-display.$(OBJEXT) $(am__objects_1)
+ @XDMCP_SUPPORT_TRUE at am__objects_3 = $(am__objects_2)
++am__objects_4 = $(am__objects_1)
++ at WITH_CONSOLE_KIT_TRUE@am__objects_5 = $(am__objects_4)
+ am_gdm_OBJECTS = main.$(OBJEXT) gdm-display-access-file.$(OBJEXT) \
+ gdm-display-store.$(OBJEXT) gdm-display-factory.$(OBJEXT) \
+ gdm-local-display-factory.$(OBJEXT) gdm-display.$(OBJEXT) \
+@@ -148,7 +151,7 @@ am_gdm_OBJECTS = main.$(OBJEXT) gdm-display-access-fil
+ gdm-session-record.$(OBJEXT) \
+ gdm-session-worker-common.$(OBJEXT) \
+ gdm-session-worker-job.$(OBJEXT) gdm-dbus-util.$(OBJEXT) \
+- $(am__objects_1) $(am__objects_3)
++ $(am__objects_1) $(am__objects_3) $(am__objects_5)
+ nodist_gdm_OBJECTS = gdm-display-glue.$(OBJEXT) \
+ gdm-local-display-factory-glue.$(OBJEXT) \
+ gdm-manager-glue.$(OBJEXT) gdm-local-display-glue.$(OBJEXT) \
+@@ -175,16 +178,16 @@ am__gdm_session_worker_SOURCES_DIST = session-worker-m
+ $(top_srcdir)/pam-extensions/gdm-pam-extensions.h \
+ gdm-session-linux-auditor.h gdm-session-linux-auditor.c \
+ gdm-session-solaris-auditor.h gdm-session-solaris-auditor.c
+- at HAVE_LIBAUDIT_TRUE@am__objects_4 = \
++ at HAVE_LIBAUDIT_TRUE@am__objects_6 = \
+ @HAVE_LIBAUDIT_TRUE@ gdm-session-linux-auditor.$(OBJEXT)
+- at HAVE_ADT_TRUE@am__objects_5 = gdm-session-solaris-auditor.$(OBJEXT)
++ at HAVE_ADT_TRUE@am__objects_7 = gdm-session-solaris-auditor.$(OBJEXT)
+ am_gdm_session_worker_OBJECTS = session-worker-main.$(OBJEXT) \
+ gdm-session.$(OBJEXT) gdm-session-settings.$(OBJEXT) \
+ gdm-session-auditor.$(OBJEXT) gdm-session-record.$(OBJEXT) \
+ gdm-session-worker.$(OBJEXT) gdm-session-worker-job.$(OBJEXT) \
+ gdm-session-worker-common.$(OBJEXT) gdm-dbus-util.$(OBJEXT) \
+- $(am__objects_1) $(am__objects_1) $(am__objects_4) \
+- $(am__objects_5)
++ $(am__objects_1) $(am__objects_1) $(am__objects_6) \
++ $(am__objects_7)
+ nodist_gdm_session_worker_OBJECTS = gdm-session-glue.$(OBJEXT) \
+ gdm-session-worker-glue.$(OBJEXT) \
+ gdm-session-enum-types.$(OBJEXT) $(am__objects_1)
+@@ -310,6 +313,7 @@ CHECK_CFLAGS = @CHECK_CFLAGS@
+ CHECK_LIBS = @CHECK_LIBS@
+ COMMON_CFLAGS = @COMMON_CFLAGS@
+ COMMON_LIBS = @COMMON_LIBS@
++CONSOLEKIT_DIR = @CONSOLEKIT_DIR@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -466,6 +470,7 @@ SYSTEMD_X_SERVER = @SYSTEMD_X_SERVER@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
++WITH_CONSOLE_KIT = @WITH_CONSOLE_KIT@
+ XDMCP_LIBS = @XDMCP_LIBS@
+ XEVIE_OPTION = @XEVIE_OPTION@
+ XGETTEXT = @XGETTEXT@
+@@ -571,6 +576,7 @@ AM_CPPFLAGS = \
+ -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \
+ -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
+ -DGDM_SESSION_DEFAULT_PATH=\"$(GDM_SESSION_DEFAULT_PATH)\" \
++ -DCONSOLEKIT_DIR=\"$(CONSOLEKIT_DIR)\" \
+ $(DISABLE_DEPRECATED_CFLAGS) \
+ $(DAEMON_CFLAGS) \
+ $(XLIB_CFLAGS) \
+@@ -674,7 +680,8 @@ gdm_SOURCES = main.c gdm-display-access-file.c \
+ gdm-session-record.c gdm-session-record.h \
+ gdm-session-worker-common.c gdm-session-worker-common.h \
+ gdm-session-worker-job.c gdm-session-worker-job.h \
+- gdm-dbus-util.c gdm-dbus-util.h $(NULL) $(am__append_4)
++ gdm-dbus-util.c gdm-dbus-util.h $(NULL) $(am__append_4) \
++ $(am__append_5)
+ nodist_gdm_SOURCES = \
+ gdm-display-glue.h \
+ gdm-display-glue.c \
+@@ -701,8 +708,8 @@ XDMCP_SOURCES = \
+ gdm-xdmcp-chooser-display.h \
$(NULL)
- gdm_session_worker_LDADD = \
+-EXTRA_gdm_SOURCES = \
+- $(XDMCP_SOURCES) \
++EXTRA_gdm_SOURCES = $(XDMCP_SOURCES) $(NULL) $(CONSOLE_KIT_SOURCES)
++CONSOLE_KIT_SOURCES = \
+ $(NULL)
+
+ gdm_LDADD = \
Added: trunk/x11/gdm/files/patch-daemon_gdm-launch-environment.c
===================================================================
--- trunk/x11/gdm/files/patch-daemon_gdm-launch-environment.c (rev 0)
+++ trunk/x11/gdm/files/patch-daemon_gdm-launch-environment.c 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,37 @@
+$OpenBSD: patch-daemon_gdm-launch-environment_c,v 1.8 2017/04/17 13:17:07 ajacoutot Exp $
+
+XXX fix+push upstream
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 13:28:01 -0400
+Subject: drop consolekit support
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From a9cacb929470eb82582396984c61d5b611bfeb1a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 14:33:40 -0400
+Subject: session: drop session-type property
+
+--- daemon/gdm-launch-environment.c.orig Wed Apr 12 15:47:09 2017
++++ daemon/gdm-launch-environment.c Mon Apr 17 14:17:28 2017
+@@ -197,6 +197,9 @@ build_launch_environment (GdmLaunchEnvironment *launch
+ char *seat_id;
+
+ seat_id = launch_environment->priv->x11_display_seat_id;
++ if (g_str_has_prefix (seat_id, "/org/freedesktop/ConsoleKit/")) {
++ seat_id += strlen ("/org/freedesktop/ConsoleKit/");
++ }
+
+ g_hash_table_insert (hash, g_strdup ("GDM_SEAT_ID"), g_strdup (seat_id));
+ }
+@@ -224,6 +227,8 @@ on_session_setup_complete (GdmSession *session,
+ gdm_session_set_environment_variable (launch_environment->priv->session, key, value);
+ }
+ g_hash_table_destroy (hash);
++
++ gdm_session_select_session_type (launch_environment->priv->session, "LoginWindow");
+ }
+
+ static void
Property changes on: trunk/x11/gdm/files/patch-daemon_gdm-launch-environment.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-daemon_gdm-local-display-factory.c
===================================================================
--- trunk/x11/gdm/files/patch-daemon_gdm-local-display-factory.c (rev 0)
+++ trunk/x11/gdm/files/patch-daemon_gdm-local-display-factory.c 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,132 @@
+$OpenBSD: patch-daemon_gdm-local-display-factory_c,v 1.6 2017/03/03 13:01:26 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 13:28:01 -0400
+Subject: drop consolekit support
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+--- daemon/gdm-local-display-factory.c.orig Wed Mar 1 16:58:36 2017
++++ daemon/gdm-local-display-factory.c Fri Mar 3 12:00:56 2017
+@@ -42,6 +42,8 @@
+
+ #define GDM_LOCAL_DISPLAY_FACTORY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LOCAL_DISPLAY_FACTORY, GdmLocalDisplayFactoryPrivate))
+
++#define CK_SEAT1_PATH "/org/freedesktop/ConsoleKit/Seat1"
++
+ #define GDM_DBUS_PATH "/org/gnome/DisplayManager"
+ #define GDM_LOCAL_DISPLAY_FACTORY_DBUS_PATH GDM_DBUS_PATH "/LocalDisplayFactory"
+ #define GDM_MANAGER_DBUS_NAME "org.gnome.DisplayManager.LocalDisplayFactory"
+@@ -57,8 +59,10 @@ struct GdmLocalDisplayFactoryPrivate
+ /* FIXME: this needs to be per seat? */
+ guint num_failures;
+
++#ifdef WITH_SYSTEMD
+ guint seat_new_id;
+ guint seat_removed_id;
++#endif
+ };
+
+ enum {
+@@ -206,8 +210,10 @@ gdm_local_display_factory_create_transient_display (Gd
+
+ g_debug ("GdmLocalDisplayFactory: Creating transient display");
+
+-#ifdef ENABLE_USER_DISPLAY_SERVER
+- display = gdm_local_display_new ();
++#if defined ENABLE_USER_DISPLAY_SERVER && defined WITH_SYSTEMD
++ if (LOGIND_RUNNING() > 0) {
++ display = gdm_local_display_new ();
++ }
+ #else
+ if (display == NULL) {
+ guint32 num;
+@@ -289,7 +295,7 @@ on_display_status_changed (GdmDisplay *dis
+ /* reset num failures */
+ factory->priv->num_failures = 0;
+
+- gdm_local_display_factory_sync_seats (factory);
++ create_display (factory, seat_id, session_type, is_initial);
+ }
+ break;
+ case GDM_DISPLAY_FAILED:
+@@ -368,7 +374,7 @@ create_display (GdmLocalDisplayFactory *factory,
+
+ g_debug ("GdmLocalDisplayFactory: Adding display on seat %s", seat_id);
+
+-#ifdef ENABLE_USER_DISPLAY_SERVER
++#if defined ENABLE_USER_DISPLAY_SERVER && defined WITH_SYSTEMD
+ if (g_strcmp0 (seat_id, "seat0") == 0) {
+ display = gdm_local_display_new ();
+ if (session_type != NULL) {
+@@ -400,6 +406,8 @@ create_display (GdmLocalDisplayFactory *factory,
+ return display;
+ }
+
++#ifdef WITH_SYSTEMD
++
+ static void
+ delete_display (GdmLocalDisplayFactory *factory,
+ const char *seat_id) {
+@@ -536,6 +544,7 @@ gdm_local_display_factory_stop_monitor (GdmLocalDispla
+ factory->priv->seat_removed_id = 0;
+ }
+ }
++#endif
+
+ static void
+ on_display_added (GdmDisplayStore *display_store,
+@@ -576,6 +585,7 @@ static gboolean
+ gdm_local_display_factory_start (GdmDisplayFactory *base_factory)
+ {
+ GdmLocalDisplayFactory *factory = GDM_LOCAL_DISPLAY_FACTORY (base_factory);
++ GdmDisplay *display;
+ GdmDisplayStore *store;
+
+ g_return_val_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory), FALSE);
+@@ -594,8 +604,17 @@ gdm_local_display_factory_start (GdmDisplayFactory *ba
+ factory,
+ 0);
+
+- gdm_local_display_factory_start_monitor (factory);
+- return gdm_local_display_factory_sync_seats (factory);
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ gdm_local_display_factory_start_monitor (factory);
++ return gdm_local_display_factory_sync_seats (factory);
++ }
++#endif
++
++ /* On ConsoleKit just create Seat1, and that's it. */
++ display = create_display (factory, CK_SEAT1_PATH, NULL, TRUE);
++
++ return display != NULL;
+ }
+
+ static gboolean
+@@ -606,7 +625,9 @@ gdm_local_display_factory_stop (GdmDisplayFactory *bas
+
+ g_return_val_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory), FALSE);
+
++#ifdef WITH_SYSTEMD
+ gdm_local_display_factory_stop_monitor (factory);
++#endif
+
+ store = gdm_display_factory_get_display_store (GDM_DISPLAY_FACTORY (factory));
+
+@@ -762,7 +783,9 @@ gdm_local_display_factory_finalize (GObject *object)
+
+ g_hash_table_destroy (factory->priv->used_display_numbers);
+
++#ifdef WITH_SYSTEMD
+ gdm_local_display_factory_stop_monitor (factory);
++#endif
+
+ G_OBJECT_CLASS (gdm_local_display_factory_parent_class)->finalize (object);
+ }
Property changes on: trunk/x11/gdm/files/patch-daemon_gdm-local-display-factory.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-daemon_gdm-manager.c
===================================================================
--- trunk/x11/gdm/files/patch-daemon_gdm-manager.c (rev 0)
+++ trunk/x11/gdm/files/patch-daemon_gdm-manager.c 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,946 @@
+$OpenBSD: patch-daemon_gdm-manager_c,v 1.14 2017/05/10 10:18:15 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 21905303afbd508f3bf599ad219c9209413c53a2 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Wed, 5 Apr 2017 12:11:20 -0400
+Subject: manager: stop transient greeter session when done with it
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 22c332baaf8ad6d7082c5b01250bae70934c2fd1 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Tue, 4 Apr 2017 17:07:04 -0400
+Subject: manager: make sure we end up on a login screen
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 13:28:01 -0400
+Subject: drop consolekit support
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+
+--- daemon/gdm-manager.c.orig 2017-10-24 21:33:58.000000000 +0200
++++ daemon/gdm-manager.c 2018-01-14 13:33:21.588929000 +0100
+@@ -36,7 +36,9 @@
+
+ #include <act/act-user-manager.h>
+
++#ifdef WITH_SYSTEMD
+ #include <systemd/sd-login.h>
++#endif
+
+ #include "gdm-common.h"
+
+@@ -63,6 +65,15 @@
+
+ #define INITIAL_SETUP_USERNAME "gnome-initial-setup"
+
++#define CK_NAME "org.freedesktop.ConsoleKit"
++#define CK_PATH "/org/freedesktop/ConsoleKit"
++#define CK_INTERFACE "org.freedesktop.ConsoleKit"
++
++#define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager"
++#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
++#define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat"
++#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
++
+ typedef struct
+ {
+ GdmManager *manager;
+@@ -206,9 +217,10 @@ plymouth_quit_without_transition (void)
+ }
+ #endif
+
++#ifdef WITH_SYSTEMD
+ static char *
+-get_session_id_for_pid (pid_t pid,
+- GError **error)
++get_session_id_for_pid_systemd (pid_t pid,
++ GError **error)
+ {
+ char *session, *gsession;
+ int ret;
+@@ -233,11 +245,61 @@ get_session_id_for_pid (pid_t pid,
+ return NULL;
+ }
+ }
++#endif
+
++#ifdef WITH_CONSOLE_KIT
++static char *
++get_session_id_for_pid_consolekit (GDBusConnection *connection,
++ pid_t pid,
++ GError **error)
++{
++ GVariant *reply;
++ char *retval;
++
++ reply = g_dbus_connection_call_sync (connection,
++ "org.freedesktop.ConsoleKit",
++ "/org/freedesktop/ConsoleKit/Manager",
++ "org.freedesktop.ConsoleKit.Manager",
++ "GetSessionForUnixProcess",
++ g_variant_new ("(u)", pid),
++ G_VARIANT_TYPE ("(o)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, error);
++ if (reply == NULL) {
++ return NULL;
++ }
++
++ g_variant_get (reply, "(o)", &retval);
++ g_variant_unref (reply);
++
++ return retval;
++}
++#endif
++
++static char *
++get_session_id_for_pid (GDBusConnection *connection,
++ pid_t pid,
++ GError **error)
++{
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return get_session_id_for_pid_systemd (pid, error);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return get_session_id_for_pid_consolekit (connection, pid, error);
++#endif
++
++ return NULL;
++}
++
++#ifdef WITH_SYSTEMD
+ static gboolean
+-get_uid_for_session_id (const char *session_id,
+- uid_t *uid,
+- GError **error)
++get_uid_for_systemd_session_id (const char *session_id,
++ uid_t *uid,
++ GError **error)
+ {
+ int ret;
+
+@@ -254,8 +316,62 @@ get_uid_for_session_id (const char *session_id,
+
+ return TRUE;
+ }
++#endif
+
++#ifdef WITH_CONSOLE_KIT
+ static gboolean
++get_uid_for_consolekit_session_id (GDBusConnection *connection,
++ const char *session_id,
++ uid_t *out_uid,
++ GError **error)
++{
++ GVariant *reply;
++ guint32 uid;
++
++ reply = g_dbus_connection_call_sync (connection,
++ "org.freedesktop.ConsoleKit",
++ session_id,
++ "org.freedesktop.ConsoleKit.Session",
++ "GetUnixUser",
++ NULL,
++ G_VARIANT_TYPE ("(u)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ error);
++ if (reply == NULL) {
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(u)", &uid);
++ g_variant_unref (reply);
++
++ *out_uid = (uid_t) uid;
++
++ return TRUE;
++}
++#endif
++
++static gboolean
++get_uid_for_session_id (GDBusConnection *connection,
++ const char *session_id,
++ uid_t *uid,
++ GError **error)
++{
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return get_uid_for_systemd_session_id (session_id, uid, error);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return get_uid_for_consolekit_session_id (connection, session_id, uid, error);
++#endif
++
++ return FALSE;
++}
++
++static gboolean
+ lookup_by_session_id (const char *id,
+ GdmDisplay *display,
+ gpointer user_data)
+@@ -267,11 +383,51 @@ lookup_by_session_id (const char *id,
+ return g_strcmp0 (current, looking_for) == 0;
+ }
+
++#ifdef WITH_CONSOLE_KIT
+ static gboolean
+-is_login_session (GdmManager *self,
+- const char *session_id,
+- GError **error)
++is_consolekit_login_session (GdmManager *self,
++ GDBusConnection *connection,
++ const char *session_id,
++ GError **error)
+ {
++ GVariant *reply;
++ char *session_type = NULL;
++
++ reply = g_dbus_connection_call_sync (connection,
++ "org.freedesktop.ConsoleKit",
++ session_id,
++ "org.freedesktop.ConsoleKit.Session",
++ "GetSessionType",
++ NULL,
++ G_VARIANT_TYPE ("(s)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ error);
++ if (reply == NULL) {
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(s)", &session_type);
++ g_variant_unref (reply);
++
++ if (g_strcmp0 (session_type, "LoginWindow") != 0) {
++ g_free (session_type);
++
++ return FALSE;
++ }
++
++ g_free (session_type);
++ return TRUE;
++}
++#endif
++
++#ifdef WITH_SYSTEMD
++static gboolean
++is_systemd_login_session (GdmManager *self,
++ const char *session_id,
++ GError **error)
++{
+ char *session_class = NULL;
+ int ret;
+
+@@ -295,12 +451,33 @@ is_login_session (GdmManager *self,
+ g_free (session_class);
+ return TRUE;
+ }
++#endif
+
+ static gboolean
+-activate_session_id (GdmManager *manager,
+- const char *seat_id,
+- const char *session_id)
++is_login_session (GdmManager *self,
++ GDBusConnection *connection,
++ const char *session_id,
++ GError **error)
+ {
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return is_systemd_login_session (self, session_id, error);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return is_consolekit_login_session (self, connection, session_id, error);
++#endif
++
++ return FALSE;
++}
++
++#ifdef WITH_SYSTEMD
++static gboolean
++activate_session_id_for_systemd (GdmManager *manager,
++ const char *seat_id,
++ const char *session_id)
++{
+ GError *error = NULL;
+ GVariant *reply;
+
+@@ -326,16 +503,75 @@ activate_session_id (GdmManager *manager,
+
+ return TRUE;
+ }
++#endif
+
++#ifdef WITH_CONSOLE_KIT
+ static gboolean
+-session_unlock (GdmManager *manager,
+- const char *ssid)
++activate_session_id_for_ck (GdmManager *manager,
++ const char *seat_id,
++ const char *session_id)
+ {
+ GError *error = NULL;
+ GVariant *reply;
+
+- g_debug ("Unlocking session %s", ssid);
++ reply = g_dbus_connection_call_sync (manager->priv->connection,
++ CK_NAME,
++ seat_id,
++ "org.freedesktop.ConsoleKit.Seat",
++ "ActivateSession",
++ g_variant_new ("(o)", session_id),
++ NULL, /* expected reply */
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ &error);
++ if (reply == NULL) {
++ g_debug ("GdmManager: ConsoleKit %s raised:\n %s\n\n",
++ g_dbus_error_get_remote_error (error), error->message);
++ g_error_free (error);
+
++ /* It is very likely that the "error" just reported is
++ * that the session is already active. Unfortunately,
++ * ConsoleKit doesn't use proper error codes and it
++ * translates the error message, so we have no real way
++ * to detect this case...
++ */
++ return TRUE;
++ }
++
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++#endif
++
++static gboolean
++activate_session_id (GdmManager *manager,
++ const char *seat_id,
++ const char *session_id)
++{
++
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return activate_session_id_for_systemd (manager, seat_id, session_id);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return activate_session_id_for_ck (manager, seat_id, session_id);
++#else
++ return FALSE;
++#endif
++}
++
++#ifdef WITH_SYSTEMD
++static gboolean
++session_unlock_for_systemd (GdmManager *manager,
++ const char *ssid)
++{
++ GError *error = NULL;
++ GVariant *reply;
++
+ reply = g_dbus_connection_call_sync (manager->priv->connection,
+ "org.freedesktop.login1",
+ "/org/freedesktop/login1",
+@@ -358,7 +594,60 @@ session_unlock (GdmManager *manager,
+
+ return TRUE;
+ }
++#endif
+
++#ifdef WITH_CONSOLE_KIT
++static gboolean
++session_unlock_for_ck (GdmManager *manager,
++ const char *ssid)
++{
++ GError *error = NULL;
++ GVariant *reply;
++
++ reply = g_dbus_connection_call_sync (manager->priv->connection,
++ CK_NAME,
++ ssid,
++ CK_SESSION_INTERFACE,
++ "Unlock",
++ NULL, /* parameters */
++ NULL, /* expected reply */
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ &error);
++ if (reply == NULL) {
++ g_debug ("GdmManager: ConsoleKit %s raised:\n %s\n\n",
++ g_dbus_error_get_remote_error (error), error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++#endif
++
++static gboolean
++session_unlock (GdmManager *manager,
++ const char *ssid)
++{
++
++ g_debug ("Unlocking session %s", ssid);
++
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return session_unlock_for_systemd (manager, ssid);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return session_unlock_for_ck (manager, ssid);
++#else
++ return TRUE;
++#endif
++}
++
+ static GdmSession *
+ find_session_for_user_on_seat (GdmManager *manager,
+ const char *username,
+@@ -389,11 +678,44 @@ find_session_for_user_on_seat (GdmManager *manager,
+ return NULL;
+ }
+
++#ifdef WITH_CONSOLE_KIT
+ static gboolean
+-is_remote_session (GdmManager *self,
+- const char *session_id,
+- GError **error)
++is_consolekit_remote_session (GdmManager *self,
++ GDBusConnection *connection,
++ const char *session_id,
++ GError **error)
+ {
++ GVariant *reply;
++ gboolean is_remote;
++
++ reply = g_dbus_connection_call_sync (connection,
++ "org.freedesktop.ConsoleKit",
++ session_id,
++ "org.freedesktop.ConsoleKit.Session",
++ "IsLocal",
++ NULL,
++ G_VARIANT_TYPE ("(b)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ error);
++ if (reply == NULL) {
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(b)", &is_remote);
++ g_variant_unref (reply);
++
++ return is_remote;
++}
++#endif
++
++#ifdef WITH_SYSTEMD
++static gboolean
++is_systemd_remote_session (GdmManager *self,
++ const char *session_id,
++ GError **error)
++{
+ char *seat;
+ int ret;
+ gboolean is_remote;
+@@ -418,10 +740,31 @@ is_remote_session (GdmManager *self,
+
+ return is_remote;
+ }
++#endif
+
++static gboolean
++is_remote_session (GdmManager *self,
++ GDBusConnection *connection,
++ const char *session_id,
++ GError **error)
++{
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return is_systemd_remote_session (self, session_id, error);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return is_consolekit_remote_session (self, connection, session_id, error);
++#endif
++
++ return FALSE;
++}
++
++#ifdef WITH_SYSTEMD
+ static char *
+-get_seat_id_for_session_id (const char *session_id,
+- GError **error)
++get_seat_id_for_systemd_session_id (const char *session_id,
++ GError **error)
+ {
+ int ret;
+ char *seat, *out_seat;
+@@ -446,11 +789,62 @@ get_seat_id_for_session_id (const char *session_id,
+
+ return out_seat;
+ }
++#endif
+
++#ifdef WITH_CONSOLE_KIT
+ static char *
+-get_tty_for_session_id (const char *session_id,
+- GError **error)
++get_seat_id_for_consolekit_session_id (GDBusConnection *connection,
++ const char *session_id,
++ GError **error)
+ {
++ GVariant *reply;
++ char *retval;
++
++ reply = g_dbus_connection_call_sync (connection,
++ "org.freedesktop.ConsoleKit",
++ session_id,
++ "org.freedesktop.ConsoleKit.Session",
++ "GetSeatId",
++ NULL,
++ G_VARIANT_TYPE ("(o)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ error);
++ if (reply == NULL) {
++ return NULL;
++ }
++
++ g_variant_get (reply, "(o)", &retval);
++ g_variant_unref (reply);
++
++ return retval;
++}
++#endif
++
++static char *
++get_seat_id_for_session_id (GDBusConnection *connection,
++ const char *session_id,
++ GError **error)
++{
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return get_seat_id_for_systemd_session_id (session_id, error);
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ return get_seat_id_for_consolekit_session_id (connection, session_id, error);
++#endif
++
++ return NULL;
++}
++
++#ifdef WITH_SYSTEMD
++static char *
++get_tty_for_systemd_session_id (const char *session_id,
++ GError **error)
++{
+ int ret;
+ char *tty, *out_tty;
+
+@@ -473,7 +867,21 @@ get_tty_for_session_id (const char *session_id,
+
+ return out_tty;
+ }
++#endif
+
++static char *
++get_tty_for_session_id (const char *session_id,
++ GError **error)
++{
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return get_tty_for_systemd_session_id (session_id, error);
++ }
++#endif
++
++ return NULL;
++}
++
+ static void
+ get_display_and_details_for_bus_sender (GdmManager *self,
+ GDBusConnection *connection,
+@@ -516,7 +924,7 @@ get_display_and_details_for_bus_sender (GdmManager
+ goto out;
+ }
+
+- session_id = get_session_id_for_pid (pid, &error);
++ session_id = get_session_id_for_pid (connection, pid, &error);
+
+ if (session_id == NULL) {
+ g_debug ("GdmManager: Error while retrieving session id for sender: %s",
+@@ -530,7 +938,7 @@ get_display_and_details_for_bus_sender (GdmManager
+ }
+
+ if (out_is_login_screen != NULL) {
+- *out_is_login_screen = is_login_session (self, session_id, &error);
++ *out_is_login_screen = is_login_session (self, connection, session_id, &error);
+
+ if (error != NULL) {
+ g_debug ("GdmManager: Error while checking if sender is login screen: %s",
+@@ -540,7 +948,7 @@ get_display_and_details_for_bus_sender (GdmManager
+ }
+ }
+
+- if (!get_uid_for_session_id (session_id, &session_uid, &error)) {
++ if (!get_uid_for_session_id (connection, session_id, &session_uid, &error)) {
+ g_debug ("GdmManager: Error while retrieving uid for session: %s",
+ error->message);
+ g_error_free (error);
+@@ -557,7 +965,7 @@ get_display_and_details_for_bus_sender (GdmManager
+ }
+
+ if (out_seat_id != NULL) {
+- *out_seat_id = get_seat_id_for_session_id (session_id, &error);
++ *out_seat_id = get_seat_id_for_session_id (connection, session_id, &error);
+
+ if (error != NULL) {
+ g_debug ("GdmManager: Error while retrieving seat id for session: %s",
+@@ -567,7 +975,7 @@ get_display_and_details_for_bus_sender (GdmManager
+ }
+
+ if (out_is_remote != NULL) {
+- *out_is_remote = is_remote_session (self, session_id, &error);
++ *out_is_remote = is_remote_session (self, connection, session_id, &error);
+
+ if (error != NULL) {
+ g_debug ("GdmManager: Error while retrieving remoteness for session: %s",
+@@ -725,29 +1133,6 @@ out:
+ return recorded;
+ }
+
+-static GdmSession *
+-find_user_session_for_display (GdmManager *self,
+- GdmDisplay *display)
+-{
+-
+- GList *node = self->priv->user_sessions;
+-
+- while (node != NULL) {
+- GdmSession *session = node->data;
+- GdmDisplay *candidate_display;
+- GList *next_node = node->next;
+-
+- candidate_display = get_display_for_user_session (session);
+-
+- if (candidate_display == display)
+- return session;
+-
+- node = next_node;
+- }
+-
+- return NULL;
+-}
+-
+ static gboolean
+ gdm_manager_handle_register_display (GdmDBusManager *manager,
+ GDBusMethodInvocation *invocation,
+@@ -787,7 +1172,7 @@ gdm_manager_handle_register_display (GdmDBusManager
+ }
+ }
+
+- session = find_user_session_for_display (self, display);
++ session = get_user_session_for_display (display);
+
+ if (session != NULL) {
+ GPid pid;
+@@ -961,7 +1346,8 @@ on_reauthentication_client_rejected (GdmSession
+ * same audit session, ignore it since it doesn't "own" the
+ * reauthentication session
+ */
+- client_session_id = get_session_id_for_pid (pid_of_client,
++ client_session_id = get_session_id_for_pid (self->priv->connection,
++ pid_of_client,
+ NULL);
+ session_id = g_object_get_data (G_OBJECT (session), "caller-session-id");
+
+@@ -1173,16 +1559,20 @@ static gboolean
+ display_is_on_seat0 (GdmDisplay *display)
+ {
+ gboolean is_on_seat0 = TRUE;
+- char *seat_id = NULL;
+
+- g_object_get (G_OBJECT (display), "seat-id", &seat_id, NULL);
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ char *seat_id = NULL;
+
+- if (g_strcmp0 (seat_id, "seat0") != 0) {
+- is_on_seat0 = FALSE;
+- }
++ g_object_get (G_OBJECT (display), "seat-id", &seat_id, NULL);
+
+- g_free (seat_id);
++ if (g_strcmp0 (seat_id, "seat0") != 0) {
++ is_on_seat0 = FALSE;
++ }
+
++ g_free (seat_id);
++ }
++#endif
+ return is_on_seat0;
+ }
+
+@@ -1320,133 +1710,6 @@ maybe_start_pending_initial_login (GdmManager *manager
+ g_free (user_session_seat_id);
+ }
+
+-static gboolean
+-get_login_window_session_id (const char *seat_id,
+- char **session_id)
+-{
+- gboolean ret;
+- int res, i;
+- char **sessions;
+- char *service_id;
+- char *service_class;
+- char *state;
+-
+- res = sd_seat_get_sessions (seat_id, &sessions, NULL, NULL);
+- if (res < 0) {
+- g_debug ("Failed to determine sessions: %s", strerror (-res));
+- return FALSE;
+- }
+-
+- if (sessions == NULL || sessions[0] == NULL) {
+- *session_id = NULL;
+- ret = TRUE;
+- goto out;
+- }
+-
+- for (i = 0; sessions[i]; i ++) {
+-
+- res = sd_session_get_class (sessions[i], &service_class);
+- if (res < 0) {
+- g_debug ("failed to determine class of session %s: %s", sessions[i], strerror (-res));
+- ret = FALSE;
+- goto out;
+- }
+-
+- if (strcmp (service_class, "greeter") != 0) {
+- free (service_class);
+- continue;
+- }
+-
+- free (service_class);
+-
+- ret = sd_session_get_state (sessions[i], &state);
+- if (ret < 0) {
+- g_debug ("failed to determine state of session %s: %s", sessions[i], strerror (-res));
+- ret = FALSE;
+- goto out;
+- }
+-
+- if (g_strcmp0 (state, "closing") == 0) {
+- free (state);
+- continue;
+- }
+- free (state);
+-
+- res = sd_session_get_service (sessions[i], &service_id);
+- if (res < 0) {
+- g_debug ("failed to determine service of session %s: %s", sessions[i], strerror (-res));
+- ret = FALSE;
+- goto out;
+- }
+-
+- if (strcmp (service_id, "gdm-launch-environment") == 0) {
+- *session_id = g_strdup (sessions[i]);
+- ret = TRUE;
+-
+- free (service_id);
+- goto out;
+- }
+-
+- free (service_id);
+- }
+-
+- *session_id = NULL;
+- ret = TRUE;
+-
+-out:
+- if (sessions) {
+- for (i = 0; sessions[i]; i ++) {
+- free (sessions[i]);
+- }
+-
+- free (sessions);
+- }
+-
+- return ret;
+-}
+-
+-static void
+-activate_login_window_session_on_seat (GdmManager *self,
+- const char *seat_id)
+-{
+- char *session_id;
+-
+- if (!get_login_window_session_id (seat_id, &session_id)) {
+- return;
+- }
+-
+- activate_session_id (self, seat_id, session_id);
+-}
+-
+-static void
+-maybe_activate_other_session (GdmManager *self,
+- GdmDisplay *old_display)
+-{
+- char *seat_id = NULL;
+- char *session_id;
+- int ret;
+-
+- g_object_get (G_OBJECT (old_display),
+- "seat-id", &seat_id,
+- NULL);
+-
+- ret = sd_seat_get_active (seat_id, &session_id, NULL);
+-
+- if (ret == 0) {
+- GdmDisplay *display;
+-
+- display = gdm_display_store_find (self->priv->display_store,
+- lookup_by_session_id,
+- (gpointer) session_id);
+-
+- if (display == NULL) {
+- activate_login_window_session_on_seat (self, seat_id);
+- }
+- }
+-
+- g_free (seat_id);
+-}
+-
+ static const char *
+ get_username_for_greeter_display (GdmManager *manager,
+ GdmDisplay *display)
+@@ -1692,7 +1955,6 @@ on_display_status_changed (GdmDisplay *display,
+ manager->priv->ran_once = TRUE;
+ }
+ maybe_start_pending_initial_login (manager, display);
+- maybe_activate_other_session (manager, display);
+ break;
+ default:
+ break;
+@@ -2027,11 +2289,57 @@ on_user_session_died (GdmSession *session,
+ }
+
+ static char *
++query_ck_for_display_device (GdmManager *manager,
++ GdmDisplay *display)
++{
++ char *out;
++ char *command;
++ char *display_name = NULL;
++ int status;
++ gboolean res;
++ GError *error;
++
++ g_object_get (G_OBJECT (display),
++ "x11-display-name", &display_name,
++ NULL);
++
++ error = NULL;
++ command = g_strdup_printf (CONSOLEKIT_DIR "/ck-get-x11-display-device --display %s",
++ display_name);
++ g_free (display_name);
++
++ g_debug ("GdmManager: Running helper %s", command);
++ out = NULL;
++ res = g_spawn_command_line_sync (command,
++ &out,
++ NULL,
++ &status,
++ &error);
++ if (! res) {
++ g_warning ("GdmManager: Could not run helper %s: %s", command, error->message);
++ g_error_free (error);
++ } else {
++ out = g_strstrip (out);
++ g_debug ("GdmManager: Got tty: '%s'", out);
++ }
++
++ g_free (command);
++
++ return out;
++}
++
++static char *
+ get_display_device (GdmManager *manager,
+ GdmDisplay *display)
+ {
+- /* systemd finds the display device out on its own based on the display */
+- return NULL;
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ /* systemd finds the display device out on its own based on the display */
++ return NULL;
++ }
++#endif
++
++ return query_ck_for_display_device (manager, display);
+ }
+
+ static void
+@@ -2040,25 +2348,6 @@ on_session_reauthenticated (GdmSession *session,
+ GdmManager *manager)
+ {
+ gboolean fail_if_already_switched = FALSE;
+-
+- if (gdm_session_get_display_mode (session) == GDM_SESSION_DISPLAY_MODE_REUSE_VT) {
+- const char *seat_id;
+- char *session_id;
+-
+- seat_id = gdm_session_get_display_seat_id (session);
+- if (get_login_window_session_id (seat_id, &session_id)) {
+- GdmDisplay *display = gdm_display_store_find (manager->priv->display_store,
+- lookup_by_session_id,
+- (gpointer) session_id);
+-
+- if (display != NULL) {
+- gdm_display_stop_greeter_session (display);
+- gdm_display_unmanage (display);
+- gdm_display_finish (display);
+- }
+- g_free (session_id);
+- }
+- }
+
+ /* There should already be a session running, so jump to its
+ * VT. In the event we're already on the right VT, (i.e. user
Property changes on: trunk/x11/gdm/files/patch-daemon_gdm-manager.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-daemon_gdm-server.c
===================================================================
--- trunk/x11/gdm/files/patch-daemon_gdm-server.c (rev 0)
+++ trunk/x11/gdm/files/patch-daemon_gdm-server.c 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,167 @@
+--- daemon/gdm-server.c.orig 2017-05-05 16:40:44.000000000 +0200
++++ daemon/gdm-server.c 2017-06-08 10:39:30.725180000 +0200
+@@ -43,7 +43,9 @@
+ #include <linux/vt.h>
+ #endif
+
++#ifdef WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
++#endif
+
+ #ifdef ENABLE_SYSTEMD_JOURNAL
+ #include <systemd/sd-journal.h>
+@@ -122,23 +124,65 @@
+
+ G_DEFINE_TYPE (GdmServer, gdm_server, G_TYPE_OBJECT)
+
++static char *
++_gdm_server_query_ck_for_display_device (GdmServer *server)
++{
++ char *out;
++ char *command;
++ int status;
++ gboolean res;
++ GError *error;
++
++ g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
++
++ error = NULL;
++ command = g_strdup_printf (CONSOLEKIT_DIR "/ck-get-x11-display-device --display %s",
++ server->priv->display_name);
++
++ g_debug ("GdmServer: Running helper %s", command);
++ out = NULL;
++ res = g_spawn_command_line_sync (command,
++ &out,
++ NULL,
++ &status,
++ &error);
++ if (! res) {
++ g_warning ("Could not run helper: %s", error->message);
++ g_error_free (error);
++ } else {
++ out = g_strstrip (out);
++ g_debug ("GdmServer: Got tty: '%s'", out);
++ }
++
++ g_free (command);
++
++ return out;
++}
++
+ char *
+ gdm_server_get_display_device (GdmServer *server)
+ {
+- /* systemd finds the display device out on its own based on the display */
+- return NULL;
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ /* systemd finds the display device out on its own based on the display */
++ return NULL;
++ }
++#endif
++
++ if (server->priv->display_device == NULL) {
++ server->priv->display_device =
++ _gdm_server_query_ck_for_display_device (server);
++
++ g_object_notify (G_OBJECT (server), "display-device");
++ }
++
++ return g_strdup (server->priv->display_device);
+ }
+
+ static void
+ gdm_server_ready (GdmServer *server)
+ {
+ g_debug ("GdmServer: Got USR1 from X server - emitting READY");
+-
+- gdm_run_script (GDMCONFDIR "/Init", GDM_USERNAME,
+- server->priv->display_name,
+- NULL, /* hostname */
+- server->priv->auth_file);
+-
+ g_signal_emit (server, signals[READY], 0);
+ }
+
+@@ -226,8 +270,10 @@
+ debug_options = "";
+ }
+
+-#define X_SERVER_ARG_FORMAT " -background none -noreset -verbose %s%s"
++ #define X_SERVER_ARG_FORMAT " -background none -noreset -verbose %s%s"
+
++#ifdef WITH_SYSTEMD
++
+ /* This is a temporary hack to work around the fact that XOrg
+ * currently lacks support for multi-seat hotplugging for
+ * display devices. This bit should be removed as soon as XOrg
+@@ -242,6 +288,10 @@
+ * wasn't booted using systemd, or b) the wrapper tool is
+ * missing, or c) we are running for the main seat 'seat0'. */
+
++ if (!LOGIND_RUNNING()) {
++ goto fallback;
++ }
++
+ #ifdef ENABLE_SYSTEMD_JOURNAL
+ /* For systemd, we don't have a log file but instead log to stdout,
+ so set it to the xserver's built-in default verbosity */
+@@ -264,8 +314,9 @@
+ return;
+
+ fallback:
+- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
++#endif
+
++ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
+ }
+
+ static gboolean
+@@ -315,10 +366,12 @@
+ argv[len++] = g_strdup (server->priv->auth_file);
+ }
+
+- if (server->priv->display_seat_id != NULL) {
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING() && server->priv->display_seat_id != NULL) {
+ argv[len++] = g_strdup ("-seat");
+ argv[len++] = g_strdup (server->priv->display_seat_id);
+ }
++#endif
+
+ /* If we were compiled with Xserver >= 1.17 we need to specify
+ * '-listen tcp' as the X server dosen't listen on tcp sockets
+@@ -657,18 +710,14 @@
+ g_signal_emit (server, signals [DIED], 0, num);
+ }
+
++ active_servers = g_slist_remove (active_servers, server);
++
+ g_spawn_close_pid (server->priv->pid);
+ server->priv->pid = -1;
+
+ g_object_unref (server);
+ }
+
+-static void
+-prune_active_servers_list (GdmServer *server)
+-{
+- active_servers = g_slist_remove (active_servers, server);
+-}
+-
+ static gboolean
+ gdm_server_spawn (GdmServer *server,
+ const char *vtarg,
+@@ -707,11 +756,6 @@
+ g_free (freeme);
+
+ active_servers = g_slist_append (active_servers, server);
+-
+- g_object_weak_ref (G_OBJECT (server),
+- (GWeakNotify)
+- prune_active_servers_list,
+- server);
+
+ gdm_server_launch_sigusr1_thread_if_needed ();
+
Property changes on: trunk/x11/gdm/files/patch-daemon_gdm-server.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-daemon_gdm-session-worker-job.c
===================================================================
--- trunk/x11/gdm/files/patch-daemon_gdm-session-worker-job.c (rev 0)
+++ trunk/x11/gdm/files/patch-daemon_gdm-session-worker-job.c 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,20 @@
+$OpenBSD: patch-daemon_gdm-session-worker-job_c,v 1.1 2015/10/18 13:25:54 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+--- daemon/gdm-session-worker-job.c.orig Mon Sep 21 16:12:33 2015
++++ daemon/gdm-session-worker-job.c Sun Oct 18 14:23:39 2015
+@@ -36,7 +36,9 @@
+ #include <sys/prctl.h>
+ #endif
+
++#ifdef WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
++#endif
+
+ #ifdef ENABLE_SYSTEMD_JOURNAL
+ #include <systemd/sd-journal.h>
Property changes on: trunk/x11/gdm/files/patch-daemon_gdm-session-worker-job.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-daemon_gdm-session-worker.c
===================================================================
--- trunk/x11/gdm/files/patch-daemon_gdm-session-worker.c (rev 0)
+++ trunk/x11/gdm/files/patch-daemon_gdm-session-worker.c 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,611 @@
+$OpenBSD: patch-daemon_gdm-session-worker_c,v 1.15 2017/03/12 12:58:03 nigel Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 13:28:01 -0400
+Subject: drop consolekit support
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From a9cacb929470eb82582396984c61d5b611bfeb1a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 14:33:40 -0400
+Subject: session: drop session-type property
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 6942fb9b16bab7173bbd295fb19a9770289dbe0e Mon Sep 17 00:00:00 2001
+From: Tim Lunn <tim at feathertop.org>
+Date: Mon, 11 Apr 2016 23:18:10 +1000
+Subject: gdm-session: set PAM_TTY when initialising pam
+
+--- daemon/gdm-session-worker.c.orig 2017-10-31 18:16:51.000000000 +0100
++++ daemon/gdm-session-worker.c 2018-01-17 17:38:41.826277000 +0100
+@@ -28,9 +28,11 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#ifdef WITH_SYSTEMD
+ #include <sys/ioctl.h>
+ #include <sys/vt.h>
+ #include <sys/kd.h>
++#endif
+ #include <errno.h>
+ #include <grp.h>
+ #include <pwd.h>
+@@ -49,7 +51,9 @@
+
+ #include <X11/Xauth.h>
+
++#ifdef WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
++#endif
+
+ #ifdef ENABLE_SYSTEMD_JOURNAL
+ #include <systemd/sd-journal.h>
+@@ -93,7 +97,7 @@
+ #endif
+
+ #ifndef GDM_SESSION_DEFAULT_PATH
+-#define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin"
++#define GDM_SESSION_DEFAULT_PATH "%%LOCALBASE%%/bin:/usr/bin:/bin"
+ #endif
+
+ #ifndef GDM_SESSION_ROOT_UID
+@@ -136,6 +140,10 @@ struct GdmSessionWorkerPrivate
+
+ int exit_code;
+
++#ifdef WITH_CONSOLE_KIT
++ char *session_cookie;
++#endif
++
+ pam_handle_t *pam_handle;
+
+ GPid child_pid;
+@@ -150,6 +158,7 @@ struct GdmSessionWorkerPrivate
+ char *hostname;
+ char *username;
+ char *log_file;
++ char *session_type;
+ char *session_id;
+ uid_t uid;
+ gid_t gid;
+@@ -223,6 +232,204 @@ G_DEFINE_TYPE_WITH_CODE (GdmSessionWorker,
+ G_IMPLEMENT_INTERFACE (GDM_DBUS_TYPE_WORKER,
+ worker_interface_init))
+
++#ifdef WITH_CONSOLE_KIT
++static gboolean
++open_ck_session (GdmSessionWorker *worker)
++{
++ GDBusConnection *system_bus;
++ GVariantBuilder builder;
++ GVariant *parameters;
++ GVariant *in_args;
++ struct passwd *pwent;
++ GVariant *reply;
++ GError *error = NULL;
++ const char *display_name;
++ const char *display_device;
++ const char *display_hostname;
++ const char *session_type;
++ gint32 uid;
++
++ g_assert (worker->priv->session_cookie == NULL);
++
++ if (worker->priv->x11_display_name != NULL) {
++ display_name = worker->priv->x11_display_name;
++ } else {
++ display_name = "";
++ }
++ if (worker->priv->hostname != NULL) {
++ display_hostname = worker->priv->hostname;
++ } else {
++ display_hostname = "";
++ }
++ if (worker->priv->display_device != NULL) {
++ display_device = worker->priv->display_device;
++ } else {
++ display_device = "";
++ }
++
++ if (worker->priv->session_type != NULL) {
++ session_type = worker->priv->session_type;
++ } else {
++ session_type = "";
++ }
++
++ g_assert (worker->priv->username != NULL);
++
++ gdm_get_pwent_for_name (worker->priv->username, &pwent);
++ if (pwent == NULL) {
++ goto out;
++ }
++
++ uid = (gint32) pwent->pw_uid;
++
++ error = NULL;
++ system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
++
++ if (system_bus == NULL) {
++ g_warning ("Couldn't create connection to system bus: %s",
++ error->message);
++
++ g_error_free (error);
++ goto out;
++ }
++
++ g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(sv)"));
++ g_variant_builder_add_parsed (&builder, "('unix-user', <%i>)", uid);
++ g_variant_builder_add_parsed (&builder, "('x11-display-device', <%s>)", display_device);
++ g_variant_builder_add_parsed (&builder, "('x11-display', <%s>)", display_name);
++ g_variant_builder_add_parsed (&builder, "('remote-host-name', <%s>)", display_hostname);
++ g_variant_builder_add_parsed (&builder, "('is-local', <%b>)", worker->priv->display_is_local);
++ g_variant_builder_add_parsed (&builder, "('session-type', <%s>)", session_type);
++
++ parameters = g_variant_builder_end (&builder);
++ in_args = g_variant_new_tuple (¶meters, 1);
++
++ reply = g_dbus_connection_call_sync (system_bus,
++ "org.freedesktop.ConsoleKit",
++ "/org/freedesktop/ConsoleKit/Manager",
++ "org.freedesktop.ConsoleKit.Manager",
++ "OpenSessionWithParameters",
++ in_args,
++ G_VARIANT_TYPE ("(s)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ &error);
++
++ if (! reply) {
++ g_warning ("%s\n", error->message);
++ g_clear_error (&error);
++ goto out;
++ }
++
++ g_variant_get (reply, "(s)", &worker->priv->session_cookie);
++
++ g_variant_unref (reply);
++
++out:
++ return worker->priv->session_cookie != NULL;
++}
++
++static void
++close_ck_session (GdmSessionWorker *worker)
++{
++ GDBusConnection *system_bus;
++ GVariant *reply;
++ GError *error = NULL;
++ gboolean was_closed;
++
++ if (worker->priv->session_cookie == NULL) {
++ return;
++ }
++
++ error = NULL;
++ system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
++
++ if (system_bus == NULL) {
++ g_warning ("Couldn't create connection to system bus: %s",
++ error->message);
++
++ g_error_free (error);
++ goto out;
++ }
++
++ reply = g_dbus_connection_call_sync (system_bus,
++ "org.freedesktop.ConsoleKit",
++ "/org/freedesktop/ConsoleKit/Manager",
++ "org.freedesktop.ConsoleKit.Manager",
++ "CloseSession",
++ g_variant_new ("(s)", worker->priv->session_cookie),
++ G_VARIANT_TYPE ("(b)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ &error);
++
++ if (! reply) {
++ g_warning ("%s", error->message);
++ g_clear_error (&error);
++ goto out;
++ }
++
++ g_variant_get (reply, "(b)", &was_closed);
++
++ if (!was_closed) {
++ g_warning ("Unable to close ConsoleKit session");
++ }
++
++ g_variant_unref (reply);
++
++out:
++ g_clear_pointer (&worker->priv->session_cookie,
++ (GDestroyNotify) g_free);
++}
++
++static char *
++get_ck_session_id (GdmSessionWorker *worker)
++{
++ GDBusConnection *system_bus;
++ GVariant *reply;
++ GError *error = NULL;
++ char *session_id = NULL;
++
++ error = NULL;
++ system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
++
++ if (system_bus == NULL) {
++ g_warning ("Couldn't create connection to system bus: %s",
++ error->message);
++
++ g_error_free (error);
++ goto out;
++ }
++
++ reply = g_dbus_connection_call_sync (system_bus,
++ "org.freedesktop.ConsoleKit",
++ "/org/freedesktop/ConsoleKit/Manager",
++ "org.freedesktop.ConsoleKit.Manager",
++ "GetSessionForCookie",
++ g_variant_new ("(s)", worker->priv->session_cookie),
++ G_VARIANT_TYPE ("(o)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ &error);
++
++ if (reply == NULL) {
++ g_warning ("%s", error->message);
++ g_clear_error (&error);
++ goto out;
++ }
++
++ g_variant_get (reply, "(o)", &session_id);
++
++ g_variant_unref (reply);
++
++out:
++ return session_id;
++}
++#endif
++
+ /* adapted from glib script_execute */
+ static void
+ script_execute (const gchar *file,
+@@ -674,7 +881,9 @@ gdm_session_worker_process_pam_message (GdmSessionWork
+ char *user_answer;
+ gboolean res;
+ char *utf8_msg;
++#ifdef PAM_RADIO_TYPE
+ char *msg;
++#endif
+
+ if (response != NULL) {
+ *response = NULL;
+@@ -878,6 +1087,7 @@ gdm_session_worker_stop_auditor (GdmSessionWorker *wor
+ worker->priv->auditor = NULL;
+ }
+
++#ifdef WITH_SYSTEMD
+ static void
+ on_release_display (int signal)
+ {
+@@ -1003,6 +1213,7 @@ jump_to_vt (GdmSessionWorker *worker,
+
+ close (active_vt_tty_fd);
+ }
++#endif
+
+ static void
+ gdm_session_worker_uninitialize_pam (GdmSessionWorker *worker,
+@@ -1033,11 +1244,13 @@ gdm_session_worker_uninitialize_pam (GdmSessionWorker
+
+ gdm_session_worker_stop_auditor (worker);
+
++#ifdef WITH_SYSTEMD
+ if (g_strcmp0 (worker->priv->display_seat_id, "seat0") == 0) {
+ if (worker->priv->login_vt != worker->priv->session_vt) {
+ jump_to_vt (worker, worker->priv->login_vt);
+ }
+ }
++#endif
+
+ worker->priv->login_vt = 0;
+ worker->priv->session_vt = 0;
+@@ -1088,6 +1301,7 @@ _get_xauth_for_pam (const char *x11_authority_file)
+ }
+ #endif
+
++#ifdef WITH_SYSTEMD
+ static gboolean
+ ensure_login_vt (GdmSessionWorker *worker)
+ {
+@@ -1099,7 +1313,7 @@ ensure_login_vt (GdmSessionWorker *worker)
+
+ if (fd < 0) {
+ g_debug ("GdmSessionWorker: couldn't open VT master: %m");
+- return FALSE;
++ return FALSE;
+ }
+
+ if (ioctl (fd, VT_GETSTATE, &vt_state) < 0) {
+@@ -1113,6 +1327,7 @@ out:
+ close (fd);
+ return got_login_vt;
+ }
++#endif
+
+ static gboolean
+ gdm_session_worker_initialize_pam (GdmSessionWorker *worker,
+@@ -1129,7 +1344,6 @@ gdm_session_worker_initialize_pam (GdmSessionWorker
+ {
+ struct pam_conv pam_conversation;
+ int error_code;
+- char tty_string[256];
+
+ g_assert (worker->priv->pam_handle == NULL);
+
+@@ -1196,10 +1410,12 @@ gdm_session_worker_initialize_pam (GdmSessionWorker
+ }
+ }
+
++#ifdef WITH_SYSTEMD
+ /* set seat ID */
+- if (seat_id != NULL && seat_id[0] != '\0') {
++ if (seat_id != NULL && seat_id[0] != '\0' && LOGIND_RUNNING()) {
+ gdm_session_worker_set_environment_variable (worker, "XDG_SEAT", seat_id);
+ }
++#endif
+
+ if (strcmp (service, "gdm-launch-environment") == 0) {
+ gdm_session_worker_set_environment_variable (worker, "XDG_SESSION_CLASS", "greeter");
+@@ -1208,6 +1424,7 @@ gdm_session_worker_initialize_pam (GdmSessionWorker
+ g_debug ("GdmSessionWorker: state SETUP_COMPLETE");
+ worker->priv->state = GDM_SESSION_WORKER_STATE_SETUP_COMPLETE;
+
++#ifdef WITH_SYSTEMD
+ /* Temporarily set PAM_TTY with the currently active VT (login screen)
+ PAM_TTY will be reset with the users VT right before the user session is opened */
+ ensure_login_vt (worker);
+@@ -1215,6 +1432,7 @@ gdm_session_worker_initialize_pam (GdmSessionWorker
+ pam_set_item (worker->priv->pam_handle, PAM_TTY, tty_string);
+ if (!display_is_local)
+ worker->priv->password_is_required = TRUE;
++#endif
+
+ out:
+ if (error_code != PAM_SUCCESS) {
+@@ -1509,7 +1727,7 @@ _lookup_passwd_info (const char *username,
+ if (passwd_entry->pw_shell != NULL && passwd_entry->pw_shell[0] != '\0') {
+ *shellp = g_strdup (passwd_entry->pw_shell);
+ } else {
+- *shellp = g_strdup ("/bin/bash");
++ *shellp = g_strdup ("/bin/sh");
+ }
+ }
+ ret = TRUE;
+@@ -1762,6 +1980,26 @@ gdm_session_worker_get_environment (GdmSessionWorker *
+ return (const char * const *) pam_getenvlist (worker->priv->pam_handle);
+ }
+
++#ifdef WITH_CONSOLE_KIT
++static void
++register_ck_session (GdmSessionWorker *worker)
++{
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ return;
++ }
++#endif
++
++ open_ck_session (worker);
++
++ if (worker->priv->session_cookie != NULL) {
++ gdm_session_worker_set_environment_variable (worker,
++ "XDG_SESSION_COOKIE",
++ worker->priv->session_cookie);
++ }
++}
++#endif
++
+ static gboolean
+ run_script (GdmSessionWorker *worker,
+ const char *dir)
+@@ -1792,6 +2030,9 @@ session_worker_child_watch (GPid pid,
+ : WIFSIGNALED (status) ? WTERMSIG (status)
+ : -1);
+
++#ifdef WITH_CONSOLE_KIT
++ close_ck_session (worker);
++#endif
+
+ gdm_session_worker_uninitialize_pam (worker, PAM_SUCCESS);
+
+@@ -1982,6 +2223,7 @@ gdm_session_worker_start_session (GdmSessionWorker *w
+
+ error_code = PAM_SUCCESS;
+
++#ifdef WITH_SYSTEMD
+ /* If we're in new vt mode, jump to the new vt now. There's no need to jump for
+ * the other two modes: in the logind case, the session will activate itself when
+ * ready, and in the reuse server case, we're already on the correct VT. */
+@@ -1990,6 +2232,7 @@ gdm_session_worker_start_session (GdmSessionWorker *w
+ jump_to_vt (worker, worker->priv->session_vt);
+ }
+ }
++#endif
+
+ if (!worker->priv->is_program_session && !run_script (worker, GDMCONFDIR "/PostLogin")) {
+ g_set_error (error,
+@@ -2054,6 +2297,7 @@ gdm_session_worker_start_session (GdmSessionWorker *w
+ _exit (EXIT_FAILURE);
+ }
+
++#ifdef WITH_SYSTEMD
+ /* Take control of the tty
+ */
+ if (needs_controlling_terminal) {
+@@ -2061,6 +2305,7 @@ gdm_session_worker_start_session (GdmSessionWorker *w
+ g_debug ("GdmSessionWorker: could not take control of tty: %m");
+ }
+ }
++#endif
+
+ #ifdef HAVE_LOGINCAP
+ if (setusercontext (NULL, passwd_entry, passwd_entry->pw_uid, LOGIN_SETALL) < 0) {
+@@ -2205,11 +2450,13 @@ gdm_session_worker_start_session (GdmSessionWorker *w
+ return TRUE;
+ }
+
++#ifdef WITH_SYSTEMD
+ static gboolean
+ set_up_for_new_vt (GdmSessionWorker *worker)
+ {
+ int fd;
+ char vt_string[256], tty_string[256];
++ struct vt_stat vt_state = { 0 };
+ int session_vt = 0;
+
+ fd = open ("/dev/tty0", O_RDWR | O_NOCTTY);
+@@ -2219,6 +2466,11 @@ set_up_for_new_vt (GdmSessionWorker *worker)
+ return FALSE;
+ }
+
++ if (ioctl (fd, VT_GETSTATE, &vt_state) < 0) {
++ g_debug ("GdmSessionWorker: couldn't get current VT: %m");
++ goto fail;
++ }
++
+ if (worker->priv->display_is_initial) {
+ session_vt = atoi (GDM_INITIAL_VT);
+ } else {
+@@ -2228,6 +2480,7 @@ set_up_for_new_vt (GdmSessionWorker *worker)
+ }
+ }
+
++ worker->priv->login_vt = vt_state.v_active;
+ worker->priv->session_vt = session_vt;
+
+ close (fd);
+@@ -2290,6 +2543,7 @@ fail:
+ close (fd);
+ return FALSE;
+ }
++#endif
+
+ static gboolean
+ set_up_for_current_vt (GdmSessionWorker *worker,
+@@ -2357,12 +2611,14 @@ set_up_for_current_vt (GdmSessionWorker *worker,
+ }
+ #endif
+
++#ifdef WITH_SYSTEMD
+ if (g_strcmp0 (worker->priv->display_seat_id, "seat0") == 0) {
+ g_debug ("GdmSessionWorker: setting XDG_VTNR to current vt");
+ set_xdg_vtnr_to_current_vt (worker);
+ } else {
+ g_debug ("GdmSessionWorker: not setting XDG_VTNR since not seat0");
+ }
++#endif
+
+ return TRUE;
+ out:
+@@ -2386,6 +2642,7 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
+ return FALSE;
+ }
+ break;
++#ifdef WITH_SYSTEMD
+ case GDM_SESSION_DISPLAY_MODE_NEW_VT:
+ case GDM_SESSION_DISPLAY_MODE_LOGIND_MANAGED:
+ if (!set_up_for_new_vt (worker)) {
+@@ -2396,6 +2653,7 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
+ return FALSE;
+ }
+ break;
++#endif
+ }
+
+ flags = 0;
+@@ -2417,8 +2675,18 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
+ g_debug ("GdmSessionWorker: state SESSION_OPENED");
+ worker->priv->state = GDM_SESSION_WORKER_STATE_SESSION_OPENED;
+
++#ifdef WITH_SYSTEMD
+ session_id = gdm_session_worker_get_environment_variable (worker, "XDG_SESSION_ID");
++#endif
+
++#ifdef WITH_CONSOLE_KIT
++ register_ck_session (worker);
++
++ if (session_id == NULL) {
++ session_id = get_ck_session_id (worker);
++ }
++#endif
++
+ if (session_id != NULL) {
+ g_free (worker->priv->session_id);
+ worker->priv->session_id = session_id;
+@@ -2523,6 +2791,19 @@ gdm_session_worker_handle_set_session_name (GdmDBusWor
+ }
+
+ static gboolean
++gdm_session_worker_handle_set_session_type (GdmDBusWorker *object,
++ GDBusMethodInvocation *invocation,
++ const char *session_type)
++{
++ GdmSessionWorker *worker = GDM_SESSION_WORKER (object);
++ g_debug ("GdmSessionWorker: session type set to %s", session_type);
++ g_free (worker->priv->session_type);
++ worker->priv->session_type = g_strdup (session_type);
++ gdm_dbus_worker_complete_set_session_type (object, invocation);
++ return TRUE;
++}
++
++static gboolean
+ gdm_session_worker_handle_set_session_display_mode (GdmDBusWorker *object,
+ GDBusMethodInvocation *invocation,
+ const char *str)
+@@ -2949,6 +3230,7 @@ gdm_session_worker_handle_open (GdmDBusWorker
+ return TRUE;
+ }
+
++#ifdef SUPPORTS_PAM_EXTENSIONS
+ static char **
+ filter_extensions (const char * const *extensions)
+ {
+@@ -2974,6 +3256,7 @@ filter_extensions (const char * const *extensions)
+
+ return filtered_extensions;
+ }
++#endif
+
+ static gboolean
+ gdm_session_worker_handle_initialize (GdmDBusWorker *object,
+@@ -2993,8 +3276,10 @@ gdm_session_worker_handle_initialize (GdmDBusWorker
+ while (g_variant_iter_loop (&iter, "{sv}", &key, &value)) {
+ if (g_strcmp0 (key, "service") == 0) {
+ worker->priv->service = g_variant_dup_string (value, NULL);
++#ifdef SUPPORTS_PAM_EXTENSIONS
+ } else if (g_strcmp0 (key, "extensions") == 0) {
+ worker->priv->extensions = filter_extensions (g_variant_get_strv (value, NULL));
++#endif
+ } else if (g_strcmp0 (key, "username") == 0) {
+ worker->priv->username = g_variant_dup_string (value, NULL);
+ } else if (g_strcmp0 (key, "is-program-session") == 0) {
+@@ -3434,6 +3719,7 @@ worker_interface_init (GdmDBusWorkerIface *interface)
+ interface->handle_open = gdm_session_worker_handle_open;
+ interface->handle_set_language_name = gdm_session_worker_handle_set_language_name;
+ interface->handle_set_session_name = gdm_session_worker_handle_set_session_name;
++ interface->handle_set_session_type = gdm_session_worker_handle_set_session_type;
+ interface->handle_set_session_display_mode = gdm_session_worker_handle_set_session_display_mode;
+ interface->handle_set_environment_variable = gdm_session_worker_handle_set_environment_variable;
+ interface->handle_start_program = gdm_session_worker_handle_start_program;
Property changes on: trunk/x11/gdm/files/patch-daemon_gdm-session-worker.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-daemon_gdm-session-worker.xml
===================================================================
--- trunk/x11/gdm/files/patch-daemon_gdm-session-worker.xml (rev 0)
+++ trunk/x11/gdm/files/patch-daemon_gdm-session-worker.xml 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,12 @@
+--- daemon/gdm-session-worker.xml.orig 2015-07-20 13:13:42 UTC
++++ daemon/gdm-session-worker.xml
+@@ -13,6 +13,9 @@
+ <method name="SetSessionName">
+ <arg name="session_name" direction="in" type="s" />
+ </method>
++ <method name="SetSessionType">
++ <arg name="session_type" direction="in" type="s"/>
++ </method>
+ <method name="SetSessionDisplayMode">
+ <arg name="mode" direction="in" type="s"/>
+ </method>
Property changes on: trunk/x11/gdm/files/patch-daemon_gdm-session-worker.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-daemon_gdm-session.c
===================================================================
--- trunk/x11/gdm/files/patch-daemon_gdm-session.c (rev 0)
+++ trunk/x11/gdm/files/patch-daemon_gdm-session.c 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,56 @@
+$OpenBSD: patch-daemon_gdm-session_c,v 1.12 2017/05/10 10:18:15 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 13:48:52 -0400
+Subject: require logind support
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From a9cacb929470eb82582396984c61d5b611bfeb1a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 14:33:40 -0400
+Subject: session: drop session-type property
+
+Index: daemon/gdm-session.c
+--- daemon/gdm-session.c.orig
++++ daemon/gdm-session.c
+@@ -3076,6 +3076,10 @@ gdm_session_bypasses_xsession (GdmSession *self)
+ g_return_val_if_fail (self != NULL, FALSE);
+ g_return_val_if_fail (GDM_IS_SESSION (self), FALSE);
+
++ if (!LOGIND_RUNNING()) {
++ return GDM_SESSION_DISPLAY_MODE_REUSE_VT;
++ }
++
+ #ifdef ENABLE_WAYLAND_SUPPORT
+ if (gdm_session_is_wayland_session (self)) {
+ bypasses_xsession = TRUE;
+@@ -3168,6 +3172,27 @@ gdm_session_select_program (GdmSession *self,
+ g_free (self->priv->selected_program);
+
+ self->priv->selected_program = g_strdup (text);
++}
++
++void
++gdm_session_select_session_type (GdmSession *self,
++ const char *text)
++{
++ GHashTableIter iter;
++ gpointer key, value;
++
++ g_debug ("GdmSession: selecting session type '%s'", text);
++
++ g_hash_table_iter_init (&iter, self->priv->conversations);
++ while (g_hash_table_iter_next (&iter, &key, &value)) {
++ GdmSessionConversation *conversation;
++
++ conversation = (GdmSessionConversation *) value;
++
++ gdm_dbus_worker_call_set_session_type (conversation->worker_proxy,
++ text,
++ NULL, NULL, NULL);
++ }
+ }
+
+ void
Property changes on: trunk/x11/gdm/files/patch-daemon_gdm-session.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-daemon_gdm-session.h
===================================================================
--- trunk/x11/gdm/files/patch-daemon_gdm-session.h (rev 0)
+++ trunk/x11/gdm/files/patch-daemon_gdm-session.h 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,19 @@
+$OpenBSD: patch-daemon_gdm-session_h,v 1.4 2016/04/26 08:25:04 ajacoutot Exp $
+
+REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
+From a9cacb929470eb82582396984c61d5b611bfeb1a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 12 Jun 2015 14:33:40 -0400
+Subject: session: drop session-type property
+
+--- daemon/gdm-session.h.orig Tue Apr 19 07:00:04 2016
++++ daemon/gdm-session.h Tue Apr 26 10:02:48 2016
+@@ -180,6 +180,8 @@ void gdm_session_answer_query
+ const char *text);
+ void gdm_session_select_program (GdmSession *session,
+ const char *command_line);
++void gdm_session_select_session_type (GdmSession *session,
++ const char *session_type);
+ void gdm_session_select_session (GdmSession *session,
+ const char *session_name);
+ void gdm_session_select_user (GdmSession *session,
Property changes on: trunk/x11/gdm/files/patch-daemon_gdm-session.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-data_Init.in
===================================================================
--- trunk/x11/gdm/files/patch-data_Init.in (rev 0)
+++ trunk/x11/gdm/files/patch-data_Init.in 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,13 @@
+$OpenBSD: patch-data_Init_in,v 1.7 2015/04/15 14:47:00 ajacoutot Exp $
+--- data/Init.in.orig Thu Apr 2 15:52:42 2015
++++ data/Init.in Wed Apr 15 16:43:30 2015
+@@ -6,6 +6,9 @@
+ PATH="@X_PATH@:$PATH"
+ OLD_IFS=$IFS
+
++# enhance fade in look
++xsetroot -solid black
++
+ gdmwhich () {
+ COMMAND="$1"
+ OUTPUT=
Property changes on: trunk/x11/gdm/files/patch-data_Init.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop
===================================================================
--- trunk/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,5 +1,5 @@
---- data/applications/mime-dummy-handler.desktop.orig 2015-06-18 15:47:40.000000000 +0200
-+++ data/applications/mime-dummy-handler.desktop 2015-07-03 09:30:57.146642000 +0200
+--- data/applications/mime-dummy-handler.desktop.orig 2015-05-29 13:27:05.000000000 +0200
++++ data/applications/mime-dummy-handler.desktop 2015-06-04 07:47:55.014724000 +0200
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
Modified: trunk/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings
===================================================================
--- trunk/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,5 +1,5 @@
---- data/dconf/defaults/00-upstream-settings.orig 2015-06-18 15:47:40.000000000 +0200
-+++ data/dconf/defaults/00-upstream-settings 2015-07-03 09:32:09.925298000 +0200
+--- data/dconf/defaults/00-upstream-settings.orig 2015-05-29 13:27:05.000000000 +0200
++++ data/dconf/defaults/00-upstream-settings 2015-06-04 07:49:07.773567000 +0200
@@ -13,7 +13,7 @@
show-desktop-icons=false
Added: trunk/x11/gdm/files/patch-data_pam-redhat_gdm-autologin.pam
===================================================================
--- trunk/x11/gdm/files/patch-data_pam-redhat_gdm-autologin.pam (rev 0)
+++ trunk/x11/gdm/files/patch-data_pam-redhat_gdm-autologin.pam 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,10 @@
+--- data/pam-redhat/gdm-autologin.pam.orig 2015-07-20 13:13:44 UTC
++++ data/pam-redhat/gdm-autologin.pam
+@@ -8,6 +8,7 @@ password include system-auth
+ session required pam_selinux.so close
+ session required pam_loginuid.so
+ session optional pam_console.so
++-session optional pam_ck_connector.so
+ session required pam_selinux.so open
+ session optional pam_keyinit.so force revoke
+ session required pam_namespace.so
Property changes on: trunk/x11/gdm/files/patch-data_pam-redhat_gdm-autologin.pam
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-data_pam-redhat_gdm-fingerprint.pam
===================================================================
--- trunk/x11/gdm/files/patch-data_pam-redhat_gdm-fingerprint.pam (rev 0)
+++ trunk/x11/gdm/files/patch-data_pam-redhat_gdm-fingerprint.pam 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,10 @@
+--- data/pam-redhat/gdm-fingerprint.pam.orig 2015-07-20 13:13:44 UTC
++++ data/pam-redhat/gdm-fingerprint.pam
+@@ -9,6 +9,7 @@ password include fingerprint-au
+ session required pam_selinux.so close
+ session required pam_loginuid.so
+ session optional pam_console.so
++-session optional pam_ck_connector.so
+ session required pam_selinux.so open
+ session optional pam_keyinit.so force revoke
+ session required pam_namespace.so
Property changes on: trunk/x11/gdm/files/patch-data_pam-redhat_gdm-fingerprint.pam
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam
===================================================================
--- trunk/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam (rev 0)
+++ trunk/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,10 @@
+--- data/pam-redhat/gdm-password.pam.orig 2015-07-20 13:13:44 UTC
++++ data/pam-redhat/gdm-password.pam
+@@ -12,6 +12,7 @@ password substack password-auth
+ session required pam_selinux.so close
+ session required pam_loginuid.so
+ session optional pam_console.so
++-session optional pam_ck_connector.so
+ session required pam_selinux.so open
+ session optional pam_keyinit.so force revoke
+ session required pam_namespace.so
Property changes on: trunk/x11/gdm/files/patch-data_pam-redhat_gdm-password.pam
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-data_pam-redhat_gdm-pin.pam
===================================================================
--- trunk/x11/gdm/files/patch-data_pam-redhat_gdm-pin.pam (rev 0)
+++ trunk/x11/gdm/files/patch-data_pam-redhat_gdm-pin.pam 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,10 @@
+--- data/pam-redhat/gdm-pin.pam.orig 2015-07-20 13:13:44 UTC
++++ data/pam-redhat/gdm-pin.pam
+@@ -13,6 +13,7 @@ password optional pam_pin.so
+ session required pam_selinux.so close
+ session required pam_loginuid.so
+ session optional pam_console.so
++-session optional pam_ck_connector.so
+ session required pam_selinux.so open
+ session optional pam_keyinit.so force revoke
+ session required pam_namespace.so
Property changes on: trunk/x11/gdm/files/patch-data_pam-redhat_gdm-pin.pam
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-data_pam-redhat_gdm-smartcard.pam
===================================================================
--- trunk/x11/gdm/files/patch-data_pam-redhat_gdm-smartcard.pam (rev 0)
+++ trunk/x11/gdm/files/patch-data_pam-redhat_gdm-smartcard.pam 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,10 @@
+--- data/pam-redhat/gdm-smartcard.pam.orig 2015-07-20 13:13:44 UTC
++++ data/pam-redhat/gdm-smartcard.pam
+@@ -9,6 +9,7 @@ password include smartcard-auth
+ session required pam_selinux.so close
+ session required pam_loginuid.so
+ session optional pam_console.so
++-session optional pam_ck_connector.so
+ session required pam_selinux.so open
+ session optional pam_keyinit.so force revoke
+ session required pam_namespace.so
Property changes on: trunk/x11/gdm/files/patch-data_pam-redhat_gdm-smartcard.pam
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c
===================================================================
--- trunk/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,11 +0,0 @@
---- gui/simple-chooser/gdm-host-chooser-widget.c.orig 2010-01-13 14:29:00.000000000 +0000
-+++ gui/simple-chooser/gdm-host-chooser-widget.c 2010-01-17 13:04:14.000000000 +0000
-@@ -543,6 +543,8 @@ xdmcp_init (GdmHostChooserWidget *widget
- #ifdef ENABLE_IPV6
- widget->priv->socket_fd = socket (AF_INET6, SOCK_DGRAM, 0);
- if (widget->priv->socket_fd != -1) {
-+ int off = 0;
-+ setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof (off));
- widget->priv->have_ipv6 = TRUE;
- }
- #endif
Added: trunk/x11/gdm/files/patch-libgdm_gdm-user-switching.c
===================================================================
--- trunk/x11/gdm/files/patch-libgdm_gdm-user-switching.c (rev 0)
+++ trunk/x11/gdm/files/patch-libgdm_gdm-user-switching.c 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,412 @@
+--- libgdm/gdm-user-switching.c.orig 2015-07-20 13:13:45 UTC
++++ libgdm/gdm-user-switching.c
+@@ -31,12 +31,25 @@
+ #include <glib-object.h>
+ #include <gio/gio.h>
+
++#ifdef WITH_SYSTEMD
+ #include <systemd/sd-login.h>
++#endif
+
+ #include "common/gdm-common.h"
+ #include "gdm-user-switching.h"
+ #include "gdm-client.h"
+
++#ifdef WITH_CONSOLE_KIT
++#define CK_NAME "org.freedesktop.ConsoleKit"
++#define CK_PATH "/org/freedesktop/ConsoleKit"
++#define CK_INTERFACE "org.freedesktop.ConsoleKit"
++
++#define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager"
++#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
++#define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat"
++#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
++#endif
++
+ static gboolean
+ create_transient_display (GDBusConnection *connection,
+ GCancellable *cancellable,
+@@ -67,12 +80,304 @@ create_transient_display (GDBusConnectio
+ return TRUE;
+ }
+
++#ifdef WITH_CONSOLE_KIT
++
+ static gboolean
+-activate_session_id (GDBusConnection *connection,
+- GCancellable *cancellable,
+- const char *seat_id,
+- const char *session_id,
+- GError **error)
++get_current_session_id (GDBusConnection *connection,
++ char **session_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ CK_MANAGER_PATH,
++ CK_MANAGER_INTERFACE,
++ "GetCurrentSession",
++ NULL, /* parameters */
++ G_VARIANT_TYPE ("(o)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine session: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(o)", session_id);
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++
++static gboolean
++get_seat_id_for_session (GDBusConnection *connection,
++ const char *session_id,
++ char **seat_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ session_id,
++ CK_SESSION_INTERFACE,
++ "GetSeatId",
++ NULL, /* parameters */
++ G_VARIANT_TYPE ("(o)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine seat: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(o)", seat_id);
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++
++static char *
++get_current_seat_id (GDBusConnection *connection)
++{
++ gboolean res;
++ char *session_id;
++ char *seat_id;
++
++ session_id = NULL;
++ seat_id = NULL;
++
++ res = get_current_session_id (connection, &session_id);
++ if (res) {
++ res = get_seat_id_for_session (connection, session_id, &seat_id);
++ }
++ g_free (session_id);
++
++ return seat_id;
++}
++
++static gboolean
++activate_session_id_for_ck (GDBusConnection *connection,
++ GCancellable *cancellable,
++ const char *seat_id,
++ const char *session_id,
++ GError **error)
++{
++ GVariant *reply;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ seat_id,
++ CK_SEAT_INTERFACE,
++ "ActivateSession",
++ g_variant_new ("(o)", session_id),
++ NULL,
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, error);
++ if (reply == NULL) {
++ g_prefix_error (error, _("Unable to activate session: "));
++ return FALSE;
++ }
++
++ g_variant_unref (reply);
++
++ return TRUE;
++}
++
++static gboolean
++session_is_login_window (GDBusConnection *connection,
++ const char *session_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++ const char *value;
++ gboolean ret;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ session_id,
++ CK_SESSION_INTERFACE,
++ "GetSessionType",
++ NULL,
++ G_VARIANT_TYPE ("(s)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine session type: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(&s)", &value);
++
++ if (value == NULL || value[0] == '\0' || strcmp (value, "LoginWindow") != 0) {
++ ret = FALSE;
++ } else {
++ ret = TRUE;
++ }
++
++ g_variant_unref (reply);
++
++ return ret;
++}
++
++static gboolean
++seat_can_activate_sessions (GDBusConnection *connection,
++ const char *seat_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++ gboolean ret;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ seat_id,
++ CK_SEAT_INTERFACE,
++ "CanActivateSessions",
++ NULL,
++ G_VARIANT_TYPE ("(b)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to determine if can activate sessions: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(b)", &ret);
++ g_variant_unref (reply);
++
++ return ret;
++}
++
++static const char **
++seat_get_sessions (GDBusConnection *connection,
++ const char *seat_id)
++{
++ GError *local_error = NULL;
++ GVariant *reply;
++ const char **value;
++
++ reply = g_dbus_connection_call_sync (connection,
++ CK_NAME,
++ seat_id,
++ CK_SEAT_INTERFACE,
++ "GetSessions",
++ NULL,
++ G_VARIANT_TYPE ("(ao)"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL, &local_error);
++ if (reply == NULL) {
++ g_warning ("Unable to list sessions: %s", local_error->message);
++ g_error_free (local_error);
++ return FALSE;
++ }
++
++ g_variant_get (reply, "(^ao)", &value);
++ g_variant_unref (reply);
++
++ return value;
++}
++
++static gboolean
++get_login_window_session_id_for_ck (GDBusConnection *connection,
++ const char *seat_id,
++ char **session_id)
++{
++ gboolean can_activate_sessions;
++ const char **sessions;
++ int i;
++
++ *session_id = NULL;
++ sessions = NULL;
++
++ g_debug ("checking if seat can activate sessions");
++
++ can_activate_sessions = seat_can_activate_sessions (connection, seat_id);
++ if (! can_activate_sessions) {
++ g_debug ("seat is unable to activate sessions");
++ return FALSE;
++ }
++
++ sessions = seat_get_sessions (connection, seat_id);
++ for (i = 0; sessions [i] != NULL; i++) {
++ const char *ssid;
++
++ ssid = sessions [i];
++
++ if (session_is_login_window (connection, ssid)) {
++ *session_id = g_strdup (ssid);
++ break;
++ }
++ }
++ g_free (sessions);
++
++ return TRUE;
++}
++
++static gboolean
++goto_login_session_for_ck (GDBusConnection *connection,
++ GCancellable *cancellable,
++ GError **error)
++{
++ gboolean ret;
++ gboolean res;
++ char *session_id;
++ char *seat_id;
++
++ ret = FALSE;
++
++ /* First look for any existing LoginWindow sessions on the seat.
++ If none are found, create a new one. */
++
++ seat_id = get_current_seat_id (connection);
++ if (seat_id == NULL || seat_id[0] == '\0') {
++ g_debug ("seat id is not set; can't switch sessions");
++ g_set_error (error, GDM_CLIENT_ERROR, 0, _("Could not identify the current session."));
++
++ return FALSE;
++ }
++
++ res = get_login_window_session_id_for_ck (connection, seat_id, &session_id);
++ if (! res) {
++ g_set_error (error, GDM_CLIENT_ERROR, 0, _("User unable to switch sessions."));
++ return FALSE;
++ }
++
++ if (session_id != NULL) {
++ res = activate_session_id_for_ck (connection, cancellable, seat_id, session_id, error);
++ if (res) {
++ ret = TRUE;
++ }
++ }
++
++ if (! ret && g_strcmp0 (seat_id, "/org/freedesktop/ConsoleKit/Seat1") == 0) {
++ res = create_transient_display (connection, cancellable, error);
++ if (res) {
++ ret = TRUE;
++ }
++ }
++
++ return ret;
++}
++#endif
++
++#ifdef WITH_SYSTEMD
++
++static gboolean
++activate_session_id_for_systemd (GDBusConnection *connection,
++ GCancellable *cancellable,
++ const char *seat_id,
++ const char *session_id,
++ GError **error)
+ {
+ GVariant *reply;
+
+@@ -97,8 +402,8 @@ activate_session_id (GDBusConnection *c
+ }
+
+ static gboolean
+-get_login_window_session_id (const char *seat_id,
+- char **session_id)
++get_login_window_session_id_for_systemd (const char *seat_id,
++ char **session_id)
+ {
+ gboolean ret;
+ int res, i;
+@@ -182,9 +487,9 @@ out:
+ }
+
+ static gboolean
+-goto_login_session (GDBusConnection *connection,
+- GCancellable *cancellable,
+- GError **error)
++goto_login_session_for_systemd (GDBusConnection *connection,
++ GCancellable *cancellable,
++ GError **error)
+ {
+ gboolean ret;
+ int res;
+@@ -238,9 +543,9 @@ goto_login_session (GDBusConnection *co
+ return FALSE;
+ }
+
+- res = get_login_window_session_id (seat_id, &session_id);
++ res = get_login_window_session_id_for_systemd (seat_id, &session_id);
+ if (res && session_id != NULL) {
+- res = activate_session_id (connection, cancellable, seat_id, session_id, error);
++ res = activate_session_id_for_systemd (connection, cancellable, seat_id, session_id, error);
+
+ if (res) {
+ ret = TRUE;
+@@ -259,10 +564,11 @@ goto_login_session (GDBusConnection *co
+
+ return ret;
+ }
++#endif
+
+ gboolean
+ gdm_goto_login_session_sync (GCancellable *cancellable,
+- GError **error)
++ GError **error)
+ {
+ GDBusConnection *connection;
+ gboolean retval;
+@@ -271,8 +577,23 @@ gdm_goto_login_session_sync (GCancellabl
+ if (!connection)
+ return FALSE;
+
+- retval = goto_login_session (connection, cancellable, error);
++#ifdef WITH_SYSTEMD
++ if (LOGIND_RUNNING()) {
++ retval = goto_login_session_for_systemd (connection,
++ cancellable,
++ error);
++
++ g_object_unref (connection);
++ return retval;
++ }
++#endif
++
++#ifdef WITH_CONSOLE_KIT
++ retval = goto_login_session_for_ck (connection, cancellable, error);
+
+ g_object_unref (connection);
+ return retval;
++#else
++ return FALSE;
++#endif
+ }
Property changes on: trunk/x11/gdm/files/patch-libgdm_gdm-user-switching.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11/gdm/pkg-plist
===================================================================
--- trunk/x11/gdm/pkg-plist 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/gdm/pkg-plist 2019-02-09 16:31:07 UTC (rev 24922)
@@ -7,8 +7,8 @@
@sample %%ETCDIR%%/PreSession/Default.sample
%%ETCDIR%%/Xsession
@sample %%ETCDIR%%/custom.conf.sample
-%%ETCDIR%%/home/.pulse/client.conf
-%%ETCDIR%%/locale.conf
+ at sample %%ETCDIR%%/home/.pulse/client.conf.sample
+ at sample %%ETCDIR%%/locale.conf.sample
etc/pam.d/gdm-autologin
etc/pam.d/gdm-launch-environment
etc/pam.d/gdm-password
@@ -31,13 +31,12 @@
%%DATADIR%%/gdb-cmd
%%DATADIR%%/gdm.schemas
%%DATADIR%%/greeter-dconf-defaults
-%%DATADIR%%/greeter/applications/gnome-shell-wayland.desktop
-%%DATADIR%%/greeter/applications/gnome-shell.desktop
%%DATADIR%%/greeter/applications/mime-dummy-handler.desktop
%%DATADIR%%/greeter/applications/mimeapps.list
%%DATADIR%%/greeter/autostart/orca-autostart.desktop
%%DATADIR%%/locale.alias
share/gir-1.0/Gdm-1.0.gir
+share/gnome-session/sessions/gnome-login.session
share/help/C/gdm/index.docbook
share/help/C/gdm/legal.xml
share/help/ca/gdm/index.docbook
@@ -68,6 +67,8 @@
share/help/oc/gdm/legal.xml
share/help/pt_BR/gdm/index.docbook
share/help/pt_BR/gdm/legal.xml
+share/help/ro/gdm/index.docbook
+share/help/ro/gdm/legal.xml
share/help/ru/gdm/index.docbook
share/help/ru/gdm/legal.xml
share/help/sl/gdm/index.docbook
@@ -76,6 +77,8 @@
share/help/sv/gdm/legal.xml
share/help/te/gdm/index.docbook
share/help/te/gdm/legal.xml
+share/help/tr/gdm/index.docbook
+share/help/tr/gdm/legal.xml
share/help/uk/gdm/index.docbook
share/help/uk/gdm/legal.xml
share/help/zh_CN/gdm/index.docbook
@@ -134,6 +137,7 @@
share/locale/it/LC_MESSAGES/gdm.mo
share/locale/ja/LC_MESSAGES/gdm.mo
share/locale/ka/LC_MESSAGES/gdm.mo
+share/locale/kab/LC_MESSAGES/gdm.mo
share/locale/kk/LC_MESSAGES/gdm.mo
share/locale/km/LC_MESSAGES/gdm.mo
share/locale/kn/LC_MESSAGES/gdm.mo
@@ -195,13 +199,13 @@
share/pixmaps/gdm.png
share/pixmaps/nobody.png
share/pixmaps/nohost.png
- at exec mkdir -p %D/share/xsessions
- at exec dconf update
- at unexec dconf update
+ at postexec mkdir -p %D/share/xsessions
+ at postexec dconf update
+ at postunexec dconf update
@mode 1775
@dir etc/gdm/home
@mode
- at unexec rm -rf %D/etc/gdm/home/.gconf*
+ at postunexec rm -rf %D/etc/gdm/home/.gconf*
@dir %%ETCDIR%%/Sessions
@dir %%ETCDIR%%/home/.local/share/applications
@dir etc/dm
@@ -211,4 +215,4 @@
@dir /var/run/gdm/greeter
@dir /var/run/gdm/
@dir /var/log/gdm/
- at unexec rm -fr /var/gdm
+ at postunexec rm -fr /var/gdm
Modified: trunk/x11/iceauth/Makefile
===================================================================
--- trunk/x11/iceauth/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/iceauth/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,6 +2,7 @@
PORTNAME= iceauth
PORTVERSION= 1.0.8
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -11,7 +12,7 @@
LICENSE_FILE= ${WRKSRC}/COPYING
XORG_CAT= app
-USE_XORG= xproto ice
+USE_XORG= xorgproto ice
PLIST_FILES= bin/iceauth man/man1/iceauth.1.gz
Modified: trunk/x11/libICE/Makefile
===================================================================
--- trunk/x11/libICE/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libICE/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,7 +2,7 @@
PORTNAME= libICE
PORTVERSION= 1.0.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -12,7 +12,7 @@
LICENSE_FILE= ${WRKSRC}/COPYING
XORG_CAT= lib
-USE_XORG= xproto:both xtrans
+USE_XORG= xorgproto xtrans
INSTALL_TARGET= install-strip
Modified: trunk/x11/libSM/Makefile
===================================================================
--- trunk/x11/libSM/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libSM/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,7 +2,7 @@
PORTNAME= libSM
PORTVERSION= 1.2.2
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11
@@ -12,7 +12,7 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= ice xproto:both xtrans
+USE_XORG= ice xorgproto xtrans
CONFIGURE_ARGS+=--disable-docs --without-xmlto
Modified: trunk/x11/libX11/Makefile
===================================================================
--- trunk/x11/libX11/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libX11/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,7 +1,8 @@
# $MidnightBSD$
PORTNAME= libX11
-PORTVERSION= 1.6.5
+PORTVERSION= 1.6.6
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
@@ -12,9 +13,7 @@
USES= cpe perl5
XORG_CAT= lib
-USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
- kbproto:both inputproto xf86bigfontproto xproto:both \
- xcb
+USE_XORG= xau xdmcp xtrans xorgproto xcb
USE_PERL5= build
CPE_VENDOR= x
Modified: trunk/x11/libX11/distinfo
===================================================================
--- trunk/x11/libX11/distinfo 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libX11/distinfo 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534882340
-SHA256 (xorg/lib/libX11-1.6.5.tar.bz2) = 4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d
-SIZE (xorg/lib/libX11-1.6.5.tar.bz2) = 2361556
+TIMESTAMP = 1534962530
+SHA256 (xorg/lib/libX11-1.6.6.tar.bz2) = 65fe181d40ec77f45417710c6a67431814ab252d21c2e85c75dd1ed568af414f
+SIZE (xorg/lib/libX11-1.6.6.tar.bz2) = 2342730
Modified: trunk/x11/libX11/pkg-plist
===================================================================
--- trunk/x11/libX11/pkg-plist 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libX11/pkg-plist 2019-02-09 16:31:07 UTC (rev 24922)
@@ -874,6 +874,7 @@
man/man3/XkbGetKeyboardByName.3.gz
man/man3/XkbGetMap.3.gz
man/man3/XkbGetNameChanges.3.gz
+man/man3/XkbGetNamedDeviceIndicator.3.gz
man/man3/XkbGetNamedGeometry.3.gz
man/man3/XkbGetNamedIndicator.3.gz
man/man3/XkbGetNames.3.gz
@@ -954,6 +955,7 @@
man/man3/XkbSetIndicatorMap.3.gz
man/man3/XkbSetMap.3.gz
man/man3/XkbSetModActionVMods.3.gz
+man/man3/XkbSetNamedDeviceIndicator.3.gz
man/man3/XkbSetNamedIndicator.3.gz
man/man3/XkbSetNames.3.gz
man/man3/XkbSetPtrActionX.3.gz
Modified: trunk/x11/libXau/Makefile
===================================================================
--- trunk/x11/libXau/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXau/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,7 +2,7 @@
PORTNAME= libXau
PORTVERSION= 1.0.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -12,6 +12,6 @@
LICENSE_FILE= ${WRKSRC}/COPYING
XORG_CAT= lib
-USE_XORG= xproto:both
+USE_XORG= xorgproto
.include <bsd.port.mk>
Modified: trunk/x11/libXcomposite/Makefile
===================================================================
--- trunk/x11/libXcomposite/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXcomposite/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,7 +2,7 @@
PORTNAME= libXcomposite
PORTVERSION= 0.4.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -12,6 +12,6 @@
LICENSE_FILE= ${WRKSRC}/COPYING
XORG_CAT= lib
-USE_XORG= compositeproto:both x11 xfixes xext fixesproto xproto:both
+USE_XORG= x11 xfixes xext xorgproto
.include <bsd.port.mk>
Modified: trunk/x11/libXcursor/Makefile
===================================================================
--- trunk/x11/libXcursor/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXcursor/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,6 +2,7 @@
PORTNAME= libXcursor
PORTVERSION= 1.1.15
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -10,14 +11,12 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= xrender x11 xfixes fixesproto xproto:both \
- xextproto
-
+USE_XORG= xrender x11 xfixes xorgproto
USES+= cpe
CPE_PRODUCT= libxcursor
CPE_VENDOR= x
-CONFIGURE_ARGS= --with-icondir=${PREFIX}/lib/X11/icons
+CONFIGURE_ARGS= --with-icondir=${PREFIX}/share/icons
INSTALL_TARGET= install-strip
.include <bsd.port.mk>
Modified: trunk/x11/libXdamage/Makefile
===================================================================
--- trunk/x11/libXdamage/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXdamage/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,7 +2,7 @@
PORTNAME= libXdamage
PORTVERSION= 1.1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -12,6 +12,6 @@
LICENSE_FILE= ${WRKSRC}/COPYING
XORG_CAT= lib
-USE_XORG= x11 damageproto:both xfixes fixesproto xextproto xproto:both
+USE_XORG= x11 xfixes xorgproto
.include <bsd.port.mk>
Modified: trunk/x11/libXdmcp/Makefile
===================================================================
--- trunk/x11/libXdmcp/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXdmcp/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,6 +2,7 @@
PORTNAME= libXdmcp
PORTVERSION= 1.1.2
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -10,7 +11,7 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= xproto:both
+USE_XORG= xorgproto:both
CONFIGURE_ARGS+=--disable-docs --without-xmlto
Modified: trunk/x11/libXevie/Makefile
===================================================================
--- trunk/x11/libXevie/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXevie/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -3,14 +3,15 @@
PORTNAME= libXevie
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
COMMENT= The Xevie library
+
LICENSE= mit
XORG_CAT= lib
-USE_XORG= evieproto x11 xext xextproto xproto:both
+USE_XORG= x11 xext xorgproto
.include <bsd.port.mk>
Modified: trunk/x11/libXevie/pkg-descr
===================================================================
--- trunk/x11/libXevie/pkg-descr 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXevie/pkg-descr 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,3 +1,3 @@
This package contains libXevie, the X.Org Xevie library.
-WWW: http://www.freedesktop.org/wiki/Software/xlibs
+WWW: https://www.freedesktop.org/wiki/Software/xlibs/
Modified: trunk/x11/libXext/Makefile
===================================================================
--- trunk/x11/libXext/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXext/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,7 +2,7 @@
PORTNAME= libXext
PORTVERSION= 1.3.3
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11
@@ -12,7 +12,7 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= xproto x11 xextproto:both xau
+USE_XORG= x11 xau xorgproto
CONFIGURE_ARGS+=--disable-specs --without-xmlto
INSTALL_TARGET= install-strip
USES+= cpe
Modified: trunk/x11/libXfixes/Makefile
===================================================================
--- trunk/x11/libXfixes/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXfixes/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,7 +2,7 @@
PORTNAME= libXfixes
PORTVERSION= 5.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -11,7 +11,7 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= x11 fixesproto:both xproto:both xextproto
+USE_XORG= x11 xorgproto
USES+= cpe
CPE_PRODUCT= libxfixes
CPE_VENDOR= x
Modified: trunk/x11/libXi/Makefile
===================================================================
--- trunk/x11/libXi/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXi/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,6 +2,7 @@
PORTNAME= libXi
PORTVERSION= 1.7.9
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
@@ -11,7 +12,7 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= xproto x11 xext xextproto xfixes inputproto:both
+USE_XORG= x11 xext xfixes xorgproto
INSTALL_TARGET= install-strip
USES+= cpe
CPE_PRODUCT= libxi
Modified: trunk/x11/libXpm/Makefile
===================================================================
--- trunk/x11/libXpm/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXpm/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,7 +2,7 @@
PORTNAME= libXpm
PORTVERSION= 3.5.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -11,7 +11,7 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= xproto x11 xext xextproto xt
+USE_XORG= xorgproto x11 xext xt
LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS_DEFINE= NLS
Modified: trunk/x11/libXprintAppUtil/Makefile
===================================================================
--- trunk/x11/libXprintAppUtil/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXprintAppUtil/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,7 +2,7 @@
PORTNAME= libXprintAppUtil
PORTVERSION= 1.0.1
-PORTREVISON= 3
+PORTREVISON= 4
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -11,6 +11,6 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= printproto x11 xau xp xprintutil xproto:both
+USE_XORG= x11 xau xp xprintutil xorgproto
.include <bsd.port.mk>
Modified: trunk/x11/libXrandr/Makefile
===================================================================
--- trunk/x11/libXrandr/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXrandr/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,7 +2,7 @@
PORTNAME= libXrandr
PORTVERSION= 1.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -11,7 +11,7 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= x11 randrproto:both xext xextproto xrender renderproto xproto:both
+USE_XORG= x11 xext xrender xorgproto
USES+= cpe
CPE_PRODUCT= libxrandr
CPE_VENDOR= x
Modified: trunk/x11/libXrender/Makefile
===================================================================
--- trunk/x11/libXrender/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXrender/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,7 +2,7 @@
PORTNAME= libXrender
PORTVERSION= 0.9.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -11,6 +11,6 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= x11 renderproto:both xproto:both
+USE_XORG= x11 xorgproto
.include <bsd.port.mk>
Modified: trunk/x11/libXres/Makefile
===================================================================
--- trunk/x11/libXres/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXres/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,6 +2,7 @@
PORTNAME= libXres
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -10,7 +11,7 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= x11 xext xextproto resourceproto xproto:both
+USE_XORG= x11 xext xorgproto
INSTALL_TARGET= install-strip
USES+= cpe
CPE_PRODUCT= libxres
Modified: trunk/x11/libXv/Makefile
===================================================================
--- trunk/x11/libXv/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXv/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,6 +2,7 @@
PORTNAME= libXv
PORTVERSION= 1.0.11
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
@@ -11,7 +12,7 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= x11 xext xextproto videoproto:both xproto:both
+USE_XORG= x11 xext xorgproto
USES+= cpe
CPE_PRODUCT= libxv
CPE_VENDOR= x
Modified: trunk/x11/libXvMC/Makefile
===================================================================
--- trunk/x11/libXvMC/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXvMC/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,6 +2,7 @@
PORTNAME= libXvMC
PORTVERSION= 1.0.10
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -10,9 +11,9 @@
LICENSE= mit
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= cpe
XORG_CAT= lib
-USE_XORG= x11 xext xv xextproto videoproto:both xproto:both
-USES+= cpe
+USE_XORG= x11 xext xv xorgproto
CPE_PRODUCT= libxvmc
CPE_VENDOR= x
Modified: trunk/x11/libXxf86dga/Makefile
===================================================================
--- trunk/x11/libXxf86dga/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXxf86dga/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,7 +2,7 @@
PORTNAME= libXxf86dga
PORTVERSION= 1.1.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -11,7 +11,7 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= xproto x11 xextproto xext xf86dgaproto:both
+USE_XORG= x11 xext xorgproto
USES+= cpe
CPE_PRODUCT= libxxf86dga
CPE_VENDOR= x
Modified: trunk/x11/libXxf86misc/Makefile
===================================================================
--- trunk/x11/libXxf86misc/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXxf86misc/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,6 +2,7 @@
PORTNAME= libXxf86misc
PORTVERSION= 1.0.4
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -10,6 +11,6 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= xproto x11 xextproto xext xf86miscproto:both
+USE_XORG= x11 xext xorgproto
.include <bsd.port.mk>
Modified: trunk/x11/libXxf86vm/Makefile
===================================================================
--- trunk/x11/libXxf86vm/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXxf86vm/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,6 +2,7 @@
PORTNAME= libXxf86vm
PORTVERSION= 1.1.4
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -10,7 +11,7 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= xproto x11 xextproto xext xf86vidmodeproto:both
+USE_XORG= xorgproto x11 xext
USES+= cpe
CPE_PRODUCT= libxxf86vm
CPE_VENDOR= x
Modified: trunk/x11/libXxf86vm/pkg-plist
===================================================================
--- trunk/x11/libXxf86vm/pkg-plist 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libXxf86vm/pkg-plist 2019-02-09 16:31:07 UTC (rev 24922)
@@ -5,24 +5,25 @@
lib/libXxf86vm.so.1.0.0
libdata/pkgconfig/xxf86vm.pc
man/man3/XF86VM.3.gz
+man/man3/XF86VidModeAddModeLine.3.gz
+man/man3/XF86VidModeDeleteModeLine.3.gz
+man/man3/XF86VidModeGetAllModeLines.3.gz
+man/man3/XF86VidModeGetDotClocks.3.gz
+man/man3/XF86VidModeGetGamma.3.gz
+man/man3/XF86VidModeGetGammaRamp.3.gz
+man/man3/XF86VidModeGetGammaRampSize.3.gz
+man/man3/XF86VidModeGetModeLine.3.gz
+man/man3/XF86VidModeGetMonitor.3.gz
+man/man3/XF86VidModeGetPermissions.3.gz
+man/man3/XF86VidModeGetViewPort.3.gz
man/man3/XF86VidModeLockModeSwitch.3.gz
-man/man3/XF86VidModeDeleteModeLine.3.gz
man/man3/XF86VidModeModModeLine.3.gz
-man/man3/XF86VidModeGetAllModeLines.3.gz
man/man3/XF86VidModeQueryExtension.3.gz
-man/man3/XF86VidModeGetDotClocks.3.gz
man/man3/XF86VidModeQueryVersion.3.gz
-man/man3/XF86VidModeGetGamma.3.gz
man/man3/XF86VidModeSetClientVersion.3.gz
-man/man3/XF86VidModeGetGammaRamp.3.gz
man/man3/XF86VidModeSetGamma.3.gz
-man/man3/XF86VidModeGetGammaRampSize.3.gz
man/man3/XF86VidModeSetGammaRamp.3.gz
-man/man3/XF86VidModeGetModeLine.3.gz
man/man3/XF86VidModeSetViewPort.3.gz
-man/man3/XF86VidModeGetMonitor.3.gz
man/man3/XF86VidModeSwitchMode.3.gz
-man/man3/XF86VidModeGetPermissions.3.gz
man/man3/XF86VidModeSwitchToMode.3.gz
-man/man3/XF86VidModeGetViewPort.3.gz
man/man3/XF86VidModeValidateModeLine.3.gz
Modified: trunk/x11/libdmx/Makefile
===================================================================
--- trunk/x11/libdmx/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libdmx/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,6 +2,7 @@
PORTNAME= libdmx
PORTVERSION= 1.1.4
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -10,7 +11,7 @@
LICENSE= mit
XORG_CAT= lib
-USE_XORG= x11 xext xextproto dmxproto:both
+USE_XORG= x11 xext xorgproto
USES+= cpe
CPE_VENDOR= x
Modified: trunk/x11/libxshmfence/Makefile
===================================================================
--- trunk/x11/libxshmfence/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/libxshmfence/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -3,7 +3,7 @@
PORTNAME= libxshmfence
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -11,7 +11,7 @@
LICENSE= mit
-USE_XORG= xproto
+USE_XORG= xorgproto
XORG_CAT= lib
CONFIGURE_ARGS= --with-shared-memory-dir=/tmp
Modified: trunk/x11/listres/Makefile
===================================================================
--- trunk/x11/listres/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/listres/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,6 +2,7 @@
PORTNAME= listres
PORTVERSION= 1.0.4
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -10,7 +11,7 @@
LICENSE= mit
XORG_CAT= app
-USE_XORG= x11 xproto xt xmu xaw
+USE_XORG= x11 xaw xmu xorgproto xt
PLIST_FILES= bin/listres man/man1/listres.1.gz
Modified: trunk/x11/rgb/Makefile
===================================================================
--- trunk/x11/rgb/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/rgb/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,7 +2,7 @@
PORTNAME= rgb
PORTVERSION= 1.0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -13,7 +13,7 @@
CONFIGURE_ARGS= --with-rgb-db-dir=${PREFIX}/lib/X11/rgb
XORG_CAT= app
-USE_XORG= x11 xproto
+USE_XORG= x11 xorgproto
PLIST_FILES= bin/showrgb lib/X11/rgb.txt man/man1/showrgb.1.gz
Modified: trunk/x11/xdpyinfo/Makefile
===================================================================
--- trunk/x11/xdpyinfo/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xdpyinfo/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,6 +2,7 @@
PORTNAME= xdpyinfo
PORTVERSION= 1.3.2
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -10,7 +11,7 @@
LICENSE= mit
XORG_CAT= app
-USE_XORG= dmx x11 xcb xcomposite xext xinerama xproto xrender \
+USE_XORG= dmx x11 xcb xcomposite xext xinerama xorgproto xrender \
xtst xxf86dga xxf86misc xxf86vm
PLIST_FILES= bin/xdpyinfo man/man1/xdpyinfo.1.gz
Modified: trunk/x11/xprehashprinterlist/Makefile
===================================================================
--- trunk/x11/xprehashprinterlist/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xprehashprinterlist/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -5,7 +5,8 @@
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
-COMMENT= Recomputes the list of available printers.
+COMMENT= Recomputes the list of available printers
+
LICENSE= mit
XORG_CAT= app
Modified: trunk/x11/xrx/Makefile
===================================================================
--- trunk/x11/xrx/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xrx/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,7 +2,7 @@
PORTNAME= xrx
PORTVERSION= 1.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -11,7 +11,7 @@
LICENSE= mit
XORG_CAT= app
-USE_XORG= x11 xt xext xtrans xproxymngproto xau xaw ice
+USE_XORG= x11 xt xext xtrans xorgproto xau xaw ice
USES= libtool
USE_LDCONFIG= yes
Modified: trunk/x11/xscreensaver/Makefile
===================================================================
--- trunk/x11/xscreensaver/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xscreensaver/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,7 +1,8 @@
# $MidnightBSD$
PORTNAME= xscreensaver
-PORTVERSION= 5.29
+PORTVERSION= 5.40
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/
@@ -10,107 +11,92 @@
LICENSE= mit
-LIB_DEPENDS= libgle.so:${PORTSDIR}/graphics/gle \
- libjpeg.so:${PORTSDIR}/graphics/jpeg
+RUN_DEPENDS= p5-libwww>0:www/p5-libwww \
+ giftopnm:graphics/netpbm
+LIB_DEPENDS= libgle.so:graphics/gle \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
-RUN_DEPENDS= p5-libwww>0:${PORTSDIR}/www/p5-libwww \
- giftopnm:${PORTSDIR}/graphics/netpbm
-
-DESTDIRNAME= install_prefix
-
CONFLICTS= xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*
-USES= pkgconfig gettext gmake perl5
-USE_AUTOTOOLS= autoconf
-USE_GL= yes
-USE_GNOME= gdkpixbuf2 gtk20 intltool libglade2 libxml2
+USES= autoreconf gettext gmake jpeg localbase:ldflags perl5 pkgconfig
+USE_GL= gl glu
+USE_GNOME= cairo gdkpixbuf2 gtk20 intltool libglade2 libxml2
USE_PERL5= run
-USE_XORG= xpm xext xxf86misc
+USE_XORG= ice sm x11 xext xi xinerama xmu xrandr xrender xpm xt \
+ xxf86misc xxf86vm
+USE_CSTD= gnu99
GNU_CONFIGURE= yes
+CONFIGURE_ENV+= PERL="${PERL}"
CONFIGURE_ARGS= --with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \
--with-jpeg=${LOCALBASE} --with-xshm-ext --with-xdbe-ext \
--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
--with-configdir=${PREFIX}/share/xscreensaver/config/ \
+ --with-x-app-defaults=${PREFIX}/lib/X11/app-defaults/ \
--with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \
--with-xf86gamma-ext --with-randr-ext --without-kerberos \
--without-setuid-hacks --enable-locking
+MAKE_ARGS+= install_prefix=${FAKE_DESTDIR}
-OPTIONS_DEFINE= PAM FIREF XAOS1 XDALI XURTH XMOUN XPLAN \
- XSNOW
-SETUID_HACKS_DESC= Install sonar hack suid so it can ping
-FIREF_DESC= Add extra port x11/fireflies
-XAOS1_DESC= Add extra port graphics/xaos
-XDALI_DESC= Add extra port x11-clocks/xdaliclock
-XURTH_DESC= Add extra port astro/xearth
-XMOUN_DESC= Add extra port graphics/xmountains
-XPLAN_DESC= Add extra port astro/xplanet
-XSNOW_DESC= Add extra port x11/xsnow
+OPTIONS_DEFINE= PAM SETUID_HACKS FIREF NLS NSFW XAOS1 XDALI XEARTH \
+ XFT XMOUN XPLANET XSNOW
+OPTIONS_DEFAULT=XFT
+OPTIONS_SUB= yes
-.include <bsd.mport.options.mk>
+PAM_CONFIGURE_WITH= pam
-.if ${PORT_OPTIONS:MPAM}
-CONFIGURE_ARGS+= --with-pam
-PLIST_SUB+= PAM=""
-.else
-CONFIGURE_ARGS+= --without-pam
-PLIST_SUB+= PAM="@comment not installed: "
-.endif
+SETUID_HACKS_DESC= Install sonar hack suid so it can ping
-.if ${PORT_OPTIONS:MFIREF}
-RUN_DEPENDS+= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies
-.endif
-.if ${PORT_OPTIONS:MXAOS1}
-RUN_DEPENDS+= xaos:${PORTSDIR}/graphics/xaos
-.endif
-.if ${PORT_OPTIONS:MXDALI}
-RUN_DEPENDS+= xdaliclock:${PORTSDIR}/x11-clocks/xdaliclock
-.endif
-.if ${PORT_OPTIONS:MXURTH}
-RUN_DEPENDS+= xearth:${PORTSDIR}/astro/xearth
-.endif
-.if ${PORT_OPTIONS:MXMOUN}
-RUN_DEPENDS+= xmountains:${PORTSDIR}/graphics/xmountains
-.endif
-.if ${PORT_OPTIONS:MXPLAN}
-RUN_DEPENDS+= xplanet:${PORTSDIR}/astro/xplanet
-.endif
-.if ${PORT_OPTIONS:MXSNOW}
-RUN_DEPENDS+= xsnow:${PORTSDIR}/x11/xsnow
-.endif
+FIREF_DESC= Add extra port x11/fireflies
+FIREF_RUN_DEPENDS= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies:x11/fireflies
-.undef HAVE_GNOME
+NLS_USES= gettext-runtime
+NLS_CONFIGURE_ENABLE= nls
+NSFW_DESC= Include material that is Not Safe For Work
+
+XAOS1_DESC= Add extra port graphics/xaos
+XAOS1_RUN_DEPENDS= xaos:graphics/xaos
+
+XDALI_DESC= Add extra port x11-clocks/xdaliclock
+XDALI_RUN_DEPENDS= xdaliclock:x11-clocks/xdaliclock
+
+XFT_CONFIGURE_WITH= xft
+XFT_USE= XORG=xft
+
+XEARTH_DESC= Add extra port astro/xearth
+XEARTH_RUN_DEPENDS= xearth:astro/xearth
+
+XMOUN_DESC= Add extra port graphics/xmountains
+XMOUN_RUN_DEPENDS= xmountains:graphics/xmountains
+
+XPLANET_DESC= Add extra port astro/xplanet
+XPLANET_RUN_DEPENDS= xplanet:astro/xplanet
+
+XSNOW_DESC= Add extra port x11/xsnow
+XSNOW_RUN_DEPENDS= xsnow:x11/xsnow
+
SUB_FILES= xscreensaver-blank.desktop xscreensaver-lock.desktop \
xscreensaver-start.desktop xscreensaver-stop.desktop
post-patch:
- @ ${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Patched
- @ ${SED} -e 's#-lpthread#${PTHREAD_LIBS}#g' \
- -e 's#malloc.h#stdlib.h#g' \
- -e 's#/usr/X11R6#${LOCALBASE}#g' \
- -e 's#pkg_config --list-all#pkg_config --help#' \
- ${WRKSRC}/configure.Patched > ${WRKSRC}/configure
-.if ${PORT_OPTIONS:MPAM}
-.for f in driver/passwd-pam.c driver/xscreensaver.man
- @ ${CP} ${WRKSRC}/${f} ${WRKSRC}/${f}.presed
- @ ${SED} -e "s#/etc/pam.d#${PREFIX}/etc/pam.d#g" \
- ${WRKSRC}/${f}.presed > ${WRKSRC}/${f}
-.endfor
- @ ${CP} ${FILESDIR}/xscreensaver.pam \
- ${WRKSRC}/driver/xscreensaver.pam.in
-.else
- @ ${CP} ${WRKSRC}/driver/Makefile.in ${WRKSRC}/driver/Makefile.in.post
- @ ${SED} -e "s#install-xml install-pam#install-xml#" \
- ${WRKSRC}/driver/Makefile.in.post > ${WRKSRC}/driver/Makefile.in
-.endif
+ ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
+ -e 's|pkg_config --list-all|pkg_config --help|' \
+ ${WRKSRC}/configure.in
+ ${REINPLACE_CMD} -e "s|/etc/pam.d|${PREFIX}/etc/pam.d|g" \
+ ${WRKSRC}/driver/passwd-pam.c \
+ ${WRKSRC}/driver/xscreensaver.man
+ ${CP} ${FILESDIR}/xscreensaver.pam \
+ ${WRKSRC}/driver/xscreensaver.pam.in
+post-patch-NSFW-off:
+ ${REINPLACE_CMD} -e 's|Dick Pix|Stuff|' ${WRKSRC}/hacks/bsod.c
+ ${REINPLACE_CMD} -e 's|dick pics|data, etc.|' ${WRKSRC}/hacks/bsod.c
+
post-install:
- ${INSTALL_DATA} ${FILESDIR}/x*.xml ${DATADIR}/config/
- @(if test -x ${LOCALBASE}/bin/xscreensaver-hacks/webcollage-helper; then \
- ${ECHO} "bin/xscreensaver-hacks/webcollage-helper" | \
- ${CAT} - ${TMPPLIST} > ${TMPPLIST}.cat && \
- ${MV} ${TMPPLIST}.cat ${TMPPLIST}; fi)
- ${INSTALL_DATA} ${WRKDIR}/*.desktop ${PREFIX}/share/applications/
+ ${INSTALL_DATA} ${FILESDIR}/x*.xml ${STAGEDIR}${DATADIR}/config/
+ ${INSTALL_DATA} ${WRKDIR}/*.desktop ${STAGEDIR}${PREFIX}/share/applications/
+ ${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver.pam
.include <bsd.port.mk>
Modified: trunk/x11/xscreensaver/distinfo
===================================================================
--- trunk/x11/xscreensaver/distinfo 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xscreensaver/distinfo 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,2 +1,3 @@
-SHA256 (xscreensaver-5.29.tar.gz) = c418f5750696b578df6d4fd62c8260c018667653ece97f2bb90612046bf0f294
-SIZE (xscreensaver-5.29.tar.gz) = 8774562
+TIMESTAMP = 1534868855
+SHA256 (xscreensaver-5.40.tar.gz) = 30a0908d4164cf780ef034f87ba884316296b308af2484261ccde86be0c95ae0
+SIZE (xscreensaver-5.40.tar.gz) = 12248135
Deleted: trunk/x11/xscreensaver/files/XScreenSaver
===================================================================
--- trunk/x11/xscreensaver/files/XScreenSaver 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xscreensaver/files/XScreenSaver 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,557 +0,0 @@
-!
-! XScreenSaver
-!
-! a screen saver and locker for the X window system
-! by Jamie Zawinski
-!
-! version 5.06
-! 16-Jul-2008
-!
-! See "man xscreensaver" for more info. The latest version is always
-! available at http://www.jwz.org/xscreensaver/
-
-
-! These resources, when placed in the system-wide app-defaults directory
-! (e.g., /usr/lib/X11/app-defaults/XScreenSaver) will provide the default
-! settings for new users. However, if you have a ".xscreensaver" file in
-! your home directory, the settings in that file take precedence.
-
-
-! Don't hand this file to "xrdb" -- that isn't how app-defaults files work.
-! Though app-defaults files have (mostly) the same syntax as your ~/.Xdefaults
-! file, they are used differently, and if you run this file through xrdb,
-! you will probably mess things up.
-
-#error Do not run app-defaults files through xrdb!
-#error That does not do what you might expect.
-#error Put this file in /usr/lib/X11/app-defaults/XScreenSaver instead.
-
-! /* (xrdb prevention kludge: whole file)
-
-*mode: random
-*timeout: 0:10:00
-*cycle: 0:10:00
-*lockTimeout: 0:00:00
-*passwdTimeout: 0:00:30
-*dpmsEnabled: False
-*dpmsStandby: 2:00:00
-*dpmsSuspend: 2:00:00
-*dpmsOff: 4:00:00
-*grabDesktopImages: True
-*grabVideoFrames: False
-*chooseRandomImages: False
-*imageDirectory:
-*nice: 10
-*memoryLimit: 0
-*lock: False
-*verbose: False
-*timestamp: True
-*fade: True
-*unfade: False
-*fadeSeconds: 0:00:03
-*fadeTicks: 20
-*splash: True
-*splashDuration: 0:00:05
-*visualID: default
-*captureStderr: True
-*ignoreUninstalledPrograms: False
-
-*textMode: file
-*textLiteral: XScreenSaver
-*textFile:
-*textProgram: fortune
-*textURL: http://www.livejournal.com/stats/latest-rss.bml
-
-*overlayTextForeground: #FFFF00
-*overlayTextBackground: #000000
-*overlayStderr: True
-*font: *-medium-r-*-140-*-m-*
-
-! The default is to use these extensions if available (as noted.)
-*sgiSaverExtension: True
-*xidleExtension: True
-*procInterrupts: True
-
-! Set this to True if you are experiencing longstanding XFree86 bug #421
-! (xscreensaver not covering the whole screen)
-GetViewPortIsFullOfLies: False
-
-! This is what the "Demo" button on the splash screen runs (/bin/sh syntax.)
-*demoCommand: xscreensaver-demo
-
-! This is what the "Prefs" button on the splash screen runs (/bin/sh syntax.)
-*prefsCommand: xscreensaver-demo -prefs
-
-! This is the URL loaded by the "Help" button on the splash screen,
-! and by the "Documentation" menu item in xscreensaver-demo.
-*helpURL: http://www.jwz.org/xscreensaver/man.html
-
-! loadURL -- how the "Help" buttons load the helpURL (/bin/sh syntax.)
-! manualCommand -- how the "Documentation" buttons display man pages.
-!
-! And there are so very many options to choose from!
-!
-! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)
-!
-*loadURL: gnome-open '%s'
-*manualCommand: gnome-terminal --title '%s manual' \
- --command '/bin/sh -c "man %s; read foo"'
-!
-! Gnome 2.2:
-!
-! *loadURL: gnome-url-show '%s'
-! *manualCommand: gnome-terminal --title '%s manual' \
-! --command '/bin/sh -c "man %s; read foo"'
-!
-! Gnome 1.4:
-!
-! *loadURL: gnome-moz-remote --newwin '%s'
-! *manualCommand: gnome-help-browser 'man:%s'
-!
-! non-Gnome systems:
-!
-! *loadURL: firefox '%s' || mozilla '%s' || netscape '%s'
-! *manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \
-! -e /bin/sh -c 'man "%s" ; read foo'
-
-
-! The format used for printing the date and time in the password dialog box
-! (see the strftime(3) manual page for details.)
-*dateFormat: %d-%b-%y (%a); %I:%M %p
-! To show the time only:
-! *dateFormat: %I:%M %p
-! For 24 hour time:
-! *dateFormat: %H:%M
-
-
-! This command is executed by the "New Login" button on the lock dialog.
-! (That button does not appear on the dialog if this program does not exist.)
-! For Gnome: probably "gdmflexiserver -ls". KDE, probably "kdmctl reserve".
-!
-! *newLoginCommand: gdmflexiserver -ls
-
-
-! Turning on "installColormap" on 8-bit systems interacts erratically with
-! certain jurassic window managers. If your screen turns some color other
-! than black, the window manager is buggy, and you need to set this resource
-! to false. Or switch WMs. Or join the 21st century and get a 24-bit
-! graphics card.
-!
-*installColormap: True
-
-
-! This is the list of installed screen saver modes. See "man xscreensaver"
-! for the syntax used here.
-!
-! If you want to disable a screensaver, DO NOT remove it from this list:
-! instead, mark it as inactive by placing a "-" at the beginning of the line.
-!
-! You can use the `xscreensaver-demo' program to edit the current list of
-! screen savers interactively.
-!
-*programs: \
- "Qix (solid)" qix -root -solid -segments 100 \n\
- "Qix (transparent)" qix -root -count 4 -solid -transparent \n\
- "Qix (linear)" qix -root -count 5 -solid -transparent \
- -linear -segments 250 -size 100 \n\
- \
- "Attraction (balls)" attraction -root -mode balls \n\
- "Attraction (lines)" attraction -root -mode lines -points 3 \
- -segments 200 \n\
-- "Attraction (splines)" attraction -root -mode splines -segments \
- 300 \n\
-- "Attraction (orbital)" attraction -root -mode lines -radius 300 \
- -orbit -vmult 0.5 \n\
- \
- pyro -root \n\
- rocks -root \n\
- helix -root \n\
- pedal -root \n\
- rorschach -root \n\
- hopalong -root \n\
- greynetic -root \n\
- imsmap -root \n\
- slidescreen -root \n\
- decayscreen -root \n\
- jigsaw -root \n\
- blitspin -root \n\
- slip -root \n\
- distort -root \n\
- spotlight -root \n\
- "Ripples (stir)" ripples -root -oily -light 2 -stir \n\
- "Ripples (desktop)" ripples -root -water -light 6 \n\
- hypercube -root \n\
-- hyperball -root \n\
- halo -root \n\
- maze -root \n\
- noseguy -root \n\
- flame -root \n\
-- lmorph -root \n\
- deco -root \n\
- moire -root \n\
- moire2 -root \n\
- lightning -root \n\
- strange -root \n\
-- spiral -root \n\
- laser -root \n\
- grav -root \n\
- drift -root \n\
- ifs -root \n\
- julia -root \n\
- penrose -root \n\
-- sierpinski -root \n\
- braid -root \n\
- galaxy -root \n\
- bouboule -root \n\
- swirl -root \n\
- flag -root \n\
- sphere -root \n\
- forest -root \n\
-- lisa -root \n\
-- lissie -root \n\
- goop -root \n\
- starfish -root \n\
- munch -root \n\
- mismunch -root \n\
- fadeplot -root \n\
- coral -root \n\
- mountain -root \n\
- triangle -root \n\
-- worm -root \n\
-- rotor -root \n\
-- demon -root \n\
-- loop -root \n\
-- vines -root \n\
- kaleidescope -root \n\
- xjack -root \n\
- xlyap -root \n\
- cynosure -root \n\
- flow -root \n\
- epicycle -root \n\
- interference -root \n\
- truchet -root \n\
- bsod -root \n\
- crystal -root \n\
- discrete -root \n\
- kumppa -root \n\
- rd-bomb -root \n\
- "RD-Bomb (mobile)" rd-bomb -root -speed 1 -size 0.1 \n\
- sonar -root \n\
- t3d -root \n\
- penetrate -root \n\
- deluxe -root \n\
- compass -root \n\
- squiral -root \n\
- xflame -root \n\
- wander -root \n\
- "Wander (spots)" wander -root -advance 0 -size 10 -circles \
- -length 10000 -reset 100000 \n\
-- critical -root \n\
- phosphor -root \n\
- xmatrix -root \n\
- petri -root \n\
- "Petri 2" petri -root -minlifespeed 0.02 \
- -maxlifespeed 0.03 -minlifespan 1 \
- -maxlifespan 1 -instantdeathchan 0 \
- -minorchan 0 -anychan 0.3 \n\
- shadebobs -root \n\
- ccurve -root \n\
- blaster -root \n\
- bumps -root \n\
- xanalogtv -root \n\
- xspirograph -root \n\
- nerverot -root \n\
- xrayswarm -root \n\
-- "Zoom (Fatbits)" zoom -root \n\
- "Zoom (Lenses)" zoom -root -lenses \n\
- rotzoomer -root \n\
- whirlwindwarp -root \n\
- whirlygig -root \n\
- speedmine -root \n\
- "SpeedWorm" speedmine -root -worm \n\
- vermiculate -root \n\
- twang -root \n\
- apollonian -root \n\
- euler2d -root \n\
- "Euler2d (dense)" euler2d -root -count 4000 -eulertail 400 \
- -ncolors 230 \n\
-- juggle -root \n\
- polyominoes -root \n\
-- thornbird -root \n\
- fluidballs -root \n\
- anemone -root \n\
- halftone -root \n\
- metaballs -root \n\
- eruption -root \n\
- popsquares -root \n\
- barcode -root \n\
- piecewise -root \n\
- cloudlife -root \n\
- fontglide -root \n\
- apple2 -root \n\
- bubbles -root \n\
- pong -root \n\
- wormhole -root \n\
- pacman -root \n\
- fuzzyflakes -root \n\
- anemotaxis -root \n\
- memscroller -root \n\
- substrate -root \n\
- intermomentary -root \n\
- interaggregate -root \n\
- fireworkx -root \n\
- fiberlamp -root \n\
- boxfit -root \n\
- celtic -root \n\
- cwaves -root \n\
- m6502 -root \n\
- abstractile -root \n\
-- lcdscrub -root \n\
-- default-n: webcollage -root \n\
-- default-n: "WebCollage (whacked)" \
- webcollage -root -filter \
- 'vidwhacker -stdin -stdout' \n\
-- default-n: vidwhacker -root \n\
- \
- GL: gears -root \n\
- GL: superquadrics -root \n\
- GL: morph3d -root \n\
- GL: cage -root \n\
- GL: moebius -root \n\
- GL: stairs -root \n\
- GL: pipes -root \n\
- GL: sproingies -root \n\
- GL: rubik -root \n\
- GL: atlantis -root \n\
- GL: lament -root \n\
- GL: bubble3d -root \n\
- GL: glplanet -root \n\
- GL: flurry -root \n\
- GL: pulsar -root \n\
-- GL: "Pulsar (textures)" \
- pulsar -root -texture -mipmap \
- -texture_quality -light -fog \n\
- GL: extrusion -root \n\
- GL: sierpinski3d -root \n\
- GL: menger -root \n\
- GL: gflux -root \n\
- GL: "GFlux (grab)" gflux -root -mode grab \n\
- GL: stonerview -root \n\
- GL: starwars -root \n\
- GL: gltext -root \n\
- GL: "GLText (clock)" gltext -text "%A%n%d %b %Y%n%r" -root \n\
- GL: molecule -root \n\
- GL: dangerball -root \n\
- GL: circuit -root \n\
- GL: engine -root \n\
- GL: flipscreen3d -root \n\
- GL: glsnake -root \n\
- GL: boxed -root \n\
-- GL: glforestfire -root \n\
-- GL: "GLForestFire (rain)" glforestfire -root -count 0 \n\
-- GL: sballs -root \n\
- GL: cubenetic -root \n\
- GL: spheremonics -root \n\
- GL: lavalite -root \n\
- GL: queens -root \n\
- GL: endgame -root \n\
-- GL: glblur -root \n\
- GL: atunnel -root \n\
- GL: flyingtoasters -root \n\
- GL: bouncingcow -root \n\
- GL: jigglypuff -root \n\
- GL: klein -root \n\
- GL: hypertorus -root \n\
- GL: glmatrix -root \n\
- GL: cubestorm -root \n\
- GL: glknots -root \n\
- GL: blocktube -root \n\
- GL: flipflop -root \n\
- GL: antspotlight -root \n\
-- GL: glslideshow -root \n\
- GL: polytopes -root \n\
- GL: gleidescope -root \n\
-- GL: mirrorblob -root \n\
- GL: "MirrorBlob (color only)" \
- mirrorblob -root -colour -no-texture \n\
- GL: blinkbox -root \n\
- GL: noof -root \n\
- GL: polyhedra -root \n\
-- GL: antinspect -root \n\
- GL: providence -root \n\
- GL: "Pinion (large gears)" pinion -root \n\
- GL: "Pinion (small gears)" pinion -root -size 0.2 -scroll 0.3 \n\
- GL: boing -root -lighting -smooth \n\
-- GL: carousel -root \n\
- GL: fliptext -root \n\
-- GL: antmaze -root \n\
- GL: tangram -root \n\
- GL: crackberg -root \n\
- GL: glhanoi -root \n\
- GL: cube21 -root \n\
- GL: timetunnel -root \n\
- GL: juggler3d -root \n\
- GL: topblock -root \n\
- GL: glschool -root \n\
- GL: glcells -root \n\
- GL: voronoi -root \n\
- GL: moebiusgears -root \n\
- GL: lockward -root \n\
- GL: cubicgrid -root \n\
- GL: hypnowheel -root \n\
- GL: "Hypnowheel (dense)" hypnowheel -root -count 3 -layers 50 \n\
- GL: "Hypnowheel (trifoil)" hypnowheel -root -count 3 -layers 2 -speed 9 -twist 9 -wander \n\
- GL: skytentacles -root \n\
- \
-- xdaliclock -root -font BUILTIN3 \n\
-- xplanet -vroot -wait 1 -timewarp 90000 \
- -label -origin moon \n\
-- xmountains -b -M -Z 0 -r 1 \n\
-- "XMountains (top)" xmountains -b -M -Z 0 -r 1 -m \n\
-- xaos -root -autopilot -nogui -delay 10000 \
- -maxframerate 30 \
- -incoloring -1 -outcoloring -1 \n\
-- xsnow -root \n\
-- goban -root \n\
-- electricsheep \n\
-- cosmos -root \n\
-- GL: sphereEversion --root \n\
-- GL: fireflies -root \n
-
-
-
-!=============================================================================
-!
-! You probably don't want to change anything after this point.
-!
-!=============================================================================
-
-
-XScreenSaver.pointerPollTime: 0:00:05
-XScreenSaver.pointerHysteresis: 10
-XScreenSaver.initialDelay: 0:00:00
-XScreenSaver.windowCreationTimeout: 0:00:30
-XScreenSaver.bourneShell: /bin/sh
-
-
-! Resources for the password and splash-screen dialog boxes of
-! the "xscreensaver" daemon.
-!
-*Dialog.headingFont: *-helvetica-bold-r-*-*-*-180-*-*-*-iso8859-1
-*Dialog.bodyFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
-*Dialog.labelFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
-*Dialog.unameFont: *-helvetica-bold-r-*-*-*-120-*-*-*-iso8859-1
-*Dialog.buttonFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
-*Dialog.dateFont: *-helvetica-medium-r-*-*-*-80-*-*-*-iso8859-1
-! Helvetica asterisks look terrible.
-!*passwd.passwdFont: *-helvetica-medium-r-*-*-*-140-*-*-*-iso8859-1
-*passwd.passwdFont: *-courier-medium-r-*-*-*-140-*-*-*-iso8859-1
-
-*Dialog.foreground: #000000
-*Dialog.background: #E6E6E6
-*Dialog.Button.foreground: #000000
-*Dialog.Button.background: #F5F5F5
-!*Dialog.Button.pointBackground: #EAEAEA
-!*Dialog.Button.clickBackground: #C3C3C3
-*Dialog.text.foreground: #000000
-*Dialog.text.background: #FFFFFF
-*passwd.thermometer.foreground: #4464AC
-*passwd.thermometer.background: #FFFFFF
-*Dialog.topShadowColor: #FFFFFF
-*Dialog.bottomShadowColor: #CECECE
-*Dialog.logo.width: 210
-*Dialog.logo.height: 210
-*Dialog.internalBorderWidth: 24
-*Dialog.borderWidth: 1
-*Dialog.shadowThickness: 2
-
-*passwd.heading.label: XScreenSaver %s
-*passwd.body.label: This screen is locked.
-*passwd.unlock.label: OK
-*passwd.login.label: New Login
-*passwd.user.label: Username:
-*passwd.thermometer.width: 8
-*passwd.asterisks: True
-*passwd.uname: True
-
-*splash.heading.label: XScreenSaver %s
-*splash.body.label: Copyright \xA9 1991-2008 by
-*splash.body2.label: Jamie Zawinski <jwz at jwz.org>
-*splash.demo.label: Settings
-*splash.help.label: Help
-
-
-!=============================================================================
-!
-! Pretty names for the hacks that have unusual capitalization.
-!
-!=============================================================================
-
-*hacks.imsmap.name: IMSmap
-*hacks.slidescreen.name: SlideScreen
-*hacks.decayscreen.name: DecayScreen
-*hacks.blitspin.name: BlitSpin
-*hacks.lmorph.name: LMorph
-*hacks.ifs.name: IFS
-*hacks.fadeplot.name: FadePlot
-*hacks.bsod.name: BSOD
-*hacks.rd-bomb.name: RD-Bomb
-*hacks.t3d.name: T3D
-*hacks.shadebobs.name: ShadeBobs
-*hacks.ccurve.name: C Curve
-*hacks.xanalogtv.name: XAnalogTV
-*hacks.xspirograph.name: XSpiroGraph
-*hacks.nerverot.name: NerveRot
-*hacks.webcollage.name: WebCollage
-*hacks.vidwhacker.name: VidWhacker
-*hacks.morph3d.name: Morph3D
-*hacks.bubble3d.name: Bubble3D
-*hacks.sierpinski3d.name: Sierpinski3D
-*hacks.gflux.name: GFlux
-*hacks.xrayswarm.name: XRaySwarm
-*hacks.whirlwindwarp.name: WhirlwindWarp
-*hacks.rotzoomer.name: RotZoomer
-*hacks.stonerview.name: StonerView
-*hacks.starwars.name: StarWars
-*hacks.dangerball.name: DangerBall
-*hacks.whirlygig.name: WhirlyGig
-*hacks.speedmine.name: SpeedMine
-*hacks.glforestfire.name: GLForestFire
-*hacks.sballs.name: SBalls
-*hacks.xdaliclock.name: XDaliClock
-*hacks.xplanetbg.name: XPlanet
-*hacks.xplanet.name: XPlanet
-*hacks.xaos.name: XaoS
-*hacks.xfishtank.name: XFishTank
-*hacks.electricsheep.name: ElectricSheep
-*hacks.sphereEversion.name: SphereEversion
-*hacks.fluidballs.name: FluidBalls
-*hacks.flyingtoasters.name: FlyingToasters
-*hacks.bouncingcow.name: BouncingCow
-*hacks.jigglypuff.name: JigglyPuff
-*hacks.hypertorus.name: HyperTorus
-*hacks.cubestorm.name: CubeStorm
-*hacks.blocktube.name: BlockTube
-*hacks.flipflop.name: FlipFlop
-*hacks.antspotlight.name: AntSpotlight
-*hacks.fontglide.name: FontGlide
-*hacks.mirrorblob.name: MirrorBlob
-*hacks.blinkbox.name: BlinkBox
-*hacks.fuzzyflakes.name: FuzzyFlakes
-*hacks.memscroller.name: MemScroller
-*hacks.boxfit.name: BoxFit
-*hacks.fliptext.name: FlipText
-*hacks.glhanoi.name: GLHanoi
-*hacks.topblock.name: TopBlock
-*hacks.glschool.name: GLSchool
-*hacks.glcells.name: GLCells
-*hacks.moebiusgears.name: MoebiusGears
-*hacks.cubicgrid.name: CubicGrid
-*hacks.lcdscrub.name: LCDscrub
-*hacks.hypnowheel.name: HypnoWheel
-*hacks.skytentacles.name: SkyTentacles
-
-! obsolete, but still used by xscreensaver-demo-Xm.
-*hacks.documentation.isInstalled: True
-
-! (xrdb prevention kludge: whole file) */
Modified: trunk/x11/xscreensaver/files/patch-config.h.in
===================================================================
--- trunk/x11/xscreensaver/files/patch-config.h.in 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xscreensaver/files/patch-config.h.in 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,6 +1,6 @@
---- config.h.in.orig 2013-09-02 12:44:35.341733572 +0200
-+++ config.h.in 2013-09-02 12:45:05.396737361 +0200
-@@ -340,6 +340,9 @@
+--- config.h.in.orig 2016-04-03 20:07:59 UTC
++++ config.h.in
+@@ -307,6 +307,9 @@
/* Define to 1 if you have the <util.h> header file. */
#undef HAVE_UTIL_H
Modified: trunk/x11/xscreensaver/files/patch-configure.in
===================================================================
--- trunk/x11/xscreensaver/files/patch-configure.in 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xscreensaver/files/patch-configure.in 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,11 +1,11 @@
---- configure.in.orig 2013-09-02 12:45:33.940731237 +0200
-+++ configure.in 2013-09-02 12:46:13.253728009 +0200
-@@ -3359,7 +3359,7 @@
+--- configure.in.orig 2016-05-19 17:59:17 UTC
++++ configure.in
+@@ -3538,7 +3538,7 @@ fi
###############################################################################
PTY_LIBS=
--AC_CHECK_HEADERS(pty.h util.h)
-+AC_CHECK_HEADERS(pty.h util.h libutil.h)
+-AC_CHECK_HEADERS(pty.h util.h sys/termios.h)
++AC_CHECK_HEADERS(pty.h util.h libutil.h sys/termios.h)
AC_CHECK_X_LIB(util, forkpty,
[PTY_LIBS="-lutil"
ac_have_forkpty=yes
Modified: trunk/x11/xscreensaver/files/patch-driver_Makefile.in
===================================================================
--- trunk/x11/xscreensaver/files/patch-driver_Makefile.in 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xscreensaver/files/patch-driver_Makefile.in 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,8 +1,17 @@
---- driver/Makefile.in.orig 2013-07-16 11:23:32.000000000 +0200
-+++ driver/Makefile.in 2013-09-02 11:56:16.862939343 +0200
-@@ -81,8 +81,8 @@
+--- driver/Makefile.in.orig 2016-05-24 18:02:30 UTC
++++ driver/Makefile.in
+@@ -51,7 +51,7 @@ DEPEND_DEFINES = @DEPEND_DEFINES@
+ SHELL = /bin/sh
+ INSTALL = @INSTALL@
+-SUID_FLAGS = -o root -m 4755
++SUID_FLAGS = -m 755
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_SETUID = @INSTALL_SETUID@
+@@ -81,8 +81,8 @@ XPM_LIBS = @XPM_LIBS@
+
AD_DIR = @APPDEFAULTS@
-PAM_DIR = /etc/pam.d
-PAM_CONF = /etc/pam.conf
@@ -11,12 +20,3 @@
UTILS_SRC = $(srcdir)/../utils
UTILS_BIN = ../utils
-@@ -207,7 +207,7 @@
- SAVER_LIBS = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
- $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
- -lXt -lX11 -lXext $(X_EXTRA_LIBS) \
-- $(PASSWD_LIBS)
-+ $(PASSWD_LIBS) $(INTL_LIBS)
-
- CMD_LIBS = $(LIBS) $(X_LIBS) \
- $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
Modified: trunk/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
===================================================================
--- trunk/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,5 +1,5 @@
---- driver/XScreenSaver.ad.in.orig 2013-12-09 12:01:40.000000000 +0100
-+++ driver/XScreenSaver.ad.in 2013-12-17 19:34:28.222008084 +0100
+--- driver/XScreenSaver.ad.in.orig 2016-05-24 18:02:30 UTC
++++ driver/XScreenSaver.ad.in
@@ -56,7 +56,7 @@
*splashDuration: 0:00:05
*visualID: default
@@ -6,10 +6,10 @@
*captureStderr: True
-*ignoreUninstalledPrograms: False
+*ignoreUninstalledPrograms: True
+ *authWarningSlack: 20
*textMode: file
- *textLiteral: XScreenSaver
-@@ -122,7 +122,7 @@
+@@ -123,7 +123,7 @@ GetViewPortIsFullOfLies: False
! The format used for printing the date and time in the password dialog box
! (see the strftime(3) manual page for details.)
@@ -18,7 +18,7 @@
! To show the time only:
! *dateFormat: %I:%M %p
! For 24 hour time:
-@@ -156,6 +156,18 @@
+@@ -158,6 +158,18 @@ GetViewPortIsFullOfLies: False
! screen savers interactively.
!
*programs: \
@@ -37,19 +37,11 @@
maze -root \n\
@GL_KLUDGE@ GL: superquadrics -root \n\
attraction -root \n\
-@@ -251,7 +263,6 @@
- xspirograph -root \n\
- @GL_KLUDGE@ GL: circuit -root \n\
- @GL_KLUDGE@ GL: dangerball -root \n\
--- GL: dnalogo -root \n\
- @GL_KLUDGE@ GL: engine -root \n\
- @GL_KLUDGE@ GL: flipscreen3d -root \n\
- @GL_KLUDGE@ GL: gltext -root \n\
-@@ -449,7 +460,6 @@
+@@ -465,7 +477,6 @@ XScreenSaver.bourneShell: /bin/sh
*hacks.cwaves.name: CWaves
*hacks.dangerball.name: DangerBall
*hacks.decayscreen.name: DecayScreen
-*hacks.dnalogo.name: DNA Logo
+ *hacks.dymaxionmap.name: DymaxionMap
+ *hacks.energystream.name: EnergyStream
*hacks.euler2d.name: Euler2D
- *hacks.fadeplot.name: FadePlot
- *hacks.flipflop.name: FlipFlop
Modified: trunk/x11/xscreensaver/files/patch-hacks__config__sonar.xml
===================================================================
--- trunk/x11/xscreensaver/files/patch-hacks__config__sonar.xml 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xscreensaver/files/patch-hacks__config__sonar.xml 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,6 +1,6 @@
---- hacks/config/sonar.xml.orig 2013-12-04 23:42:00.000000000 +0100
-+++ hacks/config/sonar.xml 2013-12-09 12:29:34.301395635 +0100
-@@ -29,7 +29,7 @@
+--- hacks/config/sonar.xml.orig 2016-04-08 02:15:38 UTC
++++ hacks/config/sonar.xml
+@@ -31,7 +31,7 @@
<option id="ssh" _label="Ping known SSH hosts" arg-set="-ping /etc/hosts,$HOME/.ssh/known_hosts,$HOME/.ssh/known_hosts2"/>
@@ -9,12 +9,12 @@
<option id="sim" _label="Simulation (don't ping)" arg-set="-ping simulation"/>
</select>
-@@ -76,6 +76,8 @@
+@@ -78,6 +78,8 @@ respectively.
Alternately, it can run a simulation that doesn't involve hosts.
+To ping, use the port build option to install this suid.
+
- http://en.wikipedia.org/wiki/Ping#History
+ https://en.wikipedia.org/wiki/Ping#History
Written by Jamie Zawinski and Stephen Martin; 1998.
Modified: trunk/x11/xscreensaver/files/patch-hacks_memscroller.c
===================================================================
--- trunk/x11/xscreensaver/files/patch-hacks_memscroller.c 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xscreensaver/files/patch-hacks_memscroller.c 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,12 +1,16 @@
---- hacks/memscroller.c.orig 2014-06-12 20:55:52.000000000 +0200
-+++ hacks/memscroller.c 2014-06-12 20:56:03.000000000 +0200
-@@ -349,9 +349,6 @@
- from earlier days before the advent of virtual memory management."
- -- sbrk(2) man page on MacOS
- */
--# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
--# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
--# endif
- himem = ((unsigned char *) sbrk(0)) - (2 * sizeof(void *));
- # endif
+--- hacks/memscroller.c.orig 2016-05-22 01:57:03 UTC
++++ hacks/memscroller.c
+@@ -306,13 +306,6 @@ open_file (state *st)
+ from earlier days before the advent of virtual memory management."
+ -- sbrk(2) man page on BSD systems, as of 1995 or so.
+ */
+-#ifdef HAVE_SBRK
+-# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
+- /* Don't print "warning: 'sbrk' is deprecated". */
+-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+-# endif
+-#endif
+-
+ static unsigned int
+ more_bits (state *st, scroller *sc)
Modified: trunk/x11/xscreensaver/files/patch-utils_textclient.c
===================================================================
--- trunk/x11/xscreensaver/files/patch-utils_textclient.c 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xscreensaver/files/patch-utils_textclient.c 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,8 +1,8 @@
---- utils/textclient.c.orig 2013-09-02 12:43:01.271738814 +0200
-+++ utils/textclient.c 2013-09-02 12:43:25.014748042 +0200
-@@ -50,6 +50,9 @@
- # ifdef HAVE_UTIL_H
- # include <util.h>
+--- utils/textclient.c.orig 2016-04-28 02:29:36 UTC
++++ utils/textclient.c
+@@ -55,6 +55,9 @@
+ # ifdef HAVE_SYS_TERMIOS_H
+ # include <sys/termios.h>
# endif
+# ifdef HAVE_LIBUTIL_H
+# include <libutil.h>
@@ -9,4 +9,4 @@
+# endif
#endif /* HAVE_FORKPTY */
- /*#define DEBUG*/
+ #undef DEBUG
Modified: trunk/x11/xscreensaver/pkg-descr
===================================================================
--- trunk/x11/xscreensaver/pkg-descr 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xscreensaver/pkg-descr 2019-02-09 16:31:07 UTC (rev 24922)
@@ -10,4 +10,4 @@
extremely easy to add new programs like xearth, or any other program that
can fill the root window as additional screensavers.
-WWW: http://www.jwz.org/xscreensaver/
+WWW: https://www.jwz.org/xscreensaver/
Modified: trunk/x11/xscreensaver/pkg-plist
===================================================================
--- trunk/x11/xscreensaver/pkg-plist 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xscreensaver/pkg-plist 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,4 +1,4 @@
-bin/xscreensaver
+@(,,4755) bin/xscreensaver
bin/xscreensaver-command
bin/xscreensaver-demo
bin/xscreensaver-getimage
@@ -17,6 +17,7 @@
bin/xscreensaver-hacks/attraction
bin/xscreensaver-hacks/atunnel
bin/xscreensaver-hacks/barcode
+bin/xscreensaver-hacks/binaryring
bin/xscreensaver-hacks/blaster
bin/xscreensaver-hacks/blinkbox
bin/xscreensaver-hacks/blitspin
@@ -35,15 +36,19 @@
bin/xscreensaver-hacks/ccurve
bin/xscreensaver-hacks/celtic
bin/xscreensaver-hacks/circuit
+bin/xscreensaver-hacks/cityflow
bin/xscreensaver-hacks/cloudlife
bin/xscreensaver-hacks/companioncube
bin/xscreensaver-hacks/compass
bin/xscreensaver-hacks/coral
bin/xscreensaver-hacks/crackberg
+bin/xscreensaver-hacks/crumbler
bin/xscreensaver-hacks/crystal
bin/xscreensaver-hacks/cube21
bin/xscreensaver-hacks/cubenetic
+bin/xscreensaver-hacks/cubestack
bin/xscreensaver-hacks/cubestorm
+bin/xscreensaver-hacks/cubetwist
bin/xscreensaver-hacks/cubicgrid
bin/xscreensaver-hacks/cwaves
bin/xscreensaver-hacks/cynosure
@@ -52,17 +57,22 @@
bin/xscreensaver-hacks/deco
bin/xscreensaver-hacks/deluxe
bin/xscreensaver-hacks/demon
+bin/xscreensaver-hacks/discoball
bin/xscreensaver-hacks/discrete
bin/xscreensaver-hacks/distort
bin/xscreensaver-hacks/drift
+bin/xscreensaver-hacks/dymaxionmap
bin/xscreensaver-hacks/endgame
+bin/xscreensaver-hacks/energystream
bin/xscreensaver-hacks/engine
bin/xscreensaver-hacks/epicycle
bin/xscreensaver-hacks/eruption
+bin/xscreensaver-hacks/esper
bin/xscreensaver-hacks/euler2d
bin/xscreensaver-hacks/extrusion
bin/xscreensaver-hacks/fadeplot
bin/xscreensaver-hacks/fiberlamp
+bin/xscreensaver-hacks/filmleader
bin/xscreensaver-hacks/fireworkx
bin/xscreensaver-hacks/flame
bin/xscreensaver-hacks/flipflop
@@ -76,11 +86,14 @@
bin/xscreensaver-hacks/fuzzyflakes
bin/xscreensaver-hacks/galaxy
bin/xscreensaver-hacks/gears
+bin/xscreensaver-hacks/geodesic
+bin/xscreensaver-hacks/geodesicgears
bin/xscreensaver-hacks/gflux
bin/xscreensaver-hacks/glblur
bin/xscreensaver-hacks/glcells
bin/xscreensaver-hacks/gleidescope
bin/xscreensaver-hacks/glhanoi
+bin/xscreensaver-hacks/glitchpeg
bin/xscreensaver-hacks/glknots
bin/xscreensaver-hacks/glmatrix
bin/xscreensaver-hacks/glplanet
@@ -95,8 +108,10 @@
bin/xscreensaver-hacks/halo
bin/xscreensaver-hacks/helix
bin/xscreensaver-hacks/hexadrop
+bin/xscreensaver-hacks/hexstrut
bin/xscreensaver-hacks/hilbert
bin/xscreensaver-hacks/hopalong
+bin/xscreensaver-hacks/hydrostat
bin/xscreensaver-hacks/hypertorus
bin/xscreensaver-hacks/hypnowheel
bin/xscreensaver-hacks/ifs
@@ -108,8 +123,8 @@
bin/xscreensaver-hacks/jigsaw
bin/xscreensaver-hacks/juggler3d
bin/xscreensaver-hacks/julia
+bin/xscreensaver-hacks/kaleidescope
bin/xscreensaver-hacks/kaleidocycle
-bin/xscreensaver-hacks/kaleidescope
bin/xscreensaver-hacks/klein
bin/xscreensaver-hacks/kumppa
bin/xscreensaver-hacks/lament
@@ -120,6 +135,7 @@
bin/xscreensaver-hacks/loop
bin/xscreensaver-hacks/m6502
bin/xscreensaver-hacks/maze
+bin/xscreensaver-hacks/maze3d
bin/xscreensaver-hacks/memscroller
bin/xscreensaver-hacks/menger
bin/xscreensaver-hacks/metaballs
@@ -137,6 +153,7 @@
bin/xscreensaver-hacks/noseguy
bin/xscreensaver-hacks/pacman
bin/xscreensaver-hacks/pedal
+bin/xscreensaver-hacks/peepers
bin/xscreensaver-hacks/penetrate
bin/xscreensaver-hacks/penrose
bin/xscreensaver-hacks/petri
@@ -150,6 +167,7 @@
bin/xscreensaver-hacks/polytopes
bin/xscreensaver-hacks/pong
bin/xscreensaver-hacks/popsquares
+bin/xscreensaver-hacks/projectiveplane
bin/xscreensaver-hacks/providence
bin/xscreensaver-hacks/pulsar
bin/xscreensaver-hacks/pyro
@@ -156,9 +174,12 @@
bin/xscreensaver-hacks/qix
bin/xscreensaver-hacks/quasicrystal
bin/xscreensaver-hacks/queens
+bin/xscreensaver-hacks/raverhoop
+bin/xscreensaver-hacks/razzledazzle
bin/xscreensaver-hacks/rd-bomb
bin/xscreensaver-hacks/ripples
bin/xscreensaver-hacks/rocks
+bin/xscreensaver-hacks/romanboy
bin/xscreensaver-hacks/rorschach
bin/xscreensaver-hacks/rotzoomer
bin/xscreensaver-hacks/rubik
@@ -170,9 +191,13 @@
bin/xscreensaver-hacks/skytentacles
bin/xscreensaver-hacks/slidescreen
bin/xscreensaver-hacks/slip
+%%SETUID_HACKS%%@mode 4755
bin/xscreensaver-hacks/sonar
+%%SETUID_HACKS%%@mode
bin/xscreensaver-hacks/speedmine
bin/xscreensaver-hacks/spheremonics
+bin/xscreensaver-hacks/splitflap
+bin/xscreensaver-hacks/splodesic
bin/xscreensaver-hacks/spotlight
bin/xscreensaver-hacks/sproingies
bin/xscreensaver-hacks/squiral
@@ -186,6 +211,7 @@
bin/xscreensaver-hacks/surfaces
bin/xscreensaver-hacks/swirl
bin/xscreensaver-hacks/tangram
+bin/xscreensaver-hacks/tessellimage
bin/xscreensaver-hacks/thornbird
bin/xscreensaver-hacks/timetunnel
bin/xscreensaver-hacks/topblock
@@ -193,13 +219,18 @@
bin/xscreensaver-hacks/tronbit
bin/xscreensaver-hacks/truchet
bin/xscreensaver-hacks/twang
+bin/xscreensaver-hacks/unicrud
bin/xscreensaver-hacks/unknownpleasures
bin/xscreensaver-hacks/vermiculate
+bin/xscreensaver-hacks/vfeedback
bin/xscreensaver-hacks/vidwhacker
+bin/xscreensaver-hacks/vigilance
bin/xscreensaver-hacks/voronoi
bin/xscreensaver-hacks/wander
bin/xscreensaver-hacks/webcollage
+bin/xscreensaver-hacks/webcollage-helper
bin/xscreensaver-hacks/whirlwindwarp
+bin/xscreensaver-hacks/winduprobot
bin/xscreensaver-hacks/wormhole
bin/xscreensaver-hacks/xanalogtv
bin/xscreensaver-hacks/xflame
@@ -211,7 +242,7 @@
bin/xscreensaver-hacks/zoom
bin/xscreensaver-text
%%PAM%%etc/pam.d/xscreensaver
- at comment lib/X11/app-defaults/XScreenSaver
+lib/X11/app-defaults/XScreenSaver
man/man1/xscreensaver-command.1.gz
man/man1/xscreensaver-demo.1.gz
man/man1/xscreensaver-getimage-file.1.gz
@@ -231,6 +262,7 @@
man/man6/attraction.6.gz
man/man6/atunnel.6.gz
man/man6/barcode.6.gz
+man/man6/binaryring.6.gz
man/man6/blaster.6.gz
man/man6/blinkbox.6.gz
man/man6/blitspin.6.gz
@@ -249,15 +281,19 @@
man/man6/ccurve.6.gz
man/man6/celtic.6.gz
man/man6/circuit.6.gz
+man/man6/cityflow.6.gz
man/man6/cloudlife.6.gz
man/man6/companioncube.6.gz
man/man6/compass.6.gz
man/man6/coral.6.gz
man/man6/crackberg.6.gz
+man/man6/crumbler.6.gz
man/man6/crystal.6.gz
man/man6/cube21.6.gz
man/man6/cubenetic.6.gz
+man/man6/cubestack.6.gz
man/man6/cubestorm.6.gz
+man/man6/cubetwist.6.gz
man/man6/cubicgrid.6.gz
man/man6/cwaves.6.gz
man/man6/cynosure.6.gz
@@ -266,17 +302,22 @@
man/man6/deco.6.gz
man/man6/deluxe.6.gz
man/man6/demon.6.gz
+man/man6/discoball.6.gz
man/man6/discrete.6.gz
man/man6/distort.6.gz
man/man6/drift.6.gz
+man/man6/dymaxionmap.6.gz
man/man6/endgame.6.gz
+man/man6/energystream.6.gz
man/man6/engine.6.gz
man/man6/epicycle.6.gz
man/man6/eruption.6.gz
+man/man6/esper.6.gz
man/man6/euler2d.6.gz
man/man6/extrusion.6.gz
man/man6/fadeplot.6.gz
man/man6/fiberlamp.6.gz
+man/man6/filmleader.6.gz
man/man6/fireworkx.6.gz
man/man6/flame.6.gz
man/man6/flipflop.6.gz
@@ -290,11 +331,14 @@
man/man6/fuzzyflakes.6.gz
man/man6/galaxy.6.gz
man/man6/gears.6.gz
+man/man6/geodesic.6.gz
+man/man6/geodesicgears.6.gz
man/man6/gflux.6.gz
man/man6/glblur.6.gz
man/man6/glcells.6.gz
man/man6/gleidescope.6.gz
man/man6/glhanoi.6.gz
+man/man6/glitchpeg.6.gz
man/man6/glknots.6.gz
man/man6/glmatrix.6.gz
man/man6/glplanet.6.gz
@@ -308,8 +352,11 @@
man/man6/halftone.6.gz
man/man6/halo.6.gz
man/man6/helix.6.gz
+man/man6/hexadrop.6.gz
+man/man6/hexstrut.6.gz
man/man6/hilbert.6.gz
man/man6/hopalong.6.gz
+man/man6/hydrostat.6.gz
man/man6/hypertorus.6.gz
man/man6/hypnowheel.6.gz
man/man6/ifs.6.gz
@@ -321,6 +368,8 @@
man/man6/jigsaw.6.gz
man/man6/juggler3d.6.gz
man/man6/julia.6.gz
+man/man6/kaleidescope.6.gz
+man/man6/kaleidocycle.6.gz
man/man6/klein.6.gz
man/man6/kumppa.6.gz
man/man6/lament.6.gz
@@ -330,6 +379,7 @@
man/man6/lockward.6.gz
man/man6/loop.6.gz
man/man6/maze.6.gz
+man/man6/maze3d.6.gz
man/man6/memscroller.6.gz
man/man6/menger.6.gz
man/man6/metaballs.6.gz
@@ -347,6 +397,7 @@
man/man6/noseguy.6.gz
man/man6/pacman.6.gz
man/man6/pedal.6.gz
+man/man6/peepers.6.gz
man/man6/penetrate.6.gz
man/man6/penrose.6.gz
man/man6/petri.6.gz
@@ -359,14 +410,19 @@
man/man6/polyominoes.6.gz
man/man6/polytopes.6.gz
man/man6/pong.6.gz
+man/man6/projectiveplane.6.gz
man/man6/providence.6.gz
man/man6/pulsar.6.gz
man/man6/pyro.6.gz
man/man6/qix.6.gz
+man/man6/quasicrystal.6.gz
man/man6/queens.6.gz
+man/man6/raverhoop.6.gz
+man/man6/razzledazzle.6.gz
man/man6/rd-bomb.6.gz
man/man6/ripples.6.gz
man/man6/rocks.6.gz
+man/man6/romanboy.6.gz
man/man6/rorschach.6.gz
man/man6/rotzoomer.6.gz
man/man6/rubik.6.gz
@@ -381,6 +437,8 @@
man/man6/sonar.6.gz
man/man6/speedmine.6.gz
man/man6/spheremonics.6.gz
+man/man6/splitflap.6.gz
+man/man6/splodesic.6.gz
man/man6/spotlight.6.gz
man/man6/sproingies.6.gz
man/man6/squiral.6.gz
@@ -394,6 +452,7 @@
man/man6/surfaces.6.gz
man/man6/swirl.6.gz
man/man6/tangram.6.gz
+man/man6/tessellimage.6.gz
man/man6/thornbird.6.gz
man/man6/timetunnel.6.gz
man/man6/topblock.6.gz
@@ -401,12 +460,17 @@
man/man6/tronbit.6.gz
man/man6/truchet.6.gz
man/man6/twang.6.gz
+man/man6/unicrud.6.gz
+man/man6/unknownpleasures.6.gz
man/man6/vermiculate.6.gz
+man/man6/vfeedback.6.gz
man/man6/vidwhacker.6.gz
+man/man6/vigilance.6.gz
man/man6/voronoi.6.gz
man/man6/wander.6.gz
man/man6/webcollage.6.gz
man/man6/whirlwindwarp.6.gz
+man/man6/winduprobot.6.gz
man/man6/wormhole.6.gz
man/man6/xanalogtv.6.gz
man/man6/xflame.6.gz
@@ -422,6 +486,28 @@
share/applications/xscreensaver-properties.desktop
share/applications/xscreensaver-start.desktop
share/applications/xscreensaver-stop.desktop
+%%NLS%%share/locale/da/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/wa/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
share/pixmaps/xscreensaver.xpm
%%DATADIR%%/config/README
%%DATADIR%%/config/abstractile.xml
@@ -436,6 +522,7 @@
%%DATADIR%%/config/attraction.xml
%%DATADIR%%/config/atunnel.xml
%%DATADIR%%/config/barcode.xml
+%%DATADIR%%/config/binaryring.xml
%%DATADIR%%/config/blaster.xml
%%DATADIR%%/config/blinkbox.xml
%%DATADIR%%/config/blitspin.xml
@@ -454,15 +541,19 @@
%%DATADIR%%/config/ccurve.xml
%%DATADIR%%/config/celtic.xml
%%DATADIR%%/config/circuit.xml
+%%DATADIR%%/config/cityflow.xml
%%DATADIR%%/config/cloudlife.xml
+%%DATADIR%%/config/companioncube.xml
%%DATADIR%%/config/compass.xml
-%%DATADIR%%/config/companioncube.xml
%%DATADIR%%/config/coral.xml
%%DATADIR%%/config/crackberg.xml
+%%DATADIR%%/config/crumbler.xml
%%DATADIR%%/config/crystal.xml
%%DATADIR%%/config/cube21.xml
%%DATADIR%%/config/cubenetic.xml
+%%DATADIR%%/config/cubestack.xml
%%DATADIR%%/config/cubestorm.xml
+%%DATADIR%%/config/cubetwist.xml
%%DATADIR%%/config/cubicgrid.xml
%%DATADIR%%/config/cwaves.xml
%%DATADIR%%/config/cynosure.xml
@@ -471,17 +562,22 @@
%%DATADIR%%/config/deco.xml
%%DATADIR%%/config/deluxe.xml
%%DATADIR%%/config/demon.xml
+%%DATADIR%%/config/discoball.xml
%%DATADIR%%/config/discrete.xml
%%DATADIR%%/config/distort.xml
%%DATADIR%%/config/drift.xml
+%%DATADIR%%/config/dymaxionmap.xml
%%DATADIR%%/config/endgame.xml
+%%DATADIR%%/config/energystream.xml
%%DATADIR%%/config/engine.xml
%%DATADIR%%/config/epicycle.xml
%%DATADIR%%/config/eruption.xml
+%%DATADIR%%/config/esper.xml
%%DATADIR%%/config/euler2d.xml
%%DATADIR%%/config/extrusion.xml
%%DATADIR%%/config/fadeplot.xml
%%DATADIR%%/config/fiberlamp.xml
+%%DATADIR%%/config/filmleader.xml
%%DATADIR%%/config/fireworkx.xml
%%DATADIR%%/config/flame.xml
%%DATADIR%%/config/flipflop.xml
@@ -495,11 +591,14 @@
%%DATADIR%%/config/fuzzyflakes.xml
%%DATADIR%%/config/galaxy.xml
%%DATADIR%%/config/gears.xml
+%%DATADIR%%/config/geodesic.xml
+%%DATADIR%%/config/geodesicgears.xml
%%DATADIR%%/config/gflux.xml
%%DATADIR%%/config/glblur.xml
%%DATADIR%%/config/glcells.xml
%%DATADIR%%/config/gleidescope.xml
%%DATADIR%%/config/glhanoi.xml
+%%DATADIR%%/config/glitchpeg.xml
%%DATADIR%%/config/glknots.xml
%%DATADIR%%/config/glmatrix.xml
%%DATADIR%%/config/glplanet.xml
@@ -514,8 +613,10 @@
%%DATADIR%%/config/halo.xml
%%DATADIR%%/config/helix.xml
%%DATADIR%%/config/hexadrop.xml
+%%DATADIR%%/config/hexstrut.xml
%%DATADIR%%/config/hilbert.xml
%%DATADIR%%/config/hopalong.xml
+%%DATADIR%%/config/hydrostat.xml
%%DATADIR%%/config/hypertorus.xml
%%DATADIR%%/config/hypnowheel.xml
%%DATADIR%%/config/ifs.xml
@@ -527,8 +628,8 @@
%%DATADIR%%/config/jigsaw.xml
%%DATADIR%%/config/juggler3d.xml
%%DATADIR%%/config/julia.xml
+%%DATADIR%%/config/kaleidescope.xml
%%DATADIR%%/config/kaleidocycle.xml
-%%DATADIR%%/config/kaleidescope.xml
%%DATADIR%%/config/klein.xml
%%DATADIR%%/config/kumppa.xml
%%DATADIR%%/config/lament.xml
@@ -538,6 +639,7 @@
%%DATADIR%%/config/loop.xml
%%DATADIR%%/config/m6502.xml
%%DATADIR%%/config/maze.xml
+%%DATADIR%%/config/maze3d.xml
%%DATADIR%%/config/memscroller.xml
%%DATADIR%%/config/menger.xml
%%DATADIR%%/config/metaballs.xml
@@ -555,6 +657,7 @@
%%DATADIR%%/config/noseguy.xml
%%DATADIR%%/config/pacman.xml
%%DATADIR%%/config/pedal.xml
+%%DATADIR%%/config/peepers.xml
%%DATADIR%%/config/penetrate.xml
%%DATADIR%%/config/penrose.xml
%%DATADIR%%/config/petri.xml
@@ -568,6 +671,7 @@
%%DATADIR%%/config/polytopes.xml
%%DATADIR%%/config/pong.xml
%%DATADIR%%/config/popsquares.xml
+%%DATADIR%%/config/projectiveplane.xml
%%DATADIR%%/config/providence.xml
%%DATADIR%%/config/pulsar.xml
%%DATADIR%%/config/pyro.xml
@@ -574,9 +678,12 @@
%%DATADIR%%/config/qix.xml
%%DATADIR%%/config/quasicrystal.xml
%%DATADIR%%/config/queens.xml
+%%DATADIR%%/config/raverhoop.xml
+%%DATADIR%%/config/razzledazzle.xml
%%DATADIR%%/config/rd-bomb.xml
%%DATADIR%%/config/ripples.xml
%%DATADIR%%/config/rocks.xml
+%%DATADIR%%/config/romanboy.xml
%%DATADIR%%/config/rorschach.xml
%%DATADIR%%/config/rotzoomer.xml
%%DATADIR%%/config/rubik.xml
@@ -591,6 +698,8 @@
%%DATADIR%%/config/sonar.xml
%%DATADIR%%/config/speedmine.xml
%%DATADIR%%/config/spheremonics.xml
+%%DATADIR%%/config/splitflap.xml
+%%DATADIR%%/config/splodesic.xml
%%DATADIR%%/config/spotlight.xml
%%DATADIR%%/config/sproingies.xml
%%DATADIR%%/config/squiral.xml
@@ -604,6 +713,7 @@
%%DATADIR%%/config/surfaces.xml
%%DATADIR%%/config/swirl.xml
%%DATADIR%%/config/tangram.xml
+%%DATADIR%%/config/tessellimage.xml
%%DATADIR%%/config/thornbird.xml
%%DATADIR%%/config/timetunnel.xml
%%DATADIR%%/config/topblock.xml
@@ -611,28 +721,32 @@
%%DATADIR%%/config/tronbit.xml
%%DATADIR%%/config/truchet.xml
%%DATADIR%%/config/twang.xml
+%%DATADIR%%/config/unicrud.xml
%%DATADIR%%/config/unknownpleasures.xml
%%DATADIR%%/config/vermiculate.xml
+%%DATADIR%%/config/vfeedback.xml
%%DATADIR%%/config/vidwhacker.xml
+%%DATADIR%%/config/vigilance.xml
%%DATADIR%%/config/voronoi.xml
%%DATADIR%%/config/wander.xml
%%DATADIR%%/config/webcollage.xml
%%DATADIR%%/config/whirlwindwarp.xml
+%%DATADIR%%/config/winduprobot.xml
%%DATADIR%%/config/wormhole.xml
%%DATADIR%%/config/xanalogtv.xml
+%%DATADIR%%/config/xaos.xml
+%%DATADIR%%/config/xdaliclock.xml
+%%DATADIR%%/config/xearth.xml
%%DATADIR%%/config/xflame.xml
%%DATADIR%%/config/xjack.xml
%%DATADIR%%/config/xlyap.xml
%%DATADIR%%/config/xmatrix.xml
+%%DATADIR%%/config/xmountains.xml
+%%DATADIR%%/config/xplanet.xml
%%DATADIR%%/config/xrayswarm.xml
+%%DATADIR%%/config/xsnow.xml
%%DATADIR%%/config/xspirograph.xml
%%DATADIR%%/config/zoom.xml
-%%DATADIR%%/config/xaos.xml
-%%DATADIR%%/config/xdaliclock.xml
-%%DATADIR%%/config/xearth.xml
-%%DATADIR%%/config/xmountains.xml
-%%DATADIR%%/config/xplanet.xml
-%%DATADIR%%/config/xsnow.xml
%%DATADIR%%/glade/screensaver-cmndln.png
%%DATADIR%%/glade/screensaver-colorselector.png
%%DATADIR%%/glade/screensaver-diagnostic.png
@@ -640,52 +754,3 @@
%%DATADIR%%/glade/screensaver-power.png
%%DATADIR%%/glade/screensaver-snap.png
%%DATADIR%%/glade/xscreensaver-demo.glade2
- at dirrmtry bin/xscreensaver-hacks
- at dirrmtry share/locale/ca/LC_MESSAGES
- at dirrmtry share/locale/ca
- at dirrmtry share/locale/da/LC_MESSAGES
- at dirrmtry share/locale/da
- at dirrmtry share/locale/de/LC_MESSAGES
- at dirrmtry share/locale/de
- at dirrmtry share/locale/es/LC_MESSAGES
- at dirrmtry share/locale/es
- at dirrmtry share/locale/et/LC_MESSAGES
- at dirrmtry share/locale/et
- at dirrmtry share/locale/fi/LC_MESSAGES
- at dirrmtry share/locale/fi
- at dirrmtry share/locale/fr/LC_MESSAGES
- at dirrmtry share/locale/fr
- at dirrmtry share/locale/hu/LC_MESSAGES
- at dirrmtry share/locale/hu
- at dirrmtry share/locale/it/LC_MESSAGES
- at dirrmtry share/locale/it
- at dirrmtry share/locale/ja/LC_MESSAGES
- at dirrmtry share/locale/ja
- at dirrmtry share/locale/ko/LC_MESSAGES
- at dirrmtry share/locale/ko
- at dirrmtry share/locale/nb/LC_MESSAGES
- at dirrmtry share/locale/nb
- at dirrmtry share/locale/nl/LC_MESSAGES
- at dirrmtry share/locale/nl
- at dirrmtry share/locale/pl/LC_MESSAGES
- at dirrmtry share/locale/pt
- at dirrmtry share/locale/pt_BR/LC_MESSAGES
- at dirrmtry share/locale/pt_BR
- at dirrmtry share/locale/ru/LC_MESSAGES
- at dirrmtry share/locale/ru
- at dirrmtry share/locale/sk/LC_MESSAGES
- at dirrmtry share/locale/sk
- at dirrmtry share/locale/sv/LC_MESSAGES
- at dirrmtry share/locale/sv
- at dirrmtry share/locale/vi/LC_MESSAGES
- at dirrmtry share/locale/vi
- at dirrmtry share/locale/wa/LC_MESSAGES
- at dirrmtry share/locale/wa
- at dirrmtry share/locale/zh_CN/LC_MESSAGES
- at dirrmtry share/locale/zh_CN
- at dirrmtry share/locale/zh_TW/LC_MESSAGES
- at dirrmtry share/locale/zh_TW
- at dirrmtry share/locale
- at dirrmtry %%DATADIR%%/config
- at dirrm %%DATADIR%%/glade
- at dirrmtry %%DATADIR%%
Modified: trunk/x11/xscreensaver-gnome/pkg-descr
===================================================================
--- trunk/x11/xscreensaver-gnome/pkg-descr 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xscreensaver-gnome/pkg-descr 2019-02-09 16:31:07 UTC (rev 24922)
@@ -10,4 +10,4 @@
extremely easy to add new programs like xearth, or any other program that
can fill the root window as additional screensavers.
-WWW: http://www.jwz.org/xscreensaver/
+WWW: https://www.jwz.org/xscreensaver/
Modified: trunk/x11/xscreensaver-gnome-hacks/pkg-descr
===================================================================
--- trunk/x11/xscreensaver-gnome-hacks/pkg-descr 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xscreensaver-gnome-hacks/pkg-descr 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,4 +1,4 @@
Xscreesaver-gnome-hacks is a collection of screensaver modules that can
be used with xscreensaver or gnome-screensaver.
-WWW: http://www.jwz.org/xscreensaver/
+WWW: https://www.jwz.org/xscreensaver/
Modified: trunk/x11/xscreensaver.app/Makefile
===================================================================
--- trunk/x11/xscreensaver.app/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xscreensaver.app/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,7 +2,7 @@
PORTNAME= XScreenSaver.App
PORTVERSION= 2.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 windowmaker
MASTER_SITES= SF/xscreensaverapp/${PORTNAME}/${PORTVERSION}
@@ -11,7 +11,7 @@
LICENSE= gpl2
-LIB_DEPENDS= libdockapp.so:${PORTSDIR}/x11-wm/libdockapp
+LIB_DEPENDS= libdockapp.so:x11-wm/libdockapp
PLIST_FILES= bin/XScreenSaver.App
GNU_CONFIGURE= yes
Modified: trunk/x11/xsel/Makefile
===================================================================
--- trunk/x11/xsel/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xsel/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -3,12 +3,12 @@
PORTNAME= xsel
PORTVERSION= 0.04.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://BSDforge.com/projects/source/x11/xsel/
MAINTAINER= ports at midnightbsd.org
-COMMENT= Access X selection buffer from command line
+COMMENT= Access X11 selection buffer from command line
LICENSE= mit
@@ -15,7 +15,7 @@
CONFLICTS_INSTALL= xsel-conrad-[0-9]*
USES= tar:bzip2
-USE_XORG= xmu xaw xt xproto xkbfile
+USE_XORG= xmu xaw xt xorgproto xkbfile
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lXt -lXaw -lX11 -lXmu
Modified: trunk/x11/xset/Makefile
===================================================================
--- trunk/x11/xset/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xset/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,6 +2,7 @@
PORTNAME= xset
PORTVERSION= 1.2.4
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -10,7 +11,7 @@
LICENSE= mit
XORG_CAT= app
-USE_XORG= xmuu xproto x11 xext xfontcache
+USE_XORG= xmuu xorgproto x11 xext xfontcache
CONFIGURE_ARGS= --without-xf86misc
PLIST_FILES= bin/xset man/man1/xset.1.gz
Modified: trunk/x11/xsetroot/Makefile
===================================================================
--- trunk/x11/xsetroot/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xsetroot/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,8 +1,7 @@
# $MidnightBSD$
PORTNAME= xsetroot
-PORTVERSION= 1.1.1
-PORTREVISION= 3
+PORTVERSION= 1.1.2
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
Modified: trunk/x11/xsetroot/distinfo
===================================================================
--- trunk/x11/xsetroot/distinfo 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xsetroot/distinfo 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,2 +1,3 @@
-SHA256 (xorg/app/xsetroot-1.1.1.tar.bz2) = ba215daaa78c415fce11b9e58c365d03bb602eaa5ea916578d76861a468cc3d9
-SIZE (xorg/app/xsetroot-1.1.1.tar.bz2) = 119977
+TIMESTAMP = 1525892509
+SHA256 (xorg/app/xsetroot-1.1.2.tar.bz2) = 10c442ba23591fb5470cea477a0aa5f679371f4f879c8387a1d9d05637ae417c
+SIZE (xorg/app/xsetroot-1.1.2.tar.bz2) = 129091
Modified: trunk/x11/xsm/Makefile
===================================================================
--- trunk/x11/xsm/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xsm/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= xsm
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -10,6 +10,6 @@
LICENSE= mit
XORG_CAT= app
-USE_XORG= xt xaw
+USE_XORG= ice sm x11 xaw xt
.include <bsd.port.mk>
Modified: trunk/x11/xsm/distinfo
===================================================================
--- trunk/x11/xsm/distinfo 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xsm/distinfo 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,2 +1,3 @@
-SHA256 (xorg/app/xsm-1.0.3.tar.bz2) = ad9dee2847a683841f73518a83014b0accae60e9eff7e96752a0dbc412867b4a
-SIZE (xorg/app/xsm-1.0.3.tar.bz2) = 161012
+TIMESTAMP = 1525892623
+SHA256 (xorg/app/xsm-1.0.4.tar.bz2) = 9934b6893a4e52cf7435368fc8d425c371b5e32d96e420ead30166eb82d64425
+SIZE (xorg/app/xsm-1.0.4.tar.bz2) = 170933
Modified: trunk/x11/xterm/Makefile
===================================================================
--- trunk/x11/xterm/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xterm/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -69,10 +69,6 @@
USE_XORG+= xaw
.endif
-.if ${OSVERSION} < 4015
-LIB_DEPENDS+= libutempter.so:${PORTSDIR}/sysutils/libutempter
-.endif
-
post-extract:
@${CP} ${WRKDIR}/bsd-xterm-icons-1/*.png \
${WRKDIR}/bsd-xterm-icons-1/*.xpm \
Modified: trunk/x11/xtrap/Makefile
===================================================================
--- trunk/x11/xtrap/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xtrap/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -12,6 +12,6 @@
LICENSE= mit
XORG_CAT= app
-USE_XORG= xtrap
+USE_XORG= x11 xt xtrap
.include <bsd.port.mk>
Modified: trunk/x11/xwininfo/Makefile
===================================================================
--- trunk/x11/xwininfo/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/xwininfo/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -2,6 +2,7 @@
PORTNAME= xwininfo
PORTVERSION= 1.1.4
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= ports at MidnightBSD.org
@@ -11,7 +12,7 @@
XORG_CAT= app
USES= iconv
-USE_XORG= x11 xcb xproto xorg-macros
+USE_XORG= x11 xcb xorgproto xorg-macros
PLIST_FILES= bin/xwininfo man/man1/xwininfo.1.gz
Modified: trunk/x11/yelp/Makefile
===================================================================
--- trunk/x11/yelp/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/yelp/Makefile 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,8 +1,7 @@
# $MidnightBSD$
PORTNAME= yelp
-PORTVERSION= 3.16.1
-PORTREVISION= 0
+PORTVERSION= 3.28.1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -13,26 +12,38 @@
LICENSE= gpl2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= yelp-xsl>=0:${PORTSDIR}/textproc/yelp-xsl \
- itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
-RUN_DEPENDS= yelp-xsl>=0:${PORTSDIR}/textproc/yelp-xsl
+BUILD_DEPENDS= yelp-xsl>=0:textproc/yelp-xsl \
+ itstool:textproc/itstool
+LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+ libgcrypt.so:security/libgcrypt \
+ libgpg-error.so:security/libgpg-error \
+ libsoup-2.4.so:devel/libsoup
+RUN_DEPENDS= yelp-xsl>=0:textproc/yelp-xsl
-USES= desktop-file-utils gettext gmake libtool pathfix \
- pkgconfig tar:xz
+PORTSCOUT= limitw:1,even
+
+USES= compiler:c11 desktop-file-utils gettext gmake gnome \
+ libtool pathfix pkgconfig sqlite tar:xz
USE_XORG= x11 ice
-USE_GNOME= gtk30 intlhack libxml2 libxslt
+USE_GNOME= cairo gtk30 intlhack libxml2 libxslt
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gnome.yelp.gschema.xml
INSTALL_TARGET= install-strip
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
+.if !exists(/usr/libdata/pkgconfig/liblzma.pc)
CONFIGURE_ENV+= YELP_LZMA_CFLAGS="-I/usr/include" \
YELP_LZMA_LIBS="-L/usr/lib -llzma"
+.endif
-.include <bsd.port.post.mk>
+post-patch:
+ @${REINPLACE_CMD} -e 's|%%LIBEXECDIR%%|${PREFIX}/libexec|g' \
+ ${WRKSRC}/libyelp/yelp-man-parser.c
+
+post-install:
+ ${INSTALL_SCRIPT} ${FILESDIR}/yelp-groff ${STAGEDIR}${PREFIX}/libexec
+
+.include <bsd.port.mk>
Modified: trunk/x11/yelp/distinfo
===================================================================
--- trunk/x11/yelp/distinfo 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/yelp/distinfo 2019-02-09 16:31:07 UTC (rev 24922)
@@ -1,2 +1,3 @@
-SHA256 (gnome3/yelp-3.16.1.tar.xz) = 60810b8ddf5d2bf525a70a80a982af5053db061e0d823ed883d3671d9a5267ca
-SIZE (gnome3/yelp-3.16.1.tar.xz) = 1416752
+TIMESTAMP = 1525379562
+SHA256 (gnome3/yelp-3.28.1.tar.xz) = e88a5d05af20e497c50430b36fb523f8fda79a986359a6b7bd25910a2d2e7c0c
+SIZE (gnome3/yelp-3.28.1.tar.xz) = 1381180
Added: trunk/x11/yelp/files/patch-libyelp_yelp-man-parser.c
===================================================================
--- trunk/x11/yelp/files/patch-libyelp_yelp-man-parser.c (rev 0)
+++ trunk/x11/yelp/files/patch-libyelp_yelp-man-parser.c 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,11 @@
+--- libyelp/yelp-man-parser.c.orig 2016-07-10 15:09:15 UTC
++++ libyelp/yelp-man-parser.c
+@@ -369,7 +369,7 @@ get_troff (gchar *path, GError **error)
+ {
+ gint ystdout;
+ GError *err = NULL;
+- const gchar *argv[] = { "man", "-Z", "-Tutf8", "-EUTF-8", path, NULL };
++ const gchar *argv[] = { "%%LIBEXECDIR%%", "/yelp-groff", path, NULL };
+ gchar **my_argv;
+
+ /* g_strdupv() should accept a "const gchar **". */
Property changes on: trunk/x11/yelp/files/patch-libyelp_yelp-man-parser.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/yelp/files/yelp-groff
===================================================================
--- trunk/x11/yelp/files/yelp-groff (rev 0)
+++ trunk/x11/yelp/files/yelp-groff 2019-02-09 16:31:07 UTC (rev 24922)
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# Copyright (c) 2011 Alexandre Rostovtsev <tetromino at gmail.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+#
+###
+#
+# Process the requested compressed source nroff file and output groff
+# intermediate format.
+#
+
+filename=$1
+
+if [ -z ${filename} ] ; then
+ echo "Usage: yelp-groff [FILE]" >&2
+ echo "Process a man FILE and output groff intermediate format."
+ exit 1
+fi
+
+# If "man -Z -Tutf8 -EUTF-8" works (i.e. if man is man-db), use that.
+man -Z -Tutf8 -EUTF-8 ${filename} 2>/dev/null && exit 0
+
+# Otherwise, manually uncompress the file ...
+cat="cat"
+case ${filename} in
+ *.bz2) cat="bzip2 -c -d" ;;
+ *.gz) cat="gunzip -c" ;;
+ *.lzma) cat="unlzma -c -d" ;;
+ *.xz) cat="unxz -c" ;;
+ *.Z) cat="zcat" ;;
+esac
+
+# ... and run groff to get the intermediate format; preprocess with tbl
+# unless MANROFFSEQ is defined.
+${cat} ${filename} | groff -${MANROFFSEQ:-t} -man -Z -Tutf8
Property changes on: trunk/x11/yelp/files/yelp-groff
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11/yelp/pkg-plist
===================================================================
--- trunk/x11/yelp/pkg-plist 2019-02-09 16:30:50 UTC (rev 24921)
+++ trunk/x11/yelp/pkg-plist 2019-02-09 16:31:07 UTC (rev 24922)
@@ -14,6 +14,7 @@
include/libyelp/yelp-storage.h
include/libyelp/yelp-transform.h
include/libyelp/yelp-types.h
+include/libyelp/yelp-uri-builder.h
include/libyelp/yelp-uri.h
include/libyelp/yelp-view.h
lib/libyelp.a
@@ -20,6 +21,9 @@
lib/libyelp.so
lib/libyelp.so.0
lib/libyelp.so.0.0.0
+lib/yelp/web-extensions/libyelpwebextension.a
+lib/yelp/web-extensions/libyelpwebextension.so
+libexec/yelp-groff
share/applications/yelp.desktop
share/gtk-doc/html/libyelp/YelpDocument.html
share/gtk-doc/html/libyelp/YelpSettings.html
@@ -31,7 +35,6 @@
share/gtk-doc/html/libyelp/ch01s02.html
share/gtk-doc/html/libyelp/home.png
share/gtk-doc/html/libyelp/index.html
-share/gtk-doc/html/libyelp/index.sgml
share/gtk-doc/html/libyelp/left-insensitive.png
share/gtk-doc/html/libyelp/left.png
share/gtk-doc/html/libyelp/libyelp-yelp-error.html
@@ -44,6 +47,7 @@
share/gtk-doc/html/libyelp/up.png
share/locale/af/LC_MESSAGES/yelp.mo
share/locale/am/LC_MESSAGES/yelp.mo
+share/locale/an/LC_MESSAGES/yelp.mo
share/locale/ar/LC_MESSAGES/yelp.mo
share/locale/as/LC_MESSAGES/yelp.mo
share/locale/ast/LC_MESSAGES/yelp.mo
@@ -144,6 +148,7 @@
share/locale/zh_HK/LC_MESSAGES/yelp.mo
share/locale/zh_TW/LC_MESSAGES/yelp.mo
share/locale/zu/LC_MESSAGES/yelp.mo
+share/metainfo/yelp.appdata.xml
%%DATADIR%%-xsl/xslt/common/domains/yelp.xml
%%DATADIR%%/dtd/catalog
%%DATADIR%%/dtd/docbookx.dtd
@@ -217,7 +222,6 @@
%%DATADIR%%/mathjax/jax/element/mml/optable/GreekAndCoptic.js
%%DATADIR%%/mathjax/jax/element/mml/optable/Latin1Supplement.js
%%DATADIR%%/mathjax/jax/element/mml/optable/LetterlikeSymbols.js
-%%DATADIR%%/mathjax/jax/element/mml/optable/Makefile.am
%%DATADIR%%/mathjax/jax/element/mml/optable/MathOperators.js
%%DATADIR%%/mathjax/jax/element/mml/optable/MiscMathSymbolsA.js
%%DATADIR%%/mathjax/jax/element/mml/optable/MiscMathSymbolsB.js
@@ -258,7 +262,6 @@
%%DATADIR%%/mathjax/jax/input/MathML/entities/y.js
%%DATADIR%%/mathjax/jax/input/MathML/entities/z.js
%%DATADIR%%/mathjax/jax/input/MathML/jax.js
-%%DATADIR%%/mathjax/jax/output/HTML-CSS/autoload/Makefile.am
%%DATADIR%%/mathjax/jax/output/HTML-CSS/autoload/annotation-xml.js
%%DATADIR%%/mathjax/jax/output/HTML-CSS/autoload/maction.js
%%DATADIR%%/mathjax/jax/output/HTML-CSS/autoload/menclose.js
More information about the Midnightbsd-cvs
mailing list