Alexander Pyhalov
2017-12-03 c5b2c2ff57a54344287b2ec4df8d238496416675
gnome-keyring: update to 3.20.1
9 files deleted
6 files added
1 files renamed
1224 ■■■■ changed files
components/desktop/gnome2/gnome-keyring/Makefile 71 ●●●●● patch | view | raw | blame | history
components/desktop/gnome2/gnome-keyring/gnome-keyring.p5m 199 ●●●●● patch | view | raw | blame | history
components/desktop/gnome2/gnome-keyring/manifests/sample-manifest.p5m 191 ●●●●● patch | view | raw | blame | history
components/desktop/gnome2/gnome-keyring/patches/01-ssh-agent.patch 11 ●●●●● patch | view | raw | blame | history
components/desktop/gnome2/gnome-keyring/patches/02-remove-prompt.patch 11 ●●●●● patch | view | raw | blame | history
components/desktop/gnome2/gnome-keyring/patches/03-disable-im.patch 10 ●●●●● patch | view | raw | blame | history
components/desktop/gnome2/gnome-keyring/patches/04-gmodule.patch 42 ●●●●● patch | view | raw | blame | history
components/desktop/gnome2/gnome-keyring/patches/05-show-in-mate.patch 96 ●●●●● patch | view | raw | blame | history
components/desktop/gnome2/gnome-keyring/patches/06-libtasn1.patch 29 ●●●●● patch | view | raw | blame | history
components/desktop/gnome3/gnome-keyring/Makefile 76 ●●●●● patch | view | raw | blame | history
components/desktop/gnome3/gnome-keyring/gnome-keyring.license patch | view | raw | blame | history
components/desktop/gnome3/gnome-keyring/gnome-keyring.p5m 138 ●●●●● patch | view | raw | blame | history
components/desktop/gnome3/gnome-keyring/manifests/sample-manifest.p5m 138 ●●●●● patch | view | raw | blame | history
components/desktop/gnome3/gnome-keyring/patches/01-pam-configure-and-includes.patch 71 ●●●●● patch | view | raw | blame | history
components/desktop/gnome3/gnome-keyring/patches/02-pam-defines.patch 24 ●●●●● patch | view | raw | blame | history
components/desktop/gnome3/gnome-keyring/patches/03-memrchr.patch 117 ●●●●● patch | view | raw | blame | history
components/desktop/gnome2/gnome-keyring/Makefile
File was deleted
components/desktop/gnome2/gnome-keyring/gnome-keyring.p5m
File was deleted
components/desktop/gnome2/gnome-keyring/manifests/sample-manifest.p5m
File was deleted
components/desktop/gnome2/gnome-keyring/patches/01-ssh-agent.patch
File was deleted
components/desktop/gnome2/gnome-keyring/patches/02-remove-prompt.patch
File was deleted
components/desktop/gnome2/gnome-keyring/patches/03-disable-im.patch
File was deleted
components/desktop/gnome2/gnome-keyring/patches/04-gmodule.patch
File was deleted
components/desktop/gnome2/gnome-keyring/patches/05-show-in-mate.patch
File was deleted
components/desktop/gnome2/gnome-keyring/patches/06-libtasn1.patch
File was deleted
components/desktop/gnome3/gnome-keyring/Makefile
New file
@@ -0,0 +1,76 @@
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL)". You may
# only use this file in accordance with the terms of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#
#
# Copyright (c) 2017 Alexander Pyhalov
# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
#
include ../../../../make-rules/shared-macros.mk
COMPONENT_NAME=        gnome-keyring
COMPONENT_MJR_VERSION=    3.20
COMPONENT_MNR_VERSION=    1
COMPONENT_VERSION=    $(COMPONENT_MJR_VERSION).$(COMPONENT_MNR_VERSION)
COMPONENT_PROJECT_URL=    http://www.gnome.org
COMPONENT_SUMMARY=    GNOME Keyring
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH=    \
    sha256:97964e723f454be509c956ed5e38b5c2fd7363f43bd3f153b94a4a63eb888c8c
