OCaml 4.12.0 build

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,8 +1 @@
-ocamlnet-2.2.9.tar.gz
-/ocamlnet-3.4.tar.gz
-/ocamlnet-3.4.1.tar.gz
-/ocamlnet-3.5.1.tar.gz
-/ocamlnet-3.7.3.tar.gz
-/ocamlnet-3.7.4.tar.gz
-/ocamlnet-4.0.1.tar.gz
-/ocamlnet-4.0.3.tar.gz
+/ocamlnet-*.tar.gz

0001-Build-ocamlrpcgen-as-native-code.patch

@@ -0,0 +1,45 @@
+From 828a873df2b838e46faa5700dbae18601cb8dcb9 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 14 Jan 2021 12:20:03 +0000
+Subject: [PATCH] Build ocamlrpcgen as native code.
+
+---
+ code/src/rpc-generator/Makefile | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/code/src/rpc-generator/Makefile b/code/src/rpc-generator/Makefile
+index e0ed4f5..a475e83 100644
+--- a/code/src/rpc-generator/Makefile
++++ b/code/src/rpc-generator/Makefile
+@@ -6,9 +6,11 @@ PKGNAME  = rpc-generator
+ ARCHIVE  = rpc_generator
+ OBJECTS  = config.cmo syntax.cmo options.cmo parser.cmo lexer.cmo rename.cmo \
+            generate.cmo direct.cmo
++XOBJECTS = config.cmx syntax.cmx options.cmx parser.cmx lexer.cmx rename.cmx \
++           generate.cmx direct.cmx
+ DOBJECTS = 
+ 
+-ALL_EXTRA = ocamlrpcgen$(EXEC_SUFFIX) rpcgen-packlist
++OPT_EXTRA = ocamlrpcgen$(EXEC_SUFFIX) rpcgen-packlist
+ 
+ PACKLIST = rpcgen-packlist
+ 
+@@ -21,12 +23,12 @@ PP_OPTIONS = -pp "$(CPPO) $(PP_BYTES) $(PP_DEPRECATED)"
+ 
+ include $(TOP_DIR)/Makefile.rules
+ 
+-ocamlrpcgen$(EXEC_SUFFIX): $(ARCHIVE).cma main.cmo
++ocamlrpcgen$(EXEC_SUFFIX): $(ARCHIVE).cmxa main.cmx
+ 	rm -f ocamlrpcgen ocamlrpcgen$(EXEC_SUFFIX)
+ 	OCAMLPATH="..$(PATH_SEP)$$OCAMLPATH" \
+-	$(OCAMLC) -custom -o ocamlrpcgen \
++	$(OCAMLOPT) -o ocamlrpcgen \
+ 		-package unix,netstring,$(REGEXP_PROVIDER) \
+-		$(ARCHIVE).cma main.cmo -linkpkg
++		$(ARCHIVE).cmxa main.cmx -linkpkg
+ 
+ rpcgen-packlist:
+ 	echo $(BINDIR)/ocamlrpcgen >rpcgen-packlist
+-- 
+2.28.0.rc2
+

ocaml-ocamlnet.spec

@@ -1,16 +1,5 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-
-# Prevent RPM from stripping the binaries & debuginfo.
-#
-# NB: Only required because this package uses the obsolete -custom
-# parameter and builds a bytecode 'ocamlrpcgen'.  I tried to fix the
-# build to make a native code 'ocamlrpcgen' but the build system got
-# the better of me.
-%global debug_package %{nil}
-%global __strip /bin/true
-
 Name:           ocaml-ocamlnet
-Version:        4.0.3
+Version:        4.1.8
 Release:        4%{?dist}
 Summary:        Network protocols for OCaml
 License:        BSD
@@ -18,15 +7,12 @@ License:        BSD
 URL:            http://projects.camlcity.org/projects/ocamlnet.html
 Source0:        http://download.camlcity.org/download/ocamlnet-%{version}.tar.gz
 
-# This is a hack to make it compile with gnutls 3.4.2.  Not a good fix.
-# 2015-06-17: Asked upstream if they have any better ideas.
-Patch1:         ocamlnet-4.0.3-gnutls.patch
-
-ExcludeArch:    sparc64 s390 s390x
+# Build ocamlrpcgen as native code.  Sent upstream 2021-01-14.
+Patch1:         0001-Build-ocamlrpcgen-as-native-code.patch
 
+BuildRequires:  make
 BuildRequires:  ocaml >= 3.12.1-3
 BuildRequires:  ocaml-ocamldoc
-BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-lablgtk-devel
 BuildRequires:  ocaml-labltk-devel
@@ -116,6 +102,7 @@ files for developing applications that use %{name}-nethttpd.
 
 %prep
 %setup -q -n ocamlnet-%{version}
+%patch1 -p2
 
 
 %build
@@ -134,12 +121,16 @@ unset MAKEFLAGS
   -enable-tcl \
   -enable-zip
 
-# Ugly hack to apply the patch to a generated file :-(
-make all ||:
-patch -p1 < %{patches}
+# This is a hack caused by the ocamlrpcgen patch.  Because "make all"
+# no longer builds ocamlrpcgen (it is now built by "make opt") but
+# some other parts of the build depend on this program, we have to run
+# make opt first and ignore the result.  Hopefully we'll get a better
+# result when upstream integrate the patch.  RWMJ 2021-01.
+make opt ||:
+
 make all
 
-%if %opt
+%ifarch %{ocaml_native_compiler}
 make opt
 %endif
 
