cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gdm-3.38.2.

Browse Source
This commit is contained in:
ajacoutot 2020-11-08 09:52:01 +00:00
parent 9fe71bea01
commit 57781753e0
16 changed files with 216 additions and 383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
x11/gnome/gdm/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.286 2020/11/05 08:26:12 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.287 2020/11/08 09:52:01 ajacoutot Exp $
COMMENT= GNOME display manager
GNOME_PROJECT= gdm
GNOME_VERSION= 3.36.4
GNOME_VERSION= 3.38.2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gdm-puffy.png:0
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@ -14,18 +14,13 @@ SHARED_LIBS += gdm 0.0 # 1.0
# GPLv2
PERMIT_PACKAGE= Yes
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender accountsservice atk-1.0
WANTLIB += atk-bridge-2.0 c cairo cairo-gobject canberra canberra-gtk3
WANTLIB += epoxy expat ffi fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
WANTLIB += gthread-2.0 gtk-3 harfbuzz iconv intl ltdl m ogg pam
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png pthread util vorbis vorbisfile xcb xcb-render
WANTLIB += xcb-shm z ${COMPILER_LIBCXX}
WANTLIB += X11 Xau Xdmcp accountsservice c canberra canberra-gtk3
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3
WANTLIB += intl pam util xcb
MODULES= x11/gnome \
devel/dconf
MODULES= devel/dconf \
devel/meson \
x11/gnome
BUILD_DEPENDS= devel/check \
devel/iso-codes
@ -57,33 +52,37 @@ LIB_DEPENDS= audio/libcanberra,-gtk3 \
sysutils/accountsservice
MODGNOME_TOOLS= gobject-introspection yelp
MODGNOME_CPPFLAGS= -I${X11BASE}/include -DHAS_SA_LEN
MODGNOME_LDFLAGS= -L${X11BASE}/lib
MODGNOME_CPPFLAGS= -I${X11BASE}/include
MODGNOME_LDFLAGS= -L${X11BASE}/lib -lutil
CONFIGURE_STYLE= autoreconf
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.16
# common/gdm-address.c
MODGNOME_CPPFLAGS += -DHAS_SA_LEN
CONFIGURE_ARGS= --mandir=${PREFIX}/man \
--disable-systemd-journal \
--disable-user-display-server \
--without-systemd \
--without-plymouth \
--with-lang-file=${SYSCONFDIR}/gdm/locale.conf \
--with-at-spi-registryd-directory=${LOCALBASE}/libexec \
--with-custom-conf=${SYSCONFDIR}/gdm/custom.conf \
--with-console-kit \
--with-dbus-sys=${SYSCONFDIR}/dbus-1/system.d \
--with-log-dir=/var/log/gdm \
--with-working-directory=/var/db/gdm \
--with-sysconfsubdir=gdm \
--with-pid-file=/var/run/gdm.pid \
--with-dmconfdir="${LOCALBASE}/share/xsessions" \
--with-screenshot-dir=/var/run/gdm/greeter \
--with-user=_gdm \
--with-group=_gdm \
--with-xauth-dir=/var/run/gdm \
--with-initial-vt=05
# ConsoleKit
MODGNOME_CPPFLAGS += -DWITH_CONSOLE_KIT=1 \
-DCONSOLEKIT_DIR='\"${LOCALBASE}/libexec\"'
CONFIGURE_ARGS= -Ddefault-pam-config=none \
-Duser=_gdm \
-Duser-display-server=false \
-Dat-spi-registryd-dir=${LOCALBASE}/libexec \
-Dcustom-conf=${SYSCONFDIR}/gdm/custom.conf \
-Ddbus-sys=${SYSCONFDIR}/dbus-1/system.d \
-Dlog-dir=/var/log/gdm \
-Dgroup=_gdm \
-Ddmconfdir=${LOCALBASE}/share/xsessions \
-Dinitial-vt=05 \
-Dlang-file=${SYSCONFDIR}/gdm/locale.conf \
-Dpid-file=/var/run/gdm.pid \
-Dplymouth=disabled \
-Dlibaudit=disabled \
-Dselinux=disabled \
-Dscreenshot-dir=/var/run/gdm/greeter \
-Dsysconfsubdir=gdm \
-Dsystemd-journal=false \
-Dwayland-support=false \
-Dworking-dir=/var/db/gdm \
-Dxauth-dir=/var/run/gdm
DEBUG_PACKAGES= ${BUILD_PACKAGES}
@ -96,8 +95,7 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/gdm-puffy.png \
${PREFIX}/share/pixmaps/
rm -r ${WRKINST}/var/run/gdm ${WRKINST}/rules.d
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gdm/{etc/pam.d,var/db}
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gdm/etc/pam.d
${INSTALL_DATA} ${FILESDIR}/gdm-* \
${PREFIX}/share/examples/gdm/etc/pam.d
${SUBST_CMD} -m 0644 -c -o ${SHAREOWN} -g ${SHAREGRP} \

