gnome-keyring: complete LOCAL_CRED removal, add LICENSE

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

Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Mon Feb 8 17:20:03 2016 +0200
Changeset:	43c61cdd9fe12edd817f3254d771d7b96e31dec7

Modified Files:
	gnome-keyring/Makefile
	gnome-keyring/distinfo
	gnome-keyring/patches/patch-egg_egg-unix-credentials.c
Added Files:
	gnome-keyring/patches/patch-daemon_control_gkd-control-server.c
	gnome-keyring/patches/patch-egg_egg-unix-credentials.h

Log Message:
gnome-keyring: complete LOCAL_CRED removal, add LICENSE

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

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

diffstat:
 gnome-keyring/Makefile                              |  2 +-
 gnome-keyring/distinfo                              |  4 +++-
 .../patch-daemon_control_gkd-control-server.c       | 16 ++++++++++++++++
 .../patches/patch-egg_egg-unix-credentials.c        | 21 ++++++++++++++-------
 .../patches/patch-egg_egg-unix-credentials.h        | 13 +++++++++++++
 5 files changed, 47 insertions(+), 9 deletions(-)

diffs:
diff --git a/gnome-keyring/Makefile b/gnome-keyring/Makefile
index 8b1f523..5a12f1e 100644
--- a/gnome-keyring/Makefile
+++ b/gnome-keyring/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.83 2015/04/25 14:24:48 tnn Exp $
 
 DISTNAME=	gnome-keyring-3.18.3
-PKGREVISION=	19
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/3.18/}
 EXTRACT_SUFX=	.tar.xz
@@ -9,6 +8,7 @@ EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME password and secret manager
+LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 GNU_CONFIGURE=		YES
diff --git a/gnome-keyring/distinfo b/gnome-keyring/distinfo
index 7bfacf9..521ca75 100644
--- a/gnome-keyring/distinfo
+++ b/gnome-keyring/distinfo
@@ -4,4 +4,6 @@ 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
+SHA1 (patch-daemon_control_gkd-control-server.c) = 9400ecef7efd148ed6d9512572bd6ac196dcccca
+SHA1 (patch-egg_egg-unix-credentials.c) = 2ed51494ba97476d923ab84d03713cc1d9563bc6
+SHA1 (patch-egg_egg-unix-credentials.h) = a688de09828436cee573ac0b6a944eb8d75e4794
diff --git a/gnome-keyring/patches/patch-daemon_control_gkd-control-server.c b/gnome-keyring/patches/patch-daemon_control_gkd-control-server.c
new file mode 100644
index 0000000..a0bc115
--- /dev/null
+++ b/gnome-keyring/patches/patch-daemon_control_gkd-control-server.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- daemon/control/gkd-control-server.c.orig	2015-06-29 15:24:02.000000000 +0000
++++ daemon/control/gkd-control-server.c
+@@ -431,11 +431,6 @@ gkd_control_listen (void)
+ 		return FALSE;
+ 	}
+ 
+-	if (egg_unix_credentials_setup (sock) < 0) {
+-		close (sock);
+-		return FALSE;
+-	}
+-
+ 	channel = g_io_channel_unix_new (sock);
+ 	g_io_add_watch (channel, G_IO_IN | G_IO_HUP, control_accept, NULL);
+ 	g_io_channel_set_close_on_unref (channel, TRUE);
diff --git a/gnome-keyring/patches/patch-egg_egg-unix-credentials.c b/gnome-keyring/patches/patch-egg_egg-unix-credentials.c
index 3877ab0..d45c848 100644
--- a/gnome-keyring/patches/patch-egg_egg-unix-credentials.c
+++ b/gnome-keyring/patches/patch-egg_egg-unix-credentials.c
@@ -74,10 +74,14 @@ $NetBSD$
  	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;
+@@ -223,20 +212,6 @@ again:
+ 	return 0;
+ }
+ 
+-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) {
@@ -85,6 +89,9 @@ $NetBSD$
 -		retval = -1;
 -	}
 -#endif
- 	return retval;
- }
- 
+-	return retval;
+-}
+-
+ char*
+ egg_unix_credentials_executable (pid_t pid)
+ {
diff --git a/gnome-keyring/patches/patch-egg_egg-unix-credentials.h b/gnome-keyring/patches/patch-egg_egg-unix-credentials.h
new file mode 100644
index 0000000..bbcb352
--- /dev/null
+++ b/gnome-keyring/patches/patch-egg_egg-unix-credentials.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- egg/egg-unix-credentials.h.orig	2014-09-23 07:45:13.000000000 +0000
++++ egg/egg-unix-credentials.h
+@@ -43,8 +43,6 @@ int        egg_unix_credentials_read    
+ 
+ int        egg_unix_credentials_write          (int sock);
+ 
+-int        egg_unix_credentials_setup          (int sock);
+-
+ char*      egg_unix_credentials_executable     (pid_t pid);
+ 
+ #endif /*EGGUNIXCREDENTIALS_H_*/