From 381edad2501994dac60da851a2a9ab0d0609bbfa Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 19 Jun 2024 22:07:59 +0100
Subject: [PATCH] New upstream version 0.7

New download URL
Check GPG signature
resolves: RHEL-90257

(cherry picked from commit cddffbe964c2b84e246c9d226faae2127425586d)

tests: Make sure -laugeas is available for test

(cherry picked from commit 9ce066d30ea6810d9832d5c83ba436939a39bdf3)
---
 .gitignore                                    |   5 +--
 0001-Use-ocamlopt-g-option.patch              |  28 --------------
 ...-returns-const-value-pointer-in-OCam.patch |  35 ------------------
 libguestfs.keyring                            | Bin 0 -> 2823 bytes
 ocaml-augeas.spec                             |  24 +++++++-----
 sources                                       |   3 +-
 tests/tests.yml                               |   1 +
 7 files changed, 20 insertions(+), 76 deletions(-)
 delete mode 100644 0001-Use-ocamlopt-g-option.patch
 delete mode 100644 0002-caml_named_value-returns-const-value-pointer-in-OCam.patch
 create mode 100644 libguestfs.keyring

diff --git a/.gitignore b/.gitignore
index 3cfc1a3..19e8062 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-ocaml-augeas-0.4.tar.gz
-/ocaml-augeas-0.5.tar.gz
-/ocaml-augeas-0.6.tar.gz
+/ocaml-augeas-*.tar.gz
+/ocaml-augeas-*.tar.gz.sig
diff --git a/0001-Use-ocamlopt-g-option.patch b/0001-Use-ocamlopt-g-option.patch
deleted file mode 100644
index be46e09..0000000
--- a/0001-Use-ocamlopt-g-option.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 56c0602e972f1fae336198eb9587d71f1e36daff Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 20 Aug 2019 15:06:57 +0100
-Subject: [PATCH 1/2] Use ocamlopt -g option.
-
-Originally from Fedora.
----
- Makefile.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index e01385f..4ae5ef5 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -34,8 +34,8 @@ LIBS		= @AUGEAS_LIBS@ @LIBXML2_LIBS@ @LIBS@
- 
- OCAMLCFLAGS	= -g
- OCAMLCPACKAGES	=
--OCAMLOPTFLAGS	=
--OCAMLOPTPACKAGES =
-+OCAMLOPTFLAGS	= $(OCAMLCFLAGS)
-+OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
- 
- OCAMLDOCFLAGS	= -html -sort
- 
--- 
-2.23.0
-
diff --git a/0002-caml_named_value-returns-const-value-pointer-in-OCam.patch b/0002-caml_named_value-returns-const-value-pointer-in-OCam.patch
deleted file mode 100644
index 22c5ed9..0000000
--- a/0002-caml_named_value-returns-const-value-pointer-in-OCam.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1cf5aef99b26a46529ca797547c0b49627fffe78 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Sat, 7 Dec 2019 11:08:54 +0000
-Subject: [PATCH 2/2] caml_named_value returns const value pointer in OCaml
- 4.09+
-
----
- augeas-c.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/augeas-c.c b/augeas-c.c
-index 9217017..679bcb5 100644
---- a/augeas-c.c
-+++ b/augeas-c.c
-@@ -86,7 +86,7 @@ static const int error_map_len = sizeof error_map / sizeof error_map[0];
- static void
- raise_error_and_maybe_close (augeas_t t, const char *msg, bool close_handle)
- {
--  value *exn = caml_named_value ("Augeas.Error");
-+  const value *exn = caml_named_value ("Augeas.Error");
-   value args[5];
-   const int code = aug_error (t);
-   const char *aug_err_msg;
-@@ -132,7 +132,7 @@ raise_error_and_maybe_close (augeas_t t, const char *msg, bool close_handle)
- static void
- raise_init_error (const char *msg)
- {
--  value *exn = caml_named_value ("Augeas.Error");
-+  const value *exn = caml_named_value ("Augeas.Error");
-   value args[5];
- 
-   args[0] = caml_alloc (1, 0);
--- 
-2.23.0
-
diff --git a/libguestfs.keyring b/libguestfs.keyring
new file mode 100644
index 0000000000000000000000000000000000000000..bb3eb5537b7c398a10b7e2b26ca00af011d1a73e
GIT binary patch
literal 2823
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

literal 0
HcmV?d00001

diff --git a/ocaml-augeas.spec b/ocaml-augeas.spec
index 1d9911a..656a862 100644
--- a/ocaml-augeas.spec
+++ b/ocaml-augeas.spec
@@ -2,18 +2,15 @@
 ExcludeArch: %{ix86}
 
 Name:           ocaml-augeas
-Version:        0.6
-Release:        37%{?dist}
+Version:        0.7
+Release:        1%{?dist}
 Summary:        OCaml bindings for Augeas configuration API
 License:        LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
 
-URL:            https://people.redhat.com/~rjones/augeas/files/
-Source0:        https://people.redhat.com/~rjones/augeas/files/%{name}-%{version}.tar.gz
-
-# Upstream patch to enable debuginfo.
-Patch1:         0001-Use-ocamlopt-g-option.patch
-# Const-correctness fix for OCaml 4.09+
-Patch2:         0002-caml_named_value-returns-const-value-pointer-in-OCam.patch
+URL:            https://people.redhat.com/~rjones/augeas/
+Source0:        https://download.libguestfs.org/ocaml-augeas/ocaml-augeas-%{version}.tar.gz
+Source1:        https://download.libguestfs.org/ocaml-augeas/ocaml-augeas-%{version}.tar.gz.sig
+Source2:        libguestfs.keyring
 
 BuildRequires:  make
 BuildRequires:  ocaml >= 3.09.0
@@ -21,6 +18,7 @@ BuildRequires:  ocaml-findlib
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-rpm-macros
 BuildRequires:  augeas-devel >= 0.1.0
+BuildRequires: gnupg2
 
 
 %description
@@ -39,6 +37,7 @@ developing applications that use %{name}.
 
 
 %prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1
 
 # Pass -g to ocamlmklib
@@ -48,6 +47,7 @@ sed -i 's/ocamlmklib/& -g/' Makefile.in
 %build
 %configure
 %ifarch %{ocaml_native_compiler}
+# _smp_mflags breaks the build.
 make
 %else
 make mlaugeas.cma test_augeas
@@ -85,6 +85,12 @@ ocamlfind install augeas META *.mli *.cma *.a augeas.cmi *.so
 
 
 %changelog
+* Thu May 08 2025 Richard W.M. Jones <rjones@redhat.com> - 0.7-1
+- New upstream version 0.7
+- New download URL
+- Check GPG signature
+  resolves: RHEL-90257
+
 * Wed Oct 30 2024 Troy Dawson <tdawson@redhat.com> - 0.6-37
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018
diff --git a/sources b/sources
index f55c17d..2a82037 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (ocaml-augeas-0.6.tar.gz) = e747f5c09d3821b41d98e3f12c8dfe9bb13a69d6ccaaf954f4bb33e8e4d9d62603ae26fe9f93f10b2705872526b1863a1c20e0c8a53858fdf60f8cb8cbf50b7a
+SHA512 (ocaml-augeas-0.7.tar.gz) = 2d1ef07f116abf04d74ae4bb2b9c088fd69b1d46509b684fdad454deeca554bbf737346b115976f2f7a29851a3f5186ef0479197412684a83fcd60286e6ae3ec
+SHA512 (ocaml-augeas-0.7.tar.gz.sig) = 5834ea0cd1a991f08b6c61c783cad7c9e9aaf5a3d0ac86ac8e9609353daf43b9a9fab9df2241b5f5aee225358ab89dfd7e0a579b044d01b2e2007fc4be50ee92
diff --git a/tests/tests.yml b/tests/tests.yml
index 68d1d0a..620490e 100755
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -7,6 +7,7 @@
     - ocaml
     - ocaml-findlib
     - ocaml-augeas-devel
+    - augeas-devel
     tests:
     - simple:
         dir: .