COMPONENT_ARCHIVE_URL=    http://ftp.gnome.org/pub/GNOME/sources/$(COMPONENT_NAME)/$(COMPONENT_MJR_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_CLASSIFICATION=    Desktop (GNOME)/Sessions
COMPONENT_FMRI=        gnome/gnome-keyring
COMPONENT_LICENSE=    GPLv2,LGPLv2
COMPONENT_LICENSE_FILE= gnome-keyring.license
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
PATH=$(PATH.gnu)
COMPONENT_PREP_ACTION = ( cd $(@D) && autoreconf -fi)
PAM_MODULE_DIR.32 = $(USRLIBDIR)/security
PAM_MODULE_DIR.64 = $(PAM_MODULE_DIR.32)/$(MACH64)
PAM_MODULE_DIR = $(PAM_MODULE_DIR.$(BITS))
CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin
# Overwrite files in /usr/bin
$(INSTALL_64):    $(INSTALL_32)
CONFIGURE_OPTIONS += --sysconfdir=/etc
CONFIGURE_OPTIONS += --libexecdir=$(CONFIGURE_LIBDIR.$(BITS))
CONFIGURE_OPTIONS += --disable-selinux
CONFIGURE_OPTIONS += --disable-static
CONFIGURE_OPTIONS += --enable-gpg-agent
CONFIGURE_OPTIONS += --enable-pam
CONFIGURE_OPTIONS += --enable-shared
CONFIGURE_OPTIONS += --enable-ssh-agent
CONFIGURE_OPTIONS += --with-pam-dir=$(PAM_MODULE_DIR)
CONFIGURE_OPTIONS += --with-pic
# Linux-specific capabilities support.
CONFIGURE_OPTIONS += --without-libcap-ng
# common targets
build:        $(BUILD_32_and_64)
install:    $(INSTALL_32_and_64)
test:        $(NO_TESTS)
# Auto-generated contents below.  Please manually verify and remove this comment
REQUIRED_PACKAGES += library/glib2
REQUIRED_PACKAGES += library/gnome/gcr
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/security/libgcrypt
components/desktop/gnome3/gnome-keyring/gnome-keyring.license
components/desktop/gnome3/gnome-keyring/gnome-keyring.p5m
New file
@@ -0,0 +1,138 @@
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source.  A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#
#
# Copyright 2017 Alexander Pyhalov
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=etc/xdg/autostart/gnome-keyring-pkcs11.desktop
file path=etc/xdg/autostart/gnome-keyring-secrets.desktop
file path=etc/xdg/autostart/gnome-keyring-ssh.desktop
link path=usr/bin/gnome-keyring target=gnome-keyring-3
file path=usr/bin/gnome-keyring-3
file path=usr/bin/gnome-keyring-daemon
file path=usr/lib/$(MACH64)/gnome-keyring/devel/gkm-gnome2-store-standalone.so
file path=usr/lib/$(MACH64)/gnome-keyring/devel/gkm-secret-store-standalone.so
file path=usr/lib/$(MACH64)/gnome-keyring/devel/gkm-ssh-store-standalone.so
file path=usr/lib/$(MACH64)/gnome-keyring/devel/gkm-xdg-store-standalone.so
file path=usr/lib/gnome-keyring/devel/gkm-gnome2-store-standalone.so
file path=usr/lib/gnome-keyring/devel/gkm-secret-store-standalone.so
file path=usr/lib/gnome-keyring/devel/gkm-ssh-store-standalone.so
file path=usr/lib/gnome-keyring/devel/gkm-xdg-store-standalone.so
file path=usr/lib/security/$(MACH64)/gnome-keyring-pkcs11.so
file path=usr/lib/security/$(MACH64)/pam_gnome_keyring.so
file path=usr/lib/security/gnome-keyring-pkcs11.so
file path=usr/lib/security/pam_gnome_keyring.so
file path=usr/share/GConf/gsettings/org.gnome.crypto.cache.convert
file path=usr/share/dbus-1/services/org.freedesktop.secrets.service
file path=usr/share/dbus-1/services/org.gnome.keyring.service
file path=usr/share/glib-2.0/schemas/org.gnome.crypto.cache.gschema.xml
file path=usr/share/locale/af/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ar/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/as/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ast/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/az/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/be/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/be@latin/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/bg/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/bn/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/bn_IN/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/bs/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ca/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ca@valencia/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/cs/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/cy/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/da/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/de/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/dz/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/el/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/en@shaw/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/en_CA/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/en_GB/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/eo/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/es/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/et/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/eu/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/fa/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/fi/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/fr/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/fur/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ga/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/gd/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/gl/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/gu/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/he/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/hi/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/hr/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/hu/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/id/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/is/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/it/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ja/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ka/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/kk/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/km/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/kn/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ko/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/lt/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/lv/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/mai/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/mg/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/mk/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ml/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/mn/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/mr/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ms/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/nb/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ne/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/nl/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/nn/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/oc/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/or/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/pa/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/pl/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/pt/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/pt_BR/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ro/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ru/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/rw/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/si/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/sk/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/sl/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/sq/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/sr/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/sr@latin/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/sv/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ta/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/te/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/tg/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/th/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/tr/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ug/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/uk/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/vi/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/xh/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/man/man1/gnome-keyring-3.1
file path=usr/share/man/man1/gnome-keyring-daemon.1
file path=usr/share/man/man1/gnome-keyring.1
file path=usr/share/p11-kit/modules/gnome-keyring.module
components/desktop/gnome3/gnome-keyring/manifests/sample-manifest.p5m
New file
@@ -0,0 +1,138 @@
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source.  A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#
#
# Copyright 2017 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=etc/xdg/autostart/gnome-keyring-pkcs11.desktop
file path=etc/xdg/autostart/gnome-keyring-secrets.desktop
file path=etc/xdg/autostart/gnome-keyring-ssh.desktop
link path=usr/bin/gnome-keyring target=gnome-keyring-3
file path=usr/bin/gnome-keyring-3
file path=usr/bin/gnome-keyring-daemon
file path=usr/lib/$(MACH64)/gnome-keyring/devel/gkm-gnome2-store-standalone.so
file path=usr/lib/$(MACH64)/gnome-keyring/devel/gkm-secret-store-standalone.so
file path=usr/lib/$(MACH64)/gnome-keyring/devel/gkm-ssh-store-standalone.so
file path=usr/lib/$(MACH64)/gnome-keyring/devel/gkm-xdg-store-standalone.so
file path=usr/lib/gnome-keyring/devel/gkm-gnome2-store-standalone.so
file path=usr/lib/gnome-keyring/devel/gkm-secret-store-standalone.so
file path=usr/lib/gnome-keyring/devel/gkm-ssh-store-standalone.so
file path=usr/lib/gnome-keyring/devel/gkm-xdg-store-standalone.so
file path=usr/lib/security/$(MACH64)/gnome-keyring-pkcs11.so
file path=usr/lib/security/$(MACH64)/pam_gnome_keyring.so
file path=usr/lib/security/gnome-keyring-pkcs11.so
file path=usr/lib/security/pam_gnome_keyring.so
file path=usr/share/GConf/gsettings/org.gnome.crypto.cache.convert
file path=usr/share/dbus-1/services/org.freedesktop.secrets.service
file path=usr/share/dbus-1/services/org.gnome.keyring.service
file path=usr/share/glib-2.0/schemas/org.gnome.crypto.cache.gschema.xml
file path=usr/share/locale/af/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ar/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/as/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ast/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/az/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/be/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/be@latin/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/bg/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/bn/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/bn_IN/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/bs/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ca/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ca@valencia/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/cs/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/cy/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/da/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/de/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/dz/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/el/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/en@shaw/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/en_CA/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/en_GB/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/eo/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/es/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/et/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/eu/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/fa/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/fi/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/fr/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/fur/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ga/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/gd/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/gl/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/gu/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/he/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/hi/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/hr/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/hu/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/id/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/is/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/it/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ja/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ka/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/kk/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/km/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/kn/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ko/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/lt/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/lv/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/mai/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/mg/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/mk/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ml/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/mn/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/mr/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ms/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/nb/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ne/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/nl/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/nn/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/oc/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/or/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/pa/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/pl/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/pt/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/pt_BR/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ro/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ru/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/rw/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/si/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/sk/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/sl/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/sq/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/sr/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/sr@latin/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/sv/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ta/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/te/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/tg/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/th/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/tr/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/ug/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/uk/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/vi/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/xh/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
file path=usr/share/man/man1/gnome-keyring-3.1
file path=usr/share/man/man1/gnome-keyring-daemon.1
file path=usr/share/man/man1/gnome-keyring.1
file path=usr/share/p11-kit/modules/gnome-keyring.module
components/desktop/gnome3/gnome-keyring/patches/01-pam-configure-and-includes.patch
New file
@@ -0,0 +1,71 @@
On Solaris, pam_appl.h must be included to use pam_modules.h.
Additionally, for platforms that have the pam header files in a different
location, the include paths need to be based on the result of configure.
Need to file upstream bug
--- gnome-keyring-3.16.0/configure.ac    2015-04-08 05:09:11.000000000 -0700
+++ gnome-keyring-3.16.0/configure.ac    2015-07-06 13:41:06.760980131 -0700
@@ -254,7 +254,15 @@
 pam_status="no"
 if test "$enable_pam" != "no"; then