@@ -183,7 +174,7 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
 %{_libdir}/ocaml/rpc-auth-local
 %{_libdir}/ocaml/rpc-generator
 %{_libdir}/ocaml/shell
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %exclude %{_libdir}/ocaml/*/*.a
 %exclude %{_libdir}/ocaml/*/*.cmxa
 %exclude %{_libdir}/ocaml/*/*.cmx
@@ -200,7 +191,7 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
 
 %files devel
 %doc ChangeLog RELNOTES
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.a
 %{_libdir}/ocaml/*/*.cmxa
 %{_libdir}/ocaml/*/*.cmx
@@ -212,7 +203,7 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
 %files nethttpd
 %doc ChangeLog RELNOTES
 %{_libdir}/ocaml/nethttpd
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %exclude %{_libdir}/ocaml/*/*.a
 %exclude %{_libdir}/ocaml/*/*.cmxa
 %endif
@@ -221,7 +212,7 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
 
 %files nethttpd-devel
 %doc ChangeLog RELNOTES
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.a
 %{_libdir}/ocaml/*/*.cmxa
 %endif
@@ -229,6 +220,132 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
 
 
 %changelog
+* Mon Mar  1 11:02:44 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 4.1.8-4
+- OCaml 4.12.0 build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Jan 14 2021 Richard W.M. Jones <rjones@redhat.com> - 4.1.8-2
+- Build ocamlrpcgen as native code.
+- Enable stripping.
+- Enable LTO (RHBZ#1915570).
+
+* Wed Jan 13 2021 Richard W.M. Jones <rjones@redhat.com> - 4.1.8-1
+- New upstream version 4.1.8.
+- Disable LTO (RHBZ#1915570).
+
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-18
+- OCaml 4.11.1 rebuild
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-17
+- OCaml 4.11.0 rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.6-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-15
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
+
+* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-14
+- OCaml 4.11.0 pre-release attempt 2
+
+* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-13
+- OCaml 4.11.0 pre-release
+
+* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-12
+- Update all OCaml dependencies for RPM 4.16.
+
+* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-11
+- OCaml 4.10.0 final.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.6-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-9
+- OCaml 4.10.0+beta1 rebuild.
+
+* Fri Nov 08 2019 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-8
+- Bump and rebuild (RHBZ#1770380).
+
+* Sat Jul 27 2019 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-7
+- Remove camlp4 dependency.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-3
+- OCaml 4.07.0 (final) rebuild.
+
+* Tue Jun 19 2018 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-2
+- OCaml 4.07.0-rc1 rebuild.
+
+* Tue May 15 2018 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-1
+- New upstream version 4.1.6.
+- Remove upstream patch.
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Dec 12 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.5-1
+- New upstream version 4.1.5.
+
+* Wed Nov 08 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.4-1
+- New upstream version 4.1.4.
+
+* Tue Nov 07 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.3-2
+- OCaml 4.06.0 rebuild.
+
+* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.3-1
+- New upstream version 4.1.3.
+- OCaml 4.05.0 rebuild.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.2-7
+- Bump release and rebuild.
+
+* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.2-6
+- OCaml 4.04.2 rebuild.
+
+* Fri May 12 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.2-5
+- Bump release and rebuild.
+
+* Thu May 11 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.2-4
+- Bump release and rebuild.
+
+* Thu May 11 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.2-3
+- OCaml 4.04.1 rebuild.
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Nov 05 2016 Richard W.M. Jones <rjones@redhat.com> - 4.1.2-1
+- New upstream version 4.1.2.
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 4.0.4-3
+- OCaml 4.02.3 rebuild.
+
+* Mon Jul 27 2015 Richard W.M. Jones <rjones@redhat.com> - 4.0.4-2
+- Remove ExcludeArch since bytecode build should now work.
+
+* Wed Jul 22 2015 Richard W.M. Jones <rjones@redhat.com> - 4.0.4-1
+- New upstream version 4.0.4.
+- Remove ugly hack for gnutls, since it is fixed properly upstream.
+
 * Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 4.0.3-4
 - ocaml-4.02.2 final rebuild.
 

ocamlnet-4.0.3-gnutls.patch

@@ -1,14 +0,0 @@
---- ocamlnet-4.0.3.old/src/nettls-gnutls/nettls_gnutls_bindings_stubs.c	2015-06-17 14:44:42.016525239 +0100
-+++ ocamlnet-4.0.3/src/nettls-gnutls/nettls_gnutls_bindings_stubs.c	2015-06-17 14:55:34.252866764 +0100
-@@ -2847,9 +2847,11 @@
- #ifdef HAVE_ENUM_GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA
-     case GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA: return Val_long(93721039);
- #endif
-+#if 0
- #ifdef HAVE_ENUM_GNUTLS_SUPPLEMENTAL_UNKNOWN
-     case GNUTLS_SUPPLEMENTAL_UNKNOWN: return Val_long(785140586);
- #endif
-+#endif
-     default: break;
-   };
-   failwith("wrap_gnutls_supplemental_data_format_type_t: unexpected value");

sources

@@ -1 +1 @@
-464895e60c3f68ac0ba77019822cd300  ocamlnet-4.0.3.tar.gz
+SHA512 (ocamlnet-4.1.8.tar.gz) = e238235968b9546c60568a38e68e354378d30e7137973332dcb10da21fa775ab7b367889fc51f5bd7cb00e51582834cafe2a0c4706b0bc77a44d4571a6f22815