[ocaml-cryptokit] Fix missing OCaml uint32 special types, use standard types instead.
Richard W.M. Jones
rjones at fedoraproject.org
Mon Nov 3 13:19:19 UTC 2014
commit 836ec42374d453c532f8f7b570d848fc5555c0dd
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Mon Nov 3 13:19:06 2014 +0000
Fix missing OCaml uint32 special types, use standard types instead.
cryptokit-1.9-uint32.patch | 14 ++++++++++++++
ocaml-cryptokit.spec | 12 +++++++++---
2 files changed, 23 insertions(+), 3 deletions(-)
---
diff --git a/cryptokit-1.9-uint32.patch b/cryptokit-1.9-uint32.patch
new file mode 100644
index 0000000..b0f60e5
--- /dev/null
+++ b/cryptokit-1.9-uint32.patch
@@ -0,0 +1,14 @@
+diff -ur cryptokit-1.9.old/src/stubs-md5.c cryptokit-1.9/src/stubs-md5.c
+--- cryptokit-1.9.old/src/stubs-md5.c 2010-08-30 11:53:00.000000000 +0100
++++ cryptokit-1.9/src/stubs-md5.c 2014-11-03 13:16:54.548572332 +0000
+@@ -18,8 +18,8 @@
+ #include <caml/alloc.h>
+
+ struct MD5Context {
+- uint32 buf[4];
+- uint32 bits[2];
++ uint32_t buf[4];
++ uint32_t bits[2];
+ unsigned char in[64];
+ };
+
diff --git a/ocaml-cryptokit.spec b/ocaml-cryptokit.spec
index 525c4b1..0b81e6f 100644
--- a/ocaml-cryptokit.spec
+++ b/ocaml-cryptokit.spec
@@ -2,13 +2,16 @@
Name: ocaml-cryptokit
Version: 1.9
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: OCaml library of cryptographic and hash functions
License: LGPLv2 with exceptions
URL: http://forge.ocamlcore.org/projects/cryptokit/
Source0: https://forge.ocamlcore.org/frs/download.php/1229/cryptokit-%{version}.tar.gz
+# OCaml headers dropped uint32/etc. Use standard uint32_t instead.
+Patch1: cryptokit-1.9-uint32.patch
+
ExcludeArch: sparc64 s390 s390x
BuildRequires: ocaml
@@ -53,6 +56,9 @@ developing applications that use %{name}.
%prep
%setup -q -n cryptokit-%{version}
+
+%patch1 -p1
+
./configure --destdir $RPM_BUILD_ROOT
@@ -101,8 +107,8 @@ make install
%changelog
-* Mon Nov 03 2014 Richard W.M. Jones <rjones at redhat.com> - 1.9-9
-- Bump and rebuild.
+* Mon Nov 03 2014 Richard W.M. Jones <rjones at redhat.com> - 1.9-10
+- Fix missing OCaml uint32 special types, use standard types instead.
* Sun Aug 31 2014 Richard W.M. Jones <rjones at redhat.com> - 1.9-8
- Bump release and rebuild.
More information about the scm-commits
mailing list