summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/gdm/Makefile5
-rw-r--r--x11/gdm/distinfo12
-rw-r--r--x11/gdm/patches/patch-ab13
-rw-r--r--x11/gdm/patches/patch-ah34
-rw-r--r--x11/gdm/patches/patch-al266
-rw-r--r--x11/gdm/patches/patch-am17
6 files changed, 6 insertions, 341 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index b72c6e9db89..1d799b32045 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.85 2005/08/19 18:12:39 jlam Exp $
+# $NetBSD: Makefile,v 1.86 2005/08/21 11:30:55 jmmv Exp $
#
-DISTNAME= gdm-2.8.0.0
-PKGREVISION= 1
+DISTNAME= gdm-2.8.0.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.8/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 7566fda6843..109c3e2d886 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2005/07/17 22:53:06 kristerw Exp $
+$NetBSD: distinfo,v 1.27 2005/08/21 11:30:55 jmmv Exp $
-SHA1 (gdm-2.8.0.0.tar.bz2) = d97e2e489e84094151a795b6e4c3631b3a69deb9
-RMD160 (gdm-2.8.0.0.tar.bz2) = 97927daf7914b830b0fabd8569bfa4084530fd14
-Size (gdm-2.8.0.0.tar.bz2) = 3680270 bytes
+SHA1 (gdm-2.8.0.1.tar.bz2) = 6ae66c933bf86a44951373019a6d5526ae312acd
+RMD160 (gdm-2.8.0.1.tar.bz2) = af697627b42ff1478ffcaba61a15949f7512a23b
+Size (gdm-2.8.0.1.tar.bz2) = 3522871 bytes
SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
Size (Daemon.README) = 2191 bytes
@@ -10,15 +10,11 @@ SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
Size (Daemon.png) = 15725 bytes
SHA1 (patch-aa) = 8e81767c1cdb0d85ffcf3cf62a37ac0cb7ac8634
-SHA1 (patch-ab) = c4966199d4fb6354a32e3229e8b51a08b0ff5b02
SHA1 (patch-ac) = bcb4656d9467737d62b69a1dd3f3750d5607fef3
SHA1 (patch-ad) = 4f4c4395ba6de7235069fe7ff9877381e9bc997a
SHA1 (patch-ae) = 55b66f0f32701f6911db88c0b7da29758a7b2b95
SHA1 (patch-af) = 467afc3ee4d555fac4d5d26e49c3ff8b098e7369
SHA1 (patch-ag) = 467552a6da5c83fcc3a37e59d1f4cd63241dee0d
-SHA1 (patch-ah) = bbd92c7051479e54cce1182e54aca165c43e5ca4
SHA1 (patch-ai) = 263b4a326574bdbf03a350028e157427b36144f4
SHA1 (patch-aj) = 4aa63ab6e190dc80c298e6317e7f7882f5a319f9
SHA1 (patch-ak) = b35c36326ce70c4840716bda948843c883876124
-SHA1 (patch-al) = 4117998f599c86cb6f8e96b6449bf1f1c3533e06
-SHA1 (patch-am) = 351eeed08bf6abac2a4817801a30c075acc7ebea
diff --git a/x11/gdm/patches/patch-ab b/x11/gdm/patches/patch-ab
deleted file mode 100644
index 596171cf90f..00000000000
--- a/x11/gdm/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2005/06/26 16:52:14 jmmv Exp $
-
---- docs/C/gdm.xml.orig 2005-05-17 18:55:38.000000000 +0200
-+++ docs/C/gdm.xml
-@@ -4316,7 +4316,7 @@ remote-flexi - In remote (XDMCP) &
- </sect2>
- </sect1>
-
-- <sect1 id="sbindir_binaries">
-+ <sect1 id="libexecdir_binaries">
- <title>GDM Commands in EXPANDED_LIBEXECDIR</title>
-
- <para>
diff --git a/x11/gdm/patches/patch-ah b/x11/gdm/patches/patch-ah
deleted file mode 100644
index 309e6c7453b..00000000000
--- a/x11/gdm/patches/patch-ah
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2005/06/26 16:52:14 jmmv Exp $
-
---- daemon/slave.c.orig 2005-05-06 17:05:17.000000000 +0200
-+++ daemon/slave.c
-@@ -4051,6 +4051,14 @@ gdm_slave_session_start (void)
-
- g_free (msg);
-
-+ if G_UNLIKELY (setegid (pwent->pw_gid) != 0 ||
-+ seteuid (pwent->pw_uid) != 0) {
-+ gdm_error ("Cannot set effective user/group id");
-+ gdm_verify_cleanup (d);
-+ session_started = FALSE;
-+ return;
-+ }
-+
- home_dir_ok = FALSE;
- home_dir = "/";
- } else {
-@@ -4058,14 +4066,6 @@ gdm_slave_session_start (void)
- home_dir = pwent->pw_dir;
- }
-
-- if G_UNLIKELY (setegid (pwent->pw_gid) != 0 ||
-- seteuid (pwent->pw_uid) != 0) {
-- gdm_error ("Cannot set effective user/group id");
-- gdm_verify_cleanup (d);
-- session_started = FALSE;
-- return;
-- }
--
- if G_LIKELY (home_dir_ok) {
- /* Sanity check on ~user/.dmrc */
- usrcfgok = gdm_file_check ("gdm_slave_session_start", pwent->pw_uid,
diff --git a/x11/gdm/patches/patch-al b/x11/gdm/patches/patch-al
deleted file mode 100644
index 8529b47b205..00000000000
--- a/x11/gdm/patches/patch-al
+++ /dev/null
@@ -1,266 +0,0 @@
-$NetBSD: patch-al,v 1.1 2005/07/17 22:53:06 kristerw Exp $
-
---- gui/gdmsetup.c.orig Sun Jul 17 23:50:28 2005
-+++ gui/gdmsetup.c Mon Jul 18 00:06:08 2005
-@@ -334,13 +334,13 @@
-
- for (li = list; li != NULL; li = li->next) {
- char *key = li->data;
-+ GtkTreeIter iter;
- int vt = atoi(key);
- key = g_strconcat(GDM_KEY_SERVERS, "/", key, NULL);
- cpy = ve_config_get_string (cfg, key);
- server = ve_first_word (cpy);
- options = ve_rest (cpy);
-
-- GtkTreeIter iter;
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
- XSERVER_COLUMN_VT, vt,
-@@ -2075,16 +2075,19 @@
- const char *nosound_button;
- const char *soundtest_button;
- char *sound_key, *val, *config_val;
-+ GtkWidget *acc_no_sound_file;
-+ GtkWidget *acc_sound_test;
-+ VeConfig *config;
-
- nosound_button = g_strconcat ("acc_nosound_", key, "_button", NULL);
- soundtest_button = g_strconcat ("acc_soundtest_", key, "_button", NULL);
-
-- GtkWidget *acc_no_sound_file = glade_helper_get (xml, nosound_button,
-+ acc_no_sound_file = glade_helper_get (xml, nosound_button,
- GTK_TYPE_BUTTON);
-- GtkWidget *acc_sound_test = glade_helper_get (xml, soundtest_button,
-+ acc_sound_test = glade_helper_get (xml, soundtest_button,
- GTK_TYPE_BUTTON);
-
-- VeConfig *config = ve_config_get (GDM_CONFIG_FILE);
-+ config = ve_config_get (GDM_CONFIG_FILE);
- gtk_label_set_text (GTK_LABEL (acc_sound_file_label), _("None"));
- gtk_widget_set_sensitive (acc_no_sound_file, FALSE);
- gtk_widget_set_sensitive (acc_sound_test, FALSE);
-@@ -2120,17 +2123,20 @@
-
- const char *nosound_button;
- const char *soundtest_button;
-+ GtkWidget *acc_no_sound_file;
-+ GtkWidget *acc_sound_test;
- nosound_button = g_strconcat("acc_nosound_",key,"_button",NULL);
- soundtest_button = g_strconcat("acc_soundtest_",key,"_button",NULL);
-
-- GtkWidget *acc_no_sound_file = glade_helper_get (xml, nosound_button,
-+ acc_no_sound_file = glade_helper_get (xml, nosound_button,
- GTK_TYPE_BUTTON);
-- GtkWidget *acc_sound_test = glade_helper_get (xml, soundtest_button,
-+ acc_sound_test = glade_helper_get (xml, soundtest_button,
- GTK_TYPE_BUTTON);
- if (response == GTK_RESPONSE_ACCEPT) {
- VeConfig *config = ve_config_get (GDM_CONFIG_FILE);
- char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_dialog));
- char *val;
-+ char* sound_key;
-
- gtk_label_set_text (GTK_LABEL (acc_sound_file_label), filename);
-
-@@ -2138,7 +2144,6 @@
- gtk_widget_set_sensitive (acc_sound_test, TRUE);
-
-
-- char* sound_key;
- if (strcmp (key, "ready") == 0 ) {
- have_sound_ready_file = TRUE;
- sound_key = g_strdup(GDM_KEY_SOUND_ON_LOGIN_READY_FILE);
-@@ -2270,6 +2275,9 @@
- gchar *success_key = g_strdup("success");
- gchar *failure_key = g_strdup("failure");
- VeConfig *config = ve_config_get (GDM_CONFIG_FILE);
-+ gboolean add_gtk_modules;
-+ char *modules_list;
-+ char *val;
-
- g_object_set_data (G_OBJECT (acc_sound_ready_file_label), "key",
- ready_key);
-@@ -2278,11 +2286,10 @@
- g_object_set_data (G_OBJECT (acc_sound_failure_file_label), "key",
- failure_key);
-
-- gboolean add_gtk_modules = ve_config_get_bool (config,
-+ add_gtk_modules = ve_config_get_bool (config,
- GDM_KEY_ADD_GTK_MODULES);
-- char *modules_list = ve_config_get_string (config,
-+ modules_list = ve_config_get_string (config,
- GDM_KEY_GTK_MODULES_LIST);
-- char *val;
-
- if (add_gtk_modules &&
- modules_list_contains (modules_list, "gail") &&
-@@ -2749,6 +2756,7 @@
-
- /* Loop through all checkboxes */
- while (gtk_tree_model_get_iter (model, &iter, path)) {
-+ gboolean selected;
- /* If this checkbox was just toggled */
- if (gtk_tree_path_compare (path, sel_path) == 0) {
-
-@@ -2766,7 +2774,7 @@
- }
- }
-
-- gboolean selected = FALSE;
-+ selected = FALSE;
- gtk_tree_model_get (model, &iter, THEME_COLUMN_SELECTED_LIST,
- &selected, THEME_COLUMN_DIR, &theme_name, -1);
-
-@@ -3435,12 +3443,15 @@
- static gboolean
- xserver_entry_timeout (GtkWidget *entry)
- {
-+ const char *key;
-+ VeConfig *cfg;
-+ const char *text;
- /* Get xserver section to update */
- GtkWidget *combobox = glade_helper_get (xml, "xserver_mod_combobox",
- GTK_TYPE_COMBO_BOX);
- gchar *section = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combobox));
- section = g_strconcat(GDM_KEY_SERVER_PREFIX, section, "/", NULL);
-- const char *key = g_object_get_data (G_OBJECT (entry), "key");
-+ key = g_object_get_data (G_OBJECT (entry), "key");
-
- if (strcmp (key, GDM_KEY_SERVER_NAME) == 0)
- section = g_strconcat(section, GDM_KEY_SERVER_NAME, NULL);
-@@ -3448,10 +3459,10 @@
- section = g_strconcat(section, GDM_KEY_SERVER_COMMAND, NULL);
-
- /* Locate this server's section */
-- VeConfig *cfg = ve_config_get (GDM_CONFIG_FILE);
-+ cfg = ve_config_get (GDM_CONFIG_FILE);
-
- /* Update this servers configuration */
-- const char *text = gtk_entry_get_text (GTK_ENTRY (entry));
-+ text = gtk_entry_get_text (GTK_ENTRY (entry));
- ve_config_set_string (cfg, section, ve_sure_string (text));
- ve_config_save (cfg, FALSE /* force */);
- g_free(section);
-@@ -3462,12 +3473,15 @@
- static gboolean
- xserver_toggle_timeout (GtkWidget *toggle)
- {
-+ const char *key;
-+ VeConfig *cfg;
-+ gboolean val;
- /* Get xserver section to update */
- GtkWidget *combobox = glade_helper_get (xml, "xserver_mod_combobox",
- GTK_TYPE_COMBO_BOX);
- gchar *section = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combobox));
- section = g_strconcat(GDM_KEY_SERVER_PREFIX, section, "/", NULL);
-- const char *key = g_object_get_data (G_OBJECT (toggle), "key");
-+ key = g_object_get_data (G_OBJECT (toggle), "key");
-
- if (strcmp (key, GDM_KEY_SERVER_HANDLED) == 0)
- section = g_strconcat(section, GDM_KEY_SERVER_HANDLED, NULL);
-@@ -3477,8 +3491,8 @@
- section = g_strconcat(section, GDM_KEY_SERVER_CHOOSER, NULL);
-
- /* Locate this server's section */
-- VeConfig *cfg = ve_config_get (GDM_CONFIG_FILE);
-- gboolean val = ve_config_get_bool (cfg, section);
-+ cfg = ve_config_get (GDM_CONFIG_FILE);
-+ val = ve_config_get_bool (cfg, section);
-
- /* Update this servers configuration */
- if ( ! ve_bool_equal (val, GTK_TOGGLE_BUTTON (toggle)->active)) {
-@@ -3513,6 +3527,7 @@
- xserver_populate_combobox(GtkComboBox* combobox)
- {
- gint i,j;
-+ GSList *xservers;
-
- /* Get number of items in combobox */
- i = gtk_tree_model_iter_n_children(
-@@ -3524,7 +3539,7 @@
- }
-
- /* Populate combobox with list of current servers */
-- GSList *xservers = xservers_get_server_definitions();
-+ xservers = xservers_get_server_definitions();
- g_slist_foreach(xservers, (GFunc) xserver_append_combobox, combobox);
- }
-
-@@ -3608,13 +3623,14 @@
-
- if (gtk_tree_selection_get_selected (selection, &model, &iter))
- {
-+ char *key;
- /* Update config */
- cfg = ve_config_get (GDM_CONFIG_FILE);
- gtk_tree_model_get (model, &iter, XSERVER_COLUMN_VT, &vt, -1);
-
-
- g_snprintf (vt_value, sizeof (vt_value), "%d", vt);
-- char *key = g_object_get_data (G_OBJECT (combo), "key");
-+ key = g_object_get_data (G_OBJECT (combo), "key");
- key = g_strconcat (key, "/", vt_value, "=", NULL);
- ve_config_delete_key (cfg, key);
- ve_config_save (cfg, FALSE /* force */);
-@@ -3634,6 +3650,8 @@
- GtkWidget *spinner, *combo, *entry, *button;
- gchar *string;
- char spinner_value[3];
-+ char *key;
-+ VeConfig *cfg;
-
- /* Get Widgets from glade */
- spinner = glade_helper_get (xml, "xserver_spin_button",
-@@ -3646,7 +3664,7 @@
- GTK_TYPE_BUTTON);
-
- /* Section in config to modify */
-- char *key = g_object_get_data (G_OBJECT (combo), "key");
-+ key = g_object_get_data (G_OBJECT (combo), "key");
-
- /* String to add to config */
- g_snprintf (spinner_value, sizeof (spinner_value), "%d",
-@@ -3658,7 +3676,7 @@
- NULL);
-
- /* Add to config */
-- VeConfig *cfg = ve_config_get (GDM_CONFIG_FILE);
-+ cfg = ve_config_get (GDM_CONFIG_FILE);
- ve_config_set_string (cfg, key, ve_sure_string(string));
- ve_config_save (cfg, FALSE /* force */);
-
-@@ -3684,6 +3702,8 @@
- GtkWidget *handled_check, *flexible_check;
- GtkWidget *greeter_radio, *chooser_radio;
- GtkWidget *create_button, *delete_button;
-+ VeConfig *cfg;
-+ gboolean success;
-
- /* Get Widgets from glade */
- frame = glade_helper_get (xml, "xserver_modify_frame",
-@@ -3712,12 +3732,13 @@
-
- /* TODO: Create a new section for this server */
- /* TODO: Write this value to the config and update xservers list */
-- VeConfig *cfg = ve_config_get (GDM_CONFIG_FILE);
-- gboolean success = FALSE;
-+ cfg = ve_config_get (GDM_CONFIG_FILE);
-+ success = FALSE;
- /* success = ve_config_add_section (cfg, SECTION_NAME); */
-
- if (success)
- {
-+ gint i;
- /* Update settings for new server */
- gtk_widget_set_sensitive (frame, TRUE);
- gtk_widget_set_sensitive (delete_button, TRUE);
-@@ -3735,7 +3756,7 @@
- FALSE);
-
- /* Select the new server in the combobox */
-- gint i = gtk_tree_model_iter_n_children (
-+ i = gtk_tree_model_iter_n_children (
- gtk_combo_box_get_model (GTK_COMBO_BOX (modify_combobox)), NULL) - 1;
- gtk_combo_box_set_active (GTK_COMBO_BOX (modify_combobox), i);
- }
diff --git a/x11/gdm/patches/patch-am b/x11/gdm/patches/patch-am
deleted file mode 100644
index c89b21402f1..00000000000
--- a/x11/gdm/patches/patch-am
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-am,v 1.1 2005/07/17 22:53:06 kristerw Exp $
-
---- gui/gdmlogin.c.orig Mon Jul 18 00:39:23 2005
-+++ gui/gdmlogin.c Mon Jul 18 00:39:49 2005
-@@ -342,11 +342,11 @@
- static void
- back_prog_launch_after_timeout ()
- {
-+ int timeout;
- g_assert (back_prog_timeout_event_id == -1);
- g_assert (back_prog_watcher_event_id == -1);
- g_assert (back_prog_pid == -1);
-
-- int timeout;
-
- /* No program to run. */
- if (! back_prog_get_path ())
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-13 18:35:36 +0000