[113306] trunk/dports/gnome/gnome-keyring
devans at macports.org
devans at macports.org
Wed Nov 13 05:22:21 PST 2013
Revision: 113306
https://trac.macports.org/changeset/113306
Author: devans at macports.org
Date: 2013-11-13 05:22:21 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
gnome-keyring: merge version 3.8.2 from GNOME-3 test branch.
Modified Paths:
--------------
trunk/dports/gnome/gnome-keyring/Portfile
Added Paths:
-----------
trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-armor.c.diff
trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.h.diff
Removed Paths:
-------------
trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff
trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.c.diff
trunk/dports/gnome/gnome-keyring/files/patch-pam-gkr-pam-module.c.diff
trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-secret-store-Makefile.am.diff
Property Changed:
----------------
trunk/dports/gnome/gnome-keyring/
Property changes on: trunk/dports/gnome/gnome-keyring
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/gnome-keyring:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-keyring:108269-113174
/users/rmstonecipher/gnome/gnome-keyring:102363-103172
Modified: trunk/dports/gnome/gnome-keyring/Portfile
===================================================================
--- trunk/dports/gnome/gnome-keyring/Portfile 2013-11-13 13:14:40 UTC (rev 113305)
+++ trunk/dports/gnome/gnome-keyring/Portfile 2013-11-13 13:22:21 UTC (rev 113306)
@@ -5,48 +5,46 @@
name gnome-keyring
epoch 1
-version 2.32.1
+version 3.8.2
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers devans openmaintainer
categories gnome
platforms darwin
-license GPL-2+
+license GPL-2+ LGPL-2
description GNOME program for storing passwords.
long_description \
- gnome-keyring is a program that keep password and other secrets \
- for users. It is run as a daemon in the session, similar to \
- ssh-agent, andother applications can locate it by an environment \
- variable.
+ gnome-keyring is a program that keep passwords and other secrets for \
+ users. It is run as a daemon in the session, similar to ssh-agent, and \
+ other applications locate it via an environment variable or a dbus.
homepage http://live.gnome.org/GnomeKeyring/
master_sites gnome:sources/${name}/${branch}/
-use_bzip2 yes
+use_xz yes
-checksums rmd160 cb72f171f5918ff26f40feb7bba90dc7e2e120ec \
- sha256 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9
+checksums rmd160 f63b0f7ccbdb4d9bf8a52edf4ddc7cfee6059144 \
+ sha256 f05692bb32db4d1afa65205ac4e68fa2b79107aca2393e237cf38f880cb7b868
-patchfiles patch-pkcs11-secret-store-Makefile.am.diff \
- patch-configure.in.diff \
- patch-pam-gkr-pam-module.c.diff \
- patch-egg-egg-asn1x.c.diff
+patchfiles patch-egg-egg-asn1x.h.diff \
+ patch-egg-egg-armor.c.diff
depends_build port:pkgconfig \
port:intltool \
+ port:gnome-common \
port:gtk-doc
-depends_lib port:gtk2 \
+depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:dbus \
- port:libgcrypt \
- port:libtasn1
+ port:gcr \
+ port:libgcrypt
# Don't do intltool's INTLTOOL_PERL dance
use_autoreconf yes
autoreconf.args -fvi
-configure.args --with-gtk=2.0 \
- --with-pam-dir=/usr/lib/pam \
+configure.args --with-pam-dir=/usr/lib/pam \
+ --without-libcap-ng \
--disable-silent-rules \
--disable-schemas-compile
Deleted: trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff 2013-11-13 13:14:40 UTC (rev 113305)
+++ trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff 2013-11-13 13:22:21 UTC (rev 113306)
@@ -1,20 +0,0 @@
---- configure.in.orig 2010-10-25 15:46:18.000000000 -0700
-+++ configure.in 2013-05-07 19:09:07.000000000 -0700
-@@ -1,7 +1,7 @@
- AC_INIT(daemon/gkd-main.c)
-
- AM_INIT_AUTOMAKE(gnome-keyring, 2.32.1)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
- dnl ****************************************************************************
-@@ -66,7 +66,7 @@
- DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
- AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-
--PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.0)
-+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.0 gmodule-2.0)
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
-
Copied: trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-armor.c.diff (from rev 113174, users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-egg-egg-armor.c.diff)
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-armor.c.diff (rev 0)
+++ trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-armor.c.diff 2013-11-13 13:22:21 UTC (rev 113306)
@@ -0,0 +1,30 @@
+--- egg/egg-armor.c.orig 2013-08-15 13:10:37.000000000 -0700
++++ egg/egg-armor.c 2013-08-15 13:12:47.000000000 -0700
+@@ -60,6 +60,27 @@
+ #define ARMOR_PREF_END "-----END "
+ #define ARMOR_PREF_END_L 9
+
++#ifdef __APPLE__
++/*
++ * Reverse memchr()
++ * Find the last occurrence of 'c' in the buffer 's' of size 'n'.
++ */
++static void *
++memrchr(const void *s, int c, size_t n)
++{
++ const unsigned char *cp;
++
++ if (n != 0) {
++ cp = (const unsigned char *)s + n;
++ do {
++ if (*(--cp) == (unsigned char)c)
++ return((void *)cp);
++ } while (--n != 0);
++ }
++ return(NULL);
++}
++#endif
++
+ static void
+ parse_header_lines (const gchar *hbeg,
+ const gchar *hend,
Deleted: trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.c.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.c.diff 2013-11-13 13:14:40 UTC (rev 113305)
+++ trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.c.diff 2013-11-13 13:22:21 UTC (rev 113306)
@@ -1,13 +0,0 @@
---- egg/egg-asn1x.c.orig 2013-04-07 16:21:41.000000000 -0700
-+++ egg/egg-asn1x.c 2013-04-07 16:22:19.000000000 -0700
-@@ -1988,8 +1988,8 @@
- guchar buf[sizeof (gulong)];
- gint bytes, i, off;
-
-- for (i = 0; i < sizeof (ulong); ++i) {
-- off = sizeof (ulong) - (i + 1);
-+ for (i = 0; i < sizeof (gulong); ++i) {
-+ off = sizeof (gulong) - (i + 1);
- buf[i] = (value >> (off * 8)) & 0xFF;
- }
-
Copied: trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.h.diff (from rev 113174, users/devans/GNOME-3/stable/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.h.diff)
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.h.diff (rev 0)
+++ trunk/dports/gnome/gnome-keyring/files/patch-egg-egg-asn1x.h.diff 2013-11-13 13:22:21 UTC (rev 113306)
@@ -0,0 +1,11 @@
+--- egg/egg-asn1x.h.orig 2013-08-15 14:58:31.000000000 -0700
++++ egg/egg-asn1x.h 2013-08-15 14:58:51.000000000 -0700
+@@ -68,7 +68,7 @@
+ EGG_ASN1X_GENERALIZED_TIME = 37,
+ } EggAsn1xType;
+
+-enum {
++static enum {
+ EGG_ASN1X_NO_STRICT = 0x01,
+ } EggAsn1xFlags;
+
Deleted: trunk/dports/gnome/gnome-keyring/files/patch-pam-gkr-pam-module.c.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-pam-gkr-pam-module.c.diff 2013-11-13 13:14:40 UTC (rev 113305)
+++ trunk/dports/gnome/gnome-keyring/files/patch-pam-gkr-pam-module.c.diff 2013-11-13 13:22:21 UTC (rev 113306)
@@ -1,17 +0,0 @@
---- pam/gkr-pam-module.c.orig 2010-06-12 15:33:24.000000000 -0700
-+++ pam/gkr-pam-module.c 2010-10-06 15:44:21.000000000 -0700
-@@ -33,8 +33,14 @@
-
- #include "daemon/control/gkd-control-codes.h"
-
-+#if HAVE_SECURITY_PAM_MODULES_H
- #include <security/pam_appl.h>
- #include <security/pam_modules.h>
-+#endif
-+#if HAVE_PAM_PAM_MODULES_H
-+#include <pam/pam_appl.h>
-+#include <pam/pam_modules.h>
-+#endif
-
- #include <sys/types.h>
- #include <sys/stat.h>
Deleted: trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-secret-store-Makefile.am.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-secret-store-Makefile.am.diff 2013-11-13 13:14:40 UTC (rev 113305)
+++ trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-secret-store-Makefile.am.diff 2013-11-13 13:22:21 UTC (rev 113306)
@@ -1,12 +0,0 @@
---- pkcs11/secret-store/Makefile.am.orig 2010-10-06 16:39:57.000000000 -0700
-+++ pkcs11/secret-store/Makefile.am 2010-10-06 16:41:05.000000000 -0700
-@@ -47,7 +47,8 @@
- $(GOBJECT_LIBS) \
- $(GTHREAD_LIBS) \
- $(GLIB_LIBS) \
-- $(LIBGCRYPT_LIBS)
-+ $(LIBGCRYPT_LIBS) \
-+ $(LIBTASN1_LIBS)
-
- # -------------------------------------------------------------------------------
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/e6a5fb84/attachment.html>
More information about the macports-changes
mailing list