From c47f98db286704d3acc8c8ad8a4c8bc1351abe1b Mon Sep 17 00:00:00 2001
From: Daiki Ueno <dueno@redhat.com>
Date: Feb 28 2018 09:22:39 +0000
Subject: Update to 0.23.10-1


- Update to upstream 0.23.10 release

---

diff --git a/.gitignore b/.gitignore
index f2d8374..775a045 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@
 /p11-kit-client.service
 /trust-extract-compat
 /p11-kit-0.23.9.tar.gz
+/p11-kit-client.service
+/trust-extract-compat
+/p11-kit-0.23.10.tar.gz
diff --git a/p11-kit-server-eval-env.patch b/p11-kit-server-eval-env.patch
deleted file mode 100644
index cd2a812..0000000
--- a/p11-kit-server-eval-env.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 031912fa844c4f3da327c8b2578d9d9ce2a6473e Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <dueno@redhat.com>
-Date: Thu, 5 Oct 2017 10:59:02 +0200
-Subject: [PATCH] server: Make it possible to eval envvar settings
-
-Previously, calling "eval $(p11-kit server)" from shell hung because
-the program didn't properly close stdout before forking.
----
- p11-kit/server.c | 20 +++++++++++---------
- 1 file changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/p11-kit/server.c b/p11-kit/server.c
-index 97e18e2..96c77ec 100644
---- a/p11-kit/server.c
-+++ b/p11-kit/server.c
-@@ -346,6 +346,17 @@ server_loop (Server *server,
- 	if (server->socket == -1)
- 		return 1;
- 
-+	if (!quiet) {
-+		char *path;
-+
-+		path = p11_path_encode (server->socket_name);
-+		printf ("P11_KIT_SERVER_ADDRESS=unix:path=%s\n", path);
-+		free (path);
-+		printf ("P11_KIT_SERVER_PID=%d\n", getpid ());
-+		fflush (stdout);
-+		close (STDOUT_FILENO);
-+	}
-+
- 	/* run as daemon */
- 	if (!foreground) {
- 		pid = fork ();
-@@ -372,15 +383,6 @@ server_loop (Server *server,
- 
- 	sigprocmask (SIG_BLOCK, &blockset, NULL);
- 
--	if (!quiet) {
--		char *path;
--
--		path = p11_path_encode (server->socket_name);
--		printf ("P11_KIT_SERVER_ADDRESS=unix:path=%s\n", path);
--		free (path);
--		printf ("P11_KIT_SERVER_PID=%d\n", getpid ());
--	}
--
- 	/* accept connections */
- 	ret = 0;
- 	for (;;) {
--- 
-2.13.6
-
diff --git a/p11-kit.spec b/p11-kit.spec
index 6f2cb4c..3e7931d 100644
--- a/p11-kit.spec
+++ b/p11-kit.spec
@@ -1,7 +1,6 @@
 # This spec file has been automatically updated
-Version:	0.23.9
-Release: 3%{?dist}
-Patch1:	p11-kit-server-eval-env.patch
+Version:	0.23.10
+Release: 1%{?dist}
 Name:           p11-kit
 Summary:        Library for loading and sharing PKCS#11 modules
 
@@ -143,6 +142,9 @@ fi
 
 
 %changelog
+* Wed Feb 28 2018 Daiki Ueno <dueno@redhat.com> - 0.23.10-1
+- Update to upstream 0.23.10 release
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.23.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index e959f3c..3fa1635 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (p11-kit-client.service) = 0f08618851c6eafb35c630957044fc96324be4d3828cdd2aa9b5d6e1245549197ca5b969d6a2f735c893d73c02e885cdc3205bd43e37f6124ebc6cfa61970d3b
 SHA512 (trust-extract-compat) = 91210705f9bcf1a13c0de1ca9943e3ac68296bfcb7953fc59241de060247b470b39be6e914dd4d92e38a78d5df0962c83315ad78f8c0eade8e62d884b05fdd42
-SHA512 (p11-kit-0.23.9.tar.gz) = 6a8a569483763d3ffacadf669b8ba9b9be38a77dd8dc366ca0cb91c44753517fa1879d4422e4e8dfbcac594565727839a619566a170c0f94f8e112f18b0086ed
+SHA512 (p11-kit-0.23.10.tar.gz) = 42a004613f951e4e18c10cd204bcba348267cc7b3ae0d9f26d69012b086af446947660575d5751539b8d4dd77fa9b684054ad5ac978119e0a2e94fcdf9842178