-    AC_CHECK_HEADERS(security/pam_modules.h pam/pam_modules.h, [have_pam=yes; break], have_pam=no)
+    AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
+    AC_CHECK_HEADERS(security/pam_modules.h pam/pam_modules.h, [have_pam=yes; break], have_pam=no,
+[#ifdef HAVE_SECURITY_PAM_APPL_H
+#include <security/pam_appl.h>
+#endif
+#ifdef HAVE_PAM_PAM_APPL_H
+#include <pam/pam_appl.h>
+#endif
+])
     if test "$enable_pam" = "yes" -a "$have_pam" = "no"; then
         AC_MSG_ERROR(The PAM headers are missing)
     elif test "$have_pam" = "yes"; then
--- gnome-keyring-3.16.0/pam/gkr-pam-module.c    2014-09-23 00:45:13.000000000 -0700
+++ gnome-keyring-3.16.0/pam/gkr-pam-module.c    2015-07-06 13:46:40.611562409 -0700
@@ -32,8 +32,13 @@
 #include "daemon/control/gkd-control-codes.h"
+#ifdef HAVE_PAM_PAM_APPL_H
+#include <pam/pam_appl.h>
+#include <pam/pam_modules.h>
+#else
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
--- gnome-keyring-3.16.0/pam/mock-pam.c    2014-09-23 00:45:13.000000000 -0700
+++ gnome-keyring-3.16.0/pam/mock-pam.c    2015-07-06 13:46:19.879319092 -0700
@@ -20,8 +20,13 @@
 #include "config.h"
