gnome-keyring: updated to 3.18.3

[coypu <coypu%sdf.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Mon Feb 8 17:01:33 2016 +0200
Changeset:	3a237c2521680258f5cc2a08a4a12916c5e1d585

Modified Files:
	gnome-keyring/Makefile
	gnome-keyring/PLIST
	gnome-keyring/distinfo
Added Files:
	gnome-keyring/patches/patch-egg_egg-unix-credentials.c
Removed Files:
	gnome-keyring/patches/patch-ad
	gnome-keyring/patches/patch-ae
	gnome-keyring/patches/patch-af
	gnome-keyring/patches/patch-ag
	gnome-keyring/patches/patch-configure

Log Message:
gnome-keyring: updated to 3.18.3

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3a237c2521680258f5cc2a08a4a12916c5e1d585

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnome-keyring/Makefile                             |  7 +-
 gnome-keyring/PLIST                                | 95 +++++-----------------
 gnome-keyring/distinfo                             | 14 ++--
 gnome-keyring/patches/patch-ad                     | 21 -----
 gnome-keyring/patches/patch-ae                     | 13 ---
 gnome-keyring/patches/patch-af                     | 50 ------------
 gnome-keyring/patches/patch-ag                     | 56 -------------
 gnome-keyring/patches/patch-configure              | 24 ------
 .../patches/patch-egg_egg-unix-credentials.c       | 90 ++++++++++++++++++++
 9 files changed, 118 insertions(+), 252 deletions(-)

diffs:
diff --git a/gnome-keyring/Makefile b/gnome-keyring/Makefile
index ea66f5b..8b1f523 100644
--- a/gnome-keyring/Makefile
+++ b/gnome-keyring/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD: Makefile,v 1.83 2015/04/25 14:24:48 tnn Exp $
 
-DISTNAME=	gnome-keyring-2.32.1
+DISTNAME=	gnome-keyring-3.18.3
 PKGREVISION=	19
 CATEGORIES=	security gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/2.32/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/3.18/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.gnome.org/
@@ -36,6 +36,7 @@ BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.26.0
 .include "../../devel/glib2/schemas.mk"
+.include "../../wip/gcr/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
diff --git a/gnome-keyring/PLIST b/gnome-keyring/PLIST
index 0fabc09..a183683 100644
--- a/gnome-keyring/PLIST
+++ b/gnome-keyring/PLIST
@@ -1,88 +1,24 @@
 @comment $NetBSD$
 bin/gnome-keyring
+bin/gnome-keyring-3
 bin/gnome-keyring-daemon
-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
+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.la
+lib/gnome-keyring/devel/gkm-secret-store-standalone.la
 lib/gnome-keyring/devel/gkm-ssh-store-standalone.la
-lib/gnome-keyring/devel/gkm-user-store-standalone.la
-lib/gnome-keyring/gnome-keyring-pkcs11.la
-lib/gnome-keyring/standalone/gkm-roots-store-standalone.la
-lib/gnome-keyring/standalone/gkm-secret-store-standalone.la
-lib/libgcr.la
-lib/libgp11.la
-lib/pkgconfig/gcr-0.pc
-lib/pkgconfig/gp11-0.pc
+lib/gnome-keyring/devel/gkm-xdg-store-standalone.la
+lib/pkcs11/gnome-keyring-pkcs11.la
 lib/security/pam_gnome_keyring.la
-libexec/gnome-keyring-prompt
+man/man1/gnome-keyring-3.1
+man/man1/gnome-keyring-daemon.1
+man/man1/gnome-keyring.1
 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/gcr/ui/gcr-certificate-basics-widget.ui
-share/gcr/ui/gcr-import-dialog.ui
-share/gcr/ui/gcr-unlock-options-widget.ui
 share/glib-2.0/schemas/org.gnome.crypto.cache.gschema.xml
-share/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
-share/gnome-keyring/introspect/introspect-collection.xml
-share/gnome-keyring/introspect/introspect-item.xml
-share/gnome-keyring/introspect/introspect-prompt.xml
-share/gnome-keyring/introspect/introspect-service.xml
-share/gnome-keyring/introspect/introspect-session.xml
-share/gnome-keyring/ui/gku-prompt.ui
-share/gnome/autostart/gnome-keyring-gpg.desktop
-share/gnome/autostart/gnome-keyring-pkcs11.desktop
-share/gnome/autostart/gnome-keyring-secrets.desktop
-share/gnome/autostart/gnome-keyring-ssh.desktop
-share/gtk-doc/html/gcr-0/ch01.html
-share/gtk-doc/html/gcr-0/gcr-0.devhelp
-share/gtk-doc/html/gcr-0/gcr-0.devhelp2
-share/gtk-doc/html/gcr-0/gcr-GcrCertificate.html
-share/gtk-doc/html/gcr-0/gcr-gcr-certificate-basics-widget.html
-share/gtk-doc/html/gcr-0/gcr-gcr-certificate-details-widget.html
-share/gtk-doc/html/gcr-0/gcr-gcr-import-dialog.html
-share/gtk-doc/html/gcr-0/gcr-gcr-importer.html
-share/gtk-doc/html/gcr-0/gcr-gcr-initializer.html
-share/gtk-doc/html/gcr-0/gcr-gcr-parser.html
-share/gtk-doc/html/gcr-0/gcr-gcr-simple-certificate.html
-share/gtk-doc/html/gcr-0/gcr-gcr-types.html
-share/gtk-doc/html/gcr-0/gcr-gcr-xxx.html
-share/gtk-doc/html/gcr-0/home.png
-share/gtk-doc/html/gcr-0/index.html
-share/gtk-doc/html/gcr-0/index.sgml
-share/gtk-doc/html/gcr-0/left.png
-share/gtk-doc/html/gcr-0/right.png
-share/gtk-doc/html/gcr-0/style.css
-share/gtk-doc/html/gcr-0/up.png
-share/gtk-doc/html/gp11/GP11Module.html
-share/gtk-doc/html/gp11/GP11Object.html
-share/gtk-doc/html/gp11/GP11Session.html
-share/gtk-doc/html/gp11/GP11Slot.html
-share/gtk-doc/html/gp11/ch01.html
-share/gtk-doc/html/gp11/gp11-Errors.html
-share/gtk-doc/html/gp11/gp11-GP11Attribute.html
-share/gtk-doc/html/gp11/gp11-GP11Attributes.html
-share/gtk-doc/html/gp11/gp11-Miscellaneous-Functions.html
-share/gtk-doc/html/gp11/gp11.devhelp
-share/gtk-doc/html/gp11/gp11.devhelp2
-share/gtk-doc/html/gp11/home.png
-share/gtk-doc/html/gp11/index.html
-share/gtk-doc/html/gp11/index.sgml
-share/gtk-doc/html/gp11/left.png
-share/gtk-doc/html/gp11/right.png
-share/gtk-doc/html/gp11/style.css
-share/gtk-doc/html/gp11/up.png
+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
@@ -104,6 +40,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
@@ -111,6 +48,7 @@ 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/gd/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
@@ -122,6 +60,8 @@ 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/kk/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
@@ -155,11 +95,14 @@ 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/tg/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
diff --git a/gnome-keyring/distinfo b/gnome-keyring/distinfo
index 18de7dc..7bfacf9 100644
--- a/gnome-keyring/distinfo
+++ b/gnome-keyring/distinfo
@@ -1,11 +1,7 @@
 $NetBSD: distinfo,v 1.44 2015/11/04 01:17:44 agc Exp $
 
-SHA1 (gnome-keyring-2.32.1.tar.bz2) = 3d0ecc3e29f426ecfcaa488ea17d3e330fe34eb6
-RMD160 (gnome-keyring-2.32.1.tar.bz2) = cb72f171f5918ff26f40feb7bba90dc7e2e120ec
-SHA512 (gnome-keyring-2.32.1.tar.bz2) = 23b91bc11be2805df228de98513a5f96386a89d6ead6434b7fdf4a3bee86b6601bb994b9de4524f8751c7d7f1ac9462c592bcd9b77c32234fc709148450e382b
-Size (gnome-keyring-2.32.1.tar.bz2) = 1619245 bytes
-SHA1 (patch-ad) = d49bc78227646b3de3c357cd0f1e90cd38862ee4
-SHA1 (patch-ae) = a4e6fabd0534a56b974ec799539ce93df6580ff1
-SHA1 (patch-af) = 38738bc4441a6db38c27198ee22c8d3a77559844
-SHA1 (patch-ag) = 56c977df4f0f43da04b5e39212551b00642ef674
-SHA1 (patch-configure) = de2997d31a79ac573e4c5e339b9817f6cb84e2f0
+SHA1 (gnome-keyring-3.18.3.tar.xz) = 74b49e36113afe0cb6e6752dcbc47c0cf89ae4a5
+RMD160 (gnome-keyring-3.18.3.tar.xz) = a836c50350789a385978be2a2ec8e13397f606d2
+SHA512 (gnome-keyring-3.18.3.tar.xz) = 123819218477cd9b617d9cc2c1d10483d9c790bb90edd5b20298a1ba38aeef10dcddf85fcb6b9b92969dd64e53caaaf825b5cbb741e57461050be4973e8c2f78
+Size (gnome-keyring-3.18.3.tar.xz) = 1205108 bytes
+SHA1 (patch-egg_egg-unix-credentials.c) = 6bea6c2430ce72eb381a5b4d3c710535b835b389
diff --git a/gnome-keyring/patches/patch-ad b/gnome-keyring/patches/patch-ad
deleted file mode 100644
index 6f05e0b..0000000
--- a/gnome-keyring/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2010/06/11 13:45:50 drochner Exp $
-
---- egg/egg-unix-credentials.c.orig	2009-12-15 04:00:09.000000000 +0000
-+++ egg/egg-unix-credentials.c
-@@ -127,7 +127,6 @@ egg_unix_credentials_read (int sock, pid
- 		cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr);
- 		*pid = 0;
- 		*uid = cred->sc_euid;
--		set_local_creds(sock, 0);
- #elif defined(HAVE_GETPEEREID) /* OpenBSD */
- 		uid_t euid;
- 		gid_t egid;
-@@ -215,7 +214,7 @@ egg_unix_credentials_setup (int sock)
- #if defined(LOCAL_CREDS) && !defined(HAVE_CMSGCRED)
- 	int val = 1;
- 	if (setsockopt (sock, 0, LOCAL_CREDS, &val, sizeof (val)) < 0) {
--		fprintf (stderr, "unable to set LOCAL_CREDS socket option on fd %d\n", fd);
-+		fprintf (stderr, "unable to set LOCAL_CREDS socket option on fd %d\n", sock);
- 		retval = -1;
- 	}
- #endif
diff --git a/gnome-keyring/patches/patch-ae b/gnome-keyring/patches/patch-ae
deleted file mode 100644
index 15963d3..0000000
--- a/gnome-keyring/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2011/04/13 16:39:14 drochner Exp $
-
---- daemon/Makefile.in.orig	2010-10-25 22:47:41.000000000 +0000
-+++ daemon/Makefile.in
-@@ -428,7 +428,7 @@ desktop_in_files = \
- 	gnome-keyring-ssh.desktop.in \
- 	gnome-keyring-gpg.desktop.in
- 
--desktopdir = $(sysconfdir)/xdg/autostart
-+desktopdir = $(PREFIX)/share/gnome/autostart
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- EXTRA_DIST = \
- 	$(service_in_files) \
diff --git a/gnome-keyring/patches/patch-af b/gnome-keyring/patches/patch-af
deleted file mode 100644
index ec2b29c..0000000
--- a/gnome-keyring/patches/patch-af
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-af,v 1.4 2013/07/06 22:20:33 wiz Exp $
-
-First and second chunk: libtasn-3.1 compat.
-
-Third chunk:
-date: 2009-03-17 14:52:08 +0100;  author: tnn;  state: Exp;
-Fix build failure due to 64-bit time_t.
-
---- egg/egg-asn1x.h.orig	2010-10-19 02:11:38.000000000 +0000
-+++ egg/egg-asn1x.h
-@@ -25,6 +25,7 @@
- #define EGG_ASN1X_H_
- 
- #include <glib.h>
-+#include <libtasn1.h>
- 
- #ifndef HAVE_EGG_ALLOCATOR
- typedef void* (*EggAllocator) (void* p, gsize);
-@@ -33,15 +34,13 @@ typedef void* (*EggAllocator) (void* p, 
- 
- typedef gboolean (*EggAsn1xEncoder) (gpointer data, guchar *buf, gsize n_buf);
- 
--struct static_struct_asn;
--
--GNode*              egg_asn1x_create                 (const struct static_struct_asn *defs,
-+GNode*              egg_asn1x_create                 (const ASN1_ARRAY_TYPE *defs,
-                                                       const gchar *type);
- 
--GNode*              egg_asn1x_create_quark           (const struct static_struct_asn *defs,
-+GNode*              egg_asn1x_create_quark           (const ASN1_ARRAY_TYPE *defs,
-                                                       GQuark type);
- 
--GNode*              egg_asn1x_create_and_decode      (const struct static_struct_asn *defs,
-+GNode*              egg_asn1x_create_and_decode      (const ASN1_ARRAY_TYPE *defs,
-                                                       const gchar *type,
-                                                       gconstpointer data,
-                                                       gsize n_data);
-@@ -167,10 +166,10 @@ gboolean            egg_asn1x_set_oid_as
- 
- void                egg_asn1x_destroy                (gpointer asn);
- 
--glong               egg_asn1x_parse_time_general     (const gchar *time,
-+time_t               egg_asn1x_parse_time_general     (const gchar *time,
-                                                       gssize n_time);
- 
--glong               egg_asn1x_parse_time_utc         (const gchar *time,
-+time_t               egg_asn1x_parse_time_utc         (const gchar *time,
-                                                       gssize n_time);
- 
- gssize              egg_asn1x_element_length         (gconstpointer data,
diff --git a/gnome-keyring/patches/patch-ag b/gnome-keyring/patches/patch-ag
deleted file mode 100644
index 9312062..0000000
--- a/gnome-keyring/patches/patch-ag
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2013/07/06 22:20:33 wiz Exp $
-
-First chunk: libtasn1-3.1 compat.
-Chunk 2: Fix building on systems where ulong is not defined.
-Chunk 3+4: Fix build failure due to 64-bit time_t.
-
---- egg/egg-asn1x.c.orig	2010-10-19 02:11:38.000000000 +0000
-+++ egg/egg-asn1x.c
-@@ -49,8 +49,6 @@
- 
- #include "egg-asn1x.h"
- 
--#include <libtasn1.h>
--
- #include <stdlib.h>
- #include <string.h>
- 
-@@ -1988,8 +1986,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;
- 	}
- 
-@@ -3746,11 +3744,11 @@ egg_asn1x_destroy (gpointer data)
-  * TIME PARSING
-  */
- 
--glong
-+time_t
- egg_asn1x_parse_time_general (const gchar *time, gssize n_time)
- {
- 	gboolean ret;
--	glong value;
-+	time_t value;
- 	struct tm when;
- 	gint offset = 0;
- 
-@@ -3777,11 +3775,11 @@ egg_asn1x_parse_time_general (const gcha
- 	return value;
- }
- 
--glong
-+time_t
- egg_asn1x_parse_time_utc (const gchar *time, gssize n_time)
- {
- 	gboolean ret;
--	glong value;
-+	time_t value;
- 	struct tm when;
- 	gint offset = 0;
- 
diff --git a/gnome-keyring/patches/patch-configure b/gnome-keyring/patches/patch-configure
deleted file mode 100644
index d73158d..0000000
--- a/gnome-keyring/patches/patch-configure
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2011/12/28 21:23:17 joerg Exp $
-
---- configure.orig	2010-10-25 22:47:44.000000000 +0000
-+++ configure
-@@ -14453,10 +14453,6 @@ install-data-am: install-gsettings-schem
- 
- .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"
--
- install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
-@@ -14464,7 +14460,7 @@ install-gsettings-schemas: $(gsettings_S
- 	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  echo "$$d$$p"; \
--	done | $(gsettings__base_list) | \
-+	done | \
- 	while read files; do \
- 	  echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
- 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
diff --git a/gnome-keyring/patches/patch-egg_egg-unix-credentials.c b/gnome-keyring/patches/patch-egg_egg-unix-credentials.c
new file mode 100644
index 0000000..3877ab0
--- /dev/null
+++ b/gnome-keyring/patches/patch-egg_egg-unix-credentials.c
@@ -0,0 +1,90 @@
+$NetBSD$
+
+--- egg/egg-unix-credentials.c.orig	2014-09-23 07:45:13.000000000 +0000
++++ egg/egg-unix-credentials.c
+@@ -56,14 +56,8 @@ egg_unix_credentials_read (int sock, pid
+ 	char buf;
+ 	int ret;
+ 	
+-#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
+-	/* Prefer CMSGCRED over LOCAL_CREDS because the former provides the
+-	 * remote PID. */
+ #if defined(HAVE_CMSGCRED)
+ 	struct cmsgcred *cred;
+-#else /* defined(LOCAL_CREDS) */
+-	struct sockcred *cred;
+-#endif
+ 	union {
+ 		struct cmsghdr hdr;
+ 		char cred[CMSG_SPACE (sizeof *cred)];
+@@ -84,7 +78,7 @@ egg_unix_credentials_read (int sock, pid
+ 	msg.msg_iov = &iov;
+ 	msg.msg_iovlen = 1;
+ 	
+-#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
++#if defined(HAVE_CMSGCRED)
+ 	memset (&cmsg, 0, sizeof (cmsg));
+ 	msg.msg_control = (caddr_t) &cmsg;
+ 	msg.msg_controllen = CMSG_SPACE(sizeof *cred);
+@@ -108,7 +102,7 @@ egg_unix_credentials_read (int sock, pid
+ 		return -1;
+ 	}
+ 
+-#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
++#if defined(HAVE_CMSGCRED)
+ 	if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof *cred) ||
+ 	    cmsg.hdr.cmsg_type != SCM_CREDS) {
+ 		fprintf (stderr, "message from recvmsg() was not SCM_CREDS\n");
+@@ -138,11 +132,6 @@ egg_unix_credentials_read (int sock, pid
+ 		cred = (struct cmsgcred *) CMSG_DATA (&cmsg.hdr);
+ 		*pid = cred->cmcred_pid;
+ 		*uid = cred->cmcred_euid;
+-#elif defined(LOCAL_CREDS)
+-		cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr);
+-		*pid = 0;
+-		*uid = cred->sc_euid;
+-		set_local_creds(sock, 0);
+ #elif defined(HAVE_GETPEEREID) /* OpenBSD */
+ 		uid_t euid;
+ 		gid_t egid;
+@@ -179,7 +168,7 @@ egg_unix_credentials_write (int socket)
+ {
+ 	char buf;
+ 	int bytes_written;
+-#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
++#if defined(HAVE_CMSGCRED) && defined(__FreeBSD__)
+ 	union {
+ 		struct cmsghdr hdr;
+ 		char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
+@@ -190,7 +179,7 @@ egg_unix_credentials_write (int socket)
+ 
+ 	buf = 0;
+ 
+-#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
++#if defined(HAVE_CMSGCRED) && defined(__FreeBSD__)
+ 	iov.iov_base = &buf;
+ 	iov.iov_len = 1;
+ 
+@@ -208,7 +197,7 @@ egg_unix_credentials_write (int socket)
+ 
+ again:
+ 
+-#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
++#if defined(HAVE_CMSGCRED) && defined(__FreeBSD__)
+ 	bytes_written = sendmsg (socket, &msg, 0);
+ #else
+ 	bytes_written = write (socket, &buf, 1);
+@@ -227,13 +216,6 @@ int
+ egg_unix_credentials_setup (int sock)
+ {
+ 	int retval = 0;
+-#if defined(LOCAL_CREDS) && !defined(HAVE_CMSGCRED)
+-	int val = 1;
+-	if (setsockopt (sock, 0, LOCAL_CREDS, &val, sizeof (val)) < 0) {
+-		fprintf (stderr, "unable to set LOCAL_CREDS socket option on fd %d\n", fd);
+-		retval = -1;
+-	}
+-#endif
+ 	return retval;
+ }
+