summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/gdm/Makefile7
-rw-r--r--x11/gdm/distinfo4
-rw-r--r--x11/gdm/files/patch-CVE-2011-170976
-rw-r--r--x11/gdm/files/patch-daemon_gdm-session-worker.c53
4 files changed, 10 insertions, 130 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 733f064c3..365843f78 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD: ports/x11/gdm/Makefile,v 1.137 2011/03/29 13:40:09 kwm Exp $
-# $MCom: ports-stable/x11/gdm/Makefile,v 1.10 2010/07/21 13:50:45 kwm Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.186 2011/06/02 11:58:24 kwm Exp $
#
PORTNAME= gdm
-PORTVERSION= 2.30.5
-PORTREVISION= 3
+PORTVERSION= 2.30.7
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -32,7 +31,7 @@ RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \
USERS= gdm
GROUPS= gdm
-USE_BZIP2= yes
+USE_XZ= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_XORG= dmx dmxproto
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 11fd7392b..1346e9a0c 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gdm-2.30.5.tar.bz2) = faa1cbaecf84a7015f8bfd242200deae9b7c18bf6f7ad38335fd1503e023f92d
-SIZE (gnome2/gdm-2.30.5.tar.bz2) = 2406523
+SHA256 (gnome2/gdm-2.30.7.tar.xz) = e5a098ebf0fdb5aff669dfca6e696433c4c8962c005bd13f296b7e13a60bc03b
+SIZE (gnome2/gdm-2.30.7.tar.xz) = 1715056
diff --git a/x11/gdm/files/patch-CVE-2011-1709 b/x11/gdm/files/patch-CVE-2011-1709
deleted file mode 100644
index 0c05eda44..000000000
--- a/x11/gdm/files/patch-CVE-2011-1709
+++ /dev/null
@@ -1,76 +0,0 @@
-http://git.gnome.org/browse/gdm/commit/?h=gnome-2-32&id=c721deb4c3dbf170946af8ee3634327c06ea4536
-
---- data/Makefile.in.orig 2010-08-11 19:40:15.000000000 +0200
-+++ data/Makefile.in 2011-05-31 22:05:52.000000000 +0200
-@@ -399,6 +399,8 @@ EXTRA_DIST = \
- PostLogin \
- gconf.path \
- session-setup.entries \
-+ mime-dummy-handler.desktop \
-+ mimeapps.list \
- $(NULL)
-
- CLEANFILES = \
-@@ -903,6 +905,8 @@ uninstall-hook:
- $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm \
- $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin \
- $(DESTDIR)$(workingdir)/.gconf.path \
-+ $(DESTDIR)$(workingdir)/.local/share/applications/mime-dummy-handler.desktop \
-+ $(DESTDIR)$(workingdir)/.local/share/applications/mimeapps.list \
- -rf \
- $(DESTDIR)$(workingdir)/.gconf.mandatory \
- $(DESTDIR)$(screenshotdir) \
-@@ -1000,6 +1004,12 @@ install-data-hook: gdm.conf-custom Xsess
- chown root:gdm $(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 || : ; \
-+ fi
-+
- if test '!' -d $(DESTDIR)$(cachedir); then \
- $(mkinstalldirs) $(DESTDIR)$(cachedir); \
- chmod 1755 $(DESTDIR)$(cachedir); \
-@@ -1013,6 +1023,9 @@ install-data-hook: gdm.conf-custom Xsess
- chmod 1750 $(DESTDIR)$(workingdir)/.gconf.mandatory
- chmod 1640 $(DESTDIR)$(workingdir)/.gconf.mandatory/*.xml
-
-+ $(INSTALL_DATA) $(srcdir)/mime-dummy-handler.desktop $(DESTDIR)$(workingdir)/.local/share/applications/mime-dummy-handler.desktop
-+ $(INSTALL_DATA) $(srcdir)/mimeapps.list $(DESTDIR)$(workingdir)/.local/share/applications/mimeapps.list
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- data/mime-dummy-handler.desktop.orig 2011-05-31 22:08:08.000000000 +0200
-+++ data/mime-dummy-handler.desktop 2011-05-31 22:08:03.000000000 +0200
-@@ -0,0 +1,6 @@
-+[Desktop Entry]
-+Type=Application
-+Name=Dummy URI Handler
-+Exec=/bin/true %U
-+Terminal=false
-+StartupNotify=false
---- data/mimeapps.list.orig 2011-05-31 22:08:21.000000000 +0200
-+++ data/mimeapps.list 2011-05-31 22:08:17.000000000 +0200
-@@ -0,0 +1,19 @@
-+[Default Applications]
-+x-scheme-handler/file=mime-dummy-handler.desktop
-+x-scheme-handler/ftp=mime-dummy-handler.desktop
-+x-scheme-handler/ghelp=mime-dummy-handler.desktop
-+x-scheme-handler/help=mime-dummy-handler.desktop
-+x-scheme-handler/http=mime-dummy-handler.desktop
-+x-scheme-handler/https=mime-dummy-handler.desktop
-+x-scheme-handler/info=mime-dummy-handler.desktop
-+x-scheme-handler/irc=mime-dummy-handler.desktop
-+x-scheme-handler/itms=mime-dummy-handler.desktop
-+x-scheme-handler/mailto=mime-dummy-handler.desktop
-+x-scheme-handler/man=mime-dummy-handler.desktop
-+x-scheme-handler/mms=mime-dummy-handler.desktop
-+x-scheme-handler/rtp=mime-dummy-handler.desktop
-+x-scheme-handler/rtsp=mime-dummy-handler.desktop
-+x-scheme-handler/sip=mime-dummy-handler.desktop
-+x-scheme-handler/trash=mime-dummy-handler.desktop
-+x-scheme-handler/webcal=mime-dummy-handler.desktop
-+x-scheme-handler/xmpp=mime-dummy-handler.desktop
diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c
index fc29affdd..e98e8d4d3 100644
--- a/x11/gdm/files/patch-daemon_gdm-session-worker.c
+++ b/x11/gdm/files/patch-daemon_gdm-session-worker.c
@@ -1,5 +1,5 @@
---- daemon/gdm-session-worker.c.orig 2010-08-11 19:40:07.000000000 +0200
-+++ daemon/gdm-session-worker.c 2011-03-29 10:37:37.000000000 +0200
+--- daemon/gdm-session-worker.c.orig 2011-06-02 16:50:17.000000000 +0200
++++ daemon/gdm-session-worker.c 2011-06-03 21:08:07.000000000 +0200
@@ -31,6 +31,9 @@
#include <errno.h>
#include <grp.h>
@@ -10,7 +10,7 @@
#ifdef HAVE_LOGINDEVPERM
#include <libdevinfo.h>
-@@ -341,7 +344,7 @@ gdm_session_execute (const char *file,
+@@ -341,7 +344,7 @@
* what to search if PATH is unset. POSIX may, dunno.
*/
@@ -19,50 +19,7 @@
}
len = strlen (file) + 1;
-@@ -1035,17 +1038,6 @@ gdm_cache_copy_file (GdmSessionWorker *w
- error->message);
- g_error_free (error);
- } else {
-- int res;
--
-- res = chown (cachefilename,
-- worker->priv->uid,
-- worker->priv->gid);
-- if (res == -1) {
-- g_warning ("GdmSessionWorker: Error setting owner of cache file: %s",
-- g_strerror (errno));
-- }
--
-- g_chmod (cachefilename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
- g_debug ("Copy successful");
- }
-
-@@ -1183,7 +1175,23 @@ gdm_session_worker_uninitialize_pam (Gdm
- return;
-
- if (worker->priv->state >= GDM_SESSION_WORKER_STATE_SESSION_OPENED) {
-- gdm_session_worker_cache_userfiles (worker);
-+ pid_t pid;
-+
-+ pid = fork ();
-+
-+ if (pid == 0) {
-+ if (setuid (worker->priv->uid) < 0) {
-+ g_debug ("GdmSessionWorker: could not reset uid: %s", g_strerror (errno));
-+ _exit (1);
-+ }
-+
-+ gdm_session_worker_cache_userfiles (worker);
-+ _exit (0);
-+ }
-+
-+ if (pid > 0) {
-+ gdm_wait_on_pid (pid);
-+ }
- pam_close_session (worker->priv->pam_handle, 0);
- gdm_session_auditor_report_logout (worker->priv->auditor);
-
-@@ -2027,15 +2035,16 @@ gdm_session_worker_start_user_session (G
+@@ -2032,15 +2035,16 @@
char *cachedirname;
char *home_dir;
int fd;
@@ -83,7 +40,7 @@
if (setsid () < 0) {
g_debug ("GdmSessionWorker: could not set pid '%u' as leader of new session and process group - %s",
-@@ -2043,6 +2052,28 @@ gdm_session_worker_start_user_session (G
+@@ -2048,6 +2052,28 @@
_exit (2);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 22:41:48 +0800