Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
ae9fa3339f | ||
|
6f2b69a4d9 | ||
|
5d9a4293b1 | ||
|
36bd00d4c7 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
/ocamlnet-*.tar.gz
|
||||
ocamlnet-2.2.9.tar.gz
|
||||
|
@ -1,45 +0,0 @@
|
||||
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
|
||||
|
@ -1,30 +1,38 @@
|
||||
Name: ocaml-ocamlnet
|
||||
Version: 4.1.8
|
||||
Release: 4%{?dist}
|
||||
Summary: Network protocols for OCaml
|
||||
License: BSD
|
||||
%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
||||
%define debug_package %{nil}
|
||||
|
||||
# Prevent RPM from stripping the binaries.
|
||||
%define __strip /bin/true
|
||||
|
||||
Name: ocaml-ocamlnet
|
||||
Version: 2.2.9
|
||||
Release: 15%{?dist}
|
||||
Summary: Network protocols for OCaml
|
||||
|
||||
Group: Development/Libraries
|
||||
License: BSD
|
||||
URL: http://projects.camlcity.org/projects/ocamlnet.html
|
||||
Source0: http://download.camlcity.org/download/ocamlnet-%{version}.tar.gz
|
||||
Patch0: ocamlnet-ocaml310.patch
|
||||
Patch1: ocamlnet-ucred.patch
|
||||
|
||||
# Build ocamlrpcgen as native code. Sent upstream 2021-01-14.
|
||||
Patch1: 0001-Build-ocamlrpcgen-as-native-code.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
ExcludeArch: sparc64 s390 s390x
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: ocaml >= 3.12.1-3
|
||||
BuildRequires: ocaml >= 3.10.2
|
||||
BuildRequires: ocaml-ocamldoc
|
||||
BuildRequires: ocaml-camlp4-devel
|
||||
BuildRequires: ocaml-findlib-devel
|
||||
BuildRequires: ocaml-lablgtk-devel
|
||||
BuildRequires: ocaml-labltk-devel
|
||||
BuildRequires: ocaml-pcre-devel
|
||||
BuildRequires: ocaml-zip-devel
|
||||
BuildRequires: gnutls-devel
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: ocaml-ssl-devel
|
||||
BuildRequires: ocaml-lablgtk-devel
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: tcl-devel
|
||||
|
||||
%global __ocaml_requires_opts -i Asttypes -i Outcometree -i Parsetree
|
||||
|
||||
%define _use_internal_dependency_generator 0
|
||||
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Outcometree -i Parsetree
|
||||
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
|
||||
|
||||
%description
|
||||
Ocamlnet is an ongoing effort to collect modules, classes and
|
||||
@ -40,7 +48,10 @@ In detail, the following features are available:
|
||||
parsing and printing, OO-representation of channels, and a lot
|
||||
more.
|
||||
|
||||
* netcgi2 focuses on portable web applications.
|
||||
* netcgi1 and netcgi2 focus on portable web applications. netcgi1 is
|
||||
the older, backward-compatible version, whereas netcgi2 bases on a
|
||||
revised design, and is only partly backward-compatible. Supported
|
||||
are CGI, FastCGI, AJP (mod_jk), and SCGI.
|
||||
|
||||
* rpc implements ONCRPC (alias SunRPC), the remote procedure call
|
||||
technology behind NFS and other Unix services.
|
||||
@ -60,15 +71,14 @@ In detail, the following features are available:
|
||||
|
||||
* netshm provides shared memory for IPC purposes.
|
||||
|
||||
* netsys contains bindings for system functions missing in core OCaml.
|
||||
* netsys contains bindings for system functions missing in core O'Caml.
|
||||
|
||||
* netsmtp and netpop are client implementations of the SMTP and POP3
|
||||
protocols.
|
||||
|
||||
* Bindings for GnuTLS and GSSAPI (TLS/HTTPS support).
|
||||
* smtp and pop are two further client implementations for the SMTP
|
||||
and POP3 protocols.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
|
||||
@ -80,6 +90,7 @@ developing applications that use %{name}.
|
||||
%package nethttpd
|
||||
Summary: Ocamlnet HTTP daemon
|
||||
License: GPLv2+
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
|
||||
@ -92,6 +103,7 @@ for serving web services.
|
||||
%package nethttpd-devel
|
||||
Summary: Development files for %{name}-nethttpd
|
||||
License: GPLv2+
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}-nethttpd = %{version}-%{release}
|
||||
|
||||
|
||||
@ -102,79 +114,85 @@ files for developing applications that use %{name}-nethttpd.
|
||||
|
||||
%prep
|
||||
%setup -q -n ocamlnet-%{version}
|
||||
%patch1 -p2
|
||||
|
||||
pushd src/equeue-gtk1
|
||||
%patch0 -p2
|
||||
popd
|
||||
%patch1 -p1
|
||||
|
||||
./configure -enable-tcl -with-nethttpd \
|
||||
-bindir %{_bindir} \
|
||||
-datadir %{_datadir}/%{name} \
|
||||
-prefer-netcgi2 \
|
||||
-with-nethttpd \
|
||||
-disable-apache \
|
||||
-enable-ssl \
|
||||
-enable-gtk2
|
||||
# In future:
|
||||
# -with-rpc-auth-dh (requires cryptgps)
|
||||
|
||||
|
||||
%build
|
||||
# Parallel builds don't work:
|
||||
unset MAKEFLAGS
|
||||
|
||||
./configure \
|
||||
-bindir %{_bindir} \
|
||||
-datadir %{_datadir}/%{name} \
|
||||
-disable-apache \
|
||||
-enable-pcre \
|
||||
-enable-gtk2 \
|
||||
-enable-gnutls \
|
||||
-enable-gssapi \
|
||||
-enable-nethttpd \
|
||||
-enable-tcl \
|
||||
-enable-zip
|
||||
|
||||
# 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 ||:
|
||||
|
||||
# Bletcherous hack to get that extra include path in camlp4 builds.
|
||||
echo -e '#!/bin/sh\n%{_bindir}/camlp4 -I %{_libdir}/ocaml/camlp4/Camlp4Parsers "$@"' > camlp4; chmod 0755 camlp4; export PATH=`pwd`:$PATH
|
||||
make all
|
||||
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%if %opt
|
||||
make opt
|
||||
%endif
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
export DESTDIR=$RPM_BUILD_ROOT
|
||||
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
|
||||
mkdir -p $OCAMLFIND_DESTDIR
|
||||
mkdir -p $OCAMLFIND_DESTDIR/stublibs
|
||||
make install
|
||||
|
||||
# cgi/META conflicts with mod_caml
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/ocaml/cgi/META
|
||||
rmdir $RPM_BUILD_ROOT%{_libdir}/ocaml/cgi
|
||||
|
||||
# rpc-generator/dummy.mli is empty and according to Gerd Stolpmann can
|
||||
# be deleted safely. This avoids an rpmlint warning.
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/rpc-generator/dummy.mli
|
||||
|
||||
# Strip libraries.
|
||||
strip $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.so
|
||||
|
||||
# NB. Do NOT strip the binaries and prevent prelink from stripping them too.
|
||||
# See comment at top of spec file.
|
||||
# (https://bugzilla.redhat.com/show_bug.cgi?id=435559)
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/prelink.conf.d
|
||||
echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
|
||||
> $RPM_BUILD_ROOT/etc/prelink.conf.d/ocaml-ocamlnet.conf
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc ChangeLog RELNOTES
|
||||
%{_libdir}/ocaml/equeue
|
||||
%{_libdir}/ocaml/equeue-gtk2
|
||||
%{_libdir}/ocaml/equeue-ssl
|
||||
%{_libdir}/ocaml/equeue-tcl
|
||||
%{_libdir}/ocaml/netcamlbox
|
||||
%{_libdir}/ocaml/netcgi1
|
||||
%{_libdir}/ocaml/netcgi2
|
||||
%{_libdir}/ocaml/netcgi2-plex
|
||||
%{_libdir}/ocaml/netclient
|
||||
%{_libdir}/ocaml/netgss-system
|
||||
%{_libdir}/ocaml/netmulticore
|
||||
%{_libdir}/ocaml/netplex
|
||||
%{_libdir}/ocaml/netshm
|
||||
%{_libdir}/ocaml/netstring
|
||||
%{_libdir}/ocaml/netstring-pcre
|
||||
%{_libdir}/ocaml/netsys
|
||||
%{_libdir}/ocaml/nettls-gnutls
|
||||
%{_libdir}/ocaml/netunidata
|
||||
%{_libdir}/ocaml/netzip
|
||||
%{_libdir}/ocaml/pop
|
||||
%{_libdir}/ocaml/rpc
|
||||
%{_libdir}/ocaml/rpc-auth-local
|
||||
%{_libdir}/ocaml/rpc-generator
|
||||
%{_libdir}/ocaml/rpc-ssl
|
||||
%{_libdir}/ocaml/shell
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%{_libdir}/ocaml/smtp
|
||||
%if %opt
|
||||
%exclude %{_libdir}/ocaml/*/*.a
|
||||
%exclude %{_libdir}/ocaml/*/*.cmxa
|
||||
%exclude %{_libdir}/ocaml/*/*.cmx
|
||||
@ -190,8 +208,9 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
|
||||
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%doc ChangeLog RELNOTES
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%if %opt
|
||||
%{_libdir}/ocaml/*/*.a
|
||||
%{_libdir}/ocaml/*/*.cmxa
|
||||
%{_libdir}/ocaml/*/*.cmx
|
||||
@ -201,9 +220,12 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
|
||||
|
||||
|
||||
%files nethttpd
|
||||
%defattr(-,root,root,-)
|
||||
%doc ChangeLog RELNOTES
|
||||
%{_libdir}/ocaml/nethttpd-for-netcgi1
|
||||
%{_libdir}/ocaml/nethttpd-for-netcgi2
|
||||
%{_libdir}/ocaml/nethttpd
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%if %opt
|
||||
%exclude %{_libdir}/ocaml/*/*.a
|
||||
%exclude %{_libdir}/ocaml/*/*.cmxa
|
||||
%endif
|
||||
@ -211,8 +233,9 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
|
||||
|
||||
|
||||
%files nethttpd-devel
|
||||
%defattr(-,root,root,-)
|
||||
%doc ChangeLog RELNOTES
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%if %opt
|
||||
%{_libdir}/ocaml/*/*.a
|
||||
%{_libdir}/ocaml/*/*.cmxa
|
||||
%endif
|
||||
@ -220,274 +243,6 @@ 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.
|
||||
|
||||
* Wed Jun 17 2015 Richard W.M. Jones <rjones@redhat.com> - 4.0.3-3
|
||||
- Bump release and rebuild.
|
||||
- Add a hack to make it compile with latest gnutls 3.4.2.
|
||||
|
||||
* Wed Jun 17 2015 Richard W.M. Jones <rjones@redhat.com> - 4.0.3-2
|
||||
- ocaml-4.02.2 rebuild.
|
||||
|
||||
* Fri May 15 2015 Richard W.M. Jones <rjones@redhat.com> - 4.0.3-1
|
||||
- Upgrade to 4.0.3, which also fixes gnutls 3.4 compilation problems.
|
||||
|
||||
* Wed May 13 2015 Richard W.M. Jones <rjones@redhat.com> - 4.0.1-4
|
||||
- Bump and rebuild again for gnutls/nettle soname change.
|
||||
|
||||
* Mon May 04 2015 Kalev Lember <kalevlember@gmail.com> - 4.0.1-3
|
||||
- Rebuilt for nettle soname bump
|
||||
|
||||
* Wed Feb 18 2015 Richard W.M. Jones <rjones@redhat.com> - 4.0.1-2
|
||||
- Enable more features, readding features disabled in the previous commit.
|
||||
- Enable PCRE.
|
||||
- Enable GnuTLS.
|
||||
- Enable GSSAPI.
|
||||
- Re-enable Nethttpd.
|
||||
- Re-add documentation for Netsmtp and Netpop (modules renamed).
|
||||
- Enable camlzip.
|
||||
|
||||
* Mon Feb 16 2015 Richard W.M. Jones <rjones@redhat.com> - 4.0.1-1
|
||||
- New upstream version 4.0.1.
|
||||
- ocaml-4.02.1 rebuild.
|
||||
- Disable SSL (removed from upstream, apparently?)
|
||||
- Remove POP and SMTP (removed from upstream?)
|
||||
- Add netunidata.
|
||||
- Remove patches which are no longer needed / upstream.
|
||||
|
||||
* Mon Nov 03 2014 Richard W.M. Jones <rjones@redhat.com> - 3.7.4-10
|
||||
- Bump and rebuild.
|
||||
|
||||
* Sat Aug 30 2014 Richard W.M. Jones <rjones@redhat.com> - 3.7.4-9
|
||||
- ocaml-4.02.0 final rebuild.
|
||||
- Fix for int(32|64) -> int(32|64)_t in latest OCaml upstream.
|
||||
|
||||
* Sun Aug 24 2014 Richard W.M. Jones <rjones@redhat.com> - 3.7.4-7
|
||||
- Fix for broken configure tests.
|
||||
|
||||
* Sat Aug 23 2014 Richard W.M. Jones <rjones@redhat.com> - 3.7.4-6
|
||||
- Bump release and rebuild.
|
||||
|
||||
* Sat Aug 23 2014 Richard W.M. Jones <rjones@redhat.com> - 3.7.4-5
|
||||
- ocaml-4.02.0+rc1 rebuild.
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.7.4-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Fri Aug 01 2014 Richard W.M. Jones <rjones@redhat.com> - 3.7.4-3
|
||||
- ocaml-4.02.0-0.8.git10e45753.fc22 rebuild.
|
||||
|
||||
* Wed Jul 23 2014 Richard W.M. Jones <rjones@redhat.com> - 3.7.4-2
|
||||
- New upstream version 3.7.4.
|
||||
- OCaml 4.02.0 beta rebuild.
|
||||
- Some spec file modernization.
|
||||
- Add BR tcl-devel.
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.7.3-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed Oct 02 2013 Richard W.M. Jones <rjones@redhat.com> - 3.7.3-4
|
||||
- Rebuild for ocaml-lablgtk 2.18.
|
||||
|
||||
* Thu Sep 19 2013 Richard W.M. Jones <rjones@redhat.com> - 3.7.3-3
|
||||
- Unfortunately we have to re-add the anti-stripping code back. See
|
||||
comment at top of spec file.
|
||||
- Disable debuginfo for the same reason.
|
||||
|
||||
* Sat Sep 14 2013 Richard W.M. Jones <rjones@redhat.com> - 3.7.3-1
|
||||
- New upstream version 3.7.3.
|
||||
- Rebuild for OCaml 4.01.0.
|
||||
- Enable debuginfo.
|
||||
- Do not strip binaries, remove anti-prelink protection.
|
||||
- Missing BR ncurses-devel.
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Fri Dec 14 2012 Richard W.M. Jones <rjones@redhat.com> - 3.5.1-4
|
||||
- Rebuild for OCaml 4.00.1.
|
||||
|
||||
* Sat Jul 28 2012 Richard W.M. Jones <rjones@redhat.com> - 3.5.1-3
|
||||
- Rebuild for OCaml 4.00.0 official.
|
||||
|
||||
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Sat Jun 09 2012 Richard W.M. Jones <rjones@redhat.com> - 3.5.1-1
|
||||
- New upstream version 3.5.1.
|
||||
- Rebuild for OCaml 4.00.0, plus small patch.
|
||||
- Move configure into build (not prep).
|
||||
|
||||
* Sat Apr 28 2012 Richard W.M. Jones <rjones@redhat.com> - 3.4.1-3
|
||||
- Bump and rebuild against new OCaml compiler in ARM.
|
||||
|
||||
* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 3.4.1-2
|
||||
- Rebuild against PCRE 8.30
|
||||
|
||||
* Fri Jan 6 2012 Richard W.M. Jones <rjones@redhat.com> - 3.4.1-1
|
||||
- New upstream version 3.4.1.
|
||||
- Rebuild for OCaml 3.12.1.
|
||||
|
||||
* Mon Sep 19 2011 Richard W.M. Jones <rjones@redhat.com> - 3.4-1
|
||||
- Move to new upstream 3.4 version. Note this is not compatible with
|
||||
ocamlnet 2.x.
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.9-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Sun Feb 6 2011 Richard W.M. Jones <rjones@redhat.com> - 2.2.9-23
|
||||
- Rebuild against rpm-4.9.0-0.beta1.6.fc15. See discussion:
|
||||
http://lists.fedoraproject.org/pipermail/devel/2011-February/148398.html
|
||||
|
||||
* Sat Feb 5 2011 Richard W.M. Jones <rjones@redhat.com> - 2.2.9-22
|
||||
- Bump and rebuild because of broken deps on ocaml-lablgtk.
|
||||
|
||||
* Wed Jan 05 2011 Richard W.M. Jones <rjones@redhat.com> - 2.2.9-21
|
||||
- Rebuild for OCaml 3.12 (http://fedoraproject.org/wiki/Features/OCaml3.12).
|
||||
- Missing BR ocaml-labltk-devel.
|
||||
|
||||
* Tue Jan 5 2010 Richard W.M. Jones <rjones@redhat.com> - 2.2.9-19
|
||||
- {gtk2,openssl,pcre,tcl}-devel BRs have now been pushed down to the
|
||||
corresponding ocaml-X-devel packages, so we don't need those here
|
||||
any more.
|
||||
|
||||
* Tue Jan 5 2010 Richard W.M. Jones <rjones@redhat.com> - 2.2.9-18
|
||||
- Use new dependency generator in upstream RPM 4.8.
|
||||
- Add BR gtk2-devel.
|
||||
|
||||
* Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 2.2.9-16
|
||||
- Rebuild for OCaml 3.11.2.
|
||||
|
||||
* Tue Sep 29 2009 Richard W.M. Jones <rjones@redhat.com> - 2.2.9-15
|
||||
- Force rebuild against newer lablgtk.
|
||||
|
||||
|
23
ocamlnet-ocaml310.patch
Normal file
23
ocamlnet-ocaml310.patch
Normal file
@ -0,0 +1,23 @@
|
||||
--- src/equeue-gtk2/uq_gtk.ml.orig 2007-06-11 19:35:10.000000000 +0100
|
||||
+++ src/equeue-gtk2/uq_gtk.ml 2007-06-11 20:07:54.000000000 +0100
|
||||
@@ -3,6 +3,11 @@
|
||||
open Equeue
|
||||
open Unixqueue
|
||||
|
||||
+(* Ugly hack required to compile under OCaml 3.10. This unmarshals
|
||||
+ * `IN. IN is a reserved word for Camlp4.Macro.
|
||||
+ *)
|
||||
+let __in = (Marshal.from_string "\132\149\166\190\000\000\000\003\000\000\000\000\000\000\000\000\000\000\000\000\001?\229" 0 : GMain.Io.condition)
|
||||
+
|
||||
IFDEF GTK1 THEN
|
||||
type event_id = GMain.Io.event_source
|
||||
ELSE
|
||||
@@ -147,7 +152,7 @@
|
||||
gtk_event_source_hup = None; } in
|
||||
( match g.gtk_event_source_in with
|
||||
None when i ->
|
||||
- g.gtk_event_source_in <- Some(mk_handler `IN [fd] [] []);
|
||||
+ g.gtk_event_source_in <- Some(mk_handler __in [fd] [] []);
|
||||
| Some s when not i ->
|
||||
dest_handler s;
|
||||
g.gtk_event_source_in <- None
|
12
ocamlnet-ucred.patch
Normal file
12
ocamlnet-ucred.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ur ocamlnet-2.2.9/src/rpc-auth-local/rpclocal.c ocamlnet-2.2.9.new/src/rpc-auth-local/rpclocal.c
|
||||
--- ocamlnet-2.2.9/src/rpc-auth-local/rpclocal.c 2007-11-01 22:12:33.000000000 +0000
|
||||
+++ ocamlnet-2.2.9.new/src/rpc-auth-local/rpclocal.c 2008-02-12 21:01:21.000000000 +0000
|
||||
@@ -3,6 +3,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#define _GNU_SOURCE /* for SO_PEERCRED / struct ucred */
|
||||
+
|
||||
#include "caml/mlvalues.h"
|
||||
#include "caml/alloc.h"
|
||||
#include "caml/memory.h"
|
Loading…
Reference in New Issue
Block a user