diff options
author | drochner <drochner> | 2008-04-10 16:53:44 +0000 |
---|---|---|
committer | drochner <drochner> | 2008-04-10 16:53:44 +0000 |
commit | d3d0ebe7da0c6205d00393cbd1f9617b45bd9c3a (patch) | |
tree | 454f3a456ae4a736fbad40f7bf3aeb0e23855950 /security | |
parent | 3017e25c3834615583fb179e12cb6c7fd428ccfa (diff) | |
download | pkgsrc-d3d0ebe7da0c6205d00393cbd1f9617b45bd9c3a.tar.gz |
update to 2.22.1
This switches to the gnome-2.22 release branch.
Diffstat (limited to 'security')
-rw-r--r-- | security/gnome-keyring/Makefile | 12 | ||||
-rw-r--r-- | security/gnome-keyring/PLIST | 12 | ||||
-rw-r--r-- | security/gnome-keyring/distinfo | 12 | ||||
-rw-r--r-- | security/gnome-keyring/patches/patch-aa | 17 | ||||
-rw-r--r-- | security/gnome-keyring/patches/patch-ac | 12 | ||||
-rw-r--r-- | security/gnome-keyring/patches/patch-ad | 23 |
6 files changed, 74 insertions, 14 deletions
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index 6f4e29ceb2f..e28702f7d73 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2008/02/06 00:36:06 tnn Exp $ +# $NetBSD: Makefile,v 1.35 2008/04/10 16:53:44 drochner Exp $ -DISTNAME= gnome-keyring-2.20.3 +DISTNAME= gnome-keyring-2.22.1 CATEGORIES= security gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring/2.20/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring/2.22/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@NetBSD.org @@ -16,16 +16,20 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES -PKGCONFIG_OVERRIDE= ${WRKSRC}/gnome-keyring-1.pc.in +PKGCONFIG_OVERRIDE= ${WRKSRC}/library/gnome-keyring-1.pc.in + +GCONF_SCHEMAS+= gnome-keyring.schemas CFLAGS.HPUX+= -DMAP_ANON=MAP_ANONYMOUS BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0 BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 +.include "../../devel/GConf/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" +.include "../../security/libtasn1/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/pam.buildlink3.mk" diff --git a/security/gnome-keyring/PLIST b/security/gnome-keyring/PLIST index 50eca606f86..ac5204c350e 100644 --- a/security/gnome-keyring/PLIST +++ b/security/gnome-keyring/PLIST @@ -1,15 +1,19 @@ -@comment $NetBSD: PLIST,v 1.12 2007/10/31 20:20:30 drochner Exp $ +@comment $NetBSD: PLIST,v 1.13 2008/04/10 16:53:44 drochner Exp $ bin/gnome-keyring-daemon include/gnome-keyring-1/gnome-keyring-memory.h include/gnome-keyring-1/gnome-keyring-result.h include/gnome-keyring-1/gnome-keyring.h +lib/gnome-keyring/gnome-keyring-pkcs11.la lib/libgnome-keyring.la lib/pkgconfig/gnome-keyring-1.pc lib/security/pam_gnome_keyring.la libexec/gnome-keyring-ask +share/dbus-1/services/org.gnome.keyring.service +share/gconf/schemas/gnome-keyring.schemas 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 @@ -19,6 +23,7 @@ share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-keyrings.html share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-memory.html share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-misc.html share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-network.html +share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-password.html share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-result.html share/gtk-doc/html/gnome-keyring/gnome-keyring.devhelp share/gtk-doc/html/gnome-keyring/gnome-keyring.devhelp2 @@ -54,6 +59,7 @@ share/locale/fi/LC_MESSAGES/gnome-keyring.mo share/locale/fr/LC_MESSAGES/gnome-keyring.mo share/locale/gl/LC_MESSAGES/gnome-keyring.mo share/locale/gu/LC_MESSAGES/gnome-keyring.mo +share/locale/he/LC_MESSAGES/gnome-keyring.mo share/locale/hi/LC_MESSAGES/gnome-keyring.mo share/locale/hr/LC_MESSAGES/gnome-keyring.mo share/locale/hu/LC_MESSAGES/gnome-keyring.mo @@ -74,6 +80,7 @@ share/locale/ms/LC_MESSAGES/gnome-keyring.mo share/locale/nb/LC_MESSAGES/gnome-keyring.mo share/locale/ne/LC_MESSAGES/gnome-keyring.mo share/locale/nl/LC_MESSAGES/gnome-keyring.mo +share/locale/nn/LC_MESSAGES/gnome-keyring.mo share/locale/oc/LC_MESSAGES/gnome-keyring.mo share/locale/or/LC_MESSAGES/gnome-keyring.mo share/locale/pa/LC_MESSAGES/gnome-keyring.mo @@ -101,4 +108,7 @@ 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 @dirrm share/gtk-doc/html/gnome-keyring +@comment in GConf: @dirrm share/gconf/schemas +@comment in dbus: @dirrm share/dbus-1/services +@dirrm lib/gnome-keyring @dirrm include/gnome-keyring-1 diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo index 989a87f5cef..964c749995d 100644 --- a/security/gnome-keyring/distinfo +++ b/security/gnome-keyring/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.23 2008/01/11 14:02:42 drochner Exp $ +$NetBSD: distinfo,v 1.24 2008/04/10 16:53:44 drochner Exp $ -SHA1 (gnome-keyring-2.20.3.tar.bz2) = e6518a9521bc240ac4fb55185747c80ac41739e1 -RMD160 (gnome-keyring-2.20.3.tar.bz2) = 8e85220492cd87b15bb3f1fadbb6673cea3a684c -Size (gnome-keyring-2.20.3.tar.bz2) = 541431 bytes -SHA1 (patch-aa) = ba8a85a0f1c66c72a6084aa0677074fa74017039 +SHA1 (gnome-keyring-2.22.1.tar.bz2) = 59956194b110a4e4576db0791e2d2371b39ff49c +RMD160 (gnome-keyring-2.22.1.tar.bz2) = 83dddadb1c133931151de302e8f33ff1d99ed496 +Size (gnome-keyring-2.22.1.tar.bz2) = 960392 bytes +SHA1 (patch-aa) = fff624c298f901bb1a81ac7ad4d781cae5a4cff2 SHA1 (patch-ab) = c6fc864a34ae6ccb0fdf891082146f451203494c +SHA1 (patch-ac) = 550b4ebfdf9ae7653d0174e6857e32c8453f2ca7 +SHA1 (patch-ad) = b0f1633ed5d3e24faf89c96ac730845d1edae8d6 diff --git a/security/gnome-keyring/patches/patch-aa b/security/gnome-keyring/patches/patch-aa index 54e4bd5ec01..9e1bf9b2cd5 100644 --- a/security/gnome-keyring/patches/patch-aa +++ b/security/gnome-keyring/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.6 2007/10/31 20:20:30 drochner Exp $ +$NetBSD: patch-aa,v 1.7 2008/04/10 16:53:44 drochner Exp $ ---- configure.orig 2007-09-27 20:36:29.000000000 +0200 +--- configure.orig 2008-03-09 15:25:49.000000000 +0100 +++ configure -@@ -23462,7 +23462,7 @@ else - echo "not building tests and unit tests" +@@ -23793,7 +23793,7 @@ else + tests_status="no" fi - if test "$enable_tests" == "yes"; then @@ -11,3 +11,12 @@ $NetBSD: patch-aa,v 1.6 2007/10/31 20:20:30 drochner Exp $ WITH_TESTS_TRUE= WITH_TESTS_FALSE='#' else +@@ -25228,7 +25228,7 @@ fi + + dbus_status=$DBUS_VERSION + fi +- if test "$enable_dbus" == "yes"; then ++ if test "$enable_dbus" = "yes"; then + WITH_DBUS_TRUE= + WITH_DBUS_FALSE='#' + else diff --git a/security/gnome-keyring/patches/patch-ac b/security/gnome-keyring/patches/patch-ac new file mode 100644 index 00000000000..82c71a877a2 --- /dev/null +++ b/security/gnome-keyring/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.1 2008/04/10 16:53:44 drochner Exp $ + +--- library/gnome-keyring.c.orig 2008-04-02 18:29:58.000000000 +0200 ++++ library/gnome-keyring.c +@@ -1779,6 +1779,7 @@ gnome_keyring_daemon_set_display_sync (c + * Return value: %GNOME_KEYRING_RESULT_OK if the operation was succcessful or + * an error result otherwise. + **/ ++extern char **environ; + GnomeKeyringResult + gnome_keyring_daemon_prepare_environment_sync (void) + { diff --git a/security/gnome-keyring/patches/patch-ad b/security/gnome-keyring/patches/patch-ad new file mode 100644 index 00000000000..50a43d0dbd5 --- /dev/null +++ b/security/gnome-keyring/patches/patch-ad @@ -0,0 +1,23 @@ +$NetBSD: patch-ad,v 1.1 2008/04/10 16:53:44 drochner Exp $ + +--- ./common/gkr-unix-credentials.c.orig 2008-02-13 22:07:15.000000000 +0100 ++++ ./common/gkr-unix-credentials.c +@@ -36,6 +36,10 @@ + #include <ucred.h> + #endif + ++#ifdef __NetBSD__ ++#include <sys/un.h> /* for LOCAL_CREDS */ ++#endif ++ + int + gkr_unix_credentials_read (int sock, pid_t *pid, uid_t *uid) + { +@@ -125,7 +129,6 @@ gkr_unix_credentials_read (int sock, pid + cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr); + *pid = 0; + *uid = cred->sc_euid; +- set_local_creds(fd, FALSE); + #elif defined(HAVE_GETPEERUCRED) + ucred_t *uc = NULL; + |