4
x11/gnome/gdm/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (gnome/gdm-3.36.4.tar.xz) = K804OtgqudAfWqGQswx++Uh4z4Inkd1GIiozjwk3KfI=
SHA256 (gnome/gdm-3.38.2.tar.xz) = JaJmZsPdS7alRd7LvgZ4Q5srIn7mO2fuvS15EHYeU8w=
SHA256 (gnome/gdm-puffy.png) = eh8WrKTkL1jVIbBB22MlYr1liOitfsK+RuDBjMFDt8g=
SIZE (gnome/gdm-3.36.4.tar.xz) = 1235796
SIZE (gnome/gdm-3.38.2.tar.xz) = 787024
SIZE (gnome/gdm-puffy.png) = 8570

19
x11/gnome/gdm/patches/patch-Makefile_am
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-Makefile_am,v 1.3 2017/11/05 02:17:07 ajacoutot Exp $
REVERT - Linux-PAM
From 714b6af29b916ac7da0cdab6f83460574ed49cf2 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Mon, 15 Aug 2016 13:48:00 -0400
Subject: pam_gdm: add stub pam module
Index: Makefile.am
--- Makefile.am.orig
+++ Makefile.am
@@ -7,7 +7,6 @@ SUBDIRS = \
daemon \
libgdm \
utils \
- pam_gdm \
po \
tests \
$(NULL)

13
x11/gnome/gdm/patches/patch-common_meson_build Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-common_meson_build,v 1.1 2020/11/08 09:52:01 ajacoutot Exp $
Index: common/meson.build
--- common/meson.build.orig
+++ common/meson.build
@@ -11,7 +11,6 @@ libgdmcommon_src = files(
)
libgdmcommon_deps = [
- libsystemd_dep,
gobject_dep,
gio_dep,
gio_unix_dep,

157
x11/gnome/gdm/patches/patch-configure_ac
View File

@ -1,157 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.18 2020/05/14 15:25:54 ajacoutot Exp $
REVERT - Linux-PAM
From 714b6af29b916ac7da0cdab6f83460574ed49cf2 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@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@redhat.com>
Date: Fri, 12 Jun 2015 13:28:01 -0400
Subject: drop consolekit support
https://bugzilla.gnome.org/show_bug.cgi?id=722482
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -224,12 +224,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@:>@]),,
@@ -259,6 +253,17 @@ AC_ARG_WITH([udevdir],
AS_HELP_STRING([--with-udevdir=DIR],
[Directory for udev files]),
[with_udevdir=$withval], [with_udevdir=$($PKG_CONFIG --variable=udevdir udev)])
+
+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]),
@@ -530,6 +535,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
PKG_CHECK_MODULES([KEYUTILS],
@@ -612,14 +619,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" ])
@@ -828,12 +829,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)
@@ -1026,6 +1057,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@:>@])],,
@@ -1489,6 +1528,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}
@@ -1519,6 +1559,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}
udev dir: ${with_udevdir}
plymouth support: ${use_plymouth}
@@ -1528,3 +1570,4 @@ echo \
Enable documentation: ${enable_documentation}
Install GDM's Xsession: ${enable_gdm_xsession}
"
+

