From 7869dbc859bd448f91cc82d732c83679323d617f Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Dec 26 2019 12:58:52 +0000 Subject: Orphaned for 6+ weeks --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b036259..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/pgocaml-*.tgz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/ocaml-pgocaml.spec b/ocaml-pgocaml.spec deleted file mode 100644 index e606d5f..0000000 --- a/ocaml-pgocaml.spec +++ /dev/null @@ -1,295 +0,0 @@ -%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) - -# Note new upstream versions of this require 'batteries' (it is, or -# was, actually just an optional dependency). Since this is not yet -# packaged for Fedora, we're sticking with 1.6. - -Name: ocaml-pgocaml -Version: 1.6 -Release: 35%{?dist} -Summary: OCaml library for type-safe access to PostgreSQL databases -License: LGPLv2+ with exceptions - -URL: http://pgocaml.forge.ocamlcore.org/ -# Old tarball is not on the website any longer. When we package batteries -# (see comment above) we can go back to a website link here. -Source0: pgocaml-%{version}.tgz - -# Safe-string fixes for OCaml 4.06. -Patch1: pgocaml-1.6-safe-string.patch - -BuildRequires: ocaml >= 3.10.0 -BuildRequires: ocaml-findlib-devel, ocaml-ocamldoc -BuildRequires: ocaml-extlib-devel -BuildRequires: ocaml-pcre-devel, pcre-devel -BuildRequires: ocaml-calendar-devel >= 2.01.1-2 -BuildRequires: ocaml-csv-devel -BuildRequires: ocaml-camlp4-devel - -# The find-requires/provides scripts don't understand the packed -# CalendarLib module well. Ignore the packed submodules. -%global __ocaml_requires_opts /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Parsetree -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version -%global __ocaml_provides_opts /usr/lib/rpm/ocaml-find-provides.sh - - -%description -PG'OCaml is a type-safe, simple interface to PostgreSQL from OCaml. It -lets you embed SQL statements directly into OCaml code. - - -%package devel -Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} - - -%description devel -The %{name}-devel package contains libraries and signature files for -developing applications that use %{name}. - - -%prep -%setup -q -n pgocaml-%{version} -%autopatch -p1 - - -%build -make depend -%if %opt -make all OCAMLOPTFLAGS=-g -%else -make META pGOCaml_config.ml pgocaml.cma pa_pgsql.cmo -%endif -make doc - - -%install -export DESTDIR=$RPM_BUILD_ROOT -export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml -mkdir -p $OCAMLFIND_DESTDIR -%if %opt -ocamlfind install pgocaml META *.mli *.cmi *.cmx *.cma *.cmxa *.a pa_*.cmo -%else -ocamlfind install pgocaml META *.mli *.cmi *.cma pa_*.cmo -%endif - -%if %opt -mkdir -p $RPM_BUILD_ROOT%{_bindir} -install -m 0755 pgocaml_prof $RPM_BUILD_ROOT%{_bindir} -%endif - - -%files -%doc COPYING.LIB -%{_libdir}/ocaml/pgocaml -%if %opt -%exclude %{_libdir}/ocaml/pgocaml/*.a -%exclude %{_libdir}/ocaml/pgocaml/*.cmxa -%exclude %{_libdir}/ocaml/pgocaml/*.cmx -%endif -%exclude %{_libdir}/ocaml/pgocaml/*.mli -%if %opt -%{_bindir}/pgocaml_prof -%endif - - -%files devel -%doc README.txt README.profiling BUGS.txt CONTRIBUTORS.txt COPYING.LIB HOW_IT_WORKS.txt html/* -%if %opt -%{_libdir}/ocaml/pgocaml/*.a -%{_libdir}/ocaml/pgocaml/*.cmxa -%{_libdir}/ocaml/pgocaml/*.cmx -%endif -%{_libdir}/ocaml/pgocaml/*.mli - - -%changelog -* Thu Jul 25 2019 Fedora Release Engineering - 1.6-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1.6-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.6-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jul 11 2018 Richard W.M. Jones - 1.6-32 -- OCaml 4.07.0 (final) rebuild. - -* Wed Jun 20 2018 Richard W.M. Jones - 1.6-31 -- OCaml 4.07.0-rc1 rebuild. - -* Thu Feb 08 2018 Fedora Release Engineering - 1.6-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Dec 02 2017 Richard W.M. Jones - 1.6-29 -- Bump release and rebuild for OCaml 4.06.0 again. - -* Wed Nov 22 2017 Richard W.M. Jones - 1.6-28 -- OCaml 4.06.0 rebuild. -- Safe string fixes. - -* Wed Aug 09 2017 Richard W.M. Jones - 1.6-27 -- Bump release and rebuild. - -* Tue Aug 08 2017 Richard W.M. Jones - 1.6-26 -- OCaml 4.05.0 rebuild. - -* Thu Aug 03 2017 Fedora Release Engineering - 1.6-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.6-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Jun 27 2017 Richard W.M. Jones - 1.6-23 -- OCaml 4.04.2 rebuild. - -* Sat May 13 2017 Richard W.M. Jones - 1.6-22 -- OCaml 4.04.1 rebuild. - -* Sat Feb 11 2017 Fedora Release Engineering - 1.6-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Nov 15 2016 Richard W.M. Jones - 1.6-20 -- Bump and rebuild. - [pgocaml and calendarLib] make inconsistent assumptions over implementation CalendarLib. - -* Mon Nov 07 2016 Richard W.M. Jones - 1.6-19 -- Rebuild for OCaml 4.04.0. - -* Thu Feb 04 2016 Fedora Release Engineering - 1.6-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jul 28 2015 Richard W.M. Jones - 1.6-17 -- OCaml 4.02.3 rebuild. - -* Tue Jul 21 2015 Richard W.M. Jones - 1.6-16 -- Enable bytecode builds. - -* Wed Jun 24 2015 Richard W.M. Jones - 1.6-15 -- ocaml-4.02.2 final rebuild. - -* Thu Jun 18 2015 Richard W.M. Jones - 1.6-14 -- ocaml-4.02.2 rebuild. - -* Wed Jun 17 2015 Fedora Release Engineering - 1.6-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Feb 17 2015 Richard W.M. Jones - 1.6-12 -- ocaml-4.02.1 rebuild. - -* Sun Aug 31 2014 Richard W.M. Jones - 1.6-11 -- ocaml-4.02.0 final rebuild. - -* Sat Aug 23 2014 Richard W.M. Jones - 1.6-10 -- ocaml-4.02.0+rc1 rebuild. - -* Sun Aug 17 2014 Fedora Release Engineering - 1.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Aug 02 2014 Richard W.M. Jones - 1.6-8 -- ocaml-4.02.0-0.8.git10e45753.fc22 rebuild. - -* Mon Jul 21 2014 Richard W.M. Jones - 1.6-7 -- OCaml 4.02.0 beta rebuild. - -* Sat Jun 07 2014 Fedora Release Engineering - 1.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Sep 19 2013 Richard W.M. Jones - 1.6-5 -- OCaml 4.01.0 rebuild. -- Enable debuginfo. - -* Sat Aug 03 2013 Fedora Release Engineering - 1.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 1.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Dec 02 2012 Bruno Wolff III - 1.6-2 -- Rebuild for ocaml 4.0.1. - -* Tue Oct 30 2012 Richard W.M. Jones - 1.6-1 -- New upstream version 1.6. -- Remove patch for OCaml 4, now upstream. -- Clean up spec file. - -* Fri Jul 20 2012 Fedora Release Engineering - 1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jun 11 2012 Richard W.M. Jones - 1.5-1 -- New upstream version 1.5. -- Upstream site moved to ocamlforge. -- Patch camlp4 code to use _loc instead of loc. - -* Mon Jun 11 2012 Richard W.M. Jones - 1.4-4 -- Rebuild for OCaml 4.00.0. - -* Fri Jan 06 2012 Richard W.M. Jones - 1.4-3 -- Rebuild for OCaml 3.12.1. - -* Tue Feb 08 2011 Fedora Release Engineering - 1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Jan 6 2011 Richard W.M. Jones - 1.4-1 -- New upstream version 1.4. -- Rebuild for OCaml 3.12.0. - -* Wed Dec 30 2009 Richard W.M. Jones - 1.3-2 -- Rebuild for OCaml 3.11.2. - -* Thu Oct 8 2009 Richard W.M. Jones - 1.3-1 -- New upstream version 1.3. -- Simplify build system. - -* Sat Jul 25 2009 Fedora Release Engineering - 1.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sat May 23 2009 Richard W.M. Jones - 1.1-9 -- Rebuild for OCaml 3.11.1 - -* Thu Apr 16 2009 S390x secondary arch maintainer -- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs - (added sparc64 per request from the sparc maintainer) - -* Wed Feb 25 2009 Fedora Release Engineering - 1.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Dec 5 2008 Richard W.M. Jones - 1.1-7 -- Rebuild for OCaml 3.11.0. - -* Wed Nov 26 2008 Richard W.M. Jones - 1.1-6 -- Rebuild for OCaml 3.11.0+rc1. - -* Wed Nov 19 2008 Richard W.M. Jones - 1.1-5 -- Rebuild for OCaml 3.11.0 - -* Thu Jul 10 2008 Richard W.M. Jones - 1.1-4 -- Rebuild against ocaml-calendar 2.0.4 - -* Tue Jul 1 2008 Richard W.M. Jones - 1.1-3 -- Ignore Parsetree dep. -- Bump release to -3 to solve EVR problems with F-9. - -* Tue Mar 4 2008 Richard W.M. Jones - 1.1-1 -- New upstream release 1.1. -- Clarify license is LGPLv2+ with exceptions. -- New home page and download URL. - -* Mon Mar 3 2008 Richard W.M. Jones - 0.9-5 -- Ignore modules which are really submodules of CalendarLib. - -* Sat Mar 1 2008 Richard W.M. Jones - 0.9-4 -- Add missing BR for ocaml-camlp4-devel. -- Add missing BR for pcre-devel. -- Check it builds in mock. - -* Sat Feb 23 2008 Richard W.M. Jones - 0.9-3 -- Check it builds with OCaml 3.10.1 -- Only keep license file in main package. -- Clarify license is LGPLv2 with exceptions. - -* Mon Sep 3 2007 Richard W.M. Jones - 0.9-2 -- Added the syntax extension. - -* Mon Sep 3 2007 Richard W.M. Jones - 0.9-1 -- Initial RPM release. diff --git a/pgocaml-1.6-safe-string.patch b/pgocaml-1.6-safe-string.patch deleted file mode 100644 index 9b2bffe..0000000 --- a/pgocaml-1.6-safe-string.patch +++ /dev/null @@ -1,187 +0,0 @@ -Binary files pgocaml-1.6.old/pGOCaml.cmi and pgocaml-1.6/pGOCaml.cmi differ -Binary files pgocaml-1.6.old/pGOCaml_generic.cmi and pgocaml-1.6/pGOCaml_generic.cmi differ -diff -ur pgocaml-1.6.old/pGOCaml_generic.ml pgocaml-1.6/pGOCaml_generic.ml ---- pgocaml-1.6.old/pGOCaml_generic.ml 2012-04-13 13:55:09.000000000 +0100 -+++ pgocaml-1.6/pGOCaml_generic.ml 2017-11-22 15:52:09.933379044 +0000 -@@ -48,7 +48,7 @@ - val flush : out_channel -> unit t - val input_char : in_channel -> char t - val input_binary_int : in_channel -> int t -- val really_input : in_channel -> string -> int -> int -> unit t -+ val really_input : in_channel -> bytes -> int -> int -> unit t - val close_in : in_channel -> unit t - end - -@@ -434,7 +434,7 @@ - if len > !max_message_length then ( - (* Skip the message so we stay in synch with the stream. *) - let bufsize = 65_536 in -- let buf = String.create bufsize in -+ let buf = Bytes.create bufsize in - let rec loop n = - if n > 0 then begin - let m = min n bufsize in -@@ -450,7 +450,7 @@ - ) else ( - - (* Read the binary message content. *) -- let msg = String.create len in -+ let msg = Bytes.create len in - really_input ichan msg 0 len >>= fun () -> - return (typ, msg) - ) -@@ -627,17 +627,17 @@ - | 2l -> AuthenticationKerberosV5 - | 3l -> AuthenticationCleartextPassword - | 4l -> -- let salt = String.create 2 in -+ let salt = Bytes.create 2 in - for i = 0 to 2 do -- salt.[i] <- get_char () -+ Bytes.set salt i (get_char ()) - done; -- AuthenticationCryptPassword salt -+ AuthenticationCryptPassword (Bytes.to_string salt) - | 5l -> -- let salt = String.create 4 in -+ let salt = Bytes.create 4 in - for i = 0 to 3 do -- salt.[i] <- get_char () -+ Bytes.set salt i (get_char ()) - done; -- AuthenticationMD5Password salt -+ AuthenticationMD5Password (Bytes.to_string salt) - | 6l -> AuthenticationSCMCredential - | _ -> UnknownMessage (typ, msg) - ); -@@ -704,7 +704,7 @@ - if len > Sys.max_string_length then - raise (Error "PGOCaml: result field is too wide for string"); - let bytes = get_n_bytes len in -- len, bytes -+ len, Bytes.to_string bytes - ) in - fields := field :: !fields - done; -@@ -794,8 +794,8 @@ - | None -> return () - | Some conn -> - let rec loop () = -- receive_message conn >>= fun msg -> -- let msg = parse_backend_message msg in -+ receive_message conn >>= fun (c, msg) -> -+ let msg = parse_backend_message (c, Bytes.to_string msg) in - match msg with ReadyForQuery _ -> return () | _ -> loop () - in - loop () -@@ -968,8 +968,8 @@ - let rec loop msg = - (match msg with - | Some msg -> send_recv conn msg -- | None -> receive_message conn) >>= fun msg -> -- let msg = parse_backend_message msg in -+ | None -> receive_message conn) >>= fun (c, msg) -> -+ let msg = parse_backend_message (c, Bytes.to_string msg) in - - match msg with - | ReadyForQuery _ -> return () (* Finished connecting! *) -@@ -1051,8 +1051,8 @@ - - (* Wait for ReadyForQuery. *) - let rec loop () = -- receive_message conn >>= fun msg -> -- let msg = parse_backend_message msg in -+ receive_message conn >>= fun (c, msg) -> -+ let msg = parse_backend_message (c, Bytes.to_string msg) in - match msg with - | ReadyForQuery _ -> return () (* Finished! *) - | ErrorResponse err -> pg_error ~conn err (* Error *) -@@ -1086,8 +1086,8 @@ - send_message conn msg >>= fun () -> - flush_msg conn >>= fun () -> - let rec loop () = -- receive_message conn >>= fun msg -> -- let msg = parse_backend_message msg in -+ receive_message conn >>= fun (c, msg) -> -+ let msg = parse_backend_message (c, Bytes.to_string msg) in - match msg with - | ErrorResponse err -> pg_error err - | ParseComplete -> return () (* Finished! *) -@@ -1137,8 +1137,8 @@ - *) - let rec loop () = - (* NB: receive_message flushes the output connection. *) -- receive_message conn >>= fun msg -> -- let msg = parse_backend_message msg in -+ receive_message conn >>= fun (c, msg) -> -+ let msg = parse_backend_message (c, Bytes.to_string msg) in - match msg with - | ReadyForQuery _ -> return () (* Finished! *) - | ErrorResponse err -> pg_error ~conn err (* Error *) -@@ -1253,8 +1253,8 @@ - send_message conn msg >>= fun () -> - flush_msg conn >>= fun () -> - let rec loop () = -- receive_message conn >>= fun msg -> -- let msg = parse_backend_message msg in -+ receive_message conn >>= fun (c, msg) -> -+ let msg = parse_backend_message (c, Bytes.to_string msg) in - match msg with - | ErrorResponse err -> pg_error err - | CloseComplete -> return () (* Finished! *) -@@ -1274,8 +1274,8 @@ - send_message conn msg >>= fun () -> - flush_msg conn >>= fun () -> - let rec loop () = -- receive_message conn >>= fun msg -> -- let msg = parse_backend_message msg in -+ receive_message conn >>= fun (c, msg) -> -+ let msg = parse_backend_message (c, Bytes.to_string msg) in - match msg with - | ErrorResponse err -> pg_error err - | CloseComplete -> return () -@@ -1309,8 +1309,8 @@ - add_string msg name; - send_message conn msg >>= fun () -> - flush_msg conn >>= fun () -> -- receive_message conn >>= fun msg -> -- let msg = parse_backend_message msg in -+ receive_message conn >>= fun (c, msg) -> -+ let msg = parse_backend_message (c, Bytes.to_string msg) in - ( match msg with - | ErrorResponse err -> pg_error err - | ParameterDescription params -> -@@ -1322,8 +1322,8 @@ - | _ -> - fail (Error ("PGOCaml: unknown response from describe: " ^ - string_of_msg_t msg))) >>= fun params -> -- receive_message conn >>= fun msg -> -- let msg = parse_backend_message msg in -+ receive_message conn >>= fun (c, msg) -> -+ let msg = parse_backend_message (c, Bytes.to_string msg) in - match msg with - | ErrorResponse err -> pg_error err - | NoData -> return (params, None) -@@ -1350,8 +1350,8 @@ - add_string msg portal; - send_message conn msg >>= fun () -> - flush_msg conn >>= fun () -> -- receive_message conn >>= fun msg -> -- let msg = parse_backend_message msg in -+ receive_message conn >>= fun (c, msg) -> -+ let msg = parse_backend_message (c, Bytes.to_string msg) in - match msg with - | ErrorResponse err -> pg_error err - | NoData -> return None -diff -ur pgocaml-1.6.old/pGOCaml_generic.mli pgocaml-1.6/pGOCaml_generic.mli ---- pgocaml-1.6.old/pGOCaml_generic.mli 2012-04-13 13:55:09.000000000 +0100 -+++ pgocaml-1.6/pGOCaml_generic.mli 2017-11-22 15:52:26.785377248 +0000 -@@ -38,7 +38,7 @@ - val flush : out_channel -> unit t - val input_char : in_channel -> char t - val input_binary_int : in_channel -> int t -- val really_input : in_channel -> string -> int -> int -> unit t -+ val really_input : in_channel -> bytes -> int -> int -> unit t - val close_in : in_channel -> unit t - end - diff --git a/sources b/sources deleted file mode 100644 index aa58d43..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -58666ea22faee41a72ca7f3ede464c7b pgocaml-1.6.tgz