diff options
21 files changed, 56 insertions, 469 deletions
@@ -33,6 +33,7 @@ net/vino3|net/vino|%DATE%|moved net-im/empathy3|net-im/empathy|%DATE%|moved net-im/folks04|net-im/folks|%DATE%|moved net-im/telepathy-farsight|net-im/telepathy-farstream|%DATE%|replaced +security/gnome-keyring3|security/gnome-keyring|%DATE%|moved security/seahorse3|security/seahorse|%DATE%|moved security/seahorse-plugins||%DATE%|removed sysutils/brasero3|sysutils/brasero|%DATE%|moved diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index daec9b2f2..93424878e 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -3,31 +3,46 @@ # $MCom$ PORTNAME= gnome-keyring -PORTVERSION= 2.32.1 -PORTREVISION= 3 +PORTVERSION= 3.6.2 CATEGORIES= security gnome MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 +DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Program that keeps passwords and other secrets -LIB_DEPENDS= libtasn1.so:${PORTSDIR}/security/libtasn1 \ - libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring +BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ + gcr>=3.5.3:${PORTSDIR}/security/gcr +LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \ + libdbus-1.so:${PORTSDIR}/devel/dbus \ + libgcr-3.so:${PORTSDIR}/security/gcr \ + libtasn1.so:${PORTSDIR}/security/libtasn1 \ + libp11-kit.so:${PORTSDIR}/security/p11-kit \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss -CONFLICTS= gnome-keyring-3.[0-9]* gcr-3.[0-9]* - -USE_BZIP2= yes -USE_GNOME= gnomeprefix gtk20 ltverhack intlhack +USE_XZ= yes +USE_GNOME= gnomeprefix gtk30 ltverhack intlhack USES= gettext gmake pathfix pkgconfig +INSTALLS_ICONS= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --with-pam-dir="${PREFIX}/lib" \ - --with-root-certs="${LOCALBASE}/share/certs/ca-root-nss.crt" + --with-root-certs=${LOCALBASE}/share/certs CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -GLIB_SCHEMAS= org.gnome.crypto.cache.gschema.xml \ - org.gnome.crypto.pgp.gschema.xml +GLIB_SCHEMAS= org.gnome.crypto.cache.gschema.xml + +post-patch: + @${REINPLACE_CMD} -e 's|make --version|${GMAKE} --version|g' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|gnome-keyring-module|gnome-keyring.module|g' \ + ${WRKSRC}/pkcs11/rpc-layer/Makefile.in \ + ${WRKSRC}/configure + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gnome-keyring/devel/*.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pkcs11/gnome-keyring-pkcs11.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pam_gnome_keyring.so .include <bsd.port.mk> diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo index 2774e0cb2..c3a25a259 100644 --- a/security/gnome-keyring/distinfo +++ b/security/gnome-keyring/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/gnome-keyring-2.32.1.tar.bz2) = 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9 -SIZE (gnome2/gnome-keyring-2.32.1.tar.bz2) = 1619245 +SHA256 (gnome3/gnome-keyring-3.6.2.tar.xz) = ae60558d60171325ddd90603328393d35d7b560a70b7ab45c4d2718d01130cd6 +SIZE (gnome3/gnome-keyring-3.6.2.tar.xz) = 1139836 diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure deleted file mode 100644 index 7e8ec000a..000000000 --- a/security/gnome-keyring/files/patch-configure +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.orig 2010-09-19 12:45:34.000000000 +0000 -+++ configure 2010-09-19 12:50:50.000000000 +0000 -@@ -14454,8 +14454,8 @@ - .SECONDARY: $(gsettings_SCHEMAS) - - gsettings__base_list = \ -- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ -- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" -+ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \ -+ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' - - install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) - @$(NORMAL_INSTALL) -@@ -15058,7 +15058,7 @@ - - pam_status="no" - if test "$enable_pam" != "no"; then -- for ac_header in security/pam_modules.h pam/pam_modules.h -+ for ac_header in security/pam_modules.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff --git a/security/gnome-keyring/files/patch-daemon_control_gkd-control-client.c b/security/gnome-keyring/files/patch-daemon_control_gkd-control-client.c deleted file mode 100644 index 6cdb0ca6a..000000000 --- a/security/gnome-keyring/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 <errno.h> - #include <fcntl.h> - -+#include <string.h> -+#include <sys/stat.h> - #include <sys/socket.h> - #include <sys/types.h> - #include <sys/un.h> diff --git a/security/gnome-keyring/files/patch-egg_egg-asn1x.c b/security/gnome-keyring/files/patch-egg_egg-asn1x.c deleted file mode 100644 index 30828f3f6..000000000 --- a/security/gnome-keyring/files/patch-egg_egg-asn1x.c +++ /dev/null @@ -1,13 +0,0 @@ ---- egg/egg-asn1x.c.orig 2010-09-04 12:08:41.000000000 +0200 -+++ egg/egg-asn1x.c 2010-09-04 12:10:05.000000000 +0200 -@@ -1988,8 +1988,8 @@ anode_write_integer_ulong (gulong value, - 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; - } - diff --git a/security/gnome-keyring3/files/patch-egg_egg-secure-memory.c b/security/gnome-keyring/files/patch-egg_egg-secure-memory.c index a3874cbfe..a3874cbfe 100644 --- a/security/gnome-keyring3/files/patch-egg_egg-secure-memory.c +++ b/security/gnome-keyring/files/patch-egg_egg-secure-memory.c diff --git a/security/gnome-keyring3/files/patch-egg_egg-secure-memory.h b/security/gnome-keyring/files/patch-egg_egg-secure-memory.h index 6e9b5ca3e..6e9b5ca3e 100644 --- a/security/gnome-keyring3/files/patch-egg_egg-secure-memory.h +++ b/security/gnome-keyring/files/patch-egg_egg-secure-memory.h diff --git a/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c b/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c deleted file mode 100644 index 5ae53f8b0..000000000 --- a/security/gnome-keyring/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 <sys/types.h> - #include <sys/socket.h> -+#include <sys/param.h> - #include <sys/uio.h> - #include <sys/un.h> - #include <errno.h> -@@ -37,6 +38,33 @@ - #include <ucred.h> - #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-egg_tests_test-secmem.c b/security/gnome-keyring/files/patch-egg_tests_test-secmem.c index 6aa1d599c..6aa1d599c 100644 --- a/security/gnome-keyring3/files/patch-egg_tests_test-secmem.c +++ b/security/gnome-keyring/files/patch-egg_tests_test-secmem.c diff --git a/security/gnome-keyring/files/patch-gcr_gcr-certificate.c b/security/gnome-keyring/files/patch-gcr_gcr-certificate.c deleted file mode 100644 index bdf10bf14..000000000 --- a/security/gnome-keyring/files/patch-gcr_gcr-certificate.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gcr/gcr-certificate.c.orig 2010-09-04 12:04:30.000000000 +0200 -+++ gcr/gcr-certificate.c 2010-09-04 12:04:42.000000000 +0200 -@@ -158,7 +158,7 @@ calculate_key_size (GcrCertificateInfo * - const guchar *data, *params; - gsize n_data, n_params; - guint key_size = 0, n_bits; -- guchar *key; -+ guchar *key = NULL; - GQuark oid; - - data = egg_asn1x_get_raw_element (egg_asn1x_node (info->asn1, "tbsCertificate", "subjectPublicKeyInfo", NULL), &n_data); diff --git a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c deleted file mode 100644 index 146d8b69d..000000000 --- a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c +++ /dev/null @@ -1,11 +0,0 @@ ---- pkcs11/rpc-layer/gkm-rpc-dispatch.c.orig 2010-09-04 12:06:44.000000000 +0200 -+++ pkcs11/rpc-layer/gkm-rpc-dispatch.c 2010-09-04 12:07:12.000000000 +0200 -@@ -784,7 +784,7 @@ rpc_C_Finalize (CallState *cs) - { - CK_SLOT_ID_PTR slots; - CK_ULONG n_slots, i; -- CK_RV ret; -+ CK_RV ret = CKR_OK; - - debug (("C_Finalize: enter")); - diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist index 8ce23ce40..6b480bd21 100644 --- a/security/gnome-keyring/pkg-plist +++ b/security/gnome-keyring/pkg-plist @@ -1,103 +1,28 @@ bin/gnome-keyring +bin/gnome-keyring-3 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/gcr-certificate-basics-widget.h -include/gcr/gcr/gcr-certificate-details-widget.h -include/gcr/gcr/gcr-certificate.h -include/gcr/gcr/gcr-importer.h -include/gcr/gcr/gcr-parser.h -include/gcr/gcr/gcr-simple-certificate.h -include/gcr/gcr/gcr-types.h -include/gcr/gcr/gcr-unlock-options-widget.h -include/gcr/gcr/gcr-unlock-options.h -include/gcr/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-gnome2-store-standalone.la +lib/gnome-keyring/devel/gkm-gnome2-store-standalone.so +lib/gnome-keyring/devel/gkm-roots-store-standalone.la +lib/gnome-keyring/devel/gkm-roots-store-standalone.so +lib/gnome-keyring/devel/gkm-secret-store-standalone.la +lib/gnome-keyring/devel/gkm-secret-store-standalone.so 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/gnome-keyring/devel/gkm-xdg-store-standalone.la +lib/gnome-keyring/devel/gkm-xdg-store-standalone.so lib/pam_gnome_keyring.la lib/pam_gnome_keyring.so -libdata/pkgconfig/gcr-0.pc -libdata/pkgconfig/gp11-0.pc -libexec/gnome-keyring-prompt +lib/pkcs11/gnome-keyring-pkcs11.la +lib/pkcs11/gnome-keyring-pkcs11.so share/GConf/gsettings/org.gnome.crypto.cache.convert -share/GConf/gsettings/org.gnome.crypto.pgp.convert share/dbus-1/services/org.freedesktop.secrets.service share/dbus-1/services/org.gnome.keyring.service -share/doc/gcr-0/ch01.html -share/doc/gcr-0/gcr-GcrCertificate.html -share/doc/gcr-0/gcr-gcr-certificate-basics-widget.html -share/doc/gcr-0/gcr-gcr-certificate-details-widget.html -share/doc/gcr-0/gcr-gcr-import-dialog.html -share/doc/gcr-0/gcr-gcr-importer.html -share/doc/gcr-0/gcr-gcr-initializer.html -share/doc/gcr-0/gcr-gcr-parser.html -share/doc/gcr-0/gcr-gcr-simple-certificate.html -share/doc/gcr-0/gcr-gcr-types.html -share/doc/gcr-0/gcr-gcr-xxx.html -share/doc/gcr-0/gcr-0.devhelp -share/doc/gcr-0/gcr-0.devhelp2 -share/doc/gcr-0/home.png -share/doc/gcr-0/index.html -share/doc/gcr-0/index.sgml -share/doc/gcr-0/left.png -share/doc/gcr-0/right.png -share/doc/gcr-0/style.css -share/doc/gcr-0/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/af/LC_MESSAGES/gnome-keyring.mo share/locale/ar/LC_MESSAGES/gnome-keyring.mo share/locale/as/LC_MESSAGES/gnome-keyring.mo share/locale/ast/LC_MESSAGES/gnome-keyring.mo @@ -119,6 +44,7 @@ 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/eo/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 @@ -137,6 +63,7 @@ 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/km/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 @@ -172,29 +99,20 @@ 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/ug/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-0 -@dirrm lib/gnome-keyring/standalone -@dirrm lib/gnome-keyring/devel -@dirrm lib/gnome-keyring -@dirrm include/gp11 -@dirrm include/gcr/gcr -@dirrm include/gcr +share/p11-kit/modules/gnome-keyring.module @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/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -211,6 +129,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo @dirrmtry share/locale/mg @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai +@dirrmtry share/locale/km/LC_MESSAGES +@dirrmtry share/locale/km @dirrmtry share/locale/en@shaw/LC_MESSAGES @dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @@ -225,3 +145,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo @dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as +@dirrmtry lib/pkcs11 +@dirrm lib/gnome-keyring/devel +@dirrm lib/gnome-keyring diff --git a/security/gnome-keyring3/Makefile b/security/gnome-keyring3/Makefile deleted file mode 100644 index 5f065bd61..000000000 --- a/security/gnome-keyring3/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> -# $FreeBSD$ -# $MCom: ports/trunk/security/gnome-keyring3/Makefile 18410 2013-05-01 15:20:45Z kwm $ - -PORTNAME= gnome-keyring -PORTVERSION= 3.6.2 -CATEGORIES= security gnome -MASTER_SITES= GNOME -PKGNAMESUFFIX= 3 -DIST_SUBDIR= gnome3 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Program that keeps passwords and other secrets - -BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ - gcr>=3.5.3:${PORTSDIR}/security/gcr -LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \ - libdbus-1.so:${PORTSDIR}/devel/dbus \ - libgcr-3.so:${PORTSDIR}/security/gcr \ - libtasn1.so:${PORTSDIR}/security/libtasn1 \ - libp11-kit.so:${PORTSDIR}/security/p11-kit \ - libgcrypt.so:${PORTSDIR}/security/libgcrypt -RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss - -CONFLICTS= gnome-keyring-2.[0-9]* - -USE_XZ= yes -USE_GNOME= gnomeprefix gtk30 ltverhack intlhack -USES= gettext gmake pathfix pkgconfig -INSTALLS_ICONS= yes -USE_AUTOTOOLS= libtool -USE_LDCONFIG= yes -CONFIGURE_ARGS= --with-pam-dir="${PREFIX}/lib" \ - --with-root-certs=${LOCALBASE}/share/certs -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -GLIB_SCHEMAS= org.gnome.crypto.cache.gschema.xml - -post-patch: - @${REINPLACE_CMD} -e 's|make --version|${GMAKE} --version|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|gnome-keyring-module|gnome-keyring.module|g' \ - ${WRKSRC}/pkcs11/rpc-layer/Makefile.in \ - ${WRKSRC}/configure - -.include <bsd.port.mk> diff --git a/security/gnome-keyring3/distinfo b/security/gnome-keyring3/distinfo deleted file mode 100644 index c3a25a259..000000000 --- a/security/gnome-keyring3/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (gnome3/gnome-keyring-3.6.2.tar.xz) = ae60558d60171325ddd90603328393d35d7b560a70b7ab45c4d2718d01130cd6 -SIZE (gnome3/gnome-keyring-3.6.2.tar.xz) = 1139836 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 41540e0aa..000000000 --- a/security/gnome-keyring3/pkg-plist +++ /dev/null @@ -1,157 +0,0 @@ -bin/gnome-keyring -bin/gnome-keyring-3 -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 -lib/gnome-keyring/devel/gkm-gnome2-store-standalone.a -lib/gnome-keyring/devel/gkm-gnome2-store-standalone.la -lib/gnome-keyring/devel/gkm-gnome2-store-standalone.so -lib/gnome-keyring/devel/gkm-roots-store-standalone.a -lib/gnome-keyring/devel/gkm-roots-store-standalone.la -lib/gnome-keyring/devel/gkm-roots-store-standalone.so -lib/gnome-keyring/devel/gkm-secret-store-standalone.a -lib/gnome-keyring/devel/gkm-secret-store-standalone.la -lib/gnome-keyring/devel/gkm-secret-store-standalone.so -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-xdg-store-standalone.a -lib/gnome-keyring/devel/gkm-xdg-store-standalone.la -lib/gnome-keyring/devel/gkm-xdg-store-standalone.so -lib/pam_gnome_keyring.a -lib/pam_gnome_keyring.la -lib/pam_gnome_keyring.so -lib/pkcs11/gnome-keyring-pkcs11.a -lib/pkcs11/gnome-keyring-pkcs11.la -lib/pkcs11/gnome-keyring-pkcs11.so -share/GConf/gsettings/org.gnome.crypto.cache.convert -share/dbus-1/services/org.freedesktop.secrets.service -share/dbus-1/services/org.gnome.keyring.service -share/locale/af/LC_MESSAGES/gnome-keyring.mo -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/eo/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/km/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/ug/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 -share/p11-kit/modules/gnome-keyring.module -@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/ug/LC_MESSAGES -@dirrmtry share/locale/ug -@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/km/LC_MESSAGES -@dirrmtry share/locale/km -@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 -@dirrmtry lib/pkcs11 -@dirrm lib/gnome-keyring/devel -@dirrm lib/gnome-keyring diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 935f1ca01..521dea720 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS= libck-connector.so:${PORTSDIR}/sysutils/consolekit \ libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 RUN_DEPENDS= zenity3>=3.0.0:${PORTSDIR}/x11/zenity3 \ gnome-settings-daemon>=3.0.0:${PORTSDIR}/sysutils/gnome-settings-daemon \ - gnome-keyring-3:${PORTSDIR}/security/gnome-keyring3 \ + gnome-keyring-3:${PORTSDIR}/security/gnome-keyring \ gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \ gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \ polkit-gnome>=0.105:${PORTSDIR}/sysutils/polkit-gnome \ diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 212570b9d..ce198546b 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS= pam_helper:${PORTSDIR}/security/pam_helper \ gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas \ - ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring3 + ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring USE_XZ= yes USES= gettext gmake pathfix pkgconfig diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile index f74079a58..2b5b7f555 100644 --- a/x11/gnome3/Makefile +++ b/x11/gnome3/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS?= gnome-panel>=3.0.0:${PORTSDIR}/x11/gnome-panel \ gnome-themes-standard>=3.0.0:${PORTSDIR}/x11-themes/gnome-themes-standard \ gnome-icon-theme-extras>=3.0.0:${PORTSDIR}/misc/gnome-icon-theme-extras \ gnome-icon-theme-symbolic>=3.0.0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \ - gnome-keyring3>=3.0.0:${PORTSDIR}/security/gnome-keyring3 \ + gnome-keyring>=3.0.0:${PORTSDIR}/security/gnome-keyring \ gnome-power-manager>=3.0.0:${PORTSDIR}/sysutils/gnome-power-manager \ orca>=3.0.0:${PORTSDIR}/accessibility/orca \ gnome-mount:${PORTSDIR}/sysutils/gnome-mount \ |