From 2e4d2e942a99fbc51adebabc4cd543a91491ba37 Mon Sep 17 00:00:00 2001 From: kwm Date: Tue, 30 Nov 2010 22:00:17 +0000 Subject: Clean up after 2.32 got committed. Only gdm 2.32 isn't committed because of focus issues. And it doesn't seem it getting any traction upstream. Next stop GNOME 3.0. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14916 df743ca5-7f9a-e211-a948-0013205c9059 --- security/gnome-keyring3/Makefile | 31 --- security/gnome-keyring3/distinfo | 3 - .../patch-daemon_control_gkd-control-client.c | 11 - .../files/patch-egg_egg-unix-credentials.c | 44 ---- .../files/patch-gcr_gcr-certificate.c | 11 - .../files/patch-pam_gkr-pam-client.c | 18 -- security/gnome-keyring3/pkg-descr | 17 -- security/gnome-keyring3/pkg-plist | 222 --------------------- 8 files changed, 357 deletions(-) delete mode 100644 security/gnome-keyring3/Makefile delete mode 100644 security/gnome-keyring3/distinfo delete mode 100644 security/gnome-keyring3/files/patch-daemon_control_gkd-control-client.c delete mode 100644 security/gnome-keyring3/files/patch-egg_egg-unix-credentials.c delete mode 100644 security/gnome-keyring3/files/patch-gcr_gcr-certificate.c delete mode 100644 security/gnome-keyring3/files/patch-pam_gkr-pam-client.c delete mode 100644 security/gnome-keyring3/pkg-descr delete mode 100644 security/gnome-keyring3/pkg-plist (limited to 'security/gnome-keyring3') diff --git a/security/gnome-keyring3/Makefile b/security/gnome-keyring3/Makefile deleted file mode 100644 index 1f7e5cad1..000000000 --- a/security/gnome-keyring3/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# New ports collection makefile for: gnomekeyring -# Date Created: 08 December 2003 -# Whom: Joe Marcus Clarke -# -# $FreeBSD$ -# $MCom: ports-stable/security/gnome-keyring/Makefile,v 1.6 2010/06/23 12:38:25 kwm Exp $ -# - -PORTNAME= gnome-keyring -PORTVERSION= 2.31.4 -CATEGORIES= security gnome -MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A program that keeps passwords and other secrets - -LIB_DEPENDS= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring - -USE_BZIP2= yes -USE_GNOME= gnomehack gnomeprefix gtk20 ltverhack intlhack gconf2 -USE_GMAKE= yes -USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:22 -USE_LDCONFIG= yes -CONFIGURE_ARGS= --with-pam-dir="${PREFIX}/lib" -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -GCONF_SCHEMAS= gnome-keyring.schemas - -.include diff --git a/security/gnome-keyring3/distinfo b/security/gnome-keyring3/distinfo deleted file mode 100644 index c3bc44a07..000000000 --- a/security/gnome-keyring3/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/gnome-keyring-2.31.4.tar.bz2) = 4bf2b683a8fc7b8ea2a263923a0b4240 -SHA256 (gnome2/gnome-keyring-2.31.4.tar.bz2) = c5c22ff83cfeba1e2db2145f54c71edf8c341d01748be9096062312d05da73e8 -SIZE (gnome2/gnome-keyring-2.31.4.tar.bz2) = 1600311 diff --git a/security/gnome-keyring3/files/patch-daemon_control_gkd-control-client.c b/security/gnome-keyring3/files/patch-daemon_control_gkd-control-client.c deleted file mode 100644 index 6cdb0ca6a..000000000 --- a/security/gnome-keyring3/files/patch-daemon_control_gkd-control-client.c +++ /dev/null @@ -1,11 +0,0 @@ ---- daemon/control/gkd-control-client.c.orig 2009-12-21 18:43:16.000000000 -0500 -+++ daemon/control/gkd-control-client.c 2009-12-21 18:44:17.000000000 -0500 -@@ -31,6 +31,8 @@ - #include - #include - -+#include -+#include - #include - #include - #include diff --git a/security/gnome-keyring3/files/patch-egg_egg-unix-credentials.c b/security/gnome-keyring3/files/patch-egg_egg-unix-credentials.c deleted file mode 100644 index 5ae53f8b0..000000000 --- a/security/gnome-keyring3/files/patch-egg_egg-unix-credentials.c +++ /dev/null @@ -1,44 +0,0 @@ ---- egg/egg-unix-credentials.c.orig 2010-01-13 00:21:23.000000000 -0500 -+++ egg/egg-unix-credentials.c 2010-01-13 00:25:46.000000000 -0500 -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -37,6 +38,33 @@ - #include - #endif - -+#if __FreeBSD_version < 701101 -+static char * -+strndup (const char *s, size_t n) -+{ -+ size_t nAvail; -+ char *p; -+ -+ if (s == NULL) -+ return NULL; -+ -+ if (memchr (s, '\0', n) != NULL) { -+ nAvail = strlen(s); -+ if (nAvail > n) -+ nAvail = n; -+ } else{ -+ nAvail = n; -+ } -+ p = malloc (nAvail + 1); -+ if (p == NULL) -+ return NULL; -+ memcpy (p, s, nAvail); -+ p[nAvail] = '\0'; -+ -+ return p; -+} -+#endif -+ - int - egg_unix_credentials_read (int sock, pid_t *pid, uid_t *uid) - { diff --git a/security/gnome-keyring3/files/patch-gcr_gcr-certificate.c b/security/gnome-keyring3/files/patch-gcr_gcr-certificate.c deleted file mode 100644 index 0c910a4c4..000000000 --- a/security/gnome-keyring3/files/patch-gcr_gcr-certificate.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gcr/gcr-certificate.c.orig 2009-12-16 23:36:19.000000000 -0500 -+++ gcr/gcr-certificate.c 2009-12-16 23:36:28.000000000 -0500 -@@ -156,7 +156,7 @@ calculate_key_size (GcrCertificateInfo * - const guchar *data, *params; - gsize n_data, n_params, n_key; - guint key_size = 0; -- guchar *key; -+ guchar *key = NULL; - GQuark oid; - - data = egg_asn1_read_element (info->asn1, info->der, info->n_der, "tbsCertificate.subjectPublicKeyInfo", &n_data); diff --git a/security/gnome-keyring3/files/patch-pam_gkr-pam-client.c b/security/gnome-keyring3/files/patch-pam_gkr-pam-client.c deleted file mode 100644 index 05a0306e6..000000000 --- a/security/gnome-keyring3/files/patch-pam_gkr-pam-client.c +++ /dev/null @@ -1,18 +0,0 @@ ---- pam/gkr-pam-client.c.orig 2008-10-07 12:25:23.000000000 -0400 -+++ pam/gkr-pam-client.c 2008-10-07 12:38:36.000000000 -0400 -@@ -96,12 +96,12 @@ check_peer_same_uid (int sock) - struct xucred xuc; - socklen_t xuc_len = sizeof (xuc); - -- if (getsockopt (sock, SOL_SOCKET, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && -- xuc_len == sizeof (xuc)) { -+ if (getsockopt (sock, 0, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && -+ xuc.cr_version == XUCRED_VERSION) { - uid = xuc.cr_uid; - } else { - syslog (GKR_LOG_ERR, "could not get gnome-keyring-daemon socket credentials, " -- "(returned len %d/%d)\n", xuc_len, (int)sizeof (xuc)); -+ "(returned version %d/%d)\n", xuc.cr_version, XUCRED_VERSION); - return -1; - } - diff --git a/security/gnome-keyring3/pkg-descr b/security/gnome-keyring3/pkg-descr deleted file mode 100644 index 75ce77c6d..000000000 --- a/security/gnome-keyring3/pkg-descr +++ /dev/null @@ -1,17 +0,0 @@ -Gnome-keyring is a program that keep password and other secrets for -users. It is run as a damon in the session, similar to ssh-agent, and -other applications can locate it by an environment variable. - -The program can manage several keyrings, each with its own master -password, and there is also a session keyring which is never stored to -disk, but forgotten when the session ends. - -The library libgnome-keyring is used by applications to integrate with -the gnome keyring system. However, at this point the library hasn't been -tested and used enought to consider the API to be publically -exposed. Therefore use of libgnome-keyring is at the moment limited to -internal use in the gnome desktop. However, we hope that the -gnome-keyring API will turn out useful and good, so that later it -can be made public for any application to use. - --- Gnome-keyring README diff --git a/security/gnome-keyring3/pkg-plist b/security/gnome-keyring3/pkg-plist deleted file mode 100644 index fc4b65ea1..000000000 --- a/security/gnome-keyring3/pkg-plist +++ /dev/null @@ -1,222 +0,0 @@ -bin/gnome-keyring -bin/gnome-keyring-daemon -etc/xdg/autostart/gnome-keyring-gpg.desktop -etc/xdg/autostart/gnome-keyring-pkcs11.desktop -etc/xdg/autostart/gnome-keyring-secrets.desktop -etc/xdg/autostart/gnome-keyring-ssh.desktop -include/gcr/gcr-certificate-basics-widget.h -include/gcr/gcr-certificate-details-widget.h -include/gcr/gcr-certificate.h -include/gcr/gcr-importer.h -include/gcr/gcr-parser.h -include/gcr/gcr-types.h -include/gcr/gcr-unlock-options-widget.h -include/gcr/gcr.h -include/gp11/gp11.h -include/gp11/pkcs11.h -include/gp11/pkcs11g.h -include/gp11/pkcs11n.h -lib/gnome-keyring/devel/gkm-ssh-store-standalone.a -lib/gnome-keyring/devel/gkm-ssh-store-standalone.la -lib/gnome-keyring/devel/gkm-ssh-store-standalone.so -lib/gnome-keyring/devel/gkm-user-store-standalone.a -lib/gnome-keyring/devel/gkm-user-store-standalone.la -lib/gnome-keyring/devel/gkm-user-store-standalone.so -lib/gnome-keyring/gnome-keyring-pkcs11.a -lib/gnome-keyring/gnome-keyring-pkcs11.la -lib/gnome-keyring/gnome-keyring-pkcs11.so -lib/gnome-keyring/standalone/gkm-roots-store-standalone.a -lib/gnome-keyring/standalone/gkm-roots-store-standalone.la -lib/gnome-keyring/standalone/gkm-roots-store-standalone.so -lib/gnome-keyring/standalone/gkm-secret-store-standalone.a -lib/gnome-keyring/standalone/gkm-secret-store-standalone.la -lib/gnome-keyring/standalone/gkm-secret-store-standalone.so -lib/libgcr.a -lib/libgcr.la -lib/libgcr.so -lib/libgcr.so.0 -lib/libgp11.a -lib/libgp11.la -lib/libgp11.so -lib/libgp11.so.0 -lib/pam_gnome_keyring.a -lib/pam_gnome_keyring.la -lib/pam_gnome_keyring.so -libdata/pkgconfig/gcr-0.pc -libdata/pkgconfig/gp11-0.pc -libexec/gnome-keyring-prompt -share/dbus-1/services/org.freedesktop.secrets.service -share/dbus-1/services/org.gnome.keyring.service -share/doc/gcr/ch01.html -share/doc/gcr/gcr-GcrCertificate.html -share/doc/gcr/gcr-gcr-certificate-basics-widget.html -share/doc/gcr/gcr-gcr-certificate-details-widget.html -share/doc/gcr/gcr-gcr-import-dialog.html -share/doc/gcr/gcr-gcr-importer.html -share/doc/gcr/gcr-gcr-initializer.html -share/doc/gcr/gcr-gcr-parser.html -share/doc/gcr/gcr-gcr-simple-certificate.html -share/doc/gcr/gcr-gcr-types.html -share/doc/gcr/gcr-gcr-xxx.html -share/doc/gcr/gcr.devhelp -share/doc/gcr/gcr.devhelp2 -share/doc/gcr/home.png -share/doc/gcr/index.html -share/doc/gcr/index.sgml -share/doc/gcr/left.png -share/doc/gcr/right.png -share/doc/gcr/style.css -share/doc/gcr/up.png -share/doc/gp11/GP11Module.html -share/doc/gp11/GP11Object.html -share/doc/gp11/GP11Session.html -share/doc/gp11/GP11Slot.html -share/doc/gp11/ch01.html -share/doc/gp11/gp11-Errors.html -share/doc/gp11/gp11-GP11Attribute.html -share/doc/gp11/gp11-GP11Attributes.html -share/doc/gp11/gp11-Miscellaneous-Functions.html -share/doc/gp11/gp11.devhelp -share/doc/gp11/gp11.devhelp2 -share/doc/gp11/home.png -share/doc/gp11/index.html -share/doc/gp11/index.sgml -share/doc/gp11/left.png -share/doc/gp11/right.png -share/doc/gp11/style.css -share/doc/gp11/up.png -share/gcr/ui/gcr-certificate-basics-widget.ui -share/gcr/ui/gcr-import-dialog.ui -share/gcr/ui/gcr-unlock-options-widget.ui -%%DATADIR%%/introspect/introspect-collection.xml -%%DATADIR%%/introspect/introspect-item.xml -%%DATADIR%%/introspect/introspect-prompt.xml -%%DATADIR%%/introspect/introspect-service.xml -%%DATADIR%%/introspect/introspect-session.xml -%%DATADIR%%/ui/gku-prompt.ui -share/locale/ar/LC_MESSAGES/gnome-keyring.mo -share/locale/as/LC_MESSAGES/gnome-keyring.mo -share/locale/ast/LC_MESSAGES/gnome-keyring.mo -share/locale/az/LC_MESSAGES/gnome-keyring.mo -share/locale/be/LC_MESSAGES/gnome-keyring.mo -share/locale/be@latin/LC_MESSAGES/gnome-keyring.mo -share/locale/bg/LC_MESSAGES/gnome-keyring.mo -share/locale/bn/LC_MESSAGES/gnome-keyring.mo -share/locale/bn_IN/LC_MESSAGES/gnome-keyring.mo -share/locale/bs/LC_MESSAGES/gnome-keyring.mo -share/locale/ca/LC_MESSAGES/gnome-keyring.mo -share/locale/ca@valencia/LC_MESSAGES/gnome-keyring.mo -share/locale/cs/LC_MESSAGES/gnome-keyring.mo -share/locale/cy/LC_MESSAGES/gnome-keyring.mo -share/locale/da/LC_MESSAGES/gnome-keyring.mo -share/locale/de/LC_MESSAGES/gnome-keyring.mo -share/locale/dz/LC_MESSAGES/gnome-keyring.mo -share/locale/el/LC_MESSAGES/gnome-keyring.mo -share/locale/en@shaw/LC_MESSAGES/gnome-keyring.mo -share/locale/en_CA/LC_MESSAGES/gnome-keyring.mo -share/locale/en_GB/LC_MESSAGES/gnome-keyring.mo -share/locale/es/LC_MESSAGES/gnome-keyring.mo -share/locale/et/LC_MESSAGES/gnome-keyring.mo -share/locale/eu/LC_MESSAGES/gnome-keyring.mo -share/locale/fa/LC_MESSAGES/gnome-keyring.mo -share/locale/fi/LC_MESSAGES/gnome-keyring.mo -share/locale/fr/LC_MESSAGES/gnome-keyring.mo -share/locale/ga/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 -share/locale/id/LC_MESSAGES/gnome-keyring.mo -share/locale/is/LC_MESSAGES/gnome-keyring.mo -share/locale/it/LC_MESSAGES/gnome-keyring.mo -share/locale/ja/LC_MESSAGES/gnome-keyring.mo -share/locale/ka/LC_MESSAGES/gnome-keyring.mo -share/locale/kn/LC_MESSAGES/gnome-keyring.mo -share/locale/ko/LC_MESSAGES/gnome-keyring.mo -share/locale/lt/LC_MESSAGES/gnome-keyring.mo -share/locale/lv/LC_MESSAGES/gnome-keyring.mo -share/locale/mai/LC_MESSAGES/gnome-keyring.mo -share/locale/mg/LC_MESSAGES/gnome-keyring.mo -share/locale/mk/LC_MESSAGES/gnome-keyring.mo -share/locale/ml/LC_MESSAGES/gnome-keyring.mo -share/locale/mn/LC_MESSAGES/gnome-keyring.mo -share/locale/mr/LC_MESSAGES/gnome-keyring.mo -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 -share/locale/pl/LC_MESSAGES/gnome-keyring.mo -share/locale/pt/LC_MESSAGES/gnome-keyring.mo -share/locale/pt_BR/LC_MESSAGES/gnome-keyring.mo -share/locale/ro/LC_MESSAGES/gnome-keyring.mo -share/locale/ru/LC_MESSAGES/gnome-keyring.mo -share/locale/rw/LC_MESSAGES/gnome-keyring.mo -share/locale/si/LC_MESSAGES/gnome-keyring.mo -share/locale/sk/LC_MESSAGES/gnome-keyring.mo -share/locale/sl/LC_MESSAGES/gnome-keyring.mo -share/locale/sq/LC_MESSAGES/gnome-keyring.mo -share/locale/sr/LC_MESSAGES/gnome-keyring.mo -share/locale/sr@latin/LC_MESSAGES/gnome-keyring.mo -share/locale/sv/LC_MESSAGES/gnome-keyring.mo -share/locale/ta/LC_MESSAGES/gnome-keyring.mo -share/locale/te/LC_MESSAGES/gnome-keyring.mo -share/locale/th/LC_MESSAGES/gnome-keyring.mo -share/locale/tr/LC_MESSAGES/gnome-keyring.mo -share/locale/uk/LC_MESSAGES/gnome-keyring.mo -share/locale/vi/LC_MESSAGES/gnome-keyring.mo -share/locale/xh/LC_MESSAGES/gnome-keyring.mo -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 %%DATADIR%%/ui -@dirrm %%DATADIR%%/introspect -@dirrm %%DATADIR%% -@dirrm share/gcr/ui -@dirrm share/gcr -@dirrm share/doc/gp11 -@dirrm share/doc/gcr -@dirrm lib/gnome-keyring/standalone -@dirrm lib/gnome-keyring/devel -@dirrm lib/gnome-keyring -@dirrm include/gp11 -@dirrm include/gcr -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/si/LC_MESSAGES -@dirrmtry share/locale/si -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/mg/LC_MESSAGES -@dirrmtry share/locale/mg -@dirrmtry share/locale/mai/LC_MESSAGES -@dirrmtry share/locale/mai -@dirrmtry share/locale/en@shaw/LC_MESSAGES -@dirrmtry share/locale/en@shaw -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/ca@valencia/LC_MESSAGES -@dirrmtry share/locale/ca@valencia -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN -@dirrmtry share/locale/be@latin/LC_MESSAGES -@dirrmtry share/locale/be@latin -@dirrmtry share/locale/ast/LC_MESSAGES -@dirrmtry share/locale/ast -@dirrmtry share/locale/as/LC_MESSAGES -@dirrmtry share/locale/as -- cgit v1.2.3