update gdm to 2.18.1
lots of help, and ok martynas@
This commit is contained in:
parent
cdb944d540
commit
0f80aa819a
@ -1,58 +1,56 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2006/12/16 12:22:35 espie Exp $
|
||||
|
||||
# $OpenBSD: Makefile,v 1.16 2007/05/18 17:20:39 jasper Exp $
|
||||
|
||||
COMMENT= "GNOME display manager"
|
||||
|
||||
DISTNAME= gdm-2.6.0.9
|
||||
PKGNAME= ${DISTNAME}p3
|
||||
DISTNAME= gdm-2.18.1
|
||||
CATEGORIES= x11/gnome
|
||||
|
||||
HOMEPAGE= http://www.jirka.org/gdm.html
|
||||
HOMEPAGE= http://www.gnome.org/projects/gdm/
|
||||
|
||||
# LGPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xi Xdmcp Xext \
|
||||
Xinerama Xrender art_lgpl_2 atk-1.0 audiofile bonobo-2 \
|
||||
bonobo-activation bonoboui-2 bz2 c crypto esd fontconfig \
|
||||
freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 \
|
||||
glade-2.0 glib-2.0 gmodule-2.0 gnome-2 \
|
||||
gnome-keyring gnomecanvas-2 gnomevfs-2 gobject-2.0 gsf-1 \
|
||||
gthread-2.0 gtk-x11-2.0 jpeg m \
|
||||
pango-1.0 pangocairo-1.0 pangoft2-1.0 \
|
||||
popt pthread ssl util xml2 z cairo glitz png
|
||||
WANTLIB= ORBit-2 X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama \
|
||||
Xrandr Xrender art_lgpl_2 atk-1.0 bz2 c cairo croco-0.6 \
|
||||
crypto dbus-1 dbus-glib-1 dmx expat fontconfig freetype \
|
||||
gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 glade-2.0 glib-2.0 \
|
||||
glitz gmodule-2.0 gnomecanvas-2 gnomevfs-2 gobject-2.0 \
|
||||
gsf-1 gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 \
|
||||
pangoft2-1.0 png popt pthread ssl util xml2 z
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.6/}
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.18/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
BUILD_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper \
|
||||
:p5-XML-Parser-*:textproc/p5-XML-Parser
|
||||
RUN_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper \
|
||||
RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \
|
||||
:scrollkeeper-*:textproc/scrollkeeper \
|
||||
:hicolor-icon-theme-*:x11/hicolor-icon-theme
|
||||
LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \
|
||||
rsvg-2::x11/gnome/librsvg
|
||||
LIB_DEPENDS= rsvg-2.>=18.1::x11/gnome/librsvg
|
||||
|
||||
MODULES= devel/gettext
|
||||
|
||||
CONFDIR= ${SYSCONFDIR}/X11
|
||||
USE_X11= Yes
|
||||
USE_GMAKE= Yes
|
||||
USE_LIBTOOL= Yes
|
||||
CONFIGURE_STYLE= gnu old
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+= --sysconfdir="${CONFDIR}"
|
||||
CONFIGURE_ARGS+= --localstatedir=/var
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
|
||||
--sysconfdir="${SYSCONFDIR}/X11" \
|
||||
--localstatedir=/var
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
SUBST_VARS= CONFDIR
|
||||
|
||||
post-patch:
|
||||
@ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update
|
||||
|
||||
post-install:
|
||||
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gdm; \
|
||||
cp -Rp ${WRKINST}/${CONFDIR}/* ${PREFIX}/share/examples/gdm/
|
||||
mv ${WRKINST}/${SYSCONFDIR}/X11/gdm ${PREFIX}/share/examples/; \
|
||||
rmdir ${WRKINST}/${SYSCONFDIR}/X11/dm
|
||||
find ${PREFIX}/share/examples/gdm -type d -exec chmod 555 {} \;
|
||||
find ${PREFIX}/share/examples/gdm ! -type d -exec chmod 444 {} \;
|
||||
chmod 644 ${PREFIX}/share/examples/gdm/custom.conf
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (gdm-2.6.0.9.tar.bz2) = 2EX+IFQSuxAdTGbR6IoxfQ==
|
||||
RMD160 (gdm-2.6.0.9.tar.bz2) = gYw6CsNir9c+Vo8FeTtEeJXPk9w=
|
||||
SHA1 (gdm-2.6.0.9.tar.bz2) = ifnsPKbSIzLtuMvdZgPV96uXVzY=
|
||||
SHA256 (gdm-2.6.0.9.tar.bz2) = iQ6un4pAy8A71mK5EIHHuCrofvzuY7dGKTwPwRLYlkA=
|
||||
SIZE (gdm-2.6.0.9.tar.bz2) = 3484460
|
||||
MD5 (gdm-2.18.1.tar.bz2) = qA4m2Yrb5IWqwPmu5kuSsQ==
|
||||
RMD160 (gdm-2.18.1.tar.bz2) = yyKWvGHszW36jfitBxoU5Y+N2A0=
|
||||
SHA1 (gdm-2.18.1.tar.bz2) = cLkC/4EKaRCXRsE13Qlds0mCqdA=
|
||||
SHA256 (gdm-2.18.1.tar.bz2) = NHpVUwX58ZCJ0DJoXf7By1qOuulwscLQ4JKc2DwsX/0=
|
||||
SIZE (gdm-2.18.1.tar.bz2) = 3460665
|
||||
|
@ -1,20 +1,20 @@
|
||||
$OpenBSD: patch-config_Makefile_in,v 1.6 2005/05/26 03:39:31 marcm Exp $
|
||||
--- config/Makefile.in.orig Mon Apr 11 21:37:31 2005
|
||||
+++ config/Makefile.in Wed May 18 21:04:10 2005
|
||||
@@ -252,7 +252,7 @@ localedir = $(sysconfdir)/gdm
|
||||
bisessdir = $(datadir)/gdm/BuiltInSessions
|
||||
instsessdir = $(datadir)/xsessions
|
||||
initdir = $(sysconfdir)/gdm/Init
|
||||
$OpenBSD: patch-config_Makefile_in,v 1.7 2007/05/18 17:20:40 jasper Exp $
|
||||
--- config/Makefile.in.orig Sat Apr 21 13:12:24 2007
|
||||
+++ config/Makefile.in Sat Apr 21 13:13:11 2007
|
||||
@@ -267,7 +267,7 @@ am__leading_dot = @am__leading_dot@
|
||||
am__quote = @am__quote@
|
||||
am__tar = @am__tar@
|
||||
am__untar = @am__untar@
|
||||
-authdir = $(localstatedir)/gdm
|
||||
+authdir = $(localstatedir)/db/gdm
|
||||
logdir = $(localstatedir)/log/gdm
|
||||
gnomercdir = $(sysconfdir)/gdm
|
||||
postdir = $(sysconfdir)/gdm/PostSession
|
||||
@@ -586,7 +586,6 @@ install-data-hook: gdm.conf Xsession gno
|
||||
|
||||
bindir = @bindir@
|
||||
build = @build@
|
||||
build_alias = @build_alias@
|
||||
@@ -711,7 +711,6 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession I
|
||||
if test '!' -d $(DESTDIR)$(authdir); then \
|
||||
$(mkinstalldirs) $(DESTDIR)$(authdir); \
|
||||
- chown root:gdm $(DESTDIR)$(authdir); \
|
||||
chmod 1770 $(DESTDIR)$(authdir); \
|
||||
- chown root:gdm $(DESTDIR)$(authdir) || : ; \
|
||||
fi
|
||||
|
||||
system=`uname`; \
|
||||
|
@ -1,19 +1,19 @@
|
||||
$OpenBSD: patch-config_Xsession_in,v 1.4 2005/05/26 03:39:31 marcm Exp $
|
||||
--- config/Xsession.in.orig Thu Feb 3 14:57:45 2005
|
||||
+++ config/Xsession.in Wed May 18 21:04:10 2005
|
||||
@@ -218,15 +218,16 @@ if [ "x$command" = "xdefault" ] ; then
|
||||
elif [ -x /etc/X11/Xclients ]; then
|
||||
command="/etc/X11/Xclients"
|
||||
else
|
||||
- echo "$0: Cannot find Xclients"
|
||||
- # FIXME: kind of an evil failsafe
|
||||
- command="xsm"
|
||||
+ # Load the OpenBSD default Xsession...
|
||||
+ command="/etc/X11/xdm/Xsession"
|
||||
+ # hack around running two agents
|
||||
+ NO_SSH=yes
|
||||
$OpenBSD: patch-config_Xsession_in,v 1.5 2007/05/18 17:20:40 jasper Exp $
|
||||
--- config/Xsession.in.orig Sat Apr 21 13:13:28 2007
|
||||
+++ config/Xsession.in Sat Apr 21 13:15:31 2007
|
||||
@@ -223,7 +223,10 @@ if [ "x$command" = "xdefault" ] ; then
|
||||
disptext=`gettextfunc "System has no Xclients file, so starting a failsafe xterm session. Windows will have focus only if the mouse pointer is above them. To get out of this mode type 'exit' in the window."`
|
||||
"$zenity" --info --text "$disptext"
|
||||
else
|
||||
- echo "$0: Cannot find Xclients"
|
||||
+ # Load the OpenBSD default Xsession...
|
||||
+ command="/etc/X11/xdm/Xsession"
|
||||
+ # hack around running two agents
|
||||
+ NO_SSH=yes
|
||||
fi
|
||||
exec xterm -geometry 80x24+0+0
|
||||
fi
|
||||
fi
|
||||
@@ -231,7 +234,7 @@ fi
|
||||
|
||||
# add ssh-agent if found
|
||||
sshagent="`gdmwhich ssh-agent`"
|
||||
|
@ -1,22 +1,32 @@
|
||||
--- config/gdm.conf.in.orig Mon Feb 14 14:49:35 2005
|
||||
+++ config/gdm.conf.in Wed May 18 21:04:11 2005
|
||||
@@ -71,8 +71,8 @@ TimedLoginDelay=30
|
||||
# User and group used for running gdm GUI applicaitons. By default this
|
||||
# is set to user gdm and group gdm. This user/group should have very
|
||||
# limited permissions and access to ony the gdm directories and files.
|
||||
$OpenBSD: patch-config_gdm_conf_in,v 1.6 2007/05/18 17:20:40 jasper Exp $
|
||||
--- config/gdm.conf.in.orig Mon Apr 9 08:15:16 2007
|
||||
+++ config/gdm.conf.in Fri May 18 19:34:41 2007
|
||||
@@ -99,8 +99,8 @@ TimedLoginDelay=30
|
||||
# User and group used for running GDM GUI applicaitons. By default this is set
|
||||
# to user "gdm" and group "gdm". This user/group should have very limited
|
||||
# permissions and access to ony the gdm directories and files.
|
||||
-User=gdm
|
||||
-Group=gdm
|
||||
+User=_x11
|
||||
+Group=_x11
|
||||
|
||||
# To try to kill all clients started at greeter time or in the Init script.
|
||||
# doesn't always work, only if those clients have a window of their own
|
||||
#KillInitClients=true
|
||||
@@ -135,7 +135,7 @@ Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONF
|
||||
# we force X to use specific vts. turn VTAllocation to false if this
|
||||
# is causing problems.
|
||||
# does not always work, only if those clients have a window of their own.
|
||||
@@ -178,7 +178,7 @@ XnestUnscaledFontPath=@X_XNEST_UNSCALED_FONTPATH@
|
||||
# X to use specific vts. turn VTAllocation to false if this is causing
|
||||
# problems.
|
||||
#FirstVT=7
|
||||
-#VTAllocation=true
|
||||
+VTAllocation=false
|
||||
# Should double login be treated with a warning (and possibility to change
|
||||
# vts on linux and freebsd systems for console logins)
|
||||
# Should double login be treated with a warning (and possibility to change VT's
|
||||
# on Linux and FreeBSD systems for console logins)
|
||||
#DoubleLoginWarning=true
|
||||
@@ -353,7 +353,7 @@ Browser=false
|
||||
# User ID's less than the MinimalUID value will not be included in the face
|
||||
# browser or in the gdmselection list for Automatic/Timed login. They will not
|
||||
# be displayed regardless of the settings for Include and Exclude.
|
||||
-#MinimalUID=100
|
||||
+MinimalUID=1000
|
||||
# Users listed in Include will be included in the face browser and in the
|
||||
# gdmsetup selection list for Automatic/Timed login. Users should be separated
|
||||
# by commas.
|
||||
|
@ -1,25 +1,25 @@
|
||||
$OpenBSD: patch-configure,v 1.5 2005/05/26 03:39:31 marcm Exp $
|
||||
--- configure.orig Mon Apr 11 21:37:37 2005
|
||||
+++ configure Wed May 18 21:41:47 2005
|
||||
@@ -27279,7 +27279,6 @@ else
|
||||
$OpenBSD: patch-configure,v 1.6 2007/05/18 17:20:40 jasper Exp $
|
||||
--- configure.orig Sat Apr 21 13:18:28 2007
|
||||
+++ configure Sat Apr 21 13:22:28 2007
|
||||
@@ -31596,7 +31596,6 @@ else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
-LIBWRAP_PATH=""
|
||||
- LIBWRAP_PATH=""
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
@@ -28770,7 +28769,7 @@ cat >>confdefs.h <<_ACEOF
|
||||
_ACEOF
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
@@ -33737,7 +33736,7 @@ fi
|
||||
#
|
||||
# Define some variables to represent the directories we use.
|
||||
#
|
||||
-authdir=${localstatedir}/gdm
|
||||
+authdir=${localstatedir}/db/gdm
|
||||
|
||||
-AUTHDIR_TMP="$localstatedir/gdm"
|
||||
+AUTHDIR_TMP="$localstatedir/db/gdm"
|
||||
EXPANDED_AUTHDIR=`eval echo $AUTHDIR_TMP`
|
||||
gdmlocaledir=${gdmconfdir}
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@@ -28961,9 +28960,9 @@ case "$host" in
|
||||
;;
|
||||
@@ -34138,9 +34137,9 @@ case "$host" in
|
||||
;;
|
||||
*)
|
||||
GDM_USER_PATH="/bin:/usr/bin"
|
||||
- HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
|
||||
@ -27,10 +27,10 @@ $OpenBSD: patch-configure,v 1.5 2005/05/26 03:39:31 marcm Exp $
|
||||
REBOOT_COMMAND="/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
|
||||
- SUSPEND_COMMAND=""
|
||||
+ SUSPEND_COMMAND="/usr/sbin/zzz"
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -28976,7 +28975,14 @@ if test ! -h /usr/X11R6 -a -x /usr/X11R6
|
||||
XSESSION_SHELL=/bin/sh
|
||||
SOUND_PROGRAM=/usr/bin/play
|
||||
GDMGNOMESESSIONCMD=gnome-session
|
||||
@@ -34156,7 +34155,14 @@ if test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
|
||||
X_SERVER_PATH="/usr/X11R6/bin"
|
||||
X_SERVER="/usr/X11R6/bin/X"
|
||||
GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-daemon_gdm-net_c,v 1.3 2004/06/24 23:58:34 marcm Exp $
|
||||
--- daemon/gdm-net.c.orig Fri Dec 19 13:12:07 2003
|
||||
+++ daemon/gdm-net.c Thu Jun 24 10:21:59 2004
|
||||
@@ -390,7 +390,7 @@ gdm_connection_open_fifo (const char *fi
|
||||
$OpenBSD: patch-daemon_gdm-net_c,v 1.4 2007/05/18 17:20:40 jasper Exp $
|
||||
--- daemon/gdm-net.c.orig Sat Apr 21 13:29:27 2007
|
||||
+++ daemon/gdm-net.c Sat Apr 21 13:29:48 2007
|
||||
@@ -451,7 +451,7 @@ gdm_connection_open_fifo (const char *fifo, mode_t mod
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -1,16 +1,16 @@
|
||||
$OpenBSD: patch-daemon_slave_c,v 1.5 2005/05/26 03:39:31 marcm Exp $
|
||||
--- daemon/slave.c.orig Mon Mar 7 12:40:10 2005
|
||||
+++ daemon/slave.c Wed May 18 21:04:12 2005
|
||||
@@ -2655,7 +2655,7 @@ gdm_slave_greeter (void)
|
||||
$OpenBSD: patch-daemon_slave_c,v 1.6 2007/05/18 17:20:40 jasper Exp $
|
||||
--- daemon/slave.c.orig Sat Apr 21 13:30:03 2007
|
||||
+++ daemon/slave.c Sat Apr 21 13:31:27 2007
|
||||
@@ -2707,7 +2707,7 @@ gdm_slave_greeter (void)
|
||||
|
||||
exec_command (EXPANDED_BINDIR "/gdmlogin", NULL);
|
||||
exec_command (LIBEXECDIR "/gdmlogin", NULL);
|
||||
|
||||
- VE_IGNORE_EINTR (execl (EXPANDED_BINDIR "/gdmlogin", EXPANDED_BINDIR "/gdmlogin", NULL));
|
||||
+ VE_IGNORE_EINTR (execl (EXPANDED_BINDIR "/gdmlogin", EXPANDED_BINDIR "/gdmlogin", (void *)NULL));
|
||||
- VE_IGNORE_EINTR (execl (LIBEXECDIR "/gdmlogin", LIBEXECDIR "/gdmlogin", NULL));
|
||||
+ VE_IGNORE_EINTR (execl (LIBEXECDIR "/gdmlogin", LIBEXECDIR "/gdmlogin", (void *)NULL));
|
||||
|
||||
gdm_error_box (d,
|
||||
GTK_MESSAGE_ERROR,
|
||||
@@ -3569,8 +3569,7 @@ session_child_run (struct passwd *pwent,
|
||||
@@ -3643,8 +3643,7 @@ session_child_run (struct passwd *pwent,
|
||||
if (setusercontext (NULL, pwent, pwent->pw_uid,
|
||||
LOGIN_SETLOGIN | LOGIN_SETPATH |
|
||||
LOGIN_SETPRIORITY | LOGIN_SETRESOURCES |
|
||||
@ -18,14 +18,5 @@ $OpenBSD: patch-daemon_slave_c,v 1.5 2005/05/26 03:39:31 marcm Exp $
|
||||
- LOGIN_SETENV) < 0)
|
||||
+ LOGIN_SETUMASK | LOGIN_SETUSER) < 0)
|
||||
gdm_child_exit (DISPLAY_REMANAGE,
|
||||
_("%s: setusercontext() failed for %s. "
|
||||
_("%s: setusercontext () failed for %s. "
|
||||
"Aborting."), "session_child_run",
|
||||
@@ -4846,7 +4845,7 @@ check_for_interruption (const char *msg)
|
||||
execl (GdmSoundProgram,
|
||||
GdmSoundProgram,
|
||||
GdmSoundOnLoginFile,
|
||||
- NULL);
|
||||
+ (void *)NULL);
|
||||
|
||||
_exit (0);
|
||||
}
|
||||
|
@ -1,15 +1,15 @@
|
||||
$OpenBSD: patch-gui_gdmchooser_c,v 1.1 2004/09/15 04:15:25 marcm Exp $
|
||||
--- gui/gdmchooser.c.orig Tue Aug 3 16:01:28 2004
|
||||
+++ gui/gdmchooser.c Sun Sep 12 11:34:54 2004
|
||||
@@ -44,6 +44,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
$OpenBSD: patch-gui_gdmchooser_c,v 1.2 2007/05/18 17:20:40 jasper Exp $
|
||||
--- gui/gdmchooser.c.orig Sat Apr 21 13:35:17 2007
|
||||
+++ gui/gdmchooser.c Sat Apr 21 13:37:44 2007
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <net/if.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
+#include <ifaddrs.h>
|
||||
#ifdef HAVE_SYS_SOCKIO_H
|
||||
#include <sys/sockio.h>
|
||||
#endif
|
||||
@@ -690,9 +691,38 @@ gdm_chooser_decode_packet (GIOChannel
|
||||
@@ -656,9 +657,38 @@ gdm_chooser_decode_packet (GIOChannel *source,
|
||||
|
||||
|
||||
/* Find broadcast address for all active, non pointopoint interfaces */
|
||||
@ -17,27 +17,27 @@ $OpenBSD: patch-gui_gdmchooser_c,v 1.1 2004/09/15 04:15:25 marcm Exp $
|
||||
static void
|
||||
gdm_chooser_find_bcaddr (void)
|
||||
{
|
||||
+ struct ifaddrs *ifa, *ifaddrs;
|
||||
+ struct sockaddr_in *sin;
|
||||
+ int i;
|
||||
+ struct ifaddrs *ifa, *ifaddrs;
|
||||
+ struct sockaddr_in *sin;
|
||||
+ int i;
|
||||
+
|
||||
+ if (getifaddrs(&ifaddrs))
|
||||
+ return;
|
||||
+ if (getifaddrs(&ifaddrs))
|
||||
+ return;
|
||||
+
|
||||
+ for (ifa = ifaddrs, i = 0; ifa != NULL; ifa = ifa -> ifa_next) {
|
||||
+ if (ifa->ifa_addr == NULL || !(ifa->ifa_flags & IFF_UP) ||
|
||||
+ !(ifa->ifa_flags & IFF_BROADCAST))
|
||||
+ continue;
|
||||
+ for (ifa = ifaddrs, i = 0; ifa != NULL; ifa = ifa -> ifa_next) {
|
||||
+ if (ifa->ifa_addr == NULL || !(ifa->ifa_flags & IFF_UP) ||
|
||||
+ !(ifa->ifa_flags & IFF_BROADCAST))
|
||||
+ continue;
|
||||
+
|
||||
+ switch(ifa->ifa_addr->sa_family) {
|
||||
+ case AF_INET:
|
||||
+ sin = (struct sockaddr_in *)ifa->ifa_broadaddr;
|
||||
+ bcaddr = g_slist_append (bcaddr, sin);
|
||||
+ i++;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ freeifaddrs(ifaddrs);
|
||||
+ switch(ifa->ifa_addr->sa_family) {
|
||||
+ case AF_INET:
|
||||
+ sin = (struct sockaddr_in *)ifa->ifa_broadaddr;
|
||||
+ bcaddr = g_slist_append (bcaddr, sin);
|
||||
+ i++;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ freeifaddrs(ifaddrs);
|
||||
+}
|
||||
+
|
||||
+#else
|
||||
@ -48,7 +48,7 @@ $OpenBSD: patch-gui_gdmchooser_c,v 1.1 2004/09/15 04:15:25 marcm Exp $
|
||||
int i = 0, num;
|
||||
int sock;
|
||||
struct ifconf ifc;
|
||||
@@ -752,6 +782,7 @@ gdm_chooser_find_bcaddr (void)
|
||||
@@ -718,6 +748,7 @@ gdm_chooser_find_bcaddr (void)
|
||||
|
||||
g_free (buf);
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-gui_gdmsetup_c,v 1.1 2004/09/15 04:15:25 marcm Exp $
|
||||
--- gui/gdmsetup.c.orig Wed Aug 18 12:27:40 2004
|
||||
+++ gui/gdmsetup.c Fri Sep 10 20:42:41 2004
|
||||
@@ -2025,7 +2025,7 @@ install_response (GtkWidget *chooser, gi
|
||||
$OpenBSD: patch-gui_gdmsetup_c,v 1.2 2007/05/18 17:20:40 jasper Exp $
|
||||
--- gui/gdmsetup.c.orig Sat Apr 21 13:38:12 2007
|
||||
+++ gui/gdmsetup.c Sat Apr 21 13:38:29 2007
|
||||
@@ -5532,7 +5532,7 @@ install_theme_file (gchar *filename, GtkListStore *sto
|
||||
/* HACK! */
|
||||
argv[0] = chown;
|
||||
argv[1] = "-R";
|
||||
|
@ -1,13 +1,13 @@
|
||||
$OpenBSD: patch-gui_greeter_greeter_c,v 1.5 2005/05/26 03:39:31 marcm Exp $
|
||||
--- gui/greeter/greeter.c.orig Fri Mar 4 11:55:38 2005
|
||||
+++ gui/greeter/greeter.c Wed May 18 21:04:12 2005
|
||||
@@ -1285,8 +1285,8 @@ main (int argc, char *argv[])
|
||||
$OpenBSD: patch-gui_greeter_greeter_c,v 1.6 2007/05/18 17:20:40 jasper Exp $
|
||||
--- gui/greeter/greeter.c.orig Sat Apr 21 13:38:54 2007
|
||||
+++ gui/greeter/greeter.c Sat Apr 21 13:39:38 2007
|
||||
@@ -1440,8 +1440,8 @@ main (int argc, char *argv[])
|
||||
gtk_dialog_run (GTK_DIALOG (dialog));
|
||||
gtk_widget_destroy (dialog);
|
||||
|
||||
- execl (EXPANDED_BINDIR "/gdmlogin", EXPANDED_BINDIR "/gdmlogin", NULL);
|
||||
- execl (LIBEXECDIR "/gdmlogin", LIBEXECDIR "/gdmlogin", NULL);
|
||||
- execlp ("gdmlogin", "gdmlogin", NULL);
|
||||
+ execl (EXPANDED_BINDIR "/gdmlogin", EXPANDED_BINDIR "/gdmlogin", (void *)NULL);
|
||||
+ execl (LIBEXECDIR "/gdmlogin", LIBEXECDIR "/gdmlogin", (void *)NULL);
|
||||
+ execlp ("gdmlogin", "gdmlogin", (void *)NULL);
|
||||
|
||||
dialog = ve_hig_dialog_new (NULL /* parent */,
|
||||
|
7
x11/gnome/gdm/pkg/MESSAGE
Normal file
7
x11/gnome/gdm/pkg/MESSAGE
Normal file
@ -0,0 +1,7 @@
|
||||
To enable the GNOME Display Manager, add the following lines to the
|
||||
/etc/rc.local file:
|
||||
|
||||
if [ -x ${PREFIX}/sbin/gdm ]; then
|
||||
echo -n ' gdm';
|
||||
${PREFIX}/sbin/gdm
|
||||
fi
|
3
x11/gnome/gdm/pkg/PFRAG.shared
Normal file
3
x11/gnome/gdm/pkg/PFRAG.shared
Normal file
@ -0,0 +1,3 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.1 2007/05/18 17:20:40 jasper Exp $
|
||||
lib/gtk-2.0/modules/libdwellmouselistener.so
|
||||
lib/gtk-2.0/modules/libkeymouselistener.so
|
@ -1,14 +1,11 @@
|
||||
@comment $OpenBSD: PLIST,v 1.10 2006/01/19 13:35:47 steven Exp $
|
||||
bin/gdm
|
||||
bin/gdm-binary
|
||||
@comment $OpenBSD: PLIST,v 1.11 2007/05/18 17:20:40 jasper Exp $
|
||||
%%SHARED%%
|
||||
bin/gdm-dmx-reconnect-proxy
|
||||
bin/gdmXnest
|
||||
bin/gdmXnestchooser
|
||||
bin/gdmchooser
|
||||
bin/gdmdynamic
|
||||
bin/gdmflexiserver
|
||||
bin/gdmgreeter
|
||||
bin/gdmlogin
|
||||
bin/gdmphotosetup
|
||||
bin/gdmsetup
|
||||
bin/gdmthemetester
|
||||
lib/gtk-2.0/
|
||||
lib/gtk-2.0/modules/
|
||||
@ -16,66 +13,64 @@ lib/gtk-2.0/modules/libdwellmouselistener.a
|
||||
lib/gtk-2.0/modules/libdwellmouselistener.la
|
||||
lib/gtk-2.0/modules/libkeymouselistener.a
|
||||
lib/gtk-2.0/modules/libkeymouselistener.la
|
||||
libexec/gdmchooser
|
||||
libexec/gdmgreeter
|
||||
libexec/gdmlogin
|
||||
libexec/gdmtranslate
|
||||
@man man/man1/gdm.1
|
||||
sbin/gdm
|
||||
sbin/gdm-binary
|
||||
sbin/gdm-restart
|
||||
sbin/gdm-safe-restart
|
||||
sbin/gdm-stop
|
||||
sbin/gdmconfig
|
||||
sbin/gdmsetup
|
||||
share/applications/
|
||||
share/applications/gdmflexiserver-xnest.desktop
|
||||
share/applications/gdmflexiserver.desktop
|
||||
share/applications/gdmphotosetup.desktop
|
||||
share/applications/gdmsetup.desktop
|
||||
@sample ${SYSCONFDIR}/X11/gdm/
|
||||
@sample ${SYSCONFDIR}/X11/gdm/Init/
|
||||
share/examples/gdm/
|
||||
@comment share/examples/gdm/dm/
|
||||
share/examples/gdm/gdm/
|
||||
share/examples/gdm/gdm/Init/
|
||||
share/examples/gdm/gdm/Init/Default
|
||||
@mode 555
|
||||
@sample ${SYSCONFDIR}/X11/gdm/
|
||||
share/examples/gdm/Init/
|
||||
@sample ${SYSCONFDIR}/X11/gdm/Init/
|
||||
share/examples/gdm/Init/Default
|
||||
@sample ${SYSCONFDIR}/X11/gdm/Init/Default
|
||||
@mode
|
||||
share/examples/gdm/PostLogin/
|
||||
@sample ${SYSCONFDIR}/X11/gdm/PostLogin/
|
||||
share/examples/gdm/gdm/PostLogin/
|
||||
share/examples/gdm/gdm/PostLogin/Default.sample
|
||||
share/examples/gdm/PostLogin/Default.sample
|
||||
@sample ${SYSCONFDIR}/X11/gdm/PostLogin/Default.sample
|
||||
share/examples/gdm/PostSession/
|
||||
@sample ${SYSCONFDIR}/X11/gdm/PostSession/
|
||||
share/examples/gdm/gdm/PostSession/
|
||||
share/examples/gdm/gdm/PostSession/Default
|
||||
@mode 555
|
||||
share/examples/gdm/PostSession/Default
|
||||
@sample ${SYSCONFDIR}/X11/gdm/PostSession/Default
|
||||
@mode
|
||||
share/examples/gdm/PreSession/
|
||||
@sample ${SYSCONFDIR}/X11/gdm/PreSession/
|
||||
share/examples/gdm/gdm/PreSession/
|
||||
share/examples/gdm/gdm/PreSession/Default
|
||||
@mode 555
|
||||
share/examples/gdm/PreSession/Default
|
||||
@sample ${SYSCONFDIR}/X11/gdm/PreSession/Default
|
||||
@mode
|
||||
share/examples/gdm/gdm/XKeepsCrashing
|
||||
@mode 555
|
||||
share/examples/gdm/XKeepsCrashing
|
||||
@sample ${SYSCONFDIR}/X11/gdm/XKeepsCrashing
|
||||
@mode
|
||||
share/examples/gdm/gdm/Xsession
|
||||
@mode 555
|
||||
share/examples/gdm/Xsession
|
||||
@sample ${SYSCONFDIR}/X11/gdm/Xsession
|
||||
@mode
|
||||
@comment share/examples/gdm/gdm/factory-gdm.conf
|
||||
share/examples/gdm/gdm/gdm.conf
|
||||
@sample ${SYSCONFDIR}/X11/gdm/gdm.conf
|
||||
share/examples/gdm/gdm/locale.alias
|
||||
share/examples/gdm/custom.conf
|
||||
@sample ${SYSCONFDIR}/X11/gdm/custom.conf
|
||||
share/examples/gdm/locale.alias
|
||||
@sample ${SYSCONFDIR}/X11/gdm/locale.alias
|
||||
share/examples/gdm/modules/
|
||||
@sample ${SYSCONFDIR}/X11/gdm/modules/
|
||||
share/examples/gdm/gdm/modules/
|
||||
share/examples/gdm/gdm/modules/AccessDwellMouseEvents
|
||||
share/examples/gdm/modules/AccessDwellMouseEvents
|
||||
@sample ${SYSCONFDIR}/X11/gdm/modules/AccessDwellMouseEvents
|
||||
share/examples/gdm/gdm/modules/AccessKeyMouseEvents
|
||||
share/examples/gdm/modules/AccessKeyMouseEvents
|
||||
@sample ${SYSCONFDIR}/X11/gdm/modules/AccessKeyMouseEvents
|
||||
@comment share/examples/gdm/gdm/modules/factory-AccessDwellMouseEvents
|
||||
@comment share/examples/gdm/gdm/modules/factory-AccessKeyMouseEvents
|
||||
share/examples/gdm/modules/factory-AccessDwellMouseEvents
|
||||
@sample ${SYSCONFDIR}/X11/gdm/modules/factory-AccessDwellMouseEvents
|
||||
share/examples/gdm/modules/factory-AccessKeyMouseEvents
|
||||
@sample ${SYSCONFDIR}/X11/gdm/modules/factory-AccessKeyMouseEvents
|
||||
share/gdm/
|
||||
share/gdm/BuiltInSessions/
|
||||
share/gdm/BuiltInSessions/default.desktop
|
||||
share/gdm/defaults.conf
|
||||
share/gdm/factory-defaults.conf
|
||||
share/gdm/gdmchooser.glade
|
||||
share/gdm/gdmphotosetup.glade
|
||||
share/gdm/gdmsetup.glade
|
||||
share/gdm/themes/
|
||||
share/gdm/themes/circles/
|
||||
@ -90,25 +85,17 @@ share/gdm/themes/happygnome/
|
||||
share/gdm/themes/happygnome-list/
|
||||
share/gdm/themes/happygnome-list/GdmGreeterTheme.desktop
|
||||
share/gdm/themes/happygnome-list/background.svg
|
||||
share/gdm/themes/happygnome-list/disconnect.png
|
||||
share/gdm/themes/happygnome-list/gnome-logo.png
|
||||
share/gdm/themes/happygnome-list/gnome-logo.svg
|
||||
share/gdm/themes/happygnome-list/happygnome.xml
|
||||
share/gdm/themes/happygnome-list/options.png
|
||||
share/gdm/themes/happygnome-list/screenshot.png
|
||||
share/gdm/themes/happygnome-list/session.png
|
||||
share/gdm/themes/happygnome-list/system.png
|
||||
share/gdm/themes/happygnome/GdmGreeterTheme.desktop
|
||||
share/gdm/themes/happygnome/background.svg
|
||||
share/gdm/themes/happygnome/disconnect.png
|
||||
share/gdm/themes/happygnome/gnome-logo.png
|
||||
share/gdm/themes/happygnome/gnome-logo.svg
|
||||
share/gdm/themes/happygnome/happygnome.xml
|
||||
share/gdm/themes/happygnome/options.png
|
||||
share/gdm/themes/happygnome/screenshot.png
|
||||
share/gdm/themes/happygnome/session.png
|
||||
share/gdm/themes/happygnome/system.png
|
||||
share/gnome/
|
||||
share/gnome/capplets/
|
||||
share/gnome/capplets/gdmphotosetup.desktop
|
||||
share/gnome/help/
|
||||
share/gnome/help/gdm/
|
||||
share/gnome/help/gdm/C/
|
||||
@ -144,11 +131,9 @@ share/gnome/help/gdm/ko/figures/
|
||||
share/gnome/help/gdm/ko/figures/gdm_window.png
|
||||
share/gnome/help/gdm/ko/gdm.xml
|
||||
share/gnome/help/gdm/ko/legal.xml
|
||||
share/gnome/help/gdm/sv/
|
||||
share/gnome/help/gdm/sv/figures/
|
||||
share/gnome/help/gdm/sv/figures/gdm_window.png
|
||||
share/gnome/help/gdm/sv/gdm.xml
|
||||
share/gnome/help/gdm/sv/legal.xml
|
||||
share/gnome/help/gdm/uk/
|
||||
share/gnome/help/gdm/uk/gdm.xml
|
||||
share/gnome/help/gdm/uk/legal.xml
|
||||
share/gnome/help/gdm/zh_CN/
|
||||
share/gnome/help/gdm/zh_CN/figures/
|
||||
share/gnome/help/gdm/zh_CN/figures/gdm_window.png
|
||||
@ -174,12 +159,18 @@ share/locale/am/LC_MESSAGES/gdm.mo
|
||||
share/locale/ar/
|
||||
share/locale/ar/LC_MESSAGES/
|
||||
share/locale/ar/LC_MESSAGES/gdm.mo
|
||||
share/locale/as/
|
||||
share/locale/as/LC_MESSAGES/
|
||||
share/locale/as/LC_MESSAGES/gdm.mo
|
||||
share/locale/az/LC_MESSAGES/gdm.mo
|
||||
share/locale/be/LC_MESSAGES/gdm.mo
|
||||
share/locale/bg/LC_MESSAGES/gdm.mo
|
||||
share/locale/bn/
|
||||
share/locale/bn/LC_MESSAGES/
|
||||
share/locale/bn/LC_MESSAGES/gdm.mo
|
||||
share/locale/bn_IN/
|
||||
share/locale/bn_IN/LC_MESSAGES/
|
||||
share/locale/bn_IN/LC_MESSAGES/gdm.mo
|
||||
share/locale/bs/
|
||||
share/locale/bs/LC_MESSAGES/
|
||||
share/locale/bs/LC_MESSAGES/gdm.mo
|
||||
@ -190,6 +181,9 @@ share/locale/cy/LC_MESSAGES/
|
||||
share/locale/cy/LC_MESSAGES/gdm.mo
|
||||
share/locale/da/LC_MESSAGES/gdm.mo
|
||||
share/locale/de/LC_MESSAGES/gdm.mo
|
||||
share/locale/dz/
|
||||
share/locale/dz/LC_MESSAGES/
|
||||
share/locale/dz/LC_MESSAGES/gdm.mo
|
||||
share/locale/el/LC_MESSAGES/gdm.mo
|
||||
share/locale/en_CA/
|
||||
share/locale/en_CA/LC_MESSAGES/
|
||||
@ -218,17 +212,29 @@ share/locale/hi/LC_MESSAGES/
|
||||
share/locale/hi/LC_MESSAGES/gdm.mo
|
||||
share/locale/hr/LC_MESSAGES/gdm.mo
|
||||
share/locale/hu/LC_MESSAGES/gdm.mo
|
||||
share/locale/hy/
|
||||
share/locale/hy/LC_MESSAGES/
|
||||
share/locale/hy/LC_MESSAGES/gdm.mo
|
||||
share/locale/id/LC_MESSAGES/gdm.mo
|
||||
share/locale/is/
|
||||
share/locale/is/LC_MESSAGES/
|
||||
share/locale/is/LC_MESSAGES/gdm.mo
|
||||
share/locale/it/LC_MESSAGES/gdm.mo
|
||||
share/locale/ja/LC_MESSAGES/gdm.mo
|
||||
share/locale/ka/
|
||||
share/locale/ka/LC_MESSAGES/
|
||||
share/locale/ka/LC_MESSAGES/gdm.mo
|
||||
share/locale/ko/LC_MESSAGES/gdm.mo
|
||||
share/locale/ku/
|
||||
share/locale/ku/LC_MESSAGES/
|
||||
share/locale/ku/LC_MESSAGES/gdm.mo
|
||||
share/locale/lt/
|
||||
share/locale/lt/LC_MESSAGES/
|
||||
share/locale/lt/LC_MESSAGES/gdm.mo
|
||||
share/locale/lv/LC_MESSAGES/gdm.mo
|
||||
share/locale/mg/
|
||||
share/locale/mg/LC_MESSAGES/
|
||||
share/locale/mg/LC_MESSAGES/gdm.mo
|
||||
share/locale/mi/
|
||||
share/locale/mi/LC_MESSAGES/
|
||||
share/locale/mi/LC_MESSAGES/gdm.mo
|
||||
@ -248,12 +254,17 @@ share/locale/ms/
|
||||
share/locale/ms/LC_MESSAGES/
|
||||
share/locale/ms/LC_MESSAGES/gdm.mo
|
||||
share/locale/nb/LC_MESSAGES/gdm.mo
|
||||
share/locale/ne/
|
||||
share/locale/ne/LC_MESSAGES/
|
||||
share/locale/ne/LC_MESSAGES/gdm.mo
|
||||
share/locale/nl/LC_MESSAGES/gdm.mo
|
||||
share/locale/nn/LC_MESSAGES/gdm.mo
|
||||
share/locale/no/LC_MESSAGES/gdm.mo
|
||||
share/locale/nso/
|
||||
share/locale/nso/LC_MESSAGES/
|
||||
share/locale/nso/LC_MESSAGES/gdm.mo
|
||||
share/locale/or/
|
||||
share/locale/or/LC_MESSAGES/
|
||||
share/locale/or/LC_MESSAGES/gdm.mo
|
||||
share/locale/pa/
|
||||
share/locale/pa/LC_MESSAGES/
|
||||
share/locale/pa/LC_MESSAGES/gdm.mo
|
||||
@ -289,10 +300,16 @@ share/locale/xh/
|
||||
share/locale/xh/LC_MESSAGES/
|
||||
share/locale/xh/LC_MESSAGES/gdm.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/gdm.mo
|
||||
share/locale/zh_HK/
|
||||
share/locale/zh_HK/LC_MESSAGES/
|
||||
share/locale/zh_HK/LC_MESSAGES/gdm.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/gdm.mo
|
||||
share/locale/zu/
|
||||
share/locale/zu/LC_MESSAGES/
|
||||
share/locale/zu/LC_MESSAGES/gdm.mo
|
||||
share/man/
|
||||
share/man/man1/
|
||||
@man share/man/man1/gdm.1
|
||||
share/omf/gdm/
|
||||
share/omf/gdm/gdm-C.omf
|
||||
share/omf/gdm/gdm-de.omf
|
||||
@ -301,11 +318,36 @@ share/omf/gdm/gdm-fr.omf
|
||||
share/omf/gdm/gdm-it.omf
|
||||
share/omf/gdm/gdm-ja.omf
|
||||
share/omf/gdm/gdm-ko.omf
|
||||
share/omf/gdm/gdm-sv.omf
|
||||
share/omf/gdm/gdm-uk.omf
|
||||
share/omf/gdm/gdm-zh_CN.omf
|
||||
share/omf/gdm/gdm-zh_HK.omf
|
||||
share/omf/gdm/gdm-zh_TW.omf
|
||||
share/pixmaps/
|
||||
share/pixmaps/faces/
|
||||
share/pixmaps/faces/astronaut.jpg
|
||||
share/pixmaps/faces/baseball.png
|
||||
share/pixmaps/faces/butterfly.png
|
||||
share/pixmaps/faces/cat-eye.jpg
|
||||
share/pixmaps/faces/chess.jpg
|
||||
share/pixmaps/faces/coffee.jpg
|
||||
share/pixmaps/faces/dice.jpg
|
||||
share/pixmaps/faces/energy-arc.jpg
|
||||
share/pixmaps/faces/fish.jpg
|
||||
share/pixmaps/faces/flake.jpg
|
||||
share/pixmaps/faces/flower.jpg
|
||||
share/pixmaps/faces/grapes.jpg
|
||||
share/pixmaps/faces/guitar.jpg
|
||||
share/pixmaps/faces/launch.jpg
|
||||
share/pixmaps/faces/leaf.jpg
|
||||
share/pixmaps/faces/lightning.jpg
|
||||
share/pixmaps/faces/penguin.jpg
|
||||
share/pixmaps/faces/puppy.jpg
|
||||
share/pixmaps/faces/sky.jpg
|
||||
share/pixmaps/faces/soccerball.png
|
||||
share/pixmaps/faces/sunflower.jpg
|
||||
share/pixmaps/faces/sunset.jpg
|
||||
share/pixmaps/faces/tennis-ball.png
|
||||
share/pixmaps/faces/yellow-rose.jpg
|
||||
share/pixmaps/gdm-foot-logo.png
|
||||
share/pixmaps/gdm-setup.png
|
||||
share/pixmaps/gdm-xnest.png
|
||||
@ -317,8 +359,10 @@ share/xsessions/
|
||||
share/xsessions/gnome.desktop
|
||||
@exec %D/bin/scrollkeeper-update -q
|
||||
@unexec %D/bin/scrollkeeper-update -q
|
||||
@exec %D/bin/update-desktop-database
|
||||
@unexec %D/bin/update-desktop-database
|
||||
@mode 0755
|
||||
@sample /var/log/gdm/
|
||||
@group _x11
|
||||
@mode 1770
|
||||
@group _x11
|
||||
@sample /var/db/gdm/
|
||||
|
Loading…
Reference in New Issue
Block a user