From 557e2c1a2cebd5b141160b0e61eb318d82bd35a8 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Fri, 22 Dec 2023 04:14:19 +0000 Subject: [PATCH 1/1] Import ocaml-eqaf_0.9-4+rpi1.debian.tar.xz [dgit import tarball ocaml-eqaf 0.9-4+rpi1 ocaml-eqaf_0.9-4+rpi1.debian.tar.xz] --- changelog | 45 +++++++++++++++++++ control | 44 ++++++++++++++++++ copyright | 35 +++++++++++++++ debian-dune | 1 + gbp.conf | 2 + libeqaf-ocaml-dev.docs | 1 + libeqaf-ocaml-dev.install.in | 14 ++++++ libeqaf-ocaml.install.in | 5 +++ ...Handle-unknown-ocaml-system-as-Linux.patch | 22 +++++++++ patches/disable-afl.patch | 32 +++++++++++++ patches/series | 2 + rules | 7 +++ source/format | 1 + watch | 2 + 14 files changed, 213 insertions(+) create mode 100644 changelog create mode 100644 control create mode 100644 copyright create mode 100644 debian-dune create mode 100644 gbp.conf create mode 100644 libeqaf-ocaml-dev.docs create mode 100644 libeqaf-ocaml-dev.install.in create mode 100644 libeqaf-ocaml.install.in create mode 100644 patches/0001-Handle-unknown-ocaml-system-as-Linux.patch create mode 100644 patches/disable-afl.patch create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format create mode 100644 watch diff --git a/changelog b/changelog new file mode 100644 index 0000000..24d43d3 --- /dev/null +++ b/changelog @@ -0,0 +1,45 @@ +ocaml-eqaf (0.9-4+rpi1) trixie-staging; urgency=medium + + * Remove build-dependency on libcrowbar-ocaml-dev. + * Disable tests which use afl++ via crowbar. + + -- Peter Michael Green Fri, 22 Dec 2023 04:14:19 +0000 + +ocaml-eqaf (0.9-4) unstable; urgency=medium + + * Fix FTBFS on mipsel and mips64el + + -- Stéphane Glondu Thu, 17 Aug 2023 14:30:17 +0200 + +ocaml-eqaf (0.9-3) unstable; urgency=medium + + * Use ocaml_dune DH buildsystem + + -- Stéphane Glondu Thu, 17 Aug 2023 09:27:46 +0200 + +ocaml-eqaf (0.9-2) unstable; urgency=medium + + * Team upload. + * Fix d/watch. + * Bump standards-version to 4.6.2 + * Fix compilation with recent dune + + -- Julien Puydt Thu, 06 Jul 2023 08:56:51 +0200 + +ocaml-eqaf (0.9-1) unstable; urgency=medium + + * New upstream release + + -- Stéphane Glondu Sat, 21 Jan 2023 09:57:42 +0100 + +ocaml-eqaf (0.8-2) unstable; urgency=medium + + * Fix debian/copyright + + -- Stéphane Glondu Sun, 28 Nov 2021 13:27:49 +0100 + +ocaml-eqaf (0.8-1) unstable; urgency=medium + + * Initial release (Closes: #1000391) + + -- Stéphane Glondu Mon, 22 Nov 2021 17:03:45 +0100 diff --git a/control b/control new file mode 100644 index 0000000..a29553d --- /dev/null +++ b/control @@ -0,0 +1,44 @@ +Source: ocaml-eqaf +Section: ocaml +Priority: optional +Maintainer: Debian OCaml Maintainers +Uploaders: Stéphane Glondu +Build-Depends: + debhelper-compat (= 13), + ocaml, + ocaml-dune, + libcstruct-ocaml-dev, + libalcotest-ocaml-dev , + dh-ocaml (>= 1.2) +Standards-Version: 4.6.2 +Rules-Requires-Root: no +Vcs-Browser: https://salsa.debian.org/ocaml-team/ocaml-eqaf +Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml-eqaf.git +Homepage: https://github.com/mirage/eqaf + +Package: libeqaf-ocaml-dev +Provides: ${ocaml:Provides} +Architecture: any +Depends: + ${ocaml:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Recommends: ocaml-findlib +Description: constant-time equal function on string for OCaml (dev files) + This package provides an equal function on string in constant-time to + avoid timing-attack with crypto stuff. + . + This package contains development files. + +Package: libeqaf-ocaml +Provides: ${ocaml:Provides} +Architecture: any +Depends: + ${ocaml:Depends}, + ${shlibs:Depends}, + ${misc:Depends} +Description: constant-time equal function on string for OCaml (runtime files) + This package provides an equal function on string in constant-time to + avoid timing-attack with crypto stuff. + . + This package contains runtime files. diff --git a/copyright b/copyright new file mode 100644 index 0000000..f4ec62c --- /dev/null +++ b/copyright @@ -0,0 +1,35 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ + +Files: * +Copyright: 2018, Romain Calascibetta + 2018, David Kaloper Meršinjak +License: MIT + +Files: check/linear_algebra.ml +Copyright: 2018, Jane Street Group, LLC +License: Apache-2.0 + +Files: debian/* +Copyright: 2021, Stéphane Glondu +License: MIT + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + the Software, and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License: Apache-2.0 + See `/usr/share/common-licenses/Apache-2.0'. diff --git a/debian-dune b/debian-dune new file mode 100644 index 0000000..6314ff6 --- /dev/null +++ b/debian-dune @@ -0,0 +1 @@ +eqaf diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..cec628c --- /dev/null +++ b/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff --git a/libeqaf-ocaml-dev.docs b/libeqaf-ocaml-dev.docs new file mode 100644 index 0000000..a7a328f --- /dev/null +++ b/libeqaf-ocaml-dev.docs @@ -0,0 +1 @@ +usr/doc/*/* diff --git a/libeqaf-ocaml-dev.install.in b/libeqaf-ocaml-dev.install.in new file mode 100644 index 0000000..e06b4e3 --- /dev/null +++ b/libeqaf-ocaml-dev.install.in @@ -0,0 +1,14 @@ +@OCamlStdlibDir@/*/*opam* +@OCamlStdlibDir@/*/*dune* +@OCamlStdlibDir@/*/*.ml* +@OCamlStdlibDir@/*/*.cmi +@OCamlStdlibDir@/*/*.cmt* +OPT: @OCamlStdlibDir@/*/*.a +OPT: @OCamlStdlibDir@/*/*.cmx +OPT: @OCamlStdlibDir@/*/*.cmxa +@OCamlStdlibDir@/*/*/*.ml* +@OCamlStdlibDir@/*/*/*.cmi +@OCamlStdlibDir@/*/*/*.cmt* +OPT: @OCamlStdlibDir@/*/*/*.a +OPT: @OCamlStdlibDir@/*/*/*.cmx +OPT: @OCamlStdlibDir@/*/*/*.cmxa diff --git a/libeqaf-ocaml.install.in b/libeqaf-ocaml.install.in new file mode 100644 index 0000000..0f2ecc4 --- /dev/null +++ b/libeqaf-ocaml.install.in @@ -0,0 +1,5 @@ +@OCamlStdlibDir@/*/META +@OCamlStdlibDir@/*/*.cma +DYN: @OCamlStdlibDir@/*/*.cmxs +@OCamlStdlibDir@/*/*/*.cma +DYN: @OCamlStdlibDir@/*/*/*.cmxs diff --git a/patches/0001-Handle-unknown-ocaml-system-as-Linux.patch b/patches/0001-Handle-unknown-ocaml-system-as-Linux.patch new file mode 100644 index 0000000..c311fc1 --- /dev/null +++ b/patches/0001-Handle-unknown-ocaml-system-as-Linux.patch @@ -0,0 +1,22 @@ +From: Stephane Glondu +Date: Thu, 17 Aug 2023 14:27:20 +0200 +Subject: Handle "unknown" ocaml system as Linux + +In Debian, on mipsel and mips64el, ocaml reports system as "unknown". +--- + clock/select/select.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/clock/select/select.ml b/clock/select/select.ml +index 78b45cf..6572136 100644 +--- a/clock/select/select.ml ++++ b/clock/select/select.ml +@@ -22,7 +22,7 @@ let () = + | [|_; "--system"; system; "-o"; output|] -> + let system = + match system with +- | "linux" | "elf" -> `Linux ++ | "linux" | "elf" | "unknown" -> `Linux + | "windows" | "mingw64" | "mingw" | "cygwin" -> `Windows + | "freebsd" -> `FreeBSD + | "macosx" -> `MacOSX diff --git a/patches/disable-afl.patch b/patches/disable-afl.patch new file mode 100644 index 0000000..162e798 --- /dev/null +++ b/patches/disable-afl.patch @@ -0,0 +1,32 @@ +Description: disable test that relies on afl++ via crowbar. +Author: Peter Michael Green + +Index: ocaml-eqaf-0.9/eqaf.opam +=================================================================== +--- ocaml-eqaf-0.9.orig/eqaf.opam ++++ ocaml-eqaf-0.9/eqaf.opam +@@ -24,7 +24,6 @@ depends: [ + "cstruct" {>= "1.1.0"} + "base64" {with-test} + "alcotest" {with-test} +- "crowbar" {with-test} + "fmt" {with-test & >= "0.8.7"} + "bechamel" {with-test} + ] +\ No newline at end of file +Index: ocaml-eqaf-0.9/fuzz/dune +=================================================================== +--- ocaml-eqaf-0.9.orig/fuzz/dune ++++ ocaml-eqaf-0.9/fuzz/dune +@@ -1,11 +0,0 @@ +-(executable +- (name fuzz) +- (libraries crowbar eqaf)) +- +-(rule +- (alias runtest) +- (package eqaf) +- (deps +- (:fuzz fuzz.exe)) +- (action +- (run %{fuzz}))) diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..303e69f --- /dev/null +++ b/patches/series @@ -0,0 +1,2 @@ +0001-Handle-unknown-ocaml-system-as-Linux.patch +disable-afl.patch diff --git a/rules b/rules new file mode 100755 index 0000000..91ce70b --- /dev/null +++ b/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +include /usr/share/ocaml/ocamlvars.mk + +%: + dh $@ --with ocaml --buildsystem ocaml_dune diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/watch b/watch new file mode 100644 index 0000000..9df1cdc --- /dev/null +++ b/watch @@ -0,0 +1,2 @@ +version=4 +https://github.com/mirage/eqaf/tags .*/v?([0-9.]+)\.tar\.gz -- 2.30.2