+#ifdef HAVE_PAM_PAM_APPL_H
+#include <pam/pam_appl.h>
+#include <pam/pam_modules.h>
+#else
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
--- gnome-keyring-3.16.0/pam/test-pam.c    2014-10-14 08:55:45.000000000 -0700
+++ gnome-keyring-3.16.0/pam/test-pam.c    2015-07-06 13:46:16.817220995 -0700
@@ -26,7 +26,11 @@
 #include "egg/egg-testing.h"
 #include "egg/egg-secure-memory.h"
+#ifdef HAVE_PAM_PAM_APPL_H
+#include <pam/pam_appl.h>
+#else
 #include <security/pam_appl.h>
+#endif
 #include <glib.h>
 #include <glib/gstdio.h>
components/desktop/gnome3/gnome-keyring/patches/02-pam-defines.patch
New file
@@ -0,0 +1,24 @@
On Solaris, pam modules are always dynamic, but use the #define check that
gnome-keyring does in gkr-pam-module.c for consistency.
Solaris should define PAM_EXTERN by default in appropriate pam header files
just as Linux/BSD do:
24969227 Add PAM_EXTERN for Linux/BSD module source compatibility
--- gnome-keyring-3.16.0/pam/mock-pam.c    2015-07-06 14:02:14.786683308 -0700
+++ gnome-keyring-3.16.0/pam/mock-pam.c    2015-07-06 14:03:45.431087928 -0700
@@ -31,6 +31,14 @@
 #include <stdlib.h>
 #include <string.h>
