cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update gnome-keyring to latest stable version 2.22.2

Browse Source 
(our local patch has been imported upstream)
- explicitly disable gtk-doc run

ok jasper@
This commit is contained in:
ajacoutot 2008-05-27 15:30:42 +00:00
parent 6e163b3cbd
commit 47d928e238
6 changed files with 28 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
x11/gnome/keyring/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.25 2008/05/26 08:32:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.26 2008/05/27 15:30:42 ajacoutot Exp $
COMMENT= password agent for the GNOME project
GNOME_PROJECT= gnome-keyring
GNOME_VERSION= 2.21.5
SHARED_LIBS += gnome-keyring 3.0 # .1.1
PKGNAME= ${DISTNAME}p4
GNOME_VERSION= 2.22.2
SHARED_LIBS += gnome-keyring 3.1 # .1.1
# GPLv2/LGPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -18,7 +17,7 @@ WANTLIB= ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 \
glitz gmodule-2.0 gobject-2.0 gpg-error gthread-2.0 \
gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pcre png pthread z
pcre pixman-1 png pthread z
MODULES= devel/gettext \
x11/gnome
@ -31,9 +30,11 @@ LIB_DEPENDS= gconf-2::devel/gconf2 \
MODGNOME_DEVHELP_FILES= Yes
USE_X11= Yes
CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gnome-keyring \
--with-root-certs=/etc/ssl \
--disable-schemas-install \
--disable-hal \
--disable-tests
--disable-tests \
--disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

10
x11/gnome/keyring/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/gnome-keyring-2.21.5.tar.bz2) = HYwD6koecE0uQH159NgI0Q==
RMD160 (gnome/gnome-keyring-2.21.5.tar.bz2) = 8lVoJ5Krp4qXODEpnAMsJRFhXUA=
SHA1 (gnome/gnome-keyring-2.21.5.tar.bz2) = kyW6YyzfEIXb1Eyi6HOpN4K4FBY=
SHA256 (gnome/gnome-keyring-2.21.5.tar.bz2) = bZmmSKu6dPDGZp/lm8WfDUK1H+iey4vNEZVNJzz2rAY=
SIZE (gnome/gnome-keyring-2.21.5.tar.bz2) = 719286
MD5 (gnome/gnome-keyring-2.22.2.tar.bz2) = aVe4mtNMDlMTXmYQLk25+Q==
RMD160 (gnome/gnome-keyring-2.22.2.tar.bz2) = n8+b7mVAUMp/ditdUOmO9pDoQJ4=
SHA1 (gnome/gnome-keyring-2.22.2.tar.bz2) = syduLDSbdh0Wffm9u5wZJoryvUs=
SHA256 (gnome/gnome-keyring-2.22.2.tar.bz2) = dQ1J597XmoaFcEpzLShJcxUN8cAub/EtADpkhpZtW1w=
SIZE (gnome/gnome-keyring-2.22.2.tar.bz2) = 904890

52
x11/gnome/keyring/patches/patch-common_gkr-async_c
View File

@ -1,52 +0,0 @@
$OpenBSD: patch-common_gkr-async_c,v 1.1 2008/02/14 12:39:15 jasper Exp $
--- common/gkr-async.c.orig Thu Feb 14 00:03:24 2008
+++ common/gkr-async.c Thu Feb 14 00:16:53 2008
@@ -34,6 +34,11 @@
#define DEBUG_LOCKS 0
+/*
+ * See comments on async_poll_func() on the order of the various
+ * gets and sets of waiting_on_* flags.
+ */
+
#if DEBUG_LOCKS
#define DO_LOCK(mtx) G_STMT_START { \
g_printerr ("%s LOCK %s\n", __func__, G_STRINGIFY(mtx)); \
@@ -93,8 +98,20 @@ async_poll_func (GPollFD *ufds, guint nfsd, gint timeo
gint ret;
g_assert (orig_poll_func);
+
+ /*
+ * These two atomic variables are interlocked in the
+ * opposite order from those in DO_LOCK which prevents
+ * race conditions in the if statements.
+ */
g_atomic_int_set (&waiting_on_poll, 1);
+
+ if (g_atomic_int_get (&waiting_on_lock))
+
+ timeout = 0;
+
ret = (orig_poll_func) (ufds, nfsd, timeout);
+
g_atomic_int_set (&waiting_on_poll, 0);
if (done_queue && !g_queue_is_empty (done_queue))
@@ -314,7 +331,6 @@ cleanup_done_thread (gpointer message, gpointer data)
running_workers = NULL;
g_assert (main_loop);
- gkr_wakeup_register (g_main_loop_get_context (main_loop));
return FALSE;
}
@@ -346,7 +362,6 @@ gkr_async_worker_start (GThreadFunc func, GkrAsyncWork
if (!done_queue) {
g_assert (main_loop);
- gkr_wakeup_register (g_main_loop_get_context (main_loop));
done_queue = g_queue_new ();
g_assert (!running_workers);

14
x11/gnome/keyring/patches/patch-common_gkr-unix-credentials_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-common_gkr-unix-credentials_c,v 1.1 2008/05/27 15:30:42 ajacoutot Exp $
--- common/gkr-unix-credentials.c.orig Tue May 27 16:31:58 2008
+++ common/gkr-unix-credentials.c Tue May 27 16:31:31 2008
@@ -135,8 +135,8 @@ gkr_unix_credentials_read (int sock, pid_t *pid, uid_t
if (getpeereid (sock, &euid, &egid) == 0) {
*uid = euid;
} else {
- g_warning ("getpeereid() failed: %s", strerror (errno));
- return FALSE;
+ fprintf (stderr, "getpeereid() failed: %s", strerror (errno));
+ return -1;
}
#elif defined(HAVE_GETPEERUCRED)
ucred_t *uc = NULL;

21
x11/gnome/keyring/patches/patch-daemon_gkr-daemon-io_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-daemon_gkr-daemon-io_c,v 1.1 2008/05/08 10:56:24 ajacoutot Exp $
--- daemon/gkr-daemon-io.c.orig Thu May 8 12:27:08 2008
+++ daemon/gkr-daemon-io.c Thu May 8 12:29:26 2008
@@ -246,6 +246,17 @@ read_unix_socket_credentials (int fd,
g_warning ("getpeerucred() failed: %s", strerror (errno));
return FALSE;
}
+#elif defined(__OpenBSD__) /* configure should have a check for HAVE_GETPEEREID */
+ uid_t euid;
+ gid_t egid;
+ *pid = 0;
+
+ if (getpeereid (fd, &euid, &egid) == 0) {
+ *uid = euid;
+ } else {
+ g_warning ("getpeereid() failed: %s", strerror (errno));
+ return FALSE;
+ }
#else /* !SO_PEERCRED && !HAVE_CMSGCRED */
g_warning ("Socket credentials not supported on this OS\n");
return FALSE;

4
x11/gnome/keyring/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2008/05/08 10:56:24 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.12 2008/05/27 15:30:42 ajacoutot Exp $
%%SHARED%%
bin/gnome-keyring-daemon
include/gnome-keyring-1/
@ -22,6 +22,7 @@ share/gtk-doc/html/gnome-keyring/
share/gtk-doc/html/gnome-keyring/ch01.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-acl.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-attributes.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-daemon.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-find.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-generic-callbacks.html
share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-item-info.html
@ -186,7 +187,6 @@ share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/gnome-keyring/*.schemas > /dev/null
share/schemas/
share/schemas/gnome-keyring/
share/schemas/gnome-keyring/gnome-keyring.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gnome-keyring/*.schemas > /dev/null