mooninite pushed to mingw-p11-kit (epel7). "Update to 0.20.4"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 16 14:08:13 UTC 2015


>From 376e523a23b9727cd64633bb65729a1f25e1b1ab Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike at cchtml.com>
Date: Sun, 17 Aug 2014 16:20:15 -0500
Subject: Update to 0.20.4


diff --git a/.gitignore b/.gitignore
index 1ee2e46..3f46013 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /p11-kit-0.19.3.tar.gz
 /p11-kit-0.20.1.tar.gz
 /p11-kit-0.20.2.tar.gz
+/p11-kit-0.20.4.tar.gz
diff --git a/mingw-p11-kit.spec b/mingw-p11-kit.spec
index 3b08a62..9900c93 100644
--- a/mingw-p11-kit.spec
+++ b/mingw-p11-kit.spec
@@ -1,8 +1,8 @@
 %?mingw_package_header
 
 Name:           mingw-p11-kit
-Version:        0.20.2
-Release:        2%{?dist}
+Version:        0.20.4
+Release:        1%{?dist}
 Summary:        MinGW Library for loading and sharing PKCS#11 modules
 
 License:        BSD
@@ -10,6 +10,7 @@ Group:          Development/Libraries
 URL:            http://p11-glue.freedesktop.org/p11-kit.html
 Source0:        http://p11-glue.freedesktop.org/releases/p11-kit-%{version}.tar.gz
 Patch100:       p11-kit-mingw-trust-test.patch
+Patch101:       p11-kit-0.20.4-tests.patch
 
 BuildArch:      noarch
 
@@ -73,6 +74,7 @@ way that they're discoverable.  This library is cross-compiled for MinGW.
 %prep
 %setup -q -n p11-kit-%{version}
 %patch100 -p1 -b .trust-test
+%patch101 -p0 -b .p11-kit-tests
 
 
 %build
@@ -121,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 
 
 %changelog
+* Sun Aug 17 2014 Michael Cronenworth <mike at cchtml.com> - 0.20.4-1
+- New upstream release.
+
 * Sun Mar 30 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.20.2-2
 - Rebuild against latest mingw-crt to fix Windows XP compatibility issue
 
diff --git a/p11-kit-0.20.4-tests.patch b/p11-kit-0.20.4-tests.patch
new file mode 100644
index 0000000..35907d5
--- /dev/null
+++ b/p11-kit-0.20.4-tests.patch
@@ -0,0 +1,38 @@
+--- p11-kit/tests/test-managed.c.orig	2014-08-07 01:36:24.000000000 -0500
++++ p11-kit/tests/test-managed.c	2014-08-17 16:02:07.973078907 -0500
+@@ -43,7 +43,9 @@
+ #include "virtual.h"
+ 
+ #include <sys/types.h>
++#ifndef WIN32
+ #include <sys/wait.h>
++#endif
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+@@ -196,6 +198,7 @@
+ 	teardown_mock_module (second);
+ }
+ 
++#ifndef WIN32
+ static void
+ test_fork_and_reinitialize (void)
+ {
+@@ -238,6 +241,7 @@
+ 
+ 	teardown_mock_module (module);
+ }
++#endif
+ 
+ /* Bring in all the mock module tests */
+ #include "test-mock.c"
+@@ -252,7 +256,9 @@
+ 	p11_test (test_initialize_finalize, "/managed/test_initialize_finalize");
+ 	p11_test (test_initialize_fail, "/managed/test_initialize_fail");
+ 	p11_test (test_separate_close_all_sessions, "/managed/test_separate_close_all_sessions");
++#ifndef WIN32
+ 	p11_test (test_fork_and_reinitialize, "/managed/fork-and-reinitialize");
++#endif
+ 
+ 	test_mock_add_tests ("/managed");
+ 
\ No newline at end of file
diff --git a/sources b/sources
index d53d801..cb9bca0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-757b97ee4ac0ce598661a90cd784c4f1  p11-kit-0.20.2.tar.gz
+9e94ce0f32265de8cf4a998889414b93  p11-kit-0.20.4.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mingw-p11-kit.git/commit/?h=epel7&id=376e523a23b9727cd64633bb65729a1f25e1b1ab


More information about the scm-commits mailing list