openbsd-ports/x11/gnome/gdm/patches/patch-configure
ajacoutot 56652f99ed Update to gdm-2.20.11.
* includes a security fix that we already patched for > 14 months ago
2010-06-04 07:45:56 +00:00

55 lines
1.7 KiB
Plaintext

$OpenBSD: patch-configure,v 1.17 2010/06/04 07:45:56 ajacoutot Exp $
--- configure.orig Thu Jun 3 22:34:33 2010
+++ configure Fri Jun 4 08:07:19 2010
@@ -32153,7 +32153,6 @@ fi
if test x$with_tcp_wrappers = xno ; then
echo "TCP wrappers disabled"
else
- LIBWRAP_PATH=""
case "$host" in
*-*-solaris*)
if test -f /usr/lib/libwrap.so; then
@@ -32208,6 +32207,8 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
+int allow_severity = 1;
+int deny_severity = 1;
char hosts_ctl ();
int
main ()
@@ -32373,7 +32374,6 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- LIBWRAP_PATH=""
fi
rm -rf conftest.dSYM
@@ -34956,9 +34956,9 @@ case "$host" in
;;
*openbsd*)
HOST_GDM_USER_PATH="/bin:/usr/bin"
- HOST_HALT_COMMAND="/sbin/halt -p;/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
- HOST_REBOOT_COMMAND="/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
- HOST_SUSPEND_COMMAND="/usr/bin/zzz"
+ HOST_HALT_COMMAND="/sbin/halt -p;/sbin/shutdown -hp now"
+ HOST_REBOOT_COMMAND="/sbin/reboot;/sbin/shutdown -r now"
+ HOST_SUSPEND_COMMAND="/usr/sbin/zzz"
HOST_XSESSION_SHELL=/bin/sh
HOST_SOUND_PROGRAM="$real_gdm_prefix/bin/play"
HOST_GDMGNOMESESSIONCMD=gnome-session
@@ -35075,6 +35075,12 @@ else
GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
X_CONFIG_OPTIONS="-audit 0"
fi
+
+case $host in
+ i386-*-openbsd*|amd64-*-openbsd*)
+ X_CONFIG_OPTIONS="$X_CONFIG_OPTIONS vt5"
+ ;;
+esac
# Use Xephyr if it is available. It works better than Xnest since Xephyr
# supports the Xserver extensions, even if on a remote machine.