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.
This commit is contained in:
Richard W.M. Jones
parent
14bb5ef2ab
commit
23b2b30a21
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ ocamlnet-2.2.9.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
|
||||
|
||||
@ -10,20 +10,14 @@
|
||||
%global __strip /bin/true
|
||||
|
||||
Name: ocaml-ocamlnet
|
||||
Version: 3.7.4
|
||||
Release: 11%{?dist}
|
||||
Version: 4.0.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Network protocols for OCaml
|
||||
License: BSD
|
||||
|
||||
URL: http://projects.camlcity.org/projects/ocamlnet.html
|
||||
Source0: http://download.camlcity.org/download/ocamlnet-%{version}.tar.gz
|
||||
|
||||
# Fix for broken configure tests.
|
||||
Patch1: ocamlnet-3.7.4-fix-configure.patch
|
||||
|
||||
# Fix for int(32|64) -> int(32|64)_t in latest OCaml upstream.
|
||||
Patch2: ocamlnet-3.7.4-fix-int-types.patch
|
||||
|
||||
ExcludeArch: sparc64 s390 s390x
|
||||
|
||||
BuildRequires: ocaml >= 3.12.1-3
|
||||
@ -31,7 +25,6 @@ BuildRequires: ocaml-ocamldoc
|
||||
BuildRequires: ocaml-camlp4-devel
|
||||
BuildRequires: ocaml-findlib-devel
|
||||
BuildRequires: ocaml-pcre-devel
|
||||
BuildRequires: ocaml-ssl-devel
|
||||
BuildRequires: ocaml-lablgtk-devel
|
||||
BuildRequires: ocaml-labltk-devel
|
||||
BuildRequires: ncurses-devel
|
||||
@ -76,8 +69,6 @@ In detail, the following features are available:
|
||||
|
||||
* netsys contains bindings for system functions missing in core OCaml.
|
||||
|
||||
* smtp and pop are two further client implementations for the SMTP
|
||||
and POP3 protocols.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
@ -115,9 +106,6 @@ files for developing applications that use %{name}-nethttpd.
|
||||
%prep
|
||||
%setup -q -n ocamlnet-%{version}
|
||||
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
|
||||
%build
|
||||
# Parallel builds don't work:
|
||||
@ -129,7 +117,6 @@ unset MAKEFLAGS
|
||||
-prefer-netcgi2 \
|
||||
-with-nethttpd \
|
||||
-disable-apache \
|
||||
-enable-ssl \
|
||||
-enable-gtk2
|
||||
# In future:
|
||||
# -with-rpc-auth-dh (requires cryptgps)
|
||||
@ -160,25 +147,21 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
|
||||
%doc ChangeLog RELNOTES
|
||||
%{_libdir}/ocaml/equeue
|
||||
%{_libdir}/ocaml/equeue-gtk2
|
||||
%{_libdir}/ocaml/equeue-ssl
|
||||
%{_libdir}/ocaml/equeue-tcl
|
||||
%{_libdir}/ocaml/netcamlbox
|
||||
%{_libdir}/ocaml/netcgi2
|
||||
%{_libdir}/ocaml/netcgi2-plex
|
||||
%{_libdir}/ocaml/netclient
|
||||
%{_libdir}/ocaml/netgssapi
|
||||
%{_libdir}/ocaml/netmulticore
|
||||
%{_libdir}/ocaml/netplex
|
||||
%{_libdir}/ocaml/netshm
|
||||
%{_libdir}/ocaml/netstring
|
||||
%{_libdir}/ocaml/netsys
|
||||
%{_libdir}/ocaml/pop
|
||||
%{_libdir}/ocaml/netunidata
|
||||
%{_libdir}/ocaml/rpc
|
||||
%{_libdir}/ocaml/rpc-auth-local
|
||||
%{_libdir}/ocaml/rpc-generator
|
||||
%{_libdir}/ocaml/rpc-ssl
|
||||
%{_libdir}/ocaml/shell
|
||||
%{_libdir}/ocaml/smtp
|
||||
%if %opt
|
||||
%exclude %{_libdir}/ocaml/*/*.a
|
||||
%exclude %{_libdir}/ocaml/*/*.cmxa
|
||||
@ -207,7 +190,6 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
|
||||
|
||||
%files nethttpd
|
||||
%doc ChangeLog RELNOTES
|
||||
%{_libdir}/ocaml/nethttpd-for-netcgi2
|
||||
%{_libdir}/ocaml/nethttpd
|
||||
%if %opt
|
||||
%exclude %{_libdir}/ocaml/*/*.a
|
||||
@ -226,8 +208,13 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Feb 16 2015 Richard W.M. Jones <rjones@redhat.com> - 3.7.4-11
|
||||
* 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.
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
--- ocamlnet-3.7.4/configure.old 2014-08-24 09:41:14.270683502 +0100
|
||||
+++ ocamlnet-3.7.4/configure 2014-08-24 09:41:52.120685932 +0100
|
||||
@@ -682,11 +682,11 @@
|
||||
|
||||
printf "%s" "Checking whether lablgtk2 has GMain.Io.remove... "
|
||||
mkdir -p tmp
|
||||
- cat <<EOF >tmp/gtk.ml
|
||||
+ cat <<EOF >tmp/gtktest.ml
|
||||
let _ = GMain.Io.remove;;
|
||||
EOF
|
||||
|
||||
- if ocamlfind ocamlc -package lablgtk2 -c tmp/gtk.ml >/dev/null 2>/dev/null;
|
||||
+ if ocamlfind ocamlc -package lablgtk2 -c tmp/gtktest.ml >/dev/null 2>/dev/null;
|
||||
then
|
||||
echo "yes"
|
||||
else
|
||||
@@ -697,21 +697,21 @@
|
||||
|
||||
printf "%s" "Checking whether lablgtk2 has GMain.Io.add_watch with list support... "
|
||||
mkdir -p tmp
|
||||
- cat <<'EOF' >tmp/gtk.ml
|
||||
+ cat <<'EOF' >tmp/gtktest.ml
|
||||
open GMain.Io
|
||||
let _ = (add_watch : cond:condition list -> callback:(condition list -> bool) -> ?prio:int -> channel -> id);;
|
||||
exit 0
|
||||
EOF
|
||||
# Note: this newer API is never broken in the sense checked below, i.e.
|
||||
# such lablgtk2 versions do not exist.
|
||||
- if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml >/dev/null 2>/dev/null && tmp/gtk; then
|
||||
+ if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtktest.ml >/dev/null 2>/dev/null && tmp/gtk; then
|
||||
echo "yes"
|
||||
gtk2_io_add_watch_supports_lists="-ppopt -DGTK2_IO_ADD_WATCH_SUPPORTS_LISTS"
|
||||
else
|
||||
echo "no"
|
||||
printf "%s" "Checking whether lablgtk2's GMain.Io.add_watch is broken... "
|
||||
mkdir -p tmp
|
||||
- cat <<'EOF' >tmp/gtk.ml
|
||||
+ cat <<'EOF' >tmp/gtktest.ml
|
||||
GMain.Main.init();;
|
||||
let ch = GMain.Io.channel_of_descr (Unix.stdout) in
|
||||
let w = GMain.Io.add_watch
|
||||
@@ -724,7 +724,7 @@
|
||||
else
|
||||
exit 1
|
||||
EOF
|
||||
- if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml >/dev/null 2>/dev/null && tmp/gtk; then
|
||||
+ if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtktest.ml >/dev/null 2>/dev/null && tmp/gtk; then
|
||||
echo "no"
|
||||
else
|
||||
echo "yes"
|
||||
@ -1,100 +0,0 @@
|
||||
diff -ur ocamlnet-3.7.4.old/src/netsys/netsys_c_event.c ocamlnet-3.7.4/src/netsys/netsys_c_event.c
|
||||
--- ocamlnet-3.7.4.old/src/netsys/netsys_c_event.c 2014-05-12 20:00:39.000000000 +0100
|
||||
+++ ocamlnet-3.7.4/src/netsys/netsys_c_event.c 2014-08-30 18:12:48.443050478 +0100
|
||||
@@ -142,7 +142,7 @@
|
||||
|
||||
case NE_EVENTFD:
|
||||
{
|
||||
- int64 buf;
|
||||
+ int64_t buf;
|
||||
buf = 1;
|
||||
if (ne->fd1 >= 0) {
|
||||
int code;
|
||||
@@ -391,7 +391,7 @@
|
||||
{
|
||||
#ifdef HAVE_POLL
|
||||
struct not_event *ne;
|
||||
- int64 n;
|
||||
+ int64_t n;
|
||||
char buf[1];
|
||||
int code, ok, e;
|
||||
CAMLparam1(nev);
|
||||
diff -ur ocamlnet-3.7.4.old/src/netsys/netsys_c_fadvise.c ocamlnet-3.7.4/src/netsys/netsys_c_fadvise.c
|
||||
--- ocamlnet-3.7.4.old/src/netsys/netsys_c_fadvise.c 2014-05-12 20:00:39.000000000 +0100
|
||||
+++ ocamlnet-3.7.4/src/netsys/netsys_c_fadvise.c 2014-08-30 18:12:48.446050487 +0100
|
||||
@@ -23,7 +23,7 @@
|
||||
CAMLprim value netsys_fadvise(value fd, value start, value len, value adv) {
|
||||
#ifdef HAVE_POSIX_FADVISE
|
||||
int adv_int, r;
|
||||
- int64 start_int, len_int;
|
||||
+ int64_t start_int, len_int;
|
||||
off_t start_off, len_off;
|
||||
/* Att: off_t might be 64 bit even on 32 bit systems! */
|
||||
|
||||
@@ -41,9 +41,9 @@
|
||||
start_int = Int64_val(start);
|
||||
len_int = Int64_val(len);
|
||||
|
||||
- if ( ((int64) ((off_t) start_int)) != start_int )
|
||||
+ if ( ((int64_t) ((off_t) start_int)) != start_int )
|
||||
failwith("Netsys.fadvise: large files not supported on this OS");
|
||||
- if ( ((int64) ((off_t) len_int)) != len_int )
|
||||
+ if ( ((int64_t) ((off_t) len_int)) != len_int )
|
||||
failwith("Netsys.fadvise: large files not supported on this OS");
|
||||
|
||||
start_off = start_int;
|
||||
diff -ur ocamlnet-3.7.4.old/src/netsys/netsys_c_fallocate.c ocamlnet-3.7.4/src/netsys/netsys_c_fallocate.c
|
||||
--- ocamlnet-3.7.4.old/src/netsys/netsys_c_fallocate.c 2014-05-12 20:00:39.000000000 +0100
|
||||
+++ ocamlnet-3.7.4/src/netsys/netsys_c_fallocate.c 2014-08-30 18:12:48.442050481 +0100
|
||||
@@ -20,16 +20,16 @@
|
||||
CAMLprim value netsys_fallocate(value fd, value start, value len) {
|
||||
#ifdef HAVE_POSIX_FALLOCATE
|
||||
int r;
|
||||
- int64 start_int, len_int;
|
||||
+ int64_t start_int, len_int;
|
||||
off_t start_off, len_off;
|
||||
/* Att: off_t might be 64 bit even on 32 bit systems! */
|
||||
|
||||
start_int = Int64_val(start);
|
||||
len_int = Int64_val(len);
|
||||
|
||||
- if ( ((int64) ((off_t) start_int)) != start_int )
|
||||
+ if ( ((int64_t) ((off_t) start_int)) != start_int )
|
||||
failwith("Netsys.fadvise: large files not supported on this OS");
|
||||
- if ( ((int64) ((off_t) len_int)) != len_int )
|
||||
+ if ( ((int64_t) ((off_t) len_int)) != len_int )
|
||||
failwith("Netsys.fadvise: large files not supported on this OS");
|
||||
|
||||
start_off = start_int;
|
||||
diff -ur ocamlnet-3.7.4.old/src/netsys/netsys_c_mem.c ocamlnet-3.7.4/src/netsys/netsys_c_mem.c
|
||||
--- ocamlnet-3.7.4.old/src/netsys/netsys_c_mem.c 2014-05-12 20:00:39.000000000 +0100
|
||||
+++ ocamlnet-3.7.4/src/netsys/netsys_c_mem.c 2014-08-30 18:12:48.445050479 +0100
|
||||
@@ -182,7 +182,7 @@
|
||||
void *addr, *eff_addr;
|
||||
intnat size;
|
||||
uintnat basize;
|
||||
- int64 pos0;
|
||||
+ int64_t pos0;
|
||||
uintnat pagesize, delta;
|
||||
|
||||
/* Avoid here seeking at all costs. On some systems, shared memory
|
||||
@@ -190,7 +190,7 @@
|
||||
*/
|
||||
fd = Int_val(fdv);
|
||||
pos0 = Int64_val(posv);
|
||||
- if (((int64) ((off_t) pos0)) != pos0)
|
||||
+ if (((int64_t) ((off_t) pos0)) != pos0)
|
||||
failwith("Netsys_mem: large files not supported on this OS");
|
||||
pos = pos0;
|
||||
addr = (void *) Nativeint_val(addrv);
|
||||
@@ -913,8 +913,8 @@
|
||||
caml_id = 'b';
|
||||
break;
|
||||
}
|
||||
- case 'i': /* int32 */
|
||||
- case 'j': /* int64 */
|
||||
+ case 'i': /* int32_t */
|
||||
+ case 'j': /* int64_t */
|
||||
case 'n': /* nativeint */
|
||||
if (!enable_customs) {
|
||||
#ifdef DEBUG
|
||||
Loading…
Reference in New Issue
Block a user