diff --git a/x11/gnome/at-spi2-atk/Makefile b/x11/gnome/at-spi2-atk/Makefile index 69f4c25d1c2..95be9349a54 100644 --- a/x11/gnome/at-spi2-atk/Makefile +++ b/x11/gnome/at-spi2-atk/Makefile @@ -1,12 +1,13 @@ -# $OpenBSD: Makefile,v 1.15 2012/09/11 09:10:04 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.16 2012/09/21 13:24:51 ajacoutot Exp $ SHARED_ONLY= Yes COMMENT= atk-bridge for at-spi2 GNOME_PROJECT= at-spi2-atk -GNOME_VERSION= 2.4.0 -REVISION= 2 +GNOME_VERSION= 2.5.92 + +SHARED_LIBS += atk-bridge-2.0 0.0 # 0.0 HOMEPAGE= http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus @@ -17,18 +18,18 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB += ICE SM X11 atk-1.0 atspi dbus-1 ffi glib-2.0 gmodule-2.0 -WANTLIB += gobject-2.0 gthread-2.0 pcre xcb +WANTLIB += gobject-2.0 gthread-2.0 pcre pthread xcb MODULES= devel/gettext \ x11/gnome \ devel/dconf -LIB_DEPENDS= x11/gnome/at-spi2-core>=2.2.2 \ +LIB_DEPENDS= x11/gnome/at-spi2-core>=2.5.92 \ devel/atk MODGNOME_CPPFLAGS=-I${X11BASE}/include -AUTOCONF_VERSION=2.68 +AUTOCONF_VERSION=2.69 CONFIGURE_STYLE=autoconf CONFIGURE_ARGS= --enable-p2p diff --git a/x11/gnome/at-spi2-atk/distinfo b/x11/gnome/at-spi2-atk/distinfo index 01bb16d5e1e..4fe9de27068 100644 --- a/x11/gnome/at-spi2-atk/distinfo +++ b/x11/gnome/at-spi2-atk/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/at-spi2-atk-2.4.0.tar.xz) = KOnCHsinbK5JFL28ARxPa/G+6qJ3UaiFNNhzZOaoiL8= -SIZE (gnome/at-spi2-atk-2.4.0.tar.xz) = 303684 +SHA256 (gnome/at-spi2-atk-2.5.92.tar.xz) = mCNFq0rBULmagNZ4tIsHL3P7kLEjgHIlwtGuL50bXNw= +SIZE (gnome/at-spi2-atk-2.5.92.tar.xz) = 274684 diff --git a/x11/gnome/at-spi2-atk/patches/patch-aclocal_m4 b/x11/gnome/at-spi2-atk/patches/patch-aclocal_m4 deleted file mode 100644 index 93fa283ba58..00000000000 --- a/x11/gnome/at-spi2-atk/patches/patch-aclocal_m4 +++ /dev/null @@ -1,73 +0,0 @@ -$OpenBSD: patch-aclocal_m4,v 1.1 2012/09/11 07:58:06 ajacoutot Exp $ - -Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4} - ---- aclocal.m4.orig Tue Sep 11 09:54:29 2012 -+++ aclocal.m4 Tue Sep 11 09:55:36 2012 -@@ -216,31 +216,6 @@ fi - # Substitute ALL_LINGUAS so we can use it in po/Makefile - AC_SUBST(ALL_LINGUAS) - --# Set DATADIRNAME correctly if it is not set yet --# (copied from glib-gettext.m4) --if test -z "$DATADIRNAME"; then -- AC_LINK_IFELSE( -- [AC_LANG_PROGRAM([[]], -- [[extern int _nl_msg_cat_cntr; -- return _nl_msg_cat_cntr]])], -- [DATADIRNAME=share], -- [case $host in -- *-*-solaris*) -- dnl On Solaris, if bind_textdomain_codeset is in libc, -- dnl GNU format message catalog is always supported, -- dnl since both are added to the libc all together. -- dnl Hence, we'd like to go with DATADIRNAME=share -- dnl in this case. -- AC_CHECK_FUNC(bind_textdomain_codeset, -- [DATADIRNAME=share], [DATADIRNAME=lib]) -- ;; -- *) -- [DATADIRNAME=lib] -- ;; -- esac]) --fi --AC_SUBST(DATADIRNAME) -- - IT_PO_SUBDIR([po]) - - ]) -@@ -489,6 +464,34 @@ fi - _LT_CHECK_OBJDIR - - m4_require([_LT_TAG_COMPILER])dnl -+ -+# Set DATADIRNAME correctly if it is not set yet -+# (copied from glib-gettext.m4) -+if test -z "$DATADIRNAME"; then -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM([[]], -+ [[extern int _nl_msg_cat_cntr; -+ return _nl_msg_cat_cntr]])], -+ [DATADIRNAME=share], -+ [case $host in -+ *-*-solaris*) -+ dnl On Solaris, if bind_textdomain_codeset is in libc, -+ dnl GNU format message catalog is always supported, -+ dnl since both are added to the libc all together. -+ dnl Hence, we'd like to go with DATADIRNAME=share -+ dnl in this case. -+ AC_CHECK_FUNC(bind_textdomain_codeset, -+ [DATADIRNAME=share], [DATADIRNAME=lib]) -+ ;; -+ *-*-openbsd*) -+ [DATADIRNAME=share] -+ ;; -+ *) -+ [DATADIRNAME=lib] -+ ;; -+ esac]) -+fi -+AC_SUBST(DATADIRNAME) - - case $host_os in - aix3*) diff --git a/x11/gnome/at-spi2-atk/patches/patch-atk-adaptor_adaptors_application-adaptor_c b/x11/gnome/at-spi2-atk/patches/patch-atk-adaptor_adaptors_application-adaptor_c deleted file mode 100644 index c6374bbb999..00000000000 --- a/x11/gnome/at-spi2-atk/patches/patch-atk-adaptor_adaptors_application-adaptor_c +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-atk-adaptor_adaptors_application-adaptor_c,v 1.1 2012/07/07 06:59:24 jasper Exp $ - -From e4f3eee2e137cd34cd427875365f458c65458164 Mon Sep 17 00:00:00 2001 -From: Mike Gorse -Date: Thu, 21 Jun 2012 21:56:40 +0000 -Subject: Use XDG_RUNTIME_DIR to hold sockets, and do not make a world-writable dir - -If we use XDG_RUNTIME_DIR, then the directory should be owned by the -appropriate user, so it should not need to be world-writable. Hopefully this -won't break accessibility for administrative apps on some distro. - -https://bugzilla.gnome.org/show_bug.cgi?id=678348 - -CVE-2012-3378 - ---- atk-adaptor/adaptors/application-adaptor.c.orig Thu Jul 28 18:54:50 2011 -+++ atk-adaptor/adaptors/application-adaptor.c Thu Jul 5 22:19:14 2012 -@@ -110,6 +110,8 @@ if (reply) - const char *retval = (g_getenv ("AT_SPI_CLIENT") ? - "": - spi_global_app_data->app_bus_addr); -+ if (!retval) -+ retval = ""; - dbus_message_append_args(reply, DBUS_TYPE_STRING, &retval, DBUS_TYPE_INVALID); - } - diff --git a/x11/gnome/at-spi2-atk/patches/patch-atk-adaptor_bridge_c b/x11/gnome/at-spi2-atk/patches/patch-atk-adaptor_bridge_c deleted file mode 100644 index f0c01b6b509..00000000000 --- a/x11/gnome/at-spi2-atk/patches/patch-atk-adaptor_bridge_c +++ /dev/null @@ -1,82 +0,0 @@ -$OpenBSD: patch-atk-adaptor_bridge_c,v 1.1 2012/07/07 06:59:24 jasper Exp $ - -From e4f3eee2e137cd34cd427875365f458c65458164 Mon Sep 17 00:00:00 2001 -From: Mike Gorse -Date: Thu, 21 Jun 2012 21:56:40 +0000 -Subject: Use XDG_RUNTIME_DIR to hold sockets, and do not make a world-writable dir - -If we use XDG_RUNTIME_DIR, then the directory should be owned by the -appropriate user, so it should not need to be world-writable. Hopefully this -won't break accessibility for administrative apps on some distro. - -https://bugzilla.gnome.org/show_bug.cgi?id=678348 - -CVE-2012-3378 - ---- atk-adaptor/bridge.c.orig Wed Mar 14 22:53:35 2012 -+++ atk-adaptor/bridge.c Thu Jul 5 22:19:14 2012 -@@ -327,7 +327,6 @@ register_application (SpiBridge * app) - DBusMessageIter iter; - DBusError error; - DBusPendingCall *pending; -- const int max_addr_length = 128; /* should be long enough */ - - dbus_error_init (&error); - -@@ -355,16 +354,16 @@ register_application (SpiBridge * app) - if (message) - dbus_message_unref (message); - -- /* could this be better, we accept some amount of race in getting the temp name*/ -- /* make sure the directory exists */ -- mkdir ("/tmp/at-spi2/", S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX); -- chmod ("/tmp/at-spi2/", S_IRWXU|S_IRWXG|S_IRWXO|S_ISVTX); -- app->app_bus_addr = g_malloc(max_addr_length * sizeof(char)); - #ifndef DISABLE_P2P -- sprintf (app->app_bus_addr, "unix:path=/tmp/at-spi2/socket-%d-%d", getpid(), -- rand()); --#else -- app->app_bus_addr [0] = '\0'; -+ app->app_tmp_dir = g_build_filename (g_get_user_runtime_dir (), -+ "at-spi2-XXXXXX", NULL); -+ if (!g_mkdtemp (app->app_tmp_dir)) -+ { -+ g_free (app->app_tmp_dir); -+ app->app_tmp_dir = NULL; -+ return FALSE; -+ } -+ app->app_bus_addr = g_strdup_printf ("unix:path=%s/socket", app->app_tmp_dir); - #endif - - return TRUE; -@@ -395,6 +394,20 @@ deregister_application (SpiBridge * app) - dbus_connection_send (app->bus, message, NULL); - if (message) - dbus_message_unref (message); -+ -+ if (app->app_bus_addr) -+ { -+ unlink (app->app_bus_addr); -+ g_free (app->app_bus_addr); -+ app->app_bus_addr = NULL; -+ } -+ -+ if (app->app_tmp_dir) -+ { -+ rmdir (app->app_tmp_dir); -+ g_free (app->app_tmp_dir); -+ app->app_tmp_dir = NULL; -+ } - } - - /*---------------------------------------------------------------------------*/ -@@ -583,6 +596,9 @@ setup_bus (void) - #ifndef DISABLE_P2P - DBusServer *server; - DBusError err; -+ -+ if (!spi_global_app_data->app_bus_addr) -+ return -1; - - dbus_error_init(&err); - server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err); diff --git a/x11/gnome/at-spi2-atk/patches/patch-atk-adaptor_bridge_h b/x11/gnome/at-spi2-atk/patches/patch-atk-adaptor_bridge_h deleted file mode 100644 index d224b579c86..00000000000 --- a/x11/gnome/at-spi2-atk/patches/patch-atk-adaptor_bridge_h +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-atk-adaptor_bridge_h,v 1.1 2012/07/07 06:59:24 jasper Exp $ - -From e4f3eee2e137cd34cd427875365f458c65458164 Mon Sep 17 00:00:00 2001 -From: Mike Gorse -Date: Thu, 21 Jun 2012 21:56:40 +0000 -Subject: Use XDG_RUNTIME_DIR to hold sockets, and do not make a world-writable dir - -If we use XDG_RUNTIME_DIR, then the directory should be owned by the -appropriate user, so it should not need to be world-writable. Hopefully this -won't break accessibility for administrative apps on some distro. - -https://bugzilla.gnome.org/show_bug.cgi?id=678348 - -CVE-2012-3378 - ---- atk-adaptor/bridge.h.orig Mon Jul 4 23:44:54 2011 -+++ atk-adaptor/bridge.h Thu Jul 5 22:19:14 2012 -@@ -59,7 +59,8 @@ struct _SpiBridge - */ - gchar *desktop_name; - gchar *desktop_path; --char *app_bus_addr; -+gchar *app_tmp_dir; -+gchar *app_bus_addr; - GList *events; - gboolean events_initialized; - }; diff --git a/x11/gnome/at-spi2-atk/pkg/PLIST b/x11/gnome/at-spi2-atk/pkg/PLIST index d10ff23ebea..183eb6cb131 100644 --- a/x11/gnome/at-spi2-atk/pkg/PLIST +++ b/x11/gnome/at-spi2-atk/pkg/PLIST @@ -1,5 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.5 2012/03/29 07:04:56 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.6 2012/09/21 13:24:51 ajacoutot Exp $ @conflict at-spi-<=1.32.0p3 +include/at-spi2-atk/ +include/at-spi2-atk/2.0/ +include/at-spi2-atk/2.0/atk-bridge.h lib/gnome-settings-daemon-3.0/ lib/gnome-settings-daemon-3.0/gtk-modules/ lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop @@ -8,82 +11,10 @@ lib/gtk-2.0/modules/ @comment lib/gtk-2.0/modules/libatk-bridge.a @comment lib/gtk-2.0/modules/libatk-bridge.la lib/gtk-2.0/modules/libatk-bridge.so -lib/gtk-3.0/ -lib/gtk-3.0/modules/ -@comment lib/gtk-3.0/modules/libatk-bridge.a -@comment lib/gtk-3.0/modules/libatk-bridge.la -lib/gtk-3.0/modules/libatk-bridge.so +lib/libatk-bridge-2.0.a +lib/libatk-bridge-2.0.la +@lib lib/libatk-bridge-2.0.so.${LIBatk-bridge-2.0_VERSION} +lib/pkgconfig/atk-bridge-2.0.pc share/glib-2.0/schemas/org.a11y.atspi.gschema.xml -share/locale/an/LC_MESSAGES/at-spi2-atk.mo -share/locale/ar/LC_MESSAGES/at-spi2-atk.mo -share/locale/as/LC_MESSAGES/at-spi2-atk.mo -share/locale/ast/LC_MESSAGES/at-spi2-atk.mo -share/locale/be/LC_MESSAGES/at-spi2-atk.mo -share/locale/bg/LC_MESSAGES/at-spi2-atk.mo -share/locale/bn/LC_MESSAGES/at-spi2-atk.mo -share/locale/bn_IN/LC_MESSAGES/at-spi2-atk.mo -share/locale/ca/LC_MESSAGES/at-spi2-atk.mo -share/locale/ca@valencia/LC_MESSAGES/at-spi2-atk.mo -share/locale/cs/LC_MESSAGES/at-spi2-atk.mo -share/locale/cy/LC_MESSAGES/at-spi2-atk.mo -share/locale/da/LC_MESSAGES/at-spi2-atk.mo -share/locale/de/LC_MESSAGES/at-spi2-atk.mo -share/locale/el/LC_MESSAGES/at-spi2-atk.mo -share/locale/en@shaw/LC_MESSAGES/at-spi2-atk.mo -share/locale/en_CA/LC_MESSAGES/at-spi2-atk.mo -share/locale/en_GB/LC_MESSAGES/at-spi2-atk.mo -share/locale/eo/LC_MESSAGES/at-spi2-atk.mo -share/locale/es/LC_MESSAGES/at-spi2-atk.mo -share/locale/et/LC_MESSAGES/at-spi2-atk.mo -share/locale/eu/LC_MESSAGES/at-spi2-atk.mo -share/locale/fa/LC_MESSAGES/at-spi2-atk.mo -share/locale/fi/LC_MESSAGES/at-spi2-atk.mo -share/locale/fr/LC_MESSAGES/at-spi2-atk.mo -share/locale/fy/ -share/locale/fy/LC_MESSAGES/ -share/locale/fy/LC_MESSAGES/at-spi2-atk.mo -share/locale/gl/LC_MESSAGES/at-spi2-atk.mo -share/locale/gu/LC_MESSAGES/at-spi2-atk.mo -share/locale/he/LC_MESSAGES/at-spi2-atk.mo -share/locale/hi/LC_MESSAGES/at-spi2-atk.mo -share/locale/hu/LC_MESSAGES/at-spi2-atk.mo -share/locale/id/LC_MESSAGES/at-spi2-atk.mo -share/locale/it/LC_MESSAGES/at-spi2-atk.mo -share/locale/ja/LC_MESSAGES/at-spi2-atk.mo -share/locale/km/LC_MESSAGES/at-spi2-atk.mo -share/locale/kn/LC_MESSAGES/at-spi2-atk.mo -share/locale/ko/LC_MESSAGES/at-spi2-atk.mo -share/locale/lt/LC_MESSAGES/at-spi2-atk.mo -share/locale/lv/LC_MESSAGES/at-spi2-atk.mo -share/locale/ml/LC_MESSAGES/at-spi2-atk.mo -share/locale/mr/LC_MESSAGES/at-spi2-atk.mo -share/locale/ms/LC_MESSAGES/at-spi2-atk.mo -share/locale/nb/LC_MESSAGES/at-spi2-atk.mo -share/locale/nl/LC_MESSAGES/at-spi2-atk.mo -share/locale/nn/LC_MESSAGES/at-spi2-atk.mo -share/locale/or/LC_MESSAGES/at-spi2-atk.mo -share/locale/pa/LC_MESSAGES/at-spi2-atk.mo -share/locale/pl/LC_MESSAGES/at-spi2-atk.mo -share/locale/pt/LC_MESSAGES/at-spi2-atk.mo -share/locale/pt_BR/LC_MESSAGES/at-spi2-atk.mo -share/locale/ro/LC_MESSAGES/at-spi2-atk.mo -share/locale/ru/LC_MESSAGES/at-spi2-atk.mo -share/locale/sk/LC_MESSAGES/at-spi2-atk.mo -share/locale/sl/LC_MESSAGES/at-spi2-atk.mo -share/locale/sq/LC_MESSAGES/at-spi2-atk.mo -share/locale/sr/LC_MESSAGES/at-spi2-atk.mo -share/locale/sr@latin/LC_MESSAGES/at-spi2-atk.mo -share/locale/sv/LC_MESSAGES/at-spi2-atk.mo -share/locale/ta/LC_MESSAGES/at-spi2-atk.mo -share/locale/te/LC_MESSAGES/at-spi2-atk.mo -share/locale/th/LC_MESSAGES/at-spi2-atk.mo -share/locale/tr/LC_MESSAGES/at-spi2-atk.mo -share/locale/ug/LC_MESSAGES/at-spi2-atk.mo -share/locale/uk/LC_MESSAGES/at-spi2-atk.mo -share/locale/uz@cyrillic/LC_MESSAGES/at-spi2-atk.mo -share/locale/vi/LC_MESSAGES/at-spi2-atk.mo -share/locale/zh_CN/LC_MESSAGES/at-spi2-atk.mo -share/locale/zh_HK/LC_MESSAGES/at-spi2-atk.mo -share/locale/zh_TW/LC_MESSAGES/at-spi2-atk.mo @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null @unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null