42
x11/gnome/gdm/patches/patch-daemon_Makefile_am
View File

@ -1,42 +0,0 @@
$OpenBSD: patch-daemon_Makefile_am,v 1.4 2019/11/02 15:34:07 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@redhat.com>
Date: Fri, 12 Jun 2015 13:28:01 -0400
Subject: drop consolekit support
Index: daemon/Makefile.am
--- daemon/Makefile.am.orig
+++ daemon/Makefile.am
@@ -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) \
@@ -278,6 +279,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) \
@@ -288,6 +294,10 @@ gdm_LDADD = \
$(JOURNALD_LIBS) \
$(EXTRA_DAEMON_LIBS) \
$(NULL)
+
+if WITH_CONSOLE_KIT
+gdm_SOURCES += $(CONSOLE_KIT_SOURCES)
+endif
CLEANFILES = \
gdm-display-glue.c \

14
x11/gnome/gdm/patches/patch-daemon_gdm-local-display-factory_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-daemon_gdm-local-display-factory_c,v 1.14 2020/07/14 06:32:03 ajacoutot Exp $
$OpenBSD: patch-daemon_gdm-local-display-factory_c,v 1.15 2020/11/08 09:52:01 ajacoutot Exp $
REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
@ -43,7 +43,7 @@ Index: daemon/gdm-local-display-factory.c
guint seat_removed_id;
+#endif
#if defined(ENABLE_WAYLAND_SUPPORT) && defined(ENABLE_USER_DISPLAY_SERVER)
#if defined(ENABLE_USER_DISPLAY_SERVER)
unsigned int active_vt;
@@ -87,7 +93,9 @@ static void on_display_status_changed
GParamSpec *arg1,
@ -127,7 +127,7 @@ Index: daemon/gdm-local-display-factory.c
static void
delete_display (GdmLocalDisplayFactory *factory,
const char *seat_id) {
@@ -914,6 +929,7 @@ gdm_local_display_factory_stop_monitor (GdmLocalDispla
@@ -905,6 +920,7 @@ gdm_local_display_factory_stop_monitor (GdmLocalDispla
}
#endif
}
@ -135,7 +135,7 @@ Index: daemon/gdm-local-display-factory.c
static void
on_display_added (GdmDisplayStore *display_store,
@@ -947,6 +963,7 @@ static gboolean
@@ -938,6 +954,7 @@ static gboolean
gdm_local_display_factory_start (GdmDisplayFactory *base_factory)
{
GdmLocalDisplayFactory *factory = GDM_LOCAL_DISPLAY_FACTORY (base_factory);
@ -143,7 +143,7 @@ Index: daemon/gdm-local-display-factory.c
GdmDisplayStore *store;
g_return_val_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory), FALSE);
@@ -965,8 +982,17 @@ gdm_local_display_factory_start (GdmDisplayFactory *ba
@@ -956,8 +973,17 @@ gdm_local_display_factory_start (GdmDisplayFactory *ba
factory,
0);
@ -163,7 +163,7 @@ Index: daemon/gdm-local-display-factory.c
}
static gboolean
@@ -977,7 +1003,9 @@ gdm_local_display_factory_stop (GdmDisplayFactory *bas
@@ -968,7 +994,9 @@ gdm_local_display_factory_stop (GdmDisplayFactory *bas
g_return_val_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory), FALSE);
@ -173,7 +173,7 @@ Index: daemon/gdm-local-display-factory.c
store = gdm_display_factory_get_display_store (GDM_DISPLAY_FACTORY (factory));
@@ -1129,7 +1157,9 @@ gdm_local_display_factory_finalize (GObject *object)
@@ -1120,7 +1148,9 @@ gdm_local_display_factory_finalize (GObject *object)
g_hash_table_destroy (factory->used_display_numbers);

6
x11/gnome/gdm/patches/patch-daemon_gdm-manager_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-daemon_gdm-manager_c,v 1.25 2020/11/05 08:26:13 ajacoutot Exp $
$OpenBSD: patch-daemon_gdm-manager_c,v 1.26 2020/11/08 09:52:01 ajacoutot Exp $
REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
From fcba1e1a5d556ce7b52101dbd2d1ba4a19469161 Mon Sep 17 00:00:00 2001
@ -745,7 +745,7 @@ Index: daemon/gdm-manager.c
return is_on_seat0;
}
@@ -2032,11 +2423,57 @@ on_user_session_died (GdmSession *session,
@@ -2016,11 +2407,57 @@ on_user_session_died (GdmSession *session,
}
static char *
@ -805,7 +805,7 @@ Index: daemon/gdm-manager.c
}
static void
@@ -2045,25 +2482,6 @@ on_session_reauthenticated (GdmSession *session,
@@ -2029,25 +2466,6 @@ on_session_reauthenticated (GdmSession *session,
GdmManager *manager)
{
gboolean fail_if_already_switched = FALSE;

19
x11/gnome/gdm/patches/patch-daemon_gdm-session-record_c
View File

@ -1,18 +1,17 @@
$OpenBSD: patch-daemon_gdm-session-record_c,v 1.11 2019/11/02 15:34:07 ajacoutot Exp $
$OpenBSD: patch-daemon_gdm-session-record_c,v 1.12 2020/11/08 09:52:01 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=722482
Index: daemon/gdm-session-record.c
--- daemon/gdm-session-record.c.orig
+++ daemon/gdm-session-record.c
@@ -33,6 +33,16 @@
@@ -31,8 +31,15 @@
#if defined(HAVE_UTMP_H)
#include <utmp.h>
+#include <util.h>
#endif
+#if defined(HAVE_UTIL_H)
+#include <util.h>
+#endif
+
+#if defined(HAVE_GETTTYENT)
+#include <fcntl.h> /* open(2) */
+#include <ttyent.h>
@ -22,7 +21,7 @@ Index: daemon/gdm-session-record.c
#include <glib.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
@@ -43,6 +53,9 @@
@@ -43,6 +50,9 @@
#define GDM_BAD_SESSION_RECORDS_FILE "/var/log/btmp"
#endif
@ -32,7 +31,7 @@ Index: daemon/gdm-session-record.c
#if !defined(GDM_NEW_SESSION_RECORDS_FILE)
# if defined(WTMPX_FILE)
# define GDM_NEW_SESSION_RECORDS_FILE WTMPX_FILE
@@ -168,6 +181,84 @@ record_set_line (UTMP *u,
@@ -168,6 +178,84 @@ record_set_line (UTMP *u,
g_debug ("using ut_line %.*s", (int) sizeof (u->ut_line), u->ut_line);
}
@ -117,7 +116,7 @@ Index: daemon/gdm-session-record.c
void
gdm_session_record_login (GPid session_pid,
const char *user_name,
@@ -214,8 +305,9 @@ gdm_session_record_login (GPid sessio
@@ -214,8 +302,9 @@ gdm_session_record_login (GPid sessio
setutxent();
pututxline (&session_record);
endutxent();
@ -129,7 +128,7 @@ Index: daemon/gdm-session-record.c
#endif
}
@@ -259,8 +351,8 @@ gdm_session_record_logout (GPid sessi
@@ -259,8 +348,8 @@ gdm_session_record_logout (GPid sessi
setutxent();
pututxline (&session_record);
endutxent();

57
x11/gnome/gdm/patches/patch-data_Makefile_am
View File

@ -1,57 +0,0 @@
$OpenBSD: patch-data_Makefile_am,v 1.10 2019/11/02 16:34:15 ajacoutot Exp $
Index: data/Makefile.am
--- data/Makefile.am.orig
+++ data/Makefile.am
@@ -220,6 +220,7 @@ if ENABLE_GDM_XSESSION
Xsession: $(srcdir)/Xsession.in
sed -e 's,[@]XSESSION_SHELL[@],$(XSESSION_SHELL),g' \
-e 's,[@]libexecdir[@],$(libexecdir),g' \
+ -e 's,[@]X_PATH[@],$(X_PATH),g' \
<$(srcdir)/Xsession.in >Xsession
Xsession_files += Xsession
CLEANFILES += Xsession
@@ -293,7 +294,7 @@ endif
if test '!' -d $(DESTDIR)$(logdir); then \
$(mkinstalldirs) $(DESTDIR)$(logdir); \
chmod 755 $(DESTDIR)$(logdir); \
- chown root:root $(DESTDIR)$(logdir) || : ; \
+ chown root:wheel $(DESTDIR)$(logdir) || : ; \
fi
system=`uname`; \
@@ -316,29 +317,29 @@ endif
if test '!' -d $(DESTDIR)$(xauthdir); then \
$(mkinstalldirs) $(DESTDIR)$(xauthdir); \
chmod 0711 $(DESTDIR)$(xauthdir); \
- chown root:gdm $(DESTDIR)$(xauthdir) || : ; \
+ chown root:676 $(DESTDIR)$(xauthdir) || : ; \
fi
if test '!' -d $(DESTDIR)$(screenshotdir); then \
$(mkinstalldirs) $(DESTDIR)$(screenshotdir); \
chmod 0755 $(DESTDIR)$(screenshotdir); \
- chown gdm:gdm $(DESTDIR)$(screenshotdir) || : ; \
+ chown 676:676 $(DESTDIR)$(screenshotdir) || : ; \
fi
if test '!' -d $(DESTDIR)$(workingdir); then \
$(mkinstalldirs) $(DESTDIR)$(workingdir); \
chmod 1770 $(DESTDIR)$(workingdir); \
- chown root:gdm $(DESTDIR)$(workingdir) || : ; \
+ chown root:676 $(DESTDIR)$(workingdir) || : ; \
fi
if test '!' -d $(DESTDIR)$(workingdir)/.local/share/applications; then \
$(mkinstalldirs) $(DESTDIR)$(workingdir)/.local/share/applications; \
chmod 0755 $(DESTDIR)$(workingdir)/.local/share/applications; \
- chown gdm:gdm $(DESTDIR)$(workingdir)/.local/share/applications || : ; \
+ chown 676:676 $(DESTDIR)$(workingdir)/.local/share/applications || : ; \
fi
if test '!' -d $(DESTDIR)$(cachedir); then \
$(mkinstalldirs) $(DESTDIR)$(cachedir); \
chmod 1755 $(DESTDIR)$(cachedir); \
- chown root:gdm $(DESTDIR)$(cachedir) || : ; \
+ chown root:676 $(DESTDIR)$(cachedir) || : ; \
fi

47
x11/gnome/gdm/patches/patch-data_meson_build Normal file
View File

@ -0,0 +1,47 @@
$OpenBSD: patch-data_meson_build,v 1.1 2020/11/08 09:52:01 ajacoutot Exp $
Index: data/meson.build
--- data/meson.build.orig
+++ data/meson.build
@@ -170,41 +170,10 @@ else
service_config.set('PLYMOUTH_QUIT_SERVICE', '')
endif
-if get_option('systemdsystemunitdir') != ''
- systemd_systemunitdir = get_option('systemdsystemunitdir')
-else
- systemd_systemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
-endif
-
-if get_option('systemduserunitdir') != ''
- systemd_userunitdir = get_option('systemduserunitdir')
-else
- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
- define_variable: ['prefix', get_option('prefix')])
-endif
-
-configure_file(
- input: 'gdm.service.in',
- output: '@BASENAME@',
- configuration: service_config,
- install_dir: systemd_systemunitdir,
- format: 'cmake'
-)
-
gdm_gnome_session_wanted_targets = []
foreach component: gdm_gnome_user_session_wanted_components
gdm_gnome_session_wanted_targets += 'Wants=@0@.target'.format(component)
endforeach
-
-configure_file(
- input: 'session.conf.in',
- output: 'session.conf',
- configuration: {
- 'requires_component': gdm_gnome_shell_component,
- 'wants_required_components': '\n'.join(gdm_gnome_session_wanted_targets),
- },
- install_dir: systemd_userunitdir / 'gnome-session@gnome-login.target.d',
-)
# XSession
if get_option('gdm-xsession')

19
x11/gnome/gdm/patches/patch-libgdm_Makefile_am
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-libgdm_Makefile_am,v 1.1 2019/11/02 15:34:07 ajacoutot Exp $
REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
From fcba1e1a5d556ce7b52101dbd2d1ba4a19469161 Mon Sep 17 00:00:00 2001
From: Iain Lane <iain@orangesquash.org.uk>
Date: Fri, 5 Jan 2018 11:53:34 +0000
Subject: [PATCH] manager: Find user's current graphical session, not session of caller
Index: libgdm/Makefile.am
--- libgdm/Makefile.am.orig
+++ libgdm/Makefile.am
@@ -66,7 +66,6 @@ libgdm_la_LDFLAGS =
$(END_OF_LIST)
libgdm_la_LIBADD = \
- $(top_builddir)/common/libgdmcommon.la \
$(LIBGDM_LIBS) \
$(SYSTEMD_LIBS) \
$(END_OF_LIST)

13
x11/gnome/gdm/patches/patch-libgdm_meson_build Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-libgdm_meson_build,v 1.1 2020/11/08 09:52:01 ajacoutot Exp $
Index: libgdm/meson.build
--- libgdm/meson.build.orig
+++ libgdm/meson.build
@@ -56,7 +56,6 @@ libgdm_deps = [
glib_dep,
gio_dep,
gio_unix_dep,
- libsystemd_dep,
libgdmcommon_dep,
]

55
x11/gnome/gdm/patches/patch-meson_build Normal file
View File

@ -0,0 +1,55 @@
$OpenBSD: patch-meson_build,v 1.1 2020/11/08 09:52:01 ajacoutot Exp $
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -37,9 +37,6 @@ gdm_screenshot_dir = (get_option('screenshot-dir') !=
# Common variables
config_h_dir = include_directories('.')
-# Dependencies
-udev_dep = dependency('udev')
-
glib_min_version = '2.44.0'
glib_dep = dependency('glib-2.0', version: '>=' + glib_min_version)
@@ -53,16 +50,6 @@ xcb_dep = dependency('xcb')
keyutils_dep = dependency('libkeyutils', required: false)
libselinux_dep = dependency('libselinux', required: get_option('selinux'))
-# udev
-if udev_dir == ''
- if udev_dep.found()
- udev_prefix = udev_dep.get_pkgconfig_variable('udevdir')
- else
- udev_prefix = gdm_prefix / 'lib' / 'udev'
- endif
- udev_dir = udev_prefix / 'rules.d'
-endif
-
# X11
x_deps = declare_dependency(
dependencies: [
@@ -94,19 +81,9 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
libwrap_dep = cc.find_library('libwrap')
endif
# systemd
-systemd_dep = dependency('systemd')
-libsystemd_dep = dependency('libsystemd')
-if meson.version().version_compare('>= 0.53')
- systemd_multiseat_x = find_program('systemd-multi-seat-x',
- required: false,
- dirs: [
- systemd_dep.get_pkgconfig_variable('systemdutildir'),
- '/lib/systemd',
- '/usr/lib/systemd',
- ])
-else
- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
-endif
+systemd_dep = ''
+libsystemd_dep = ''
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
plymouth_dep = dependency('ply-boot-client', required: get_option('plymouth'))

20
x11/gnome/gdm/patches/patch-pam_gdm_pam_gdm_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-pam_gdm_pam_gdm_c,v 1.1 2020/11/08 09:52:01 ajacoutot Exp $
Index: pam_gdm/pam_gdm.c
--- pam_gdm/pam_gdm.c.orig
+++ pam_gdm/pam_gdm.c
@@ -21,11 +21,13 @@
#include <unistd.h>
+#ifdef __linux__
#include <security/_pam_macros.h>
#include <security/pam_ext.h>
#include <security/pam_misc.h>
-#include <security/pam_modules.h>
#include <security/pam_modutil.h>
+#endif
+#include <security/pam_modules.h>
#ifdef HAVE_KEYUTILS
#include <keyutils.h>

36
x11/gnome/gdm/pkg/PLIST
View File

@ -1,12 +1,9 @@
@comment $OpenBSD: PLIST,v 1.99 2020/11/05 08:26:13 ajacoutot Exp $
@comment starts a full gnome-session as _gdm which requires a valid homedir
@comment $OpenBSD: PLIST,v 1.100 2020/11/08 09:52:01 ajacoutot Exp $
@newgroup _gdm:676
@newuser _gdm:676:_gdm:daemon:GNOME Display Manager:/var/db/gdm:/sbin/nologin
@extraunexec rm -rf /var/db/gdm/.local/share/applications/*
@extraunexec rm -rf /var/db/gdm/.local/share/!(applications)
@extraunexec rm -rf /var/db/gdm/.!(local)
@comment starts a full gnome-session as _gdm which requires a valid homedir
@extraunexec rm -rf /var/db/gdm/.*
@extraunexec rm -rf /var/db/gdm/*
@extraunexec rm -rf /var/cache/gdm/*
@extraunexec rm -rf /var/log/gdm/*
@rcscript ${RCDIR}/gdm
@bin bin/gdm-screenshot
@ -17,10 +14,9 @@ include/gdm/gdm-client.h
include/gdm/gdm-sessions.h
include/gdm/gdm-user-switching.h
lib/girepository-1.0/Gdm-1.0.typelib
@static-lib lib/libgdm.a
lib/libgdm.la
@lib lib/libgdm.so.${LIBgdm_VERSION}
lib/pkgconfig/gdm.pc
@so lib/security/pam_gdm.so
@bin libexec/gdm-disable-wayland
@bin libexec/gdm-host-chooser
@bin libexec/gdm-session-worker
@ -78,22 +74,6 @@ share/examples/gdm/etc/pam.d/gdm-launch-environment
share/examples/gdm/etc/pam.d/gdm-password
@sample ${SYSCONFDIR}/pam.d/gdm-password
@mode
share/examples/gdm/var/
share/examples/gdm/var/db/
share/examples/gdm/var/db/gdm/
@mode 1770
@group _gdm
@sample /var/db/gdm/
@mode
@owner _gdm
share/examples/gdm/var/db/gdm/.local/
@sample /var/db/gdm/.local/
share/examples/gdm/var/db/gdm/.local/share/
@sample /var/db/gdm/.local/share/
share/examples/gdm/var/db/gdm/.local/share/applications/
@sample /var/db/gdm/.local/share/applications/
@owner
@group
share/gdm/gdb-cmd
share/gdm/gdm.schemas
share/gdm/greeter/
@ -304,11 +284,13 @@ share/locale/zh_TW/LC_MESSAGES/gdm.mo
share/locale/zu/LC_MESSAGES/gdm.mo
share/pixmaps/
share/pixmaps/gdm-puffy.png
@comment remove for OpenBSD/7.0-current
@owner root
@group wheel
@mode 0755
@sample /var/db/gdm/
@sample /var/log/gdm/
@mode 1755
@group _gdm
@sample /var/cache/gdm/
@owner
@group
@mode
@tag glib-compile-schemas