+#ifndef PAM_EXTERN
+#ifdef PAM_STATIC
+#define PAM_EXTERN static
+#else
+#define PAM_EXTERN extern
+#endif
+#endif
+
 static int
 prompt_password (pam_handle_t *ph,
                  const char *prompt,
components/desktop/gnome3/gnome-keyring/patches/03-memrchr.patch
New file
@@ -0,0 +1,117 @@
memrchr compatibility stub taken from sudo.   Workaround for:
21158555 - solaris should provide memrchr for bsd / linux compatibility
--- gnome-keyring-3.16.0/configure.ac    2015-04-06 11:28:46.000000000 -0700
+++ gnome-keyring-3.16.0/configure.ac    2015-05-27 16:59:15.748737526 -0700
@@ -147,6 +147,12 @@
 AC_CHECK_FUNCS(flock, AC_DEFINE(HAVE_FLOCK,1,[Have flock]))
 # --------------------------------------------------------------------
+# Check for memrchr
+#
+
+AC_CHECK_FUNCS(memrchr, AC_DEFINE(HAVE_MEMRCHR,1,[Have memrchr]))
+
+# --------------------------------------------------------------------
 # Check for timegm
 #
--- gnome-keyring-3.16.0/egg/egg-armor.c    2015-04-06 11:28:46.000000000 -0700
+++ gnome-keyring-3.16.0/egg/egg-armor.c    2015-05-27 16:59:15.748737526 -0700
@@ -31,7 +31,7 @@
 #include <glib.h>
 #include <ctype.h>
-#include <string.h>
+#include "egg-memrchr.h"
 /*
  * Armor looks like:
--- gnome-keyring-3.16.0/egg/egg-memrchr.c    1969-12-31 16:00:00.000000000 -0800
+++ gnome-keyring-3.16.0/egg/egg-memrchr.c    2015-05-27 16:56:33.358969153 -0700
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2007, 2010-2011, 2013
+ *    Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#ifndef HAVE_MEMRCHR
+
+#include <sys/types.h>
+
+/*
+ * Reverse memchr()
+ * Find the last occurrence of 'c' in the buffer 's' of size 'n'.
+ */
+void *
+memrchr(const void *s, int c, size_t n)
+{
+    const unsigned char *cp;
+
+    if (n != 0) {
+    cp = (unsigned char *)s + n;
+    do {
+        if (*(--cp) == (unsigned char)c)
+        return (void *)cp;
+    } while (--n != 0);
+    }
+    return (void *)0;
+}
+#endif /* HAVE_MEMRCHR */
--- gnome-keyring-3.16.0/egg/egg-memrchr.h    1969-12-31 16:00:00.000000000 -0800
+++ gnome-keyring-3.16.0/egg/egg-memrchr.h    2015-05-27 16:57:08.717867655 -0700
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2007, 2010-2011, 2013
+ *    Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef EGG_MEMRCHR_H_
+#define EGG_MEMRCHR_H_
+
+#include <string.h>
+
+#ifndef HAVE_MEMRCHR
+
+void *      memrchr   (const void *s, int c, size_t n);
+
+#endif
+
+#endif /* EGG_MEMRCHR_H_ */
--- gnome-keyring-3.16.0/egg/Makefile.am    2015-04-06 11:28:46.000000000 -0700
+++ gnome-keyring-3.16.0/egg/Makefile.am    2015-05-27 16:58:43.053533180 -0700
@@ -27,6 +27,7 @@
     egg/egg-hex.c egg/egg-hex.h \
     egg/egg-hkdf.c egg/egg-hkdf.h \
     egg/egg-libgcrypt.c egg/egg-libgcrypt.h \
+    egg/egg-memrchr.c egg/egg-memrchr.h \
     egg/egg-oid.c egg/egg-oid.h \
     egg/egg-padding.c egg/egg-padding.h \
     egg/egg-openssl.c egg/egg-openssl.h \