- update gdm to version 2.20.8
- enable libwrap support - explicitely disable policykit and console-helper ok jasper@
This commit is contained in:
ajacoutot
parent
821ea55ffc
commit
3bd99b87ec
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.34 2008/11/24 09:10:11 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.35 2008/11/25 18:27:39 ajacoutot Exp $
|
||||
|
||||
COMMENT= GNOME display manager
|
||||
|
||||
GNOME_PROJECT= gdm
|
||||
GNOME_VERSION= 2.20.7
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
GNOME_VERSION= 2.20.8
|
||||
|
||||
HOMEPAGE= http://www.gnome.org/projects/gdm/
|
||||
|
||||
@ -14,14 +13,14 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
WANTLIB= ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
|
||||
WANTLIB= X11 Xau Xcomposite Xcursor Xdamage 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 gailutil gconf-2 gdk-x11-2.0 \
|
||||
bz2 c cairo croco-0.6 dmx \
|
||||
expat fontconfig freetype gailutil gdk-x11-2.0 \
|
||||
gdk_pixbuf-2.0 gio-2.0 glade-2.0 glib-2.0 glitz gmodule-2.0 \
|
||||
gnomecanvas-2 gnomevfs-2 gobject-2.0 gsf-1 gthread-2.0 \
|
||||
gnomecanvas-2 gobject-2.0 gsf-1 \
|
||||
gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
|
||||
pcre pixman-1 png pthread ssl util xml2 z
|
||||
pcre pixman-1 png util wrap xml2 z
|
||||
|
||||
BUILD_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper \
|
||||
:gnome-doc-utils->=0.3.2:x11/gnome/doc-utils \
|
||||
@ -45,7 +44,11 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
|
||||
--sysconfdir="${SYSCONFDIR}/X11" \
|
||||
--localstatedir=/var \
|
||||
--mandir=${PREFIX}/man \
|
||||
--enable-secureremote=yes
|
||||
--enable-secureremote=yes \
|
||||
--enable-console-helper=no \
|
||||
--disable-scrollkeeper \
|
||||
--with-console-kit=no
|
||||
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (gnome/gdm-2.20.7.tar.bz2) = Fb5ydDADyx42yc4qwt5TgQ==
|
||||
RMD160 (gnome/gdm-2.20.7.tar.bz2) = G5MhqBqlmE52cV/snOfgHxYbi8s=
|
||||
SHA1 (gnome/gdm-2.20.7.tar.bz2) = NJpaLmCj4uIpr+meE0L3XjIeU+k=
|
||||
SHA256 (gnome/gdm-2.20.7.tar.bz2) = hKceropSyJ4wRK+mlCS4p+eSEAJDNOt8I/Jb36FsqCU=
|
||||
SIZE (gnome/gdm-2.20.7.tar.bz2) = 3978969
|
||||
MD5 (gnome/gdm-2.20.8.tar.bz2) = wYOwFygObvJa041hiqwicQ==
|
||||
RMD160 (gnome/gdm-2.20.8.tar.bz2) = x92qA+5phUHOohyifruZsc3yWKo=
|
||||
SHA1 (gnome/gdm-2.20.8.tar.bz2) = +AaxcdDuprYiOGVbZnBDTwGSFK4=
|
||||
SHA256 (gnome/gdm-2.20.8.tar.bz2) = zvYI0mOGYAP1c6m4DSnGNadO5zND0/Rbs4HPULXFKJQ=
|
||||
SIZE (gnome/gdm-2.20.8.tar.bz2) = 3932232
|
||||
|
||||
@ -1,15 +1,24 @@
|
||||
$OpenBSD: patch-configure,v 1.12 2008/11/21 17:43:02 jasper Exp $
|
||||
--- configure.orig Mon Jun 30 19:55:06 2008
|
||||
+++ configure Tue Nov 18 22:55:22 2008
|
||||
@@ -30841,7 +30841,6 @@ if test x$with_tcp_wrappers = xno ; then
|
||||
$OpenBSD: patch-configure,v 1.13 2008/11/25 18:27:39 ajacoutot Exp $
|
||||
--- configure.orig Wed Sep 3 20:49:49 2008
|
||||
+++ configure Tue Nov 25 17:28:13 2008
|
||||
@@ -30952,7 +30952,6 @@ fi
|
||||
if test x$with_tcp_wrappers = xno ; then
|
||||
echo "TCP wrappers disabled"
|
||||
else
|
||||
{ echo "$as_me:$LINENO: checking whether to use TCP wrappers" >&5
|
||||
echo $ECHO_N "checking whether to use TCP wrappers... $ECHO_C" >&6; }
|
||||
- LIBWRAP_PATH=""
|
||||
case "$host" in
|
||||
*-*-solaris*)
|
||||
if test -f /usr/sfw/lib/libwrap.so; then
|
||||
@@ -31062,7 +31061,6 @@ else
|
||||
if test -f /usr/lib/libwrap.so; then
|
||||
@@ -31007,6 +31006,8 @@ cat >>conftest.$ac_ext <<_ACEOF
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
+int allow_severity = 1;
|
||||
+int deny_severity = 1;
|
||||
char hosts_ctl ();
|
||||
int
|
||||
main ()
|
||||
@@ -31162,7 +31163,6 @@ else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
@ -17,7 +26,7 @@ $OpenBSD: patch-configure,v 1.12 2008/11/21 17:43:02 jasper Exp $
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
@@ -32842,7 +32840,7 @@ fi
|
||||
@@ -32942,7 +32942,7 @@ fi
|
||||
#
|
||||
# Define some variables to represent the directories we use.
|
||||
#
|
||||
@ -26,22 +35,7 @@ $OpenBSD: patch-configure,v 1.12 2008/11/21 17:43:02 jasper Exp $
|
||||
|
||||
gdmlocaledir=${gdmconfdir}
|
||||
|
||||
@@ -33556,11 +33554,11 @@ case "$host" in
|
||||
;;
|
||||
*)
|
||||
HOST_GDM_USER_PATH="/bin:/usr/bin"
|
||||
- HOST_HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
|
||||
+ 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=""
|
||||
+ HOST_SUSPEND_COMMAND="/usr/sbin/zzz"
|
||||
HOST_XSESSION_SHELL=/bin/sh
|
||||
- HOST_SOUND_PROGRAM=/usr/bin/play
|
||||
+ HOST_SOUND_PROGRAM=$(prefix)/bin/play
|
||||
HOST_GDMGNOMESESSIONCMD=gnome-session
|
||||
HOST_UTMP_LINE_ATTACHED="/dev/console"
|
||||
HOST_UTMP_LINE_REMOTE=""
|
||||
@@ -33663,6 +33661,12 @@ else
|
||||
@@ -33777,6 +33777,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
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-daemon_slave_c,v 1.9 2008/11/21 17:43:02 jasper Exp $
|
||||
--- daemon/slave.c.orig Mon Jun 30 19:53:13 2008
|
||||
+++ daemon/slave.c Tue Nov 18 22:55:23 2008
|
||||
$OpenBSD: patch-daemon_slave_c,v 1.10 2008/11/25 18:27:39 ajacoutot Exp $
|
||||
--- daemon/slave.c.orig Wed Sep 3 20:36:08 2008
|
||||
+++ daemon/slave.c Tue Nov 25 17:18:20 2008
|
||||
@@ -2843,7 +2843,7 @@ gdm_slave_greeter (void)
|
||||
|
||||
exec_command (LIBEXECDIR "/gdmlogin", NULL);
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-daemon_slave_c,v 1.9 2008/11/21 17:43:02 jasper Exp $
|
||||
|
||||
gdm_errorgui_error_box (d,
|
||||
GTK_MESSAGE_ERROR,
|
||||
@@ -3568,6 +3568,7 @@ session_child_run (struct passwd *pwent,
|
||||
@@ -3571,6 +3571,7 @@ session_child_run (struct passwd *pwent,
|
||||
GString *fullexec = NULL;
|
||||
const char *shell = NULL;
|
||||
const char *greeter;
|
||||
@ -18,7 +18,7 @@ $OpenBSD: patch-daemon_slave_c,v 1.9 2008/11/21 17:43:02 jasper Exp $
|
||||
gint result;
|
||||
gchar **argv = NULL;
|
||||
|
||||
@@ -3787,8 +3788,7 @@ session_child_run (struct passwd *pwent,
|
||||
@@ -3790,8 +3791,7 @@ session_child_run (struct passwd *pwent,
|
||||
if (setusercontext (NULL, pwent, pwent->pw_uid,
|
||||
LOGIN_SETLOGIN | LOGIN_SETPATH |
|
||||
LOGIN_SETPRIORITY | LOGIN_SETRESOURCES |
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-gui_gdmchooser_c,v 1.3 2007/11/27 20:26:13 jasper Exp $
|
||||
--- gui/gdmchooser.c.orig Mon Oct 15 23:42:40 2007
|
||||
+++ gui/gdmchooser.c Sat Oct 27 17:09:35 2007
|
||||
$OpenBSD: patch-gui_gdmchooser_c,v 1.4 2008/11/25 18:27:39 ajacoutot Exp $
|
||||
--- gui/gdmchooser.c.orig Wed Sep 3 20:35:57 2008
|
||||
+++ gui/gdmchooser.c Tue Nov 25 17:18:20 2008
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <net/if.h>
|
||||
#include <netinet/in.h>
|
||||
@ -48,7 +48,7 @@ $OpenBSD: patch-gui_gdmchooser_c,v 1.3 2007/11/27 20:26:13 jasper Exp $
|
||||
int i = 0, num;
|
||||
int sock;
|
||||
struct ifconf ifc;
|
||||
@@ -747,6 +777,7 @@ gdm_chooser_find_bcaddr (void)
|
||||
@@ -752,6 +782,7 @@ gdm_chooser_find_bcaddr (void)
|
||||
|
||||
g_free